woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make indent

Browse Source
This commit is contained in:
Robert Swiecki 2021-06-16 17:44:07 +02:00
parent 3342a8d483
commit 2e9fd0e2e4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmdline.cc
View File

@ -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);
}

11
net.cc
View File

@ -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));