nsjail: iface_no_lo -> iface_lo

diff --git a/cmdline.cc b/cmdline.cc
index ec6a20b..b927312 100644 (file)
--- a/cmdline.cc
+++ b/cmdline.cc
@@ -374,7 +374,7 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
        nsjconf->cgroup_cpu_mount = "/sys/fs/cgroup/cpu";
        nsjconf->cgroup_cpu_parent = "NSJAIL";
        nsjconf->cgroup_cpu_ms_per_sec = 0U;
-       nsjconf->iface_no_lo = false;
+       nsjconf->iface_lo = true;
        nsjconf->iface_vs_ip = "0.0.0.0";
        nsjconf->iface_vs_nm = "255.255.255.0";
        nsjconf->iface_vs_gw = "0.0.0.0";
@@ -673,7 +673,7 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                        break;
                case 0x700:
-                       nsjconf->iface_no_lo = true;
+                       nsjconf->iface_lo = false;
                        break;
                case 'I':
                        nsjconf->iface_vs = optarg;

diff --git a/config.cc b/config.cc
index 34c687d..dbafa4c 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -265,7 +265,7 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig&
        nsjconf->cgroup_net_cls_mount = njc.cgroup_net_cls_mount().c_str();
        nsjconf->cgroup_net_cls_parent = njc.cgroup_net_cls_parent().c_str();
 
-       nsjconf->iface_no_lo = njc.iface_no_lo();
+       nsjconf->iface_lo = !(njc.iface_no_lo());
        nsjconf->iface_vs = DUP_IF_SET(njc, macvlan_iface);
        nsjconf->iface_vs_ip = njc.macvlan_vs_ip().c_str();
        nsjconf->iface_vs_nm = njc.macvlan_vs_nm().c_str();

diff --git a/net.cc b/net.cc
index 202eaae..bf26646 100644 (file)
--- a/net.cc
+++ b/net.cc
@@ -410,16 +410,16 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
 }
 
 bool initNsFromChild(nsjconf_t* nsjconf) {
-       if (nsjconf->clone_newnet == false) {
+       if (!nsjconf->clone_newnet) {
                return true;
        }
-       if (nsjconf->iface_no_lo == false) {
-               if (ifaceUp("lo") == false) {
+       if (nsjconf->iface_lo) {
+               if (!ifaceUp("lo")) {
                        return false;
                }
        }
        if (!nsjconf->iface_vs.empty()) {
-               if (netConfigureVs(nsjconf) == false) {
+               if (!netConfigureVs(nsjconf)) {
                        return false;
                }
        }

diff --git a/nsjail.h b/nsjail.h
index a53609a..ebe3359 100644 (file)
--- a/nsjail.h
+++ b/nsjail.h
@@ -123,7 +123,7 @@ struct nsjconf_t {
        bool mount_proc;
        const char* proc_path;
        bool is_proc_rw;
-       bool iface_no_lo;
+       bool iface_lo;
        std::string iface_vs;
        std::string iface_vs_ip;
        std::string iface_vs_nm;