diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-01-31 07:50:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:28:07 -0500 |
commit | 905e3e8ec5899ae618846c9ac6f38dd6c22e604e (patch) | |
tree | a15c260950c0b5e4c12d9fe6529ae6ea564902a8 /net/ipv4 | |
parent | 3cb609d57c20027a8b39fc60b79b930a89da82d4 (diff) |
[NETFILTER]: nf_conntrack_h323: constify and annotate H.323 helper
Constify data tables (predominantly in nf_conntrack_h323_types.c, but
also a few in nf_conntrack_h323_asn1.c) and use const qualifiers on
variables where possible in the h323 sources.
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_nat_h323.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c index a121989fdad7..ee47bf28c825 100644 --- a/net/ipv4/netfilter/nf_nat_h323.c +++ b/net/ipv4/netfilter/nf_nat_h323.c | |||
@@ -32,7 +32,8 @@ static int set_addr(struct sk_buff *skb, | |||
32 | __be32 ip; | 32 | __be32 ip; |
33 | __be16 port; | 33 | __be16 port; |
34 | } __attribute__ ((__packed__)) buf; | 34 | } __attribute__ ((__packed__)) buf; |
35 | struct tcphdr _tcph, *th; | 35 | const struct tcphdr *th; |
36 | struct tcphdr _tcph; | ||
36 | 37 | ||
37 | buf.ip = ip; | 38 | buf.ip = ip; |
38 | buf.port = port; | 39 | buf.port = port; |
@@ -99,7 +100,7 @@ static int set_sig_addr(struct sk_buff *skb, struct nf_conn *ct, | |||
99 | unsigned char **data, | 100 | unsigned char **data, |
100 | TransportAddress *taddr, int count) | 101 | TransportAddress *taddr, int count) |
101 | { | 102 | { |
102 | struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; | 103 | const struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; |
103 | int dir = CTINFO2DIR(ctinfo); | 104 | int dir = CTINFO2DIR(ctinfo); |
104 | int i; | 105 | int i; |
105 | __be16 port; | 106 | __be16 port; |