Author: pluto
Date: Mon Aug 1 11:56:34 2005
New Revision: 6284
Modified:
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c
netfilter-2.6/patch-o-matic-ng/trunk/status
Log:
- pptp-conntrack updated.
Modified:
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
Mon Aug 1 11:56:34 2005
@@ -156,7 +156,7 @@
ip_ct_refresh_acct(sibling, 0, NULL, 0);
return 1;
} else {
- exp = __ip_conntrack_exp_find(t);
+ exp = __ip_conntrack_expect_find(t);
if (exp) {
DEBUGP("unexpect_related of expect %p\n", exp);
ip_conntrack_unexpect_related(exp);
Modified:
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c
==============================================================================
---
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c
(original)
+++
netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c
Mon Aug 1 11:56:34 2005
@@ -273,7 +273,7 @@
/* Returns verdict for packet, and may modify conntrack */
static int gre_packet(struct ip_conntrack *ct,
- const struct sk_buff *skb,
+ struct sk_buff *skb,
enum ip_conntrack_info conntrackinfo)
{
/* If we've seen traffic both ways, this is a GRE connection.
Modified: netfilter-2.6/patch-o-matic-ng/trunk/status
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/status (original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/status Mon Aug 1 11:56:34 2005
@@ -25,7 +25,7 @@
nth 2005/07/27 added
osf 2005/07/27 added
policy 2005/07/27 added
-pptp-conntrack-nat 2005/07/27 added fix build warnings
+pptp-conntrack-nat 2005/08/01 updated
psd 2005/07/27 added
quake3-conntrack-nat 2005/07/27 added
quota 2005/07/27 added
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
