mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
cl349@firebug.cl.cam.ac.uk
f9da43103c
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk> --HG-- rename : patches/linux-2.6.16-rc6/i386-mach-io-check-nmi.patch => patches/linux-2.6.16/i386-mach-io-check-nmi.patch rename : patches/linux-2.6.16-rc6/net-csum.patch => patches/linux-2.6.16/net-csum.patch rename : patches/linux-2.6.16-rc6/pmd-shared.patch => patches/linux-2.6.16/pmd-shared.patch rename : patches/linux-2.6.16-rc6/smp-alts.patch => patches/linux-2.6.16/smp-alts.patch
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
diff -pruN ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
|
|
--- ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-03-20 05:53:29.000000000 +0000
|
|
+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-03-20 19:38:19.000000000 +0000
|
|
@@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb,
|
|
if (hdrsize < sizeof(*hdr))
|
|
return 1;
|
|
|
|
- hdr->check = ip_nat_cheat_check(~oldip, newip,
|
|
+ if ((*pskb)->proto_csum_blank) {
|
|
+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
|
|
+ } else {
|
|
+ hdr->check = ip_nat_cheat_check(~oldip, newip,
|
|
ip_nat_cheat_check(oldport ^ 0xFFFF,
|
|
newport,
|
|
hdr->check));
|
|
+ }
|
|
return 1;
|
|
}
|
|
|
|
diff -pruN ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
|
|
--- ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-03-20 05:53:29.000000000 +0000
|
|
+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c 2006-03-20 19:38:19.000000000 +0000
|
|
@@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb,
|
|
newport = tuple->dst.u.udp.port;
|
|
portptr = &hdr->dest;
|
|
}
|
|
- if (hdr->check) /* 0 is a special case meaning no checksum */
|
|
- hdr->check = ip_nat_cheat_check(~oldip, newip,
|
|
+ if (hdr->check) { /* 0 is a special case meaning no checksum */
|
|
+ if ((*pskb)->proto_csum_blank) {
|
|
+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
|
|
+ } else {
|
|
+ hdr->check = ip_nat_cheat_check(~oldip, newip,
|
|
ip_nat_cheat_check(*portptr ^ 0xFFFF,
|
|
newport,
|
|
hdr->check));
|
|
+ }
|
|
+ }
|
|
*portptr = newport;
|
|
return 1;
|
|
}
|