for(p = conn_list; p != NULL; p = p->next)
if((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask))
return p;
-
+cp
return NULL;
}
void destroy_queue(packet_queue_t *pq)
{
queue_element_t *p, *q;
-
+cp
for(p = pq->head; p != NULL; p = q)
{
q = p->next;
}
free(pq);
+cp
}
/*
*/
void free_conn_element(conn_list_t *p)
{
+cp
if(p->hostname)
free(p->hostname);
- if(p->pp)
- free(p->pp);
if(p->sq)
destroy_queue(p->sq);
if(p->rq)
free_key(p->public_key);
free_key(p->key);
free(p);
+cp
}
/*
void prune_conn_list(void)
{
conn_list_t *p, *prev = NULL, *next = NULL;
-
+cp
for(p = conn_list; p != NULL; )
{
next = p->next;
p = next;
}
+cp
}
/*
*/
conn_list_t *new_conn_list(void)
{
- conn_list_t *p = xmalloc(sizeof(conn_list_t));
-
+ conn_list_t *p = xmalloc(sizeof(*p));
+cp
/* initialise all those stupid pointers at once */
- memset(p, '\0', sizeof(conn_list_t));
+ memset(p, '\0', sizeof(*p));
+ p->vpn_mask = (ip_t)(~0L); /* If this isn't done, it would be a
+ wastebucket for all packets with
+ unknown destination. */
p->nexthop = p;
+cp
return p;
}
{
conn_list_t *p, *next;
cp
-
for(p = conn_list; p != NULL; )
{
next = p->next;
free_conn_element(p);
p = next;
}
-cp
conn_list = NULL;
+cp
}
/*
char *name;
struct hostent *host = NULL;
struct in_addr in;
-
+cp
in.s_addr = addr;
host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
name = xmalloc(20);
sprintf(name, "%s", inet_ntoa(in));
}
-
+cp
return name;
}
int masker;
char *q, *p;
struct hostent *h;
-
+cp
p = str;
if((q = strchr(p, '/')))
{
return NULL;
}
- ip = xmalloc(sizeof(ip_mask_t));
+ ip = xmalloc(sizeof(*ip));
ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
-
+cp
return ip;
}
void dump_conn_list(void)
{
conn_list_t *p;
-
+cp
syslog(LOG_DEBUG, "Connection list:");
for(p = conn_list; p != NULL; p = p->next)
IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->status,
p->socket, p->meta_socket);
}
+cp
}