23 lines
714 B
Diff
23 lines
714 B
Diff
|
--- a/net/netfilter/nf_conntrack_sip.c
|
||
|
|
+++ b/net/netfilter/nf_conntrack_sip.c
|
||
|
|
@@ -1425,8 +1425,7 @@
|
||
|
|
SIP_HDR_VIA_UDP, NULL, &matchoff,
|
||
|
|
&matchlen, &addr, &port) > 0 &&
|
||
|
|
port != ct->tuplehash[dir].tuple.src.u.udp.port &&
|
||
|
|
- nf_inet_addr_cmp(&addr, &ct->tuplehash[dir].tuple.src.u3) &&
|
||
|
|
- (dir == IP_CT_DIR_ORIGINAL))
|
||
|
|
+ nf_inet_addr_cmp(&addr, &ct->tuplehash[dir].tuple.src.u3))
|
||
|
|
ct_sip_info->forced_dport = port;
|
||
|
|
|
||
|
|
for (i = 0; i < ARRAY_SIZE(sip_handlers); i++) {
|
||
|
|
@@ -1573,9 +1572,6 @@
|
||
|
|
unsigned int dataoff, datalen;
|
||
|
|
const char *dptr;
|
||
|
|
|
||
|
|
- if (nf_ct_disable_sip_alg)
|
||
|
|
- return NF_ACCEPT;
|
||
|
|
-
|
||
|
|
/* No Data ? */
|
||
|
|
dataoff = protoff + sizeof(struct udphdr);
|
||
|
|
if (dataoff >= skb->len)
|