9
0
Fork 0

lib/ippool: Move ippool_aton() out of ippool_new()

we rather pass the in46_prefix directly into ippool_new()

Change-Id: Iadf6274e881a9bfc75eb41f9380f5ae2d8c92a0f
This commit is contained in:
Harald Welte 2017-08-12 12:55:04 +02:00
parent b513b951bd
commit 4857f3c2f3
3 changed files with 24 additions and 29 deletions

View File

@ -565,23 +565,24 @@ int main(int argc, char **argv)
}
/* dynip */
struct in46_prefix i46p;
size_t prefixlen;
if (!args_info.dynip_arg) {
if (ippool_new(&ippool, args_info.net_arg, NULL, 1, 0,
IPPOOL_NONETWORK | IPPOOL_NOGATEWAY |
IPPOOL_NOBROADCAST)) {
SYS_ERR(DGGSN, LOGL_ERROR, 0,
"Failed to allocate IP pool!");
if (ippool_aton(&i46p.addr, &prefixlen, args_info.net_arg, 0)) {
SYS_ERR(DIP, LOGL_ERROR, 0, "Failed to parse dynamic pool");
exit(1);
}
} else {
if (ippool_new(&ippool, args_info.dynip_arg, NULL, 1, 0,
IPPOOL_NONETWORK | IPPOOL_NOGATEWAY |
IPPOOL_NOBROADCAST)) {
SYS_ERR(DGGSN, LOGL_ERROR, 0,
"Failed to allocate IP pool!");
if (ippool_aton(&i46p.addr, &prefixlen, args_info.dynip_arg, 0)) {
SYS_ERR(DIP, LOGL_ERROR, 0, "Failed to parse dynamic pool");
exit(1);
}
}
i46p.prefixlen = prefixlen;
if (ippool_new(&ippool, &i46p, NULL, IPPOOL_NONETWORK | IPPOOL_NOGATEWAY | IPPOOL_NOBROADCAST)) {
SYS_ERR(DGGSN, LOGL_ERROR, 0, "Failed to allocate IP pool!");
exit(1);
}
/* DNS1 and DNS2 */
memset(&dns1, 0, sizeof(dns1));

View File

@ -185,8 +185,8 @@ void in46a_inc(struct in46_addr *addr)
}
/* Create new address pool */
int ippool_new(struct ippool_t **this, const char *dyn, const char *stat,
int allowdyn, int allowstat, int flags)
int ippool_new(struct ippool_t **this, const struct in46_prefix *dyn, const struct in46_prefix *stat,
int flags)
{
/* Parse only first instance of pool for now */
@ -200,14 +200,11 @@ int ippool_new(struct ippool_t **this, const char *dyn, const char *stat,
int dynsize;
unsigned int statsize;
if (!allowdyn) {
if (!dyn || dyn->addr.len == 0) {
dynsize = 0;
} else {
if (ippool_aton(&addr, &addrprefixlen, dyn, 0)) {
SYS_ERR(DIP, LOGL_ERROR, 0,
"Failed to parse dynamic pool");
return -1;
}
addr = dyn->addr;
addrprefixlen = dyn->prefixlen;
/* we want to work with /64 prefixes, i.e. allocate /64 prefixes rather
* than /128 (single IPv6 addresses) */
if (addr.len == sizeof(struct in6_addr))
@ -227,18 +224,15 @@ int ippool_new(struct ippool_t **this, const char *dyn, const char *stat,
dynsize--;
}
if (!allowstat) {
if (!stat || stat->addr.len == 0) {
statsize = 0;
stataddr.len = 0;
stataddrprefixlen = 0;
} else {
if (ippool_aton(&stataddr, &stataddrprefixlen, stat, 0)) {
SYS_ERR(DIP, LOGL_ERROR, 0,
"Failed to parse static range");
return -1;
}
stataddr = stat->addr;
stataddrprefixlen = stat->prefixlen;
statsize = (1 << (addr.len - addrprefixlen + 1)) -1;
statsize = (1 << (addr.len - stataddrprefixlen + 1)) -1;
if (statsize > IPPOOL_STATSIZE)
statsize = IPPOOL_STATSIZE;
}
@ -251,8 +245,8 @@ int ippool_new(struct ippool_t **this, const char *dyn, const char *stat,
return -1;
}
(*this)->allowdyn = allowdyn;
(*this)->allowstat = allowstat;
(*this)->allowdyn = dyn ? 1 : 0;
(*this)->allowstat = stat ? 1 : 0;
if (stataddr.len > 0)
(*this)->stataddr = stataddr;
(*this)->stataddrprefixlen = stataddrprefixlen;

View File

@ -71,8 +71,8 @@ struct ippoolm_t {
extern unsigned long int ippool_hash(struct in46_addr *addr);
/* Create new address pool */
extern int ippool_new(struct ippool_t **this, const char *dyn, const char *stat,
int allowdyn, int allowstat, int flags);
extern int ippool_new(struct ippool_t **this, const struct in46_prefix *dyn,
const struct in46_prefix *stat, int flags);
/* Delete existing address pool */
extern int ippool_free(struct ippool_t *this);