Skip to contentSkip to conversation

pptp_conntrack-nat: Fix compile errors DEBUGP() macro in ip_nat_proto_gre.c and ip_nat_pptp.c, fix typo in ip_conntrack_pptp.h

PATCH Applied Sander Eikelenboom 2 participants 2 messages Feb 25, 2005 – Mar 1, 2005 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pptp_conntrack-nat: Fix compile errors DEBUGP() macro in ip_nat_proto_gre.c and ip_nat_pptp.c, fix typo in ip_conntrack_pptp.h

3 small fixes:
- Fixed compile errors in 2.6 DEBUGP() macro of ip_nat_proto_gre.c and ip_nat_pptp.c
- Fixed typo in ip_conntrack_pptp.h

serveerstertje:/usr/src/netfilter-svn/patch-o-matic-ng# svn diff
Index: pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
===================================================================
--- pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h   (revision 3742)
+++ pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h   (working copy)
@@ -54,7 +54,7 @@
                 void                           *rawreq;
                struct PptpStartSessionRequest  *sreq;
                struct PptpStartSessionReply    *srep;
-               struct PptpStopSessionReqest    *streq;
+               struct PptpStopSessionRequest   *streq;
                struct PptpStopSessionReply     *strep;
                 struct PptpOutCallRequest       *ocreq;
                 struct PptpOutCallReply         *ocack;
Index: pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_proto_gre.c
===================================================================
--- pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_proto_gre.c  (revision 3742)
+++ pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_proto_gre.c  (working copy)
@@ -36,8 +36,7 @@
 MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");

#if 0
-#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \
- ": " format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s: " format, __FILE__, __FUNCTION__, ## args)
#else
#define DEBUGP(x, args...)
#endif

linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c (working copy) renamed from linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c (revision 3742) +1 -2
Index: pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_pptp.c
===================================================================
@@ -56,8 +56,7 @@
 
 #if 0
 #include "ip_conntrack_pptp_priv.h"
-#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \
-                                      ": " format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s: " format, __FILE__, __FUNCTION__, ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
Applied
#1 lore raw
Quoted 3 lines · Sander Eikelenboom

3 small fixes:
- Fixed compile errors in 2.6 DEBUGP() macro of ip_nat_proto_gre.c and ip_nat_pptp.c
- Fixed typo in ip_conntrack_pptp.h

thanks, applied.

Signature · 5 lines
- Harald Welte <[email protected]>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie