Commit 13f7d63c authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[NETFILTER]: nf_{conntrack,nat}_sip: annotate SIP helper with const 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 905e3e8e

include/linux/netfilter/nf_conntrack_sip.h

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ extern unsigned int (*nf_nat_sdp_hook)(struct sk_buff *skb, 
				       struct nf_conntrack_expect *exp,

				       const char *dptr);



extern int ct_sip_get_info(struct nf_conn *ct, const char *dptr, size_t dlen,

			   unsigned int *matchoff, unsigned int *matchlen,

			   enum sip_header_pos pos);

extern int ct_sip_get_info(const struct nf_conn *ct, const char *dptr,

                           size_t dlen, unsigned int *matchoff,

                           unsigned int *matchlen, enum sip_header_pos pos);

extern int ct_sip_lnlen(const char *line, const char *limit);

extern const char *ct_sip_search(const char *needle, const char *haystack,

				 size_t needle_len, size_t haystack_len,

net/ipv4/netfilter/nf_nat_sip.c

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ struct addr_map { 
	} addr[IP_CT_DIR_MAX];

};



static void addr_map_init(struct nf_conn *ct, struct addr_map *map)

static void addr_map_init(const struct nf_conn *ct, struct addr_map *map)

{

	struct nf_conntrack_tuple *t;

	const struct nf_conntrack_tuple *t;

	enum ip_conntrack_dir dir;

	unsigned int n;

net/netfilter/nf_conntrack_sip.c

+13 −12
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ unsigned int (*nf_nat_sdp_hook)(struct sk_buff *skb, 
				const char *dptr) __read_mostly;

EXPORT_SYMBOL_GPL(nf_nat_sdp_hook);



static int digits_len(struct nf_conn *, const char *, const char *, int *);

static int epaddr_len(struct nf_conn *, const char *, const char *, int *);

static int skp_digits_len(struct nf_conn *, const char *, const char *, int *);

static int skp_epaddr_len(struct nf_conn *, const char *, const char *, int *);

static int digits_len(const struct nf_conn *, const char *, const char *, int *);

static int epaddr_len(const struct nf_conn *, const char *, const char *, int *);

static int skp_digits_len(const struct nf_conn *, const char *, const char *, int *);

static int skp_epaddr_len(const struct nf_conn *, const char *, const char *, int *);



struct sip_header_nfo {

	const char	*lname;
@@ -61,7 +61,7 @@ struct sip_header_nfo { 
	size_t		snlen;

	size_t		ln_strlen;

	int		case_sensitive;

	int		(*match_len)(struct nf_conn *, const char *,

	int		(*match_len)(const struct nf_conn *, const char *,

				     const char *, int *);

};
@@ -225,7 +225,7 @@ const char *ct_sip_search(const char *needle, const char *haystack, 
}

EXPORT_SYMBOL_GPL(ct_sip_search);



static int digits_len(struct nf_conn *ct, const char *dptr,

static int digits_len(const struct nf_conn *ct, const char *dptr,

		      const char *limit, int *shift)

{

	int len = 0;
@@ -237,7 +237,7 @@ static int digits_len(struct nf_conn *ct, const char *dptr, 
}



/* get digits length, skipping blank spaces. */

static int skp_digits_len(struct nf_conn *ct, const char *dptr,

static int skp_digits_len(const struct nf_conn *ct, const char *dptr,

			  const char *limit, int *shift)

{

	for (; dptr <= limit && *dptr == ' '; dptr++)
@@ -246,8 +246,9 @@ static int skp_digits_len(struct nf_conn *ct, const char *dptr, 
	return digits_len(ct, dptr, limit, shift);

}



static int parse_addr(struct nf_conn *ct, const char *cp, const char **endp,

		      union nf_inet_addr *addr, const char *limit)

static int parse_addr(const struct nf_conn *ct, const char *cp,

                      const char **endp, union nf_inet_addr *addr,

                      const char *limit)

{

	const char *end;

	int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
@@ -272,7 +273,7 @@ static int parse_addr(struct nf_conn *ct, const char *cp, const char **endp, 
}



/* skip ip address. returns its length. */

static int epaddr_len(struct nf_conn *ct, const char *dptr,

static int epaddr_len(const struct nf_conn *ct, const char *dptr,

		      const char *limit, int *shift)

{

	union nf_inet_addr addr;
@@ -292,7 +293,7 @@ static int epaddr_len(struct nf_conn *ct, const char *dptr, 
}



/* get address length, skiping user info. */

static int skp_epaddr_len(struct nf_conn *ct, const char *dptr,

static int skp_epaddr_len(const struct nf_conn *ct, const char *dptr,

			  const char *limit, int *shift)

{

	const char *start = dptr;
@@ -319,7 +320,7 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr, 
}



/* Returns 0 if not found, -1 error parsing. */

int ct_sip_get_info(struct nf_conn *ct,

int ct_sip_get_info(const struct nf_conn *ct,

		    const char *dptr, size_t dlen,

		    unsigned int *matchoff,

		    unsigned int *matchlen,