[netfilter-cvslog] r3839 - in trunk/patch-o-matic-ng/pptp-conntrack-nat: linux/net/ipv4/netfilter linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-10 14:53:16 +0200 (Sun, 10 Apr 2005)
New Revision: 3839

Modified:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/ip_nat_pptp.c
Log:
don't call change_keymap() when we have no keymap (Closes: #40)


Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/ip_nat_pptp.c
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-10 12:37:52 UTC (rev 3838)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-10 12:53:16 UTC (rev 3839)
@@ -286,8 +286,12 @@
 		} else {
 			DEBUGP("can't change expect\n");
 		}
-		ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_orig, &t);
-		ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_reply, &inv_t);
+		if (oldexp->proto.gre.keymap_orig)
+			ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_orig, 
+						&t);
+		if (oldexp->proto.gre.keymap_reply)
+			ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_reply, 
+						&inv_t);
 		break;
 	case PPTP_IN_CALL_CONNECT:
 		pcid = &pptpReq.iccon->peersCallID;

Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-10 12:37:52 UTC (rev 3838)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-10 12:53:16 UTC (rev 3839)
@@ -288,8 +288,12 @@
 		} else {
 			DEBUGP("can't change expect\n");
 		}
-		ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_orig, &t);
-		ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_reply, &inv_t);
+		if (oldexp->proto.gre.keymap_orig)
+			ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_orig,
+						&t);
+		if (oldexp->proto.gre.keymap_reply)
+			ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_reply, 
+						&inv_t);
 		break;
 	case PPTP_IN_CALL_CONNECT:
 		pcid = &pptpReq->iccon.peersCallID;