diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:47:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-14 08:47:39 +0000 |
| commit | 8aed6923094927a753d5b31ed283b16343994be5 (patch) | |
| tree | 39aefbd38974af2ebd6cfda8f3692b4176084605 /target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch | |
| parent | 272ef8ac00065906c8b67843c7424fa190a8beda (diff) | |
| download | upstream-8aed6923094927a753d5b31ed283b16343994be5.tar.gz upstream-8aed6923094927a753d5b31ed283b16343994be5.tar.bz2 upstream-8aed6923094927a753d5b31ed283b16343994be5.zip | |
generic: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34676
Diffstat (limited to 'target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch')
| -rw-r--r-- | target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch b/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch index 6aaf71b809..d9505e0aa1 100644 --- a/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch +++ b/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch @@ -26,7 +26,7 @@ char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; union nf_inet_addr newaddr; -@@ -107,7 +110,8 @@ static int map_addr(struct sk_buff *skb, +@@ -107,7 +108,8 @@ static int map_addr(struct sk_buff *skb, } else if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.dst.u3, addr) && ct->tuplehash[dir].tuple.dst.u.udp.port == port) { newaddr = ct->tuplehash[!dir].tuple.src.u3; @@ -36,7 +36,7 @@ } else return 1; -@@ -144,6 +148,7 @@ static unsigned int nf_nat_sip(struct sk +@@ -144,6 +146,7 @@ static unsigned int nf_nat_sip(struct sk enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); @@ -44,7 +44,7 @@ unsigned int coff, matchoff, matchlen; enum sip_header_types hdr; union nf_inet_addr addr; -@@ -258,6 +263,20 @@ next: +@@ -258,6 +261,20 @@ next: !map_sip_addr(skb, protoff, dataoff, dptr, datalen, SIP_HDR_TO)) return NF_DROP; @@ -65,7 +65,7 @@ return NF_ACCEPT; } -@@ -311,8 +332,10 @@ static unsigned int nf_nat_sip_expect(st +@@ -311,8 +328,10 @@ static unsigned int nf_nat_sip_expect(st enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); @@ -76,7 +76,7 @@ char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; -@@ -326,8 +350,9 @@ static unsigned int nf_nat_sip_expect(st +@@ -326,8 +345,9 @@ static unsigned int nf_nat_sip_expect(st /* If the signalling port matches the connection's source port in the * original direction, try to use the destination port in the opposite * direction. */ |