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

[NETFILTER]: nf_conntrack: const annotations in nf_conntrack_sctp, nf_nat_proto_gre

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:54 +02:00
committed by Patrick McHardy
parent f2ea825f48
commit 12c33aa20e
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/netfilter/nf_nat_proto_dccp.c
View File

@@ -38,7 +38,7 @@ dccp_manip_pkt(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_tuple *tuple,
enum nf_nat_manip_type maniptype) enum nf_nat_manip_type maniptype)
{ {
struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); const struct iphdr *iph = (const void *)(skb->data + iphdroff);
struct dccp_hdr *hdr; struct dccp_hdr *hdr;
unsigned int hdroff = iphdroff + iph->ihl * 4; unsigned int hdroff = iphdroff + iph->ihl * 4;
__be32 oldip, newip; __be32 oldip, newip;

2
net/ipv4/netfilter/nf_nat_proto_gre.c
View File

@@ -84,7 +84,7 @@ gre_manip_pkt(struct sk_buff *skb, unsigned int iphdroff,
const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_tuple *tuple,
enum nf_nat_manip_type maniptype) enum nf_nat_manip_type maniptype)
{ {
struct gre_hdr *greh; const struct gre_hdr *greh;
struct gre_hdr_pptp *pgreh; struct gre_hdr_pptp *pgreh;
const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);
unsigned int hdroff = iphdroff + iph->ihl * 4; unsigned int hdroff = iphdroff + iph->ihl * 4;

17
net/netfilter/nf_conntrack_proto_sctp.c
View File

@@ -33,7 +33,7 @@ static DEFINE_RWLOCK(sctp_lock);
And so for me for SCTP :D -Kiran */ And so for me for SCTP :D -Kiran */
static const char *sctp_conntrack_names[] = { static const char *const sctp_conntrack_names[] = {
"NONE", "NONE",
"CLOSED", "CLOSED",
"COOKIE_WAIT", "COOKIE_WAIT",
@@ -133,7 +133,8 @@ static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
static bool sctp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, static bool sctp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
sctp_sctphdr_t _hdr, *hp; const struct sctphdr *hp;
struct sctphdr _hdr;
/* Actually only need first 8 bytes. */ /* Actually only need first 8 bytes. */
hp = skb_header_pointer(skb, dataoff, 8, &_hdr); hp = skb_header_pointer(skb, dataoff, 8, &_hdr);
@@ -291,8 +292,10 @@ static int sctp_packet(struct nf_conn *ct,
{ {
enum sctp_conntrack new_state, old_state; enum sctp_conntrack new_state, old_state;
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
sctp_sctphdr_t _sctph, *sh; const struct sctphdr *sh;
sctp_chunkhdr_t _sch, *sch; struct sctphdr _sctph;
const struct sctp_chunkhdr *sch;
struct sctp_chunkhdr _sch;
u_int32_t offset, count; u_int32_t offset, count;
unsigned long map[256 / sizeof(unsigned long)] = { 0 }; unsigned long map[256 / sizeof(unsigned long)] = { 0 };
@@ -393,8 +396,10 @@ static bool sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
unsigned int dataoff) unsigned int dataoff)
{ {
enum sctp_conntrack new_state; enum sctp_conntrack new_state;
sctp_sctphdr_t _sctph, *sh; const struct sctphdr *sh;
sctp_chunkhdr_t _sch, *sch; struct sctphdr _sctph;
const struct sctp_chunkhdr *sch;
struct sctp_chunkhdr _sch;
u_int32_t offset, count; u_int32_t offset, count;
unsigned long map[256 / sizeof(unsigned long)] = { 0 }; unsigned long map[256 / sizeof(unsigned long)] = { 0 };