patch-2.4.20 linux-2.4.20/net/ipv4/netfilter/ip_nat_snmp_basic.c
Next file: linux-2.4.20/net/ipv4/netfilter/ip_nat_standalone.c
Previous file: linux-2.4.20/net/ipv4/netfilter/ip_nat_rule.c
Back to the patch index
Back to the overall index
- Lines: 52
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/net/ipv4/netfilter/ip_nat_snmp_basic.c
- Orig date:
Tue Oct 30 15:08:12 2001
diff -urN linux-2.4.19/net/ipv4/netfilter/ip_nat_snmp_basic.c linux-2.4.20/net/ipv4/netfilter/ip_nat_snmp_basic.c
@@ -1243,6 +1243,7 @@
* NAT helper function, packets arrive here from NAT code.
*/
static unsigned int nat_help(struct ip_conntrack *ct,
+ struct ip_conntrack_expect *exp,
struct ip_nat_info *info,
enum ip_conntrack_info ctinfo,
unsigned int hooknum,
@@ -1259,9 +1260,9 @@
* on post routing (SNAT).
*/
if (!((dir == IP_CT_DIR_REPLY && hooknum == NF_IP_PRE_ROUTING &&
- udph->source == __constant_ntohs(SNMP_PORT)) ||
+ udph->source == ntohs(SNMP_PORT)) ||
(dir == IP_CT_DIR_ORIGINAL && hooknum == NF_IP_POST_ROUTING &&
- udph->dest == __constant_ntohs(SNMP_TRAP_PORT)))) {
+ udph->dest == ntohs(SNMP_TRAP_PORT)))) {
spin_unlock_bh(&snmp_lock);
return NF_ACCEPT;
}
@@ -1303,19 +1304,27 @@
return NF_DROP;
}
-static struct ip_nat_helper snmp = { { NULL, NULL },
+static struct ip_nat_helper snmp = {
+ { NULL, NULL },
+ "snmp",
+ IP_NAT_HELPER_F_STANDALONE,
+ THIS_MODULE,
{ { 0, { __constant_htons(SNMP_PORT) } },
{ 0, { 0 }, IPPROTO_UDP } },
{ { 0, { 0xFFFF } },
{ 0, { 0 }, 0xFFFF } },
- nat_help, "snmp" };
+ nat_help, NULL };
-static struct ip_nat_helper snmp_trap = { { NULL, NULL },
+static struct ip_nat_helper snmp_trap = {
+ { NULL, NULL },
+ "snmp_trap",
+ IP_NAT_HELPER_F_STANDALONE,
+ THIS_MODULE,
{ { 0, { __constant_htons(SNMP_TRAP_PORT) } },
{ 0, { 0 }, IPPROTO_UDP } },
{ { 0, { 0xFFFF } },
{ 0, { 0 }, 0xFFFF } },
- nat_help, "snmp_trap" };
+ nat_help, NULL };
/*****************************************************************************
*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)