Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a78dec authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: sip conntrack: make header shortcuts optional 



Not every header has a shortcut, so make them optional instead
of searching for the same string twice.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 40883e81

net/ipv4/netfilter/ip_conntrack_sip.c

+2 −3
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ static struct sip_header_nfo ct_sip_hdrs[] = { 
	[POS_REQ_HEADER] = { 	/* SIP Requests headers */

		.lname		= "sip:",

		.lnlen		= sizeof("sip:") - 1,

		.sname		= "sip:",

		.snlen		= sizeof("sip:") - 1, /* yes, i know.. ;) */

		.ln_str		= "@",

		.ln_strlen	= sizeof("@") - 1,

		.match_len	= epaddr_len
@@ -286,7 +284,8 @@ int ct_sip_get_info(const char *dptr, size_t dlen, 


	while (dptr <= limit) {

		if ((strncmp(dptr, hnfo->lname, hnfo->lnlen) != 0) &&

		    (strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {

		    (hinfo->sname == NULL ||

		     strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {

			dptr++;

			continue;

		}