Commit 31fd43b5 authored by Natanael Copa's avatar Natanael Copa

main/ipsec-tools: fix a memleak in the initial-contact patch

the patch should fix reconnection on unstable lines but contained a
memory leak. This is an update of the same patch.
(cherry picked from commit d6e71e02)
parent 34d3011b
......@@ -2,7 +2,7 @@
pkgname=ipsec-tools
pkgver=0.8_alpha20090903
_myver=0.8-alpha20090903
pkgrel=3
pkgrel=4
pkgdesc="User-space IPsec tools for various IPsec implementations"
url="http://ipsec-tools.sourceforge.net/"
license="BSD"
......@@ -52,4 +52,4 @@ md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd ipsec-tools-0.8-alpha20090903.tar.gz
2d00250cf72da7f2f559c91b65a48747 racoon.confd
13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch
baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch
fa96631e4471096d93af0e74968f6d16 initial-contact-fix.diff"
69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff"
......@@ -4,7 +4,7 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/admin.c,v
retrieving revision 1.32
diff -u -r1.32 admin.c
--- src/racoon/admin.c 3 Sep 2009 09:29:07 -0000 1.32
+++ src/racoon/admin.c 9 Dec 2009 12:58:48 -0000
+++ src/racoon/admin.c 10 Dec 2009 14:38:47 -0000
@@ -299,9 +299,8 @@
break;
......@@ -30,8 +30,8 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.c,v
retrieving revision 1.31
diff -u -r1.31 handler.c
--- src/racoon/handler.c 22 Nov 2009 19:34:55 -0000 1.31
+++ src/racoon/handler.c 9 Dec 2009 12:58:48 -0000
@@ -966,6 +966,20 @@
+++ src/racoon/handler.c 10 Dec 2009 14:38:48 -0000
@@ -966,6 +966,22 @@
}
void
......@@ -43,6 +43,8 @@ diff -u -r1.31 handler.c
+ LIST_FOREACH(p, &ctdtree, chain) {
+ if (cmpsaddr(remote, p->remote) == 0) {
+ LIST_REMOVE(p, chain);
+ racoon_free(p->remote);
+ racoon_free(p);
+ break;
+ }
+ }
......@@ -58,7 +60,7 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v
retrieving revision 1.22
diff -u -r1.22 handler.h
--- src/racoon/handler.h 3 Sep 2009 09:29:07 -0000 1.22
+++ src/racoon/handler.h 9 Dec 2009 12:58:48 -0000
+++ src/racoon/handler.h 10 Dec 2009 14:38:48 -0000
@@ -518,6 +518,7 @@
extern struct contacted *getcontacted __P((struct sockaddr *));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment