girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-17 08:16:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

IPv6: add DHCPv6 support

Browse source 
The DHCP version is determined according to the first IP address that
appears in the configuration file.  Caveat; counters are of native long
type.  Since IPv6 address space has 2^128 addresses, they are subject to
overflow.

[Sami Kerola:  This commit also fixed a percent sorting bug, which has
been broken always.  See changes ret_percent() for the fix.]

CC: LI Zimu <lzm@cernet.edu.cn>
CC: Xing Li <xing@cernet.edu.cn>
Reviewed-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Cheer Xiao <xiaqqaix@gmail.com>
This commit is contained in:
Cheer Xiao 2012-12-02 19:38:26 +00:00 • committed by Sami Kerola
parent 71bcee14e9
commit a57d399643
8 changed files with 267 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/sort.c
View file

@ -53,20 +53,35 @@ int intcomp(const void *restrict x, const void *restrict y)
return 0;
}
int ipcomp(const union ipaddr_t *restrict a, const union ipaddr_t *restrict b)
{
if (dhcp_version == VERSION_6) {
return memcmp(&a->v6, &b->v6, sizeof(a->v6));
} else {
if (a->v4 < b->v4)
return -1;
if (a->v4 > b->v4)
return 1;
return 0;
}
}
int leasecomp(const void *restrict a, const void *restrict b)
{
return ipcomp(&((const struct leases_t *)a)->ip,
&((const struct leases_t *)b)->ip);
}
int rangecomp(const void *restrict r1, const void *restrict r2)
{
if ((((struct range_t *)r1)->first_ip) <
(((struct range_t *)r2)->first_ip))
return -1;
if ((((struct range_t *)r2)->first_ip) <
(((struct range_t *)r1)->first_ip))
return 1;
return 0;
return ipcomp(&((const struct range_t *)r1)->first_ip,
&((const struct range_t *)r2)->first_ip);
}
unsigned long int ret_ip(struct range_t r)
{
return (r.first_ip);
/* FIXME: IPv6 */
return (r.first_ip.v4);
}
unsigned long int ret_cur(struct range_t r)
@ -76,13 +91,13 @@ unsigned long int ret_cur(struct range_t r)
unsigned long int ret_max(struct range_t r)
{
return (r.last_ip - r.first_ip);
return get_range_size(&r);
}
unsigned long int ret_percent(struct range_t r)
{
float f;
f = (float)r.count / (r.last_ip - r.first_ip - 1);
f = (float)r.count / get_range_size(&r);
return ((unsigned long int)(f * 100000));
}
@ -99,7 +114,7 @@ unsigned long int ret_tc(struct range_t r)
unsigned long int ret_tcperc(struct range_t r)
{
float f;
f = (float)(r.count + r.touched) / (r.last_ip - r.first_ip - 1);
f = (float)(r.count + r.touched) / get_range_size(&r);
return ((unsigned long int)(f * 10000));
}