util: Make ns_enter() a void function and report setns() errors
ns_enter() returns an integer... but it's always zero. If we actually fail the function doesn't return. Therefore it makes more sense for this to be a function returning void, and we can remove the cases where we pointlessly checked its return value. In addition ns_enter() is usually called from an ephemeral thread created by NS_CALL(). That means that the exit(EXIT_FAILURE) there usually won't be reported (since NS_CALL() doesn't wait() for the thread). So, use die() instead to print out some information in the unlikely event that our setns() here does fail. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:

committed by
Stefano Brivio

parent
b15ce5b6ce
commit
6920adda0d
3
conf.c
3
conf.c
@@ -101,9 +101,10 @@ static int get_bound_ports_ns(void *arg)
|
||||
struct get_bound_ports_ns_arg *a = (struct get_bound_ports_ns_arg *)arg;
|
||||
struct ctx *c = a->c;
|
||||
|
||||
if (!c->pasta_netns_fd || ns_enter(c))
|
||||
if (!c->pasta_netns_fd)
|
||||
return 0;
|
||||
|
||||
ns_enter(c);
|
||||
get_bound_ports(c, 1, a->proto);
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user