Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent duplicate entries in splitnet list. Submitted by Gabriel Somlo.

Browse Source
This commit is contained in:
mgrooms 2007-09-19 19:20:25 +00:00
parent 3cdf25631c
commit 33e6656ef9
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/dist/ipsec-tools/ChangeLog vendored
View File

@ -1,3 +1,7 @@
2007-09-19 Matthew Grooms <mgrooms@shrew.net>
From Gabriel Somlo <somlo@cmu.edu>
* src/racoon/isakmp_unity.c: Prevent duplicate entries in splitnet list.
2007-09-12 Matthew Grooms <mgrooms@shrew.net>
From Joy Latten <latten@austin.ibm.com>
* configure.ac: Fix autoconf check for selinux support.

27
crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: isakmp_unity.c,v 1.7 2006/10/09 06:17:20 manu Exp $ */
/* $NetBSD: isakmp_unity.c,v 1.8 2007/09/19 19:20:25 mgrooms Exp $ */
/* Id: isakmp_unity.c,v 1.10 2006/07/31 04:49:23 manubsd Exp */
@ -305,32 +305,41 @@ int splitnet_list_add(list, network, count)
struct unity_network * network;
int *count;
{
struct unity_netentry * newentry;
struct unity_netentry * nentry;
/*
* search for network in current list
* to avoid adding duplicates
*/
for (nentry = *list; nentry != NULL; nentry = nentry->next)
if (memcmp(&nentry->network, network,
sizeof(struct unity_network)) == 0)
return 0; /* it's a dupe */
/*
* allocate new netentry and copy
* new splitnet network data
* new splitnet network data
*/
newentry = (struct unity_netentry *)
nentry = (struct unity_netentry *)
racoon_malloc(sizeof(struct unity_netentry));
if (newentry == NULL)
if (nentry == NULL)
return -1;
memcpy(&newentry->network,network,
memcpy(&nentry->network,network,
sizeof(struct unity_network));
newentry->next = NULL;
nentry->next = NULL;
/*
* locate the last netentry in our
* splitnet list and add our entry
*/
if (*list == NULL)
*list = newentry;
*list = nentry;
else {
struct unity_netentry * tmpentry = *list;
while (tmpentry->next != NULL)
tmpentry = tmpentry->next;
tmpentry->next = newentry;
tmpentry->next = nentry;
}
(*count)++;