diff --git a/cmdline.cc b/cmdline.cc index d29a35a..d706b76 100644 --- a/cmdline.cc +++ b/cmdline.cc @@ -393,15 +393,14 @@ void setupUsers(nsjconf_t* nsjconf) { } std::string parseMACVlanMode(const char* optarg) { - if (strcasecmp(optarg, "private") != 0 && - strcasecmp(optarg, "vepa") != 0 && - strcasecmp(optarg, "bridge") != 0 && - strcasecmp(optarg, "passthru") != 0) { + if (strcasecmp(optarg, "private") != 0 && strcasecmp(optarg, "vepa") != 0 && + strcasecmp(optarg, "bridge") != 0 && strcasecmp(optarg, "passthru") != 0) { LOG_F( - "macvlan mode can only be one of the values: 'private'/'vepa'/'bridge'/'passthru' ('%s' " + "macvlan mode can only be one of the values: " + "'private'/'vepa'/'bridge'/'passthru' ('%s' " "provided).", optarg); - } + } return std::string(optarg); } diff --git a/net.cc b/net.cc index d8d750d..87c3df9 100644 --- a/net.cc +++ b/net.cc @@ -84,12 +84,13 @@ static bool cloneIface( rtnl_link_set_addr(rmv, nladdr); nl_addr_put(nladdr); } - - if ((err = rtnl_link_macvlan_set_mode(rmv, rtnl_link_macvlan_str2mode(nsjconf->iface_vs_mo.c_str()))) < 0) { - LOG_E("rtnl_link_macvlan_set_mode(mode:'%s') failed: %s", - nsjconf->iface_vs_mo.c_str(), nl_geterror(err)); + + if ((err = rtnl_link_macvlan_set_mode( + rmv, rtnl_link_macvlan_str2mode(nsjconf->iface_vs_mo.c_str()))) < 0) { + LOG_E("rtnl_link_macvlan_set_mode(mode:'%s') failed: %s", + nsjconf->iface_vs_mo.c_str(), nl_geterror(err)); } - + if ((err = rtnl_link_add(sk, rmv, NLM_F_CREATE)) < 0) { LOG_E("rtnl_link_add(name:'%s' link:'%s'): %s", IFACE_NAME, nsjconf->iface_vs.c_str(), nl_geterror(err));