netfilter fix (6/7): nat 64bit bigendian fixes
Subsystems (2)
PATCH 1/1 netfilter fix (6/7): nat 64bit bigendian fixes
Hi Dave!
Here goes the sixth...
Author: Jakub Bogusz <[email protected]>
This patch fixes bugs related to machine endianess (harmless on little-endians, but causing that some of conntrack modules don't work on big-endian machines) in netfilter/ip_nat code. Bugs are similar to those fixed in 42_conntrack-bigendian-fixes.patch (which fixed netfilter/ip_conntrack code).
net/ipv4/netfilter/ip_nat_ftp.c renamed from net/ipv4/netfilter/ip_nat_ftp.c.orig +1 -1
@@ -84,7 +84,7 @@ mr.range[0 ].flags |=IP_NAT_RANGE_PROTO_SPECIFIED ; mr.range[0 ].min = mr.range[0 ].max = ((union ip_conntrack_manip_proto ) - {htons (exp_ftp_info->port) }); + { .tcp = {htons (exp_ftp_info->port) } }); }return ip_nat_setup_info (ct, &mr, hooknum); }
net/ipv4/netfilter/ip_nat_snmp_basic.c renamed from net/ipv4/netfilter/ip_nat_snmp_basic.c.orig +4 -4
@@ -1309,9 +1309,9 @@"snmp" ,IP_NAT_HELPER_F_STANDALONE ,THIS_MODULE , - { { 0, { __constant_htons(SNMP_PORT) } }, + { { 0, { .udp = { __constant_htons(SNMP_PORT) } } }, { 0, { 0 }, IPPROTO_UDP } }, - { { 0, { 0xFFFF } }, + { { 0, { .udp = { 0xFFFF } } }, { 0, { 0 }, 0xFFFF } }, nat_help, NULL };
@@ -1320,9 +1320,9 @@"snmp_trap" ,IP_NAT_HELPER_F_STANDALONE ,THIS_MODULE , - { { 0, { __constant_htons(SNMP_TRAP_PORT) } }, + { { 0, { .udp = { __constant_htons(SNMP_TRAP_PORT) } } }, { 0, { 0 }, IPPROTO_UDP } }, - { { 0, { 0xFFFF } }, + { { 0, { .udp = { 0xFFFF } } }, { 0, { 0 }, 0xFFFF } }, nat_help, NULL };
net/ipv4/netfilter/ip_nat_amanda.c renamed from net/ipv4/netfilter/ip_nat_amanda.c.orig +1 -1
@@ -84,7 +84,7 @@ mr.range[0 ].flags |=IP_NAT_RANGE_PROTO_SPECIFIED ; mr.range[0 ].min = mr.range[0 ].max = ((union ip_conntrack_manip_proto ) - {htons (port) }); + { .udp = {htons (port) } }); }return ip_nat_setup_info (ct, &mr, hooknum);
Please apply, thanks.
Signature · 5 lines
- Harald Welte <[email protected]> http://www.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