Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-lib-ip: accept 2nd netmask argument in new(), IPv4() and IPv6()

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-01-26 10:47:39 +01:00
parent 0d32e69f16
commit 8c8c69fa5d
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/luci-lib-ip/src/ip.c
View file

@ -81,14 +81,14 @@ struct dump_state {
}; };
static int _cidr_new(lua_State *L, int index, int family); static int _cidr_new(lua_State *L, int index, int family, bool mask);
static cidr_t *L_checkcidr (lua_State *L, int index, cidr_t *p) static cidr_t *L_checkcidr (lua_State *L, int index, cidr_t *p)
{ {
if (lua_type(L, index) == LUA_TUSERDATA) if (lua_type(L, index) == LUA_TUSERDATA)
return luaL_checkudata(L, index, LUCI_IP_CIDR); return luaL_checkudata(L, index, LUCI_IP_CIDR);
if (_cidr_new(L, index, p ? p->family : 0)) if (_cidr_new(L, index, p ? p->family : 0, false))
return lua_touserdata(L, -1); return lua_touserdata(L, -1);
luaL_error(L, "Invalid operand"); luaL_error(L, "Invalid operand");
@ -284,7 +284,7 @@ static int L_checkbits(lua_State *L, int index, cidr_t *p)
return bits; return bits;
} }
static int _cidr_new(lua_State *L, int index, int family) static int _cidr_new(lua_State *L, int index, int family, bool mask)
{ {
uint32_t n; uint32_t n;
const char *addr; const char *addr;
@ -321,6 +321,9 @@ static int _cidr_new(lua_State *L, int index, int family)
if (family && cidr.family != family) if (family && cidr.family != family)
return 0; return 0;
if (mask)
cidr.bits = L_checkbits(L, index + 1, &cidr);
} }
if (!(cidrp = lua_newuserdata(L, sizeof(*cidrp)))) if (!(cidrp = lua_newuserdata(L, sizeof(*cidrp))))
@ -334,17 +337,17 @@ static int _cidr_new(lua_State *L, int index, int family)
static int cidr_new(lua_State *L) static int cidr_new(lua_State *L)
{ {
return _cidr_new(L, 1, 0); return _cidr_new(L, 1, 0, true);
} }
static int cidr_ipv4(lua_State *L) static int cidr_ipv4(lua_State *L)
{ {
return _cidr_new(L, 1, AF_INET); return _cidr_new(L, 1, AF_INET, true);
} }
static int cidr_ipv6(lua_State *L) static int cidr_ipv6(lua_State *L)
{ {
return _cidr_new(L, 1, AF_INET6); return _cidr_new(L, 1, AF_INET6, true);
} }
static int cidr_is4(lua_State *L) static int cidr_is4(lua_State *L)