AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Engelhardt 2008-01-31 04:50:25 -08:00 committed by David S. Miller
parent 905e3e8ec5
commit 13f7d63c29
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netfilter/nf_conntrack_sip.h
View File

@ -30,9 +30,9 @@ extern unsigned int (*nf_nat_sdp_hook)(struct sk_buff *skb,
struct nf_conntrack_expect *exp, struct nf_conntrack_expect *exp,
const char *dptr); const char *dptr);
extern int ct_sip_get_info(struct nf_conn *ct, const char *dptr, size_t dlen, extern int ct_sip_get_info(const struct nf_conn *ct, const char *dptr,
unsigned int *matchoff, unsigned int *matchlen, size_t dlen, unsigned int *matchoff,
enum sip_header_pos pos); unsigned int *matchlen, enum sip_header_pos pos);
extern int ct_sip_lnlen(const char *line, const char *limit); extern int ct_sip_lnlen(const char *line, const char *limit);
extern const char *ct_sip_search(const char *needle, const char *haystack, extern const char *ct_sip_search(const char *needle, const char *haystack,
size_t needle_len, size_t haystack_len, size_t needle_len, size_t haystack_len,

4
net/ipv4/netfilter/nf_nat_sip.c
View File

@ -35,9 +35,9 @@ struct addr_map {
} addr[IP_CT_DIR_MAX]; } 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; enum ip_conntrack_dir dir;
unsigned int n; unsigned int n;

25
net/netfilter/nf_conntrack_sip.c
View File

@ -48,10 +48,10 @@ unsigned int (*nf_nat_sdp_hook)(struct sk_buff *skb,
const char *dptr) __read_mostly; const char *dptr) __read_mostly;
EXPORT_SYMBOL_GPL(nf_nat_sdp_hook); EXPORT_SYMBOL_GPL(nf_nat_sdp_hook);
static int digits_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(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(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(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 { struct sip_header_nfo {
const char *lname; const char *lname;
@ -61,7 +61,7 @@ struct sip_header_nfo {
size_t snlen; size_t snlen;
size_t ln_strlen; size_t ln_strlen;
int case_sensitive; int case_sensitive;
int (*match_len)(struct nf_conn *, const char *, int (*match_len)(const struct nf_conn *, const char *,
const char *, int *); const char *, int *);
}; };
@ -225,7 +225,7 @@ const char *ct_sip_search(const char *needle, const char *haystack,
} }
EXPORT_SYMBOL_GPL(ct_sip_search); 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) const char *limit, int *shift)
{ {
int len = 0; int len = 0;
@ -237,7 +237,7 @@ static int digits_len(struct nf_conn *ct, const char *dptr,
} }
/* get digits length, skipping blank spaces. */ /* 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) const char *limit, int *shift)
{ {
for (; dptr <= limit && *dptr == ' '; dptr++) 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); return digits_len(ct, dptr, limit, shift);
} }
static int parse_addr(struct nf_conn *ct, const char *cp, const char **endp, static int parse_addr(const struct nf_conn *ct, const char *cp,
union nf_inet_addr *addr, const char *limit) const char **endp, union nf_inet_addr *addr,
const char *limit)
{ {
const char *end; const char *end;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num; 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. */ /* 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) const char *limit, int *shift)
{ {
union nf_inet_addr addr; 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. */ /* 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 *limit, int *shift)
{ {
const char *start = dptr; 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. */ /* 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, const char *dptr, size_t dlen,
unsigned int *matchoff, unsigned int *matchoff,
unsigned int *matchlen, unsigned int *matchlen,