projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9414b30
)
util.net: Fix s2sout on Windows (return 0.0.0.0 and :: instead of an empty list)
author
Kim Alvefur
<zash@zash.se>
Fri, 30 Aug 2013 14:14:31 +0000
(16:14 +0200)
committer
Kim Alvefur
<zash@zash.se>
Fri, 30 Aug 2013 14:14:31 +0000
(16:14 +0200)
util-src/net.c
patch
|
blob
|
history
diff --git
a/util-src/net.c
b/util-src/net.c
index 09ba92b8cb3b66eda8bb57e0cac2e550405ada13..e307c628146351873175d0dd92eb25d66188f73d 100644
(file)
--- a/
util-src/net.c
+++ b/
util-src/net.c
@@
-42,8
+42,8
@@
static int lc_local_addresses(lua_State *L)
const long ip4_linklocal = htonl(0xa9fe0000); /* 169.254.0.0 */
const long ip4_mask = htonl(0xffff0000);
struct ifaddrs *addr = NULL, *a;
const long ip4_linklocal = htonl(0xa9fe0000); /* 169.254.0.0 */
const long ip4_mask = htonl(0xffff0000);
struct ifaddrs *addr = NULL, *a;
- int n = 1;
#endif
#endif
+ int n = 1;
int type = luaL_checkoption(L, 1, "both", type_strings);
const char link_local = lua_toboolean(L, 2); /* defaults to 0 (false) */
const char ipv4 = (type == 0 || type == 1);
int type = luaL_checkoption(L, 1, "both", type_strings);
const char link_local = lua_toboolean(L, 2); /* defaults to 0 (false) */
const char ipv4 = (type == 0 || type == 1);
@@
-92,6
+92,15
@@
static int lc_local_addresses(lua_State *L)
}
freeifaddrs(addr);
}
freeifaddrs(addr);
+#else
+ if (ipv4) {
+ lua_pushstring(L, "0.0.0.0");
+ lua_rawseti(L, -2, n++);
+ }
+ if (ipv6) {
+ lua_pushstring(L, "::");
+ lua_rawseti(L, -2, n++);
+ }
#endif
return 1;
}
#endif
return 1;
}