net/pasta: naming of protocols (ipv4/6 -> ip4/6)

Author: robertswiecki

cmdline.cc

@@ -545,16 +545,16 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
 	nsjconf->user_net.nsiface = "eth0";
 	nsjconf->user_net.tcp_ports = "none";
 	nsjconf->user_net.udp_ports = "none";
-	nsjconf->user_net.enable_ipv4_dhcp = false;
+	nsjconf->user_net.enable_ip4_dhcp = false;
 	nsjconf->user_net.enable_dns = false;
 	nsjconf->user_net.dns_forward = "";
 	nsjconf->user_net.enable_tcp = true;
 	nsjconf->user_net.enable_udp = true;
 	nsjconf->user_net.enable_icmp = true;
 	nsjconf->user_net.enable_icmp = true;
 	nsjconf->user_net.no_map_gw = false;
-	nsjconf->user_net.enable_ipv6_dhcp = false;
-	nsjconf->user_net.enable_ipv6_ra = false;
+	nsjconf->user_net.enable_ip6_dhcp = false;
+	nsjconf->user_net.enable_ip6_ra = false;
 	nsjconf->orig_uid = getuid();
 	nsjconf->orig_euid = geteuid();
 	nsjconf->seccomp_fprog.filter = NULL;

config.cc

@@ -295,15 +295,15 @@ static bool parseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig& njc) {
 		nsjconf->user_net.nsiface = njc.user_net().ns_iface();
 		nsjconf->user_net.tcp_ports = njc.user_net().tcp_ports();
 		nsjconf->user_net.udp_ports = njc.user_net().udp_ports();
-		nsjconf->user_net.enable_ipv4_dhcp = njc.user_net().enable_ipv4_dhcp();
+		nsjconf->user_net.enable_ip4_dhcp = njc.user_net().enable_ip4_dhcp();
 		nsjconf->user_net.enable_dns = njc.user_net().enable_dns();
 		nsjconf->user_net.dns_forward = njc.user_net().dns_forward();
 		nsjconf->user_net.enable_tcp = njc.user_net().enable_tcp();
 		nsjconf->user_net.enable_udp = njc.user_net().enable_udp();
 		nsjconf->user_net.enable_icmp = njc.user_net().enable_icmp();
 		nsjconf->user_net.no_map_gw = njc.user_net().no_map_gw();
-		nsjconf->user_net.enable_ipv6_dhcp = njc.user_net().enable_ipv6_dhcp();
-		nsjconf->user_net.enable_ipv6_ra = njc.user_net().enable_ipv6_ra();
+		nsjconf->user_net.enable_ip6_dhcp = njc.user_net().enable_ip6_dhcp();
+		nsjconf->user_net.enable_ip6_ra = njc.user_net().enable_ip6_ra();
 	}
 
 	if (njc.has_exec_bin()) {

config.proto

@@ -271,10 +271,6 @@ message NsJailConfig {
 	optional string macvlan_vs_ma = 93 [default = ""];
 	optional string macvlan_vs_mo = 94 [default = "private"];
 
-	/* Binary path (with arguments) to be executed. If not specified here, it
-	   can be specified with cmd-line as "-- /path/to/command arg1 arg2" */
-	optional Exe exec_bin = 95;
-
 	message UserNet {
 		optional bool enable = 1 [default = false];
 		optional string ip = 2 [default = "10.255.255.2"];
@@ -286,15 +282,19 @@ message NsJailConfig {
 		optional string ns_iface = 8 [default = "eth0"];
 		optional string tcp_ports = 9 [default = "none"];
 		optional string udp_ports = 10 [default = "none"];
-		optional bool enable_ipv4_dhcp = 11 [default = false];
+		optional bool enable_ip4_dhcp = 11 [default = false];
 		optional bool enable_dns = 12 [default = false];
 		optional string dns_forward = 13 [default = ""];
 		optional bool enable_tcp = 14 [default = true];
 		optional bool enable_udp = 15 [default = true];
 		optional bool enable_icmp = 16 [default = true];
 		optional bool no_map_gw = 17 [default = false];
-		optional bool enable_ipv6_dhcp = 18 [default = false];
-		optional bool enable_ipv6_ra = 19 [default = false];
+		optional bool enable_ip6_dhcp = 18 [default = false];
+		optional bool enable_ip6_ra = 19 [default = false];
 	}
-	optional UserNet user_net = 96;
+	optional UserNet user_net = 95;
+
+	/* Binary path (with arguments) to be executed. If not specified here, it
+	   can be specified with cmd-line as "-- /path/to/command arg1 arg2" */
+	optional Exe exec_bin = 96;
 }

net.cc

@@ -188,17 +188,23 @@ static bool spawnPasta(nsjconf_t* nsjconf, int pid) {
 		std::vector<const char*> argv;
 		argv.push_back("pasta");
 
-		if (!nsjconf->user_net.enable_ipv4_dhcp) {
+		bool ip4_enabled =
+		    !nsjconf->user_net.ip.empty() || nsjconf->user_net.enable_ip4_dhcp;
+		bool ip6_enabled = !nsjconf->user_net.ip6.empty() ||
+				   nsjconf->user_net.enable_ip6_dhcp ||
+				   nsjconf->user_net.enable_ip6_ra;
+
+		if (!nsjconf->user_net.enable_ip4_dhcp) {
 			argv.push_back("--no-dhcp");
 		}
-		if (!nsjconf->user_net.enable_ipv6_dhcp) {
+		if (!nsjconf->user_net.enable_ip6_dhcp) {
 			argv.push_back("--no-dhcpv6");
 		}
-		if (!nsjconf->user_net.enable_ipv6_ra) {
+		if (!nsjconf->user_net.enable_ip6_ra) {
 			argv.push_back("--no-ra");
 		}
 
-		if (!nsjconf->user_net.enable_ipv4_dhcp && !nsjconf->user_net.enable_ipv6_dhcp) {
+		if (!nsjconf->user_net.enable_ip4_dhcp && !nsjconf->user_net.enable_ip6_dhcp) {
 			argv.push_back("--config-net");
 		}
 
@@ -258,9 +264,12 @@ static bool spawnPasta(nsjconf_t* nsjconf, int pid) {
 			}
 		}
 
-		if (nsjconf->user_net.ip6.empty()) {
+		if (!ip4_enabled) {
 			argv.push_back("-4");
 		}
+		if (!ip6_enabled) {
+			argv.push_back("-6");
+		}
 
 		if (!nsjconf->user_net.nsiface.empty()) {
 			argv.push_back("-I");

nsjail.h

@@ -159,15 +159,15 @@ struct nsjconf_t {
 		std::string nsiface;
 		std::string tcp_ports;
 		std::string udp_ports;
-		bool enable_ipv4_dhcp;
+		bool enable_ip4_dhcp;
 		bool enable_dns;
 		std::string dns_forward;
 		bool enable_tcp;
 		bool enable_udp;
 		bool enable_icmp;
 		bool no_map_gw;
-		bool enable_ipv6_dhcp;
-		bool enable_ipv6_ra;
+		bool enable_ip6_dhcp;
+		bool enable_ip6_ra;
 	} user_net;
 	std::string cgroup_mem_mount;
 	std::string cgroup_mem_parent;