Merge "netfilter: nf_conntrack_sip: Dynamically enable/disable SIP ALG" (4025936a) · Commits · e / devices / android_kernel_xiaomi_markw

net/netfilter/nf_conntrack_sip.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1782,8 +1782,6 @@ static int process_sip_msg(struct sk_buff skb, struct nf_conn ct,
	const struct nf_nat_sip_hooks *hooks;		const struct nf_nat_sip_hooks *hooks;
	int ret;		int ret;

	if (nf_ct_disable_sip_alg)
	return NF_ACCEPT;
	if (strncasecmp(*dptr, "SIP/2.0 ", strlen("SIP/2.0 ")) != 0)		if (strncasecmp(*dptr, "SIP/2.0 ", strlen("SIP/2.0 ")) != 0)
	ret = process_sip_request(skb, protoff, dataoff, dptr, datalen);		ret = process_sip_request(skb, protoff, dataoff, dptr, datalen);
	else		else
	@@ -2017,6 +2015,9 @@ static int sip_help_udp(struct sk_buff *skb, unsigned int protoff,
	unsigned int dataoff, datalen;		unsigned int dataoff, datalen;
	const char *dptr;		const char *dptr;

			if (nf_ct_disable_sip_alg)
			return NF_ACCEPT;

	/* No Data ? */		/* No Data ? */
	dataoff = protoff + sizeof(struct udphdr);		dataoff = protoff + sizeof(struct udphdr);
	if (dataoff >= skb->len)		if (dataoff >= skb->len)