chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.1.15
[secnet.git]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index b941295e7558b71da549ea0b496fc8046c0dc6dd..7dd0476cdd86faf92b260a1a701e5565137a8a4f 100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-346,13
+346,13
@@
string_t subnet_to_string(struct subnet sn)
return s;
}
return s;
}
-static struct subnet string_item_to_subnet(item_t *i, string_t desc,
+static struct subnet string_item_to_subnet(item_t *i,
c
string_t desc,
bool_t *invert)
{
struct subnet s;
uint32_t a, b, c, d, n;
uint32_t match;
bool_t *invert)
{
struct subnet s;
uint32_t a, b, c, d, n;
uint32_t match;
- string_t in;
+
c
string_t in;
*invert=False;
*invert=False;
@@
-397,7
+397,7
@@
static struct subnet string_item_to_subnet(item_t *i, string_t desc,
return s;
}
return s;
}
-uint32_t string_item_to_ipaddr(item_t *i, string_t desc)
+uint32_t string_item_to_ipaddr(item_t *i,
c
string_t desc)
{
uint32_t a, b, c, d;
uint32_t match;
{
uint32_t a, b, c, d;
uint32_t match;
@@
-419,7
+419,7
@@
uint32_t string_item_to_ipaddr(item_t *i, string_t desc)
}
struct ipset *string_list_to_ipset(list_t *l, struct cloc loc,
}
struct ipset *string_list_to_ipset(list_t *l, struct cloc loc,
-
string_t module,
string_t param)
+
cstring_t module, c
string_t param)
{
struct ipset *r, *n, *isn;
uint32_t e,i;
{
struct ipset *r, *n, *isn;
uint32_t e,i;