lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: annotate rest of nf_nat_* with const

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Jan Engelhardt
2008-04-14 11:15:42 +02:00
committed by Patrick McHardy
parent 58c0fb0ddd
commit 72b72949db
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/netfilter/nf_nat_core.c
View File

@@ -150,9 +150,9 @@ find_appropriate_src(const struct nf_conntrack_tuple *tuple,
const struct nf_nat_range *range) const struct nf_nat_range *range)
{ {
unsigned int h = hash_by_src(tuple); unsigned int h = hash_by_src(tuple);
struct nf_conn_nat *nat; const struct nf_conn_nat *nat;
struct nf_conn *ct; const struct nf_conn *ct;
struct hlist_node *n; const struct hlist_node *n;
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(nat, n, &bysource[h], bysource) { hlist_for_each_entry_rcu(nat, n, &bysource[h], bysource) {
@@ -426,7 +426,7 @@ int nf_nat_icmp_reply_translation(struct nf_conn *ct,
struct icmphdr icmp; struct icmphdr icmp;
struct iphdr ip; struct iphdr ip;
} *inside; } *inside;
struct nf_conntrack_l4proto *l4proto; const struct nf_conntrack_l4proto *l4proto;
struct nf_conntrack_tuple inner, target; struct nf_conntrack_tuple inner, target;
int hdrlen = ip_hdrlen(skb); int hdrlen = ip_hdrlen(skb);
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);

17
net/ipv4/netfilter/nf_nat_snmp_basic.c
View File

@@ -220,7 +220,7 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx,
if (ch < 0x80) if (ch < 0x80)
*len = ch; *len = ch;
else { else {
cnt = (unsigned char) (ch & 0x7F); cnt = ch & 0x7F;
*len = 0; *len = 0;
while (cnt > 0) { while (cnt > 0) {
@@ -618,8 +618,7 @@ struct snmp_cnv
int syntax; int syntax;
}; };
static struct snmp_cnv snmp_conv [] = static const struct snmp_cnv snmp_conv[] = {
{
{ASN1_UNI, ASN1_NUL, SNMP_NULL}, {ASN1_UNI, ASN1_NUL, SNMP_NULL},
{ASN1_UNI, ASN1_INT, SNMP_INTEGER}, {ASN1_UNI, ASN1_INT, SNMP_INTEGER},
{ASN1_UNI, ASN1_OTS, SNMP_OCTETSTR}, {ASN1_UNI, ASN1_OTS, SNMP_OCTETSTR},
@@ -644,7 +643,7 @@ static unsigned char snmp_tag_cls2syntax(unsigned int tag,
unsigned int cls, unsigned int cls,
unsigned short *syntax) unsigned short *syntax)
{ {
struct snmp_cnv *cnv; const struct snmp_cnv *cnv;
cnv = snmp_conv; cnv = snmp_conv;
@@ -904,7 +903,7 @@ static inline void mangle_address(unsigned char *begin,
u_int32_t old; u_int32_t old;
if (debug) if (debug)
memcpy(&old, (unsigned char *)addr, sizeof(old)); memcpy(&old, addr, sizeof(old));
*addr = map->to; *addr = map->to;
@@ -999,7 +998,7 @@ err_id_free:
* *
*****************************************************************************/ *****************************************************************************/
static void hex_dump(unsigned char *buf, size_t len) static void hex_dump(const unsigned char *buf, size_t len)
{ {
size_t i; size_t i;
@@ -1080,7 +1079,7 @@ static int snmp_parse_mangle(unsigned char *msg,
if (cls != ASN1_CTX || con != ASN1_CON) if (cls != ASN1_CTX || con != ASN1_CON)
return 0; return 0;
if (debug > 1) { if (debug > 1) {
unsigned char *pdus[] = { static const unsigned char *const pdus[] = {
[SNMP_PDU_GET] = "get", [SNMP_PDU_GET] = "get",
[SNMP_PDU_NEXT] = "get-next", [SNMP_PDU_NEXT] = "get-next",
[SNMP_PDU_RESPONSE] = "response", [SNMP_PDU_RESPONSE] = "response",
@@ -1232,8 +1231,8 @@ static int help(struct sk_buff *skb, unsigned int protoff,
{ {
int dir = CTINFO2DIR(ctinfo); int dir = CTINFO2DIR(ctinfo);
unsigned int ret; unsigned int ret;
struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct udphdr *udph = (struct udphdr *)((u_int32_t *)iph + iph->ihl); const struct udphdr *udph = (struct udphdr *)((__be32 *)iph + iph->ihl);
/* SNMP replies and originating SNMP traps get mangled */ /* SNMP replies and originating SNMP traps get mangled */
if (udph->source == htons(SNMP_PORT) && dir != IP_CT_DIR_REPLY) if (udph->source == htons(SNMP_PORT) && dir != IP_CT_DIR_REPLY)

8
net/ipv4/netfilter/nf_nat_standalone.c
View File

@@ -30,8 +30,8 @@
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
static void nat_decode_session(struct sk_buff *skb, struct flowi *fl) static void nat_decode_session(struct sk_buff *skb, struct flowi *fl)
{ {
struct nf_conn *ct; const struct nf_conn *ct;
struct nf_conntrack_tuple *t; const struct nf_conntrack_tuple *t;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
enum ip_conntrack_dir dir; enum ip_conntrack_dir dir;
unsigned long statusbit; unsigned long statusbit;
@@ -189,7 +189,7 @@ nf_nat_out(unsigned int hooknum,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
struct nf_conn *ct; const struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
#endif #endif
unsigned int ret; unsigned int ret;
@@ -223,7 +223,7 @@ nf_nat_local_fn(unsigned int hooknum,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct nf_conn *ct; const struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
unsigned int ret; unsigned int ret;