/* The 'ipset' data structure and related algorithms in this file were
inspired by the 'ipaddr.py' library from Cendio Systems AB. */
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ *
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
#include "secnet.h"
#include <limits.h>
#include <stdio.h>
#include <string.h>
#include "ipaddr.h"
+#include "util.h"
#define DEFAULT_ALLOC 2
#define EXTEND_ALLOC_BY 4
struct subnet_list *subnet_list_new(void)
{
struct subnet_list *r;
- r=safe_malloc(sizeof(*r),"subnet_list_new:list");
+ NEW(r);
r->entries=0;
r->alloc=DEFAULT_ALLOC;
- r->list=safe_malloc_ary(sizeof(*r->list),r->alloc,"subnet_list_new:data");
+ NEW_ARY(r->list,r->alloc);
return r;
}
static void subnet_list_set_len(struct subnet_list *a, int32_t l)
{
- struct subnet *nd;
int32_t na;
if (l>a->alloc) {
- assert(a->alloc < (int)(INT_MAX/sizeof(*nd))-EXTEND_ALLOC_BY);
+ assert(a->alloc < INT_MAX-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");
- }
+ REALLOC_ARY(a->list,na);
a->alloc=na;
- a->list=nd;
}
a->entries=l;
}
struct ipset *ipset_new(void)
{
struct ipset *r;
- r=safe_malloc(sizeof(*r),"ipset_new:set");
+ NEW(r);
r->l=0;
r->a=DEFAULT_ALLOC;
- r->d=safe_malloc(sizeof(*r->d)*r->a,"ipset_new:data");
+ NEW_ARY(r->d,r->a);
return r;
}
static void ipset_set_len(struct ipset *a, int32_t l)
{
- struct iprange *nd;
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");
- }
+ REALLOC_ARY(a->d,na);
a->a=na;
- a->d=nd;
}
a->l=l;
}
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;
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);
}
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];
+ SBUF_DEFINE(16, IPADDR_BUFLEN);
+ return SBUF;
}
/* The string buffer must be at least 16 bytes long */
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;