chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
polypath: Break up child process handling
[secnet.git]
/
ipaddr.c
diff --git
a/ipaddr.c
b/ipaddr.c
index d23317c90dd1308b6d5a4c53fec0ec89bcdbd217..899581f0e0a11bae619c03b8ad1d01fb32b010af 100644
(file)
--- a/
ipaddr.c
+++ b/
ipaddr.c
@@
-7,6
+7,7
@@
#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
+#include "util.h"
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
@@
-35,10
+36,7
@@
static void subnet_list_set_len(struct subnet_list *a, int32_t l)
if (l>a->alloc) {
assert(a->alloc < (int)(INT_MAX/sizeof(*nd))-EXTEND_ALLOC_BY);
na=a->alloc+EXTEND_ALLOC_BY;
if (l>a->alloc) {
assert(a->alloc < (int)(INT_MAX/sizeof(*nd))-EXTEND_ALLOC_BY);
na=a->alloc+EXTEND_ALLOC_BY;
- nd=realloc(a->list,sizeof(*nd)*na);
- if (!nd) {
- fatal_perror("subnet_list_set_len: realloc");
- }
+ nd=safe_realloc_ary(a->list,sizeof(*nd),na,"subnet_list_set_len");
a->alloc=na;
a->list=nd;
}
a->alloc=na;
a->list=nd;
}
@@
-120,10
+118,7
@@
static void ipset_set_len(struct ipset *a, int32_t l)
if (l>a->a) {
assert(a->a < INT_MAX-EXTEND_ALLOC_BY);
na=a->a+EXTEND_ALLOC_BY;
if (l>a->a) {
assert(a->a < INT_MAX-EXTEND_ALLOC_BY);
na=a->a+EXTEND_ALLOC_BY;
- nd=realloc(a->d,sizeof(*nd)*na);
- if (!nd) {
- fatal_perror("ipset_set_len: realloc");
- }
+ nd=safe_realloc_ary(a->d,sizeof(*nd),na,"ipset_set_len");
a->a=na;
a->d=nd;
}
a->a=na;
a->d=nd;
}
@@
-136,7
+131,6
@@
static void ipset_append_range(struct ipset *a, struct iprange r)
a->d[a->l-1]=r;
}
a->d[a->l-1]=r;
}
-#define max(a,b) (a>b?a:b)
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
{
struct ipset *c;
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
{
struct ipset *c;
@@
-161,7
+155,7
@@
struct ipset *ipset_union(struct ipset *a, struct ipset *b)
ipset_append_range(c,r);
else if (r.a <= c->d[c->l-1].b+1)
/* Extends (or is consumed by) the last range */
ipset_append_range(c,r);
else if (r.a <= c->d[c->l-1].b+1)
/* Extends (or is consumed by) the last range */
- c->d[c->l-1].b=
max
(c->d[c->l-1].b, r.b);
+ c->d[c->l-1].b=
MAX
(c->d[c->l-1].b, r.b);
else
ipset_append_range(c,r);
}
else
ipset_append_range(c,r);
}
@@
-418,7
+412,7
@@
static struct subnet string_item_to_subnet(item_t *i, cstring_t desc,
return s;
}
return s;
}
-uint32_t string_item_to_ipaddr(item_t *i, cstring_t desc)
+uint32_t string_item_to_ipaddr(
const
item_t *i, cstring_t desc)
{
uint32_t a, b, c, d;
int match;
{
uint32_t a, b, c, d;
int match;