diff options
| author | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
| commit | 885e117a1fe2f0a77d330c89ad5e44636f25815e (patch) | |
| tree | 2b8a5826f55d17228f3c87145bc37f798272f98c /util-src/net.c | |
| parent | 89a1476a741679c8b39ec5443fd921fb26f338a3 (diff) | |
| parent | 0d09c3499df3a314e2fcd6495d495fb69d30809f (diff) | |
| download | prosody-885e117a1fe2f0a77d330c89ad5e44636f25815e.tar.gz prosody-885e117a1fe2f0a77d330c89ad5e44636f25815e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util-src/net.c')
| -rw-r--r-- | util-src/net.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util-src/net.c b/util-src/net.c index 18f3d27a..32f69025 100644 --- a/util-src/net.c +++ b/util-src/net.c @@ -32,19 +32,19 @@ /* Enumerate all locally configured IP addresses */ -const char* const type_strings[] = { +const char *const type_strings[] = { "both", "ipv4", "ipv6", NULL }; -static int lc_local_addresses(lua_State* L) { +static int lc_local_addresses(lua_State *L) { #ifndef _WIN32 /* Link-local IPv4 addresses; see RFC 3927 and RFC 5735 */ const long ip4_linklocal = htonl(0xa9fe0000); /* 169.254.0.0 */ const long ip4_mask = htonl(0xffff0000); - struct ifaddrs* addr = NULL, *a; + struct ifaddrs *addr = NULL, *a; #endif int n = 1; int type = luaL_checkoption(L, 1, "both", type_strings); @@ -69,7 +69,7 @@ static int lc_local_addresses(lua_State* L) { for(a = addr; a; a = a->ifa_next) { int family; char ipaddr[INET6_ADDRSTRLEN]; - const char* tmp = NULL; + const char *tmp = NULL; if(a->ifa_addr == NULL || a->ifa_flags & IFF_LOOPBACK) { continue; @@ -78,7 +78,7 @@ static int lc_local_addresses(lua_State* L) { family = a->ifa_addr->sa_family; if(ipv4 && family == AF_INET) { - struct sockaddr_in* sa = (struct sockaddr_in*)a->ifa_addr; + struct sockaddr_in *sa = (struct sockaddr_in *)a->ifa_addr; if(!link_local && ((sa->sin_addr.s_addr & ip4_mask) == ip4_linklocal)) { continue; @@ -86,7 +86,7 @@ static int lc_local_addresses(lua_State* L) { tmp = inet_ntop(family, &sa->sin_addr, ipaddr, sizeof(ipaddr)); } else if(ipv6 && family == AF_INET6) { - struct sockaddr_in6* sa = (struct sockaddr_in6*)a->ifa_addr; + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)a->ifa_addr; if(!link_local && IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) { continue; @@ -124,7 +124,7 @@ static int lc_local_addresses(lua_State* L) { return 1; } -int luaopen_util_net(lua_State* L) { +int luaopen_util_net(lua_State *L) { #if (LUA_VERSION_NUM > 501) luaL_checkversion(L); #endif |