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

net: move all iface_vs* options from char* to std::string

Browse Source
This commit is contained in:
Robert Swiecki 2018-02-10 18:18:40 +01:00
parent 97278f191b
commit 7bddb40d87
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmdline.cc
View File

@ -375,7 +375,6 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
nsjconf->cgroup_cpu_parent = "NSJAIL";
nsjconf->cgroup_cpu_ms_per_sec = 0U;
nsjconf->iface_no_lo = false;
nsjconf->iface_vs = NULL;
nsjconf->iface_vs_ip = "0.0.0.0";
nsjconf->iface_vs_nm = "255.255.255.0";
nsjconf->iface_vs_gw = "0.0.0.0";

47
net.cc
View File

@ -55,11 +55,12 @@ bool initNsFromParent(nsjconf_t* nsjconf, int pid) {
if (nsjconf->clone_newnet == false) {
return true;
}
if (nsjconf->iface_vs == NULL) {
if (nsjconf->iface_vs.empty()) {
return true;
}
LOG_D("Putting iface:'%s' into namespace of PID:%d (with libnl3)", nsjconf->iface_vs, pid);
LOG_D("Putting iface:'%s' into namespace of PID:%d (with libnl3)",
nsjconf->iface_vs.c_str(), pid);
struct nl_sock* sk = nl_socket_alloc();
if (sk == NULL) {
@ -89,9 +90,9 @@ bool initNsFromParent(nsjconf_t* nsjconf, int pid) {
return false;
}
int master_index = rtnl_link_name2i(link_cache, nsjconf->iface_vs);
int master_index = rtnl_link_name2i(link_cache, nsjconf->iface_vs.c_str());
if (master_index == 0) {
LOG_E("rtnl_link_name2i(): Did not find '%s' interface", nsjconf->iface_vs);
LOG_E("rtnl_link_name2i(): Did not find '%s' interface", nsjconf->iface_vs.c_str());
nl_cache_free(link_cache);
rtnl_link_put(rmv);
nl_socket_free(sk);
@ -103,8 +104,8 @@ bool initNsFromParent(nsjconf_t* nsjconf, int pid) {
rtnl_link_set_ns_pid(rmv, pid);
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,
nl_geterror(err));
LOG_E("rtnl_link_add(name:'%s' link:'%s'): %s", IFACE_NAME,
nsjconf->iface_vs.c_str(), nl_geterror(err));
nl_cache_free(link_cache);
rtnl_link_put(rmv);
nl_socket_free(sk);
@ -122,20 +123,20 @@ bool initNsFromParent(nsjconf_t* nsjconf, int pid) {
if (nsjconf->clone_newnet == false) {
return true;
}
if (nsjconf->iface_vs == NULL) {
if (nsjconf->iface_vs.empty()) {
return true;
}
LOG_D(
"Putting iface:'%s' into namespace of PID:%d (with /sbin/ip)", nsjconf->iface_vs, pid);
LOG_D("Putting iface:'%s' into namespace of PID:%d (with /sbin/ip)",
nsjconf->iface_vs.c_str(), pid);
char pid_str[256];
snprintf(pid_str, sizeof(pid_str), "%d", pid);
const char* argv[] = {"/sbin/ip", "link", "add", "link", (char*)nsjconf->iface_vs, "name",
IFACE_NAME, "netns", pid_str, "type", "macvlan", "mode", "bridge", NULL};
const char* argv[] = {"/sbin/ip", "link", "add", "link", (char*)nsjconf->iface_vs.c_str(),
"name", IFACE_NAME, "netns", pid_str, "type", "macvlan", "mode", "bridge", NULL};
if (subproc::systemExe(argv, environ) != 0) {
LOG_E("Couldn't create MACVTAP interface for '%s'", nsjconf->iface_vs);
LOG_E("Couldn't create MACVTAP interface for '%s'", nsjconf->iface_vs.c_str());
return false;
}
@ -331,8 +332,8 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
return false;
}
if (inet_pton(AF_INET, nsjconf->iface_vs_ip, &addr) != 1) {
PLOG_E("Cannot convert '%s' into an IPv4 address", nsjconf->iface_vs_ip);
if (inet_pton(AF_INET, nsjconf->iface_vs_ip.c_str(), &addr) != 1) {
PLOG_E("Cannot convert '%s' into an IPv4 address", nsjconf->iface_vs_ip.c_str());
close(sock);
return false;
}
@ -346,20 +347,22 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
sa->sin_family = AF_INET;
sa->sin_addr = addr;
if (ioctl(sock, SIOCSIFADDR, &ifr) == -1) {
PLOG_E("ioctl(iface='%s', SIOCSIFADDR, '%s')", IFACE_NAME, nsjconf->iface_vs_ip);
PLOG_E("ioctl(iface='%s', SIOCSIFADDR, '%s')", IFACE_NAME,
nsjconf->iface_vs_ip.c_str());
close(sock);
return false;
}
if (inet_pton(AF_INET, nsjconf->iface_vs_nm, &addr) != 1) {
PLOG_E("Cannot convert '%s' into a IPv4 netmask", nsjconf->iface_vs_nm);
if (inet_pton(AF_INET, nsjconf->iface_vs_nm.c_str(), &addr) != 1) {
PLOG_E("Cannot convert '%s' into a IPv4 netmask", nsjconf->iface_vs_nm.c_str());
close(sock);
return false;
}
sa->sin_family = AF_INET;
sa->sin_addr = addr;
if (ioctl(sock, SIOCSIFNETMASK, &ifr) == -1) {
PLOG_E("ioctl(iface='%s', SIOCSIFNETMASK, '%s')", IFACE_NAME, nsjconf->iface_vs_nm);
PLOG_E("ioctl(iface='%s', SIOCSIFNETMASK, '%s')", IFACE_NAME,
nsjconf->iface_vs_nm.c_str());
close(sock);
return false;
}
@ -369,8 +372,8 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
return false;
}
if (inet_pton(AF_INET, nsjconf->iface_vs_gw, &addr) != 1) {
PLOG_E("Cannot convert '%s' into a IPv4 GW address", nsjconf->iface_vs_gw);
if (inet_pton(AF_INET, nsjconf->iface_vs_gw.c_str(), &addr) != 1) {
PLOG_E("Cannot convert '%s' into a IPv4 GW address", nsjconf->iface_vs_gw.c_str());
close(sock);
return false;
}
@ -397,7 +400,7 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
rt.rt_dev = rt_dev;
if (ioctl(sock, SIOCADDRT, &rt) == -1) {
PLOG_E("ioctl(SIOCADDRT, '%s')", nsjconf->iface_vs_gw);
PLOG_E("ioctl(SIOCADDRT, '%s')", nsjconf->iface_vs_gw.c_str());
close(sock);
return false;
}
@ -415,7 +418,7 @@ bool initNsFromChild(nsjconf_t* nsjconf) {
return false;
}
}
if (nsjconf->iface_vs) {
if (!nsjconf->iface_vs.empty()) {
if (netConfigureVs(nsjconf) == false) {
return false;
}

8
nsjail.h
View File

@ -124,10 +124,10 @@ struct nsjconf_t {
const char* proc_path;
bool is_proc_rw;
bool iface_no_lo;
const char* iface_vs;
const char* iface_vs_ip;
const char* iface_vs_nm;
const char* iface_vs_gw;
std::string iface_vs;
std::string iface_vs_ip;
std::string iface_vs_nm;
std::string iface_vs_gw;
const char* cgroup_mem_mount;
const char* cgroup_mem_parent;
size_t cgroup_mem_max;