mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->trunk

Browse source
This commit is contained in:
Matthew Wild 2013-09-03 00:20:28 +01:00
commit 8eb7b73968
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
util-src/net.c
View file

@ -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;
int n = 1;
#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);
@ -92,6 +92,15 @@ static int lc_local_addresses(lua_State *L)
}
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;
}

4
util-src/pposix.c
View file

@ -36,7 +36,7 @@
#include "lauxlib.h"
#include <fcntl.h>
#if defined(_GNU_SOURCE)
#if defined(__linux__) && defined(_GNU_SOURCE)
#include <linux/falloc.h>
#endif
@ -680,7 +680,7 @@ int lc_fallocate(lua_State* L)
offset = luaL_checkinteger(L, 2);
len = luaL_checkinteger(L, 3);
#if defined(_GNU_SOURCE)
#if defined(__linux__) && defined(_GNU_SOURCE)
if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) == 0)
{
lua_pushboolean(L, 1);