#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
+#include "util.h"
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
r=safe_malloc(sizeof(*r),"subnet_list_new:list");
r->entries=0;
r->alloc=DEFAULT_ALLOC;
- r->list=safe_malloc(sizeof(*r->list)*r->alloc,"subnet_list_new:data");
+ r->list=safe_malloc_ary(sizeof(*r->list),r->alloc,"subnet_list_new:data");
return r;
}
free(a);
}
-static void subnet_list_set_len(struct subnet_list *a, uint32_t l)
+static void subnet_list_set_len(struct subnet_list *a, int32_t l)
{
struct subnet *nd;
- uint32_t na;
+ int32_t na;
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->entries=l;
}
-void subnet_list_append(struct subnet_list *a, uint32_t prefix, uint32_t len)
+void subnet_list_append(struct subnet_list *a, uint32_t prefix, int len)
{
struct subnet *sn;
assert(a->entries < INT_MAX);
#ifdef DEBUG
static void ipset_dump(struct ipset *a, string_t name)
{
- uint32_t i;
+ int32_t i;
printf("%s: ",name);
for (i=0; i<a->l; i++) {
struct ipset *ipset_from_subnet_list(struct subnet_list *l)
{
struct ipset *r, *a, *b;
- uint32_t i;
+ int32_t i;
r=ipset_new();
for (i=0; i<l->entries; i++) {
return r;
}
-static void ipset_set_len(struct ipset *a, uint32_t l)
+static void ipset_set_len(struct ipset *a, int32_t l)
{
struct iprange *nd;
- uint32_t na;
+ int32_t na;
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->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 iprange r;
- uint32_t ia,ib;
+ int32_t ia,ib;
c=ipset_new();
ia=0; ib=0;
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);
}
{
struct ipset *r;
struct iprange ra, rb;
- uint32_t ia,ib;
+ int32_t ia,ib;
r=ipset_new();
ia=0; ib=0;
struct ipset *r;
struct iprange n;
int64_t pre;
- uint32_t i,lo,hi;
+ int32_t i;
+ uint32_t lo,hi;
r=ipset_new();
pre=-1;
bool_t ipset_contains_addr(struct ipset *a, uint32_t addr)
{
- uint32_t i;
+ int32_t i;
struct iprange r;
for (i=0; i<a->l; i++) {
{
struct subnet_list *r;
int64_t a,b,lobit,himask,lomask;
- int32_t bits;
- uint32_t i;
+ int bits;
+ int32_t i;
r=subnet_list_new();
for (i=0; i<is->l; i++) {
return r;
}
+#define IPADDR_NBUFS_SHIFT 4
+#define IPADDR_NBUFS (1 << IPADDR_NBUFS_SHIFT)
+#define IPADDR_BUFLEN 20
+
+static char *ipaddr_getbuf(void)
+{
+ static int ipaddr_bufnum;
+ static char ipaddr_bufs[IPADDR_NBUFS][IPADDR_BUFLEN];
+
+ ipaddr_bufnum++;
+ ipaddr_bufnum &= IPADDR_NBUFS-1;
+ return ipaddr_bufs[ipaddr_bufnum];
+}
+
/* The string buffer must be at least 16 bytes long */
string_t ipaddr_to_string(uint32_t addr)
{
uint8_t a,b,c,d;
string_t s;
- s=safe_malloc(16,"ipaddr_to_string");
+ s=ipaddr_getbuf();
a=addr>>24;
b=addr>>16;
c=addr>>8;
uint8_t a,b,c,d;
string_t s;
- s=safe_malloc(19,"subnet_to_string");
+ s=ipaddr_getbuf();
a=addr>>24;
b=addr>>16;
c=addr>>8;
{
struct subnet s;
uint32_t a, b, c, d, n;
- uint32_t match;
+ int match;
cstring_t in;
*invert=False;
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;
- uint32_t match;
+ int match;
/* i is not guaranteed to be a string */
if (i->type!=t_string) {