aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/nifs/common/net_nif.c
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-06-12 15:47:29 +0200
committerMicael Karlberg <[email protected]>2018-09-18 14:50:18 +0200
commitef34944c970f842a7406f59c827243c8be77fdc2 (patch)
tree6b0f6954559cbffffada3e076b93267f79181b70 /erts/emulator/nifs/common/net_nif.c
parentd892681a4554b08442db219c3ac161027e9a4c4f (diff)
downloadotp-ef34944c970f842a7406f59c827243c8be77fdc2.tar.gz
otp-ef34944c970f842a7406f59c827243c8be77fdc2.tar.bz2
otp-ef34944c970f842a7406f59c827243c8be77fdc2.zip
[net-nif] Fixed getnameinfo
And now fixed the getnameinfo function. OTP-14831
Diffstat (limited to 'erts/emulator/nifs/common/net_nif.c')
-rw-r--r--erts/emulator/nifs/common/net_nif.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/erts/emulator/nifs/common/net_nif.c b/erts/emulator/nifs/common/net_nif.c
index 900828c7b2..e0129aec69 100644
--- a/erts/emulator/nifs/common/net_nif.c
+++ b/erts/emulator/nifs/common/net_nif.c
@@ -659,6 +659,7 @@ static ErlNifResourceTypeInit netInit = {
*
* The "proper" net functions:
* ------------------------------
+ * nif_gethostname/0
* nif_getnameinfo/2
* nif_getaddrinfo/3
* nif_if_name2index/1
@@ -860,7 +861,6 @@ ERL_NIF_TERM ngethostname(ErlNifEnv* env)
* Arguments:
* SockAddr - Socket Address (address and port)
* Flags - The flags argument modifies the behavior of getnameinfo().
- * Not used!
*/
static
@@ -869,33 +869,33 @@ ERL_NIF_TERM nif_getnameinfo(ErlNifEnv* env,
const ERL_NIF_TERM argv[])
{
ERL_NIF_TERM result, eSockAddr;
- unsigned int eFlags;
+ ERL_NIF_TERM eFlags;
int flags = 0; // Just in case...
SockAddress sa;
SOCKLEN_T saLen = 0; // Just in case...
NDBG( ("nif_getnameinfo -> entry (%d)\r\n", argc) );
- if ((argc != 2) ||
- !GET_UINT(env, argv[1], &eFlags)) {
+ if (argc != 2)
return enif_make_badarg(env);
- }
eSockAddr = argv[0];
+ eFlags = argv[1];
NDBG( ("nif_getnameinfo -> "
"\r\n SockAddr: %T"
"\r\n Flags: %T"
- "\r\n", argv[0], argv[1]) );
+ "\r\n", eSockAddr, eFlags) );
if (!decode_nameinfo_flags(env, eFlags, &flags))
return enif_make_badarg(env);
- if (decode_in_sockaddr(env, eSockAddr, &sa, &saLen))
+ if (!decode_in_sockaddr(env, eSockAddr, &sa, &saLen))
return enif_make_badarg(env);
result = ngetnameinfo(env, &sa, saLen, flags);
- NDBG( ("nif_getnameinfo -> done when result: %T\r\n", result) );
+ NDBG( ("nif_getnameinfo -> done when result: "
+ "\r\n %T\r\n", result) );
return result;
}
@@ -922,6 +922,8 @@ ERL_NIF_TERM ngetnameinfo(ErlNifEnv* env,
serv, servLen,
flags);
+ NDBG( ("ngetnameinfo -> res: %d\r\n", res) );
+
switch (res) {
case 0:
{
@@ -1569,6 +1571,7 @@ BOOLEAN_T decode_nameinfo_flags(ErlNifEnv* env,
result = FALSE;
}
} else if (IS_LIST(env, eflags)) {
+ NDBG( ("decode_nameinfo_flags -> is atom\r\n") );
result = decode_nameinfo_flags_list(env, eflags, flags);
} else {
result = FALSE;