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.1 2000/10/01 03:21:49 guus Exp $
+ $Id: subnet.c,v 1.1.2.5 2000/10/24 15:46:18 guus Exp $
*/
#include "config.h"
+#include <utils.h>
+
+#include <xalloc.h>
#include "subnet.h"
#include "net.h"
subnet_t *new_subnet(void)
{
cp
-cp
+ return (subnet_t *)xmalloc(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet)
{
cp
-cp
+ free(subnet);
}
/* Linked list management */
-int subnet_add(conn_list_t *cl, subnet_t *subnet)
+void subnet_add(conn_list_t *cl, subnet_t *subnet)
{
+ subnet_t *p = NULL;
+ subnet_t *q = NULL;
cp
- subnet->next = cl->subnets->next;
- subnet->prev = NULL;
- subnet->next->prev = subnet
- cl->subnets = subnet;
+ subnet->owner = cl;
+
+ /* Sort on size of subnet mask (IPv4 only at the moment!)
+
+ Three cases: cl->subnets = NULL -> just add this subnet
+ insert before first -> add it in front of list
+ rest: insert after another subnet
+ */
+
+ if(cl->subnets)
+ {
+ p = q = cl->subnets;
+
+ for(; p; p = p->next)
+ {
+ if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
+ break;
+
+ q = p;
+ }
+ }
+
+ if(!cl->subnets || p == cl->subnets) /* First two cases */
+ {
+ /* Insert in front */
+ subnet->next = cl->subnets;
+ subnet->prev = NULL;
+ cl->subnets = subnet;
+ }
+ else /* Third case */
+ {
+ /* Insert after q */
+ subnet->next = q->next;
+ subnet->prev = q;
+ q->next = subnet;
+ }
+
+ if(subnet->next)
+ subnet->next->prev = subnet;
cp
- return 0;
}
-int subnet_del(conn_list_t *cl, subnet_t *subnet)
+void subnet_del(subnet_t *subnet)
{
cp
if(subnet->prev)
- {
- subnet->prev->next = subnet->next;
- }
+ subnet->prev->next = subnet->next;
else
- {
- subnet->owner->subnets = subnet->next;
- }
-
- subnet->next->prev = subnet->prev;
+ subnet->owner->subnets = subnet->next;
+
+ if(subnet->next)
+ subnet->next->prev = subnet->prev;
+
free_subnet(subnet);
cp
- return 0;
}
/* Ascii representation of subnets */
subnet_t *str2net(char *subnetstr)
{
+ int type;
+ subnet_t *subnet;
cp
+ if(sscanf(subnetstr, "%d,", &type) != 1)
+ return NULL;
+
+ subnet = new_subnet();
+
+ switch(type)
+ {
+ case SUBNET_MAC:
+ if(sscanf(subnetstr, "%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[3],
+ &subnet->net.mac.address.x[4],
+ &subnet->net.mac.address.x[5]) != 7)
+ {
+ free_subnet(subnet);
+ return NULL;
+ }
+ break;
+ case SUBNET_IPV4:
+ if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
+ {
+ free_subnet(subnet);
+ return NULL;
+ }
+ break;
+ case SUBNET_IPV6:
+ if(sscanf(subnetstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", &subnet->type,
+ &subnet->net.ipv6.address.x[0],
+ &subnet->net.ipv6.address.x[1],
+ &subnet->net.ipv6.address.x[2],
+ &subnet->net.ipv6.address.x[3],
+ &subnet->net.ipv6.address.x[4],
+ &subnet->net.ipv6.address.x[5],
+ &subnet->net.ipv6.address.x[6],
+ &subnet->net.ipv6.address.x[7],
+ &subnet->net.ipv6.mask.x[0],
+ &subnet->net.ipv6.mask.x[1],
+ &subnet->net.ipv6.mask.x[2],
+ &subnet->net.ipv6.mask.x[3],
+ &subnet->net.ipv6.mask.x[4],
+ &subnet->net.ipv6.mask.x[5],
+ &subnet->net.ipv6.mask.x[6],
+ &subnet->net.ipv6.mask.x[7]) != 17)
+ {
+ free_subnet(subnet);
+ return NULL;
+ }
+ break;
+ break;
+ default:
+ free_subnet(subnet);
+ return NULL;
+ }
cp
+ return subnet;
}
char *net2str(subnet_t *subnet)
{
+ char *netstr;
cp
+ switch(subnet->type)
+ {
+ case SUBNET_MAC:
+ 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[3],
+ subnet->net.mac.address.x[4],
+ subnet->net.mac.address.x[5]);
+ break;
+ case SUBNET_IPV4:
+ asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
+ break;
+ case SUBNET_IPV6:
+ 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->net.ipv6.address.x[3],
+ subnet->net.ipv6.address.x[4],
+ subnet->net.ipv6.address.x[5],
+ subnet->net.ipv6.address.x[6],
+ subnet->net.ipv6.address.x[7],
+ subnet->net.ipv6.mask.x[0],
+ subnet->net.ipv6.mask.x[1],
+ subnet->net.ipv6.mask.x[2],
+ subnet->net.ipv6.mask.x[3],
+ subnet->net.ipv6.mask.x[4],
+ subnet->net.ipv6.mask.x[5],
+ subnet->net.ipv6.mask.x[6],
+ subnet->net.ipv6.mask.x[7]);
+ break;
+ default:
+ netstr = NULL;
+ }
cp
+ return netstr;
}
/* Subnet lookup routines */
+
+subnet_t *lookup_subnet_mac(subnet_t *subnets, mac_t address)
+{
+ subnet_t *subnet;
+cp
+ for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+ {
+ if(subnet->type == SUBNET_MAC)
+ 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 *subnet;
+cp
+ for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+ {
+ if(subnet->type == SUBNET_IPV4)
+ 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 *subnet;
+ int i;
+cp
+ for(subnet = subnets; 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;
+ }
+ }
+cp
+ return subnet;
+}
projects / tinc / blobdiff