~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build system: rerun autoheader
[secnet]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index
1edc334
..
d8661da
100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-3,6
+3,7
@@
#include "secnet.h"
#include <stdio.h>
#include "secnet.h"
#include <stdio.h>
+#include <string.h>
#include "ipaddr.h"
#define DEFAULT_ALLOC 2
#include "ipaddr.h"
#define DEFAULT_ALLOC 2
@@
-283,9
+284,9
@@
bool_t ipset_is_subset(struct ipset *super, struct ipset *sub)
struct subnet_list *ipset_to_subnet_list(struct ipset *is)
{
struct subnet_list *r;
struct subnet_list *ipset_to_subnet_list(struct ipset *is)
{
struct subnet_list *r;
- int64_t a,b;
+ int64_t a,b,lobit,himask,lomask;
+ int32_t bits;
uint32_t i;
uint32_t i;
- uint32_t lomask,lobit,himask,bits;
r=subnet_list_new();
for (i=0; i<is->l; i++) {
r=subnet_list_new();
for (i=0; i<is->l; i++) {
@@
-346,13
+347,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
+398,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
+420,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;