X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/16acc475ea7c946f340c3d582f5b2085816a6c0c..7605432c908bc7809c7ceee3aaadb28981190771:/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch

diff --git a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
index 6a7a16fb9..fb5c314e6 100644
--- a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
+++ b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
@@ -1052,7 +1052,7 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c linux-2.4.29-dev/net
 diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c
 --- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-02 19:14:52.000000000 +0200
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,482 @@
 +/*
 + * ip_nat_pptp.c	- Version 1.5
 + *
@@ -1341,8 +1341,12 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net
 +		} 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;
@@ -1375,6 +1379,9 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net
 +	case PPTP_CALL_DISCONNECT_NOTIFY:
 +		pcid = &pptpReq.disc->callID;
 +		break;
++	case PPTP_SET_LINK_INFO:
++		pcid = &pptpReq.setlink->peersCallID;
++		break;
 +
 +	default:
 +		DEBUGP("unknown inbound packet %s\n",