diff options
| author | Micael Karlberg <bmk@erlang.org> | 2019-11-26 10:54:10 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2019-11-26 10:54:10 +0100 |
| commit | 171cf38c343e50ae7a4f28a6c1a1a58acad17407 (patch) | |
| tree | ac3ac97a5b9ee9085b8bf5f62cf83b2c7c745d7a | |
| parent | fad332748b4a731fe336b51335e9d10a35e5c738 (diff) | |
| download | erlang-171cf38c343e50ae7a4f28a6c1a1a58acad17407.tar.gz | |
[kernel|net] Moved some functions out of the netns tests
OTP-16212
| -rw-r--r-- | erts/emulator/nifs/common/prim_net_nif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/nifs/common/prim_net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c index 491b633716..42bfd8b5e0 100644 --- a/erts/emulator/nifs/common/prim_net_nif.c +++ b/erts/emulator/nifs/common/prim_net_nif.c @@ -307,10 +307,6 @@ static void net_down(ErlNifEnv* env, const ErlNifMonitor* mon); */ -#ifdef HAVE_SETNS -static BOOLEAN_T enet_getifaddrs_netns(ErlNifEnv* env, - ERL_NIF_TERM map, - char** netns); static ERL_NIF_TERM enet_getifaddrs(ErlNifEnv* env, char* netns); static ERL_NIF_TERM enet_getifaddrs_process(ErlNifEnv* env, @@ -334,6 +330,10 @@ static char* make_ifaddrs(ErlNifEnv* env, ERL_NIF_TERM ifu_value, ERL_NIF_TERM data, ERL_NIF_TERM* ifAddrs); +#ifdef HAVE_SETNS +static BOOLEAN_T enet_getifaddrs_netns(ErlNifEnv* env, + ERL_NIF_TERM map, + char** netns); static BOOLEAN_T change_network_namespace(char* netns, int* cns, int* err); static BOOLEAN_T restore_network_namespace(int ns, int* err); #endif @@ -1131,9 +1131,9 @@ ERL_NIF_TERM enet_getifaddrs(ErlNifEnv* env, char* netns) { ERL_NIF_TERM result; struct ifaddrs* ifap; + int save_errno; #ifdef HAVE_SETNS int current_ns = 0; - int save_errno; #endif NDBG( ("NET", "enet_getifaddrs -> entry with" |