along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: subnet.c,v 1.1.2.3 2000/10/11 22:01:02 guus Exp $
+ $Id: subnet.c,v 1.1.2.6 2000/10/28 16:41:40 guus Exp $
*/
#include "config.h"
#include "subnet.h"
#include "net.h"
+/* lists type of subnet */
+
+subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void)
void subnet_add(conn_list_t *cl, subnet_t *subnet)
{
+ subnet_t *p = NULL;
+ subnet_t *q = NULL;
cp
- /* FIXME: do sorting on netmask size if necessary */
+ subnet->owner = cl;
+
+ /* Link it into the owners list of subnets (unsorted) */
subnet->next = cl->subnets->next;
subnet->prev = NULL;
- subnet->next->prev = subnet;
+ if(subnet->next)
+ subnet->next->prev = subnet;
cl->subnets = subnet;
+
+ /* And now add it to the global subnet list (sorted) */
+
+ /* Sort on size of subnet mask (IPv4 only at the moment!)
+
+ Three cases: subnet_list[] = NULL -> just add this subnet
+ insert before first -> add it in front of list
+ rest: insert after another subnet
+ */
+
+ if(subnet_list[subnet->type])
+ {
+ p = q = subnet_list[subnet->type];
+
+ for(; p; p = p->global_next)
+ {
+ if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
+ break;
+
+ q = p;
+ }
+ }
+
+ if(!subnet_list[subnet->type] || p == subnet_list[subnet->type]) /* First two cases */
+ {
+ /* Insert in front */
+ subnet->global_next = subnet_list[subnet->type];
+ subnet->global_prev = NULL;
+ subnet_list[subnet->type] = subnet;
+ }
+ else /* Third case */
+ {
+ /* Insert after q */
+ subnet->global_next = q->global_next;
+ subnet->global_prev = q;
+ q->global_next = subnet;
+ }
+
+ if(subnet->global_next)
+ subnet->global_next->global_prev = subnet;
cp
}
void subnet_del(subnet_t *subnet)
{
cp
+ /* Remove it from owner's list */
+
if(subnet->prev)
{
subnet->prev->next = subnet->next;
}
subnet->next->prev = subnet->prev;
+
+ /* Remove it from the global list */
+
+ if(subnet->global_prev)
+ {
+ subnet->global_prev->global_next = subnet->global_next;
+ }
+ else
+ {
+ subnet_list[subnet->type] = subnet->global_next;
+ }
+
+ subnet->global_next->global_prev = subnet->global_prev;
+
free_subnet(subnet);
cp
}
}
break;
case SUBNET_IPV4:
- if(sscanf(subnetstr, "%d,%lx:%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
+ if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
{
free_subnet(subnet);
return NULL;
switch(subnet->type)
{
case SUBNET_MAC:
- asprintf(netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
+ asprintf(&netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
subnet->net.mac.address.x[4],
subnet->net.mac.address.x[5]);
case SUBNET_IPV4:
- asprintf(netstr, "%d,%lx:%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
+ asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
case SUBNET_IPV6:
- asprintf(netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
+ asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
subnet->net.ipv6.address.x[0],
subnet->net.ipv6.address.x[1],
subnet->net.ipv6.address.x[2],
/* Subnet lookup routines */
-subnet_t *lookup_subnet_mac(subnet_t *subnets, mac_t address)
+subnet_t *lookup_subnet_mac(mac_t address)
{
subnet_t *subnet;
cp
- for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+ for(subnet = subnet_list[SUBNET_MAC]; subnet != NULL; subnet = subnet->next)
{
- if(subnet->type == SUBNET_MAC)
- if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
- break;
+ if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
+ break;
}
cp
return subnet;
}
-subnet_t *lookup_subnet_ipv4(subnet_t *subnets, ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t address)
{
subnet_t *subnet;
cp
- for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+ for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->next)
{
- if(subnet->type == SUBNET_IPV4)
- if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
- break;
+ if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
+ break;
}
cp
return subnet;
}
-subnet_t *lookup_subnet_ipv6(subnet_t *subnets, ipv6_t address)
+subnet_t *lookup_subnet_ipv6(ipv6_t address)
{
subnet_t *subnet;
int i;
cp
- for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+ for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->next)
{
- if(subnet->type == SUBNET_IPV6)
- {
- for(i=0; i<8; i++)
- if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
- break;
- if(i=8)
- break;
- }
+ for(i=0; i<8; i++)
+ if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
+ break;
+ if(i=8)
+ break;
}
cp
return subnet;