Commit 9ddd0ed0 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller

[NETFILTER]: nf_{conntrack,nat}_pptp: annotate PPtP 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 de24b4eb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_common.h>
extern const char *pptp_msg_name[]; extern const char *const pptp_msg_name[];
/* state of the control session */ /* state of the control session */
enum pptp_ctrlsess_state { enum pptp_ctrlsess_state {
......
...@@ -40,11 +40,11 @@ MODULE_ALIAS("ip_nat_pptp"); ...@@ -40,11 +40,11 @@ MODULE_ALIAS("ip_nat_pptp");
static void pptp_nat_expected(struct nf_conn *ct, static void pptp_nat_expected(struct nf_conn *ct,
struct nf_conntrack_expect *exp) struct nf_conntrack_expect *exp)
{ {
struct nf_conn *master = ct->master; const struct nf_conn *master = ct->master;
struct nf_conntrack_expect *other_exp; struct nf_conntrack_expect *other_exp;
struct nf_conntrack_tuple t; struct nf_conntrack_tuple t;
struct nf_ct_pptp_master *ct_pptp_info; const struct nf_ct_pptp_master *ct_pptp_info;
struct nf_nat_pptp *nat_pptp_info; const struct nf_nat_pptp *nat_pptp_info;
struct nf_nat_range range; struct nf_nat_range range;
ct_pptp_info = &nfct_help(master)->help.ct_pptp_info; ct_pptp_info = &nfct_help(master)->help.ct_pptp_info;
...@@ -186,7 +186,7 @@ static void ...@@ -186,7 +186,7 @@ static void
pptp_exp_gre(struct nf_conntrack_expect *expect_orig, pptp_exp_gre(struct nf_conntrack_expect *expect_orig,
struct nf_conntrack_expect *expect_reply) struct nf_conntrack_expect *expect_reply)
{ {
struct nf_conn *ct = expect_orig->master; const struct nf_conn *ct = expect_orig->master;
struct nf_ct_pptp_master *ct_pptp_info; struct nf_ct_pptp_master *ct_pptp_info;
struct nf_nat_pptp *nat_pptp_info; struct nf_nat_pptp *nat_pptp_info;
...@@ -217,7 +217,7 @@ pptp_inbound_pkt(struct sk_buff *skb, ...@@ -217,7 +217,7 @@ pptp_inbound_pkt(struct sk_buff *skb,
struct PptpControlHeader *ctlh, struct PptpControlHeader *ctlh,
union pptp_ctrl_union *pptpReq) union pptp_ctrl_union *pptpReq)
{ {
struct nf_nat_pptp *nat_pptp_info; const struct nf_nat_pptp *nat_pptp_info;
u_int16_t msg; u_int16_t msg;
__be16 new_pcid; __be16 new_pcid;
unsigned int pcid_off; unsigned int pcid_off;
......
...@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(nf_nat_pptp_hook_expectfn); ...@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(nf_nat_pptp_hook_expectfn);
#ifdef DEBUG #ifdef DEBUG
/* PptpControlMessageType names */ /* PptpControlMessageType names */
const char *pptp_msg_name[] = { const char *const pptp_msg_name[] = {
"UNKNOWN_MESSAGE", "UNKNOWN_MESSAGE",
"START_SESSION_REQUEST", "START_SESSION_REQUEST",
"START_SESSION_REPLY", "START_SESSION_REPLY",
...@@ -136,7 +136,7 @@ static void pptp_expectfn(struct nf_conn *ct, ...@@ -136,7 +136,7 @@ static void pptp_expectfn(struct nf_conn *ct,
static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t) static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t)
{ {
struct nf_conntrack_tuple_hash *h; const struct nf_conntrack_tuple_hash *h;
struct nf_conntrack_expect *exp; struct nf_conntrack_expect *exp;
struct nf_conn *sibling; struct nf_conn *sibling;
...@@ -168,7 +168,7 @@ static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t) ...@@ -168,7 +168,7 @@ static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t)
/* timeout GRE data connections */ /* timeout GRE data connections */
static void pptp_destroy_siblings(struct nf_conn *ct) static void pptp_destroy_siblings(struct nf_conn *ct)
{ {
struct nf_conn_help *help = nfct_help(ct); const struct nf_conn_help *help = nfct_help(ct);
struct nf_conntrack_tuple t; struct nf_conntrack_tuple t;
nf_ct_gre_keymap_destroy(ct); nf_ct_gre_keymap_destroy(ct);
...@@ -497,9 +497,11 @@ conntrack_pptp_help(struct sk_buff *skb, unsigned int protoff, ...@@ -497,9 +497,11 @@ conntrack_pptp_help(struct sk_buff *skb, unsigned int protoff,
{ {
int dir = CTINFO2DIR(ctinfo); int dir = CTINFO2DIR(ctinfo);
struct nf_ct_pptp_master *info = &nfct_help(ct)->help.ct_pptp_info; const struct nf_ct_pptp_master *info = &nfct_help(ct)->help.ct_pptp_info;
struct tcphdr _tcph, *tcph; const struct tcphdr *tcph;
struct pptp_pkt_hdr _pptph, *pptph; struct tcphdr _tcph;
const struct pptp_pkt_hdr *pptph;
struct pptp_pkt_hdr _pptph;
struct PptpControlHeader _ctlh, *ctlh; struct PptpControlHeader _ctlh, *ctlh;
union pptp_ctrl_union _pptpReq, *pptpReq; union pptp_ctrl_union _pptpReq, *pptpReq;
unsigned int tcplen = skb->len - protoff; unsigned int tcplen = skb->len - protoff;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment