Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b72949 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: annotate rest of nf_nat_* with const 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 58c0fb0d

net/ipv4/netfilter/nf_nat_core.c

+4 −4
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ find_appropriate_src(const struct nf_conntrack_tuple *tuple, 
		     const struct nf_nat_range *range)

{

	unsigned int h = hash_by_src(tuple);

	struct nf_conn_nat *nat;

	struct nf_conn *ct;

	struct hlist_node *n;

	const struct nf_conn_nat *nat;

	const struct nf_conn *ct;

	const struct hlist_node *n;



	rcu_read_lock();

	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 iphdr ip;

	} *inside;

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l4proto *l4proto;

	struct nf_conntrack_tuple inner, target;

	int hdrlen = ip_hdrlen(skb);

	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);

net/ipv4/netfilter/nf_nat_snmp_basic.c

+8 −9
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx, 
		if (ch < 0x80)

			*len = ch;

		else {

			cnt = (unsigned char) (ch & 0x7F);

			cnt = ch & 0x7F;

			*len = 0;



			while (cnt > 0) {
@@ -618,8 +618,7 @@ struct snmp_cnv 
	int syntax;

};



static struct snmp_cnv snmp_conv [] =

{

static const struct snmp_cnv snmp_conv[] = {

	{ASN1_UNI, ASN1_NUL, SNMP_NULL},

	{ASN1_UNI, ASN1_INT, SNMP_INTEGER},

	{ASN1_UNI, ASN1_OTS, SNMP_OCTETSTR},
@@ -644,7 +643,7 @@ static unsigned char snmp_tag_cls2syntax(unsigned int tag, 
					 unsigned int cls,

					 unsigned short *syntax)

{

	struct snmp_cnv *cnv;

	const struct snmp_cnv *cnv;



	cnv = snmp_conv;
@@ -904,7 +903,7 @@ static inline void mangle_address(unsigned char *begin, 
		u_int32_t old;



		if (debug)

			memcpy(&old, (unsigned char *)addr, sizeof(old));

			memcpy(&old, addr, sizeof(old));



		*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;
@@ -1080,7 +1079,7 @@ static int snmp_parse_mangle(unsigned char *msg, 
	if (cls != ASN1_CTX || con != ASN1_CON)

		return 0;

	if (debug > 1) {

		unsigned char *pdus[] = {

		static const unsigned char *const pdus[] = {

			[SNMP_PDU_GET] = "get",

			[SNMP_PDU_NEXT] = "get-next",

			[SNMP_PDU_RESPONSE] = "response",
@@ -1232,8 +1231,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, 
{

	int dir = CTINFO2DIR(ctinfo);

	unsigned int ret;

	struct iphdr *iph = ip_hdr(skb);

	struct udphdr *udph = (struct udphdr *)((u_int32_t *)iph + iph->ihl);

	const struct iphdr *iph = ip_hdr(skb);

	const struct udphdr *udph = (struct udphdr *)((__be32 *)iph + iph->ihl);



	/* SNMP replies and originating SNMP traps get mangled */

	if (udph->source == htons(SNMP_PORT) && dir != IP_CT_DIR_REPLY)

net/ipv4/netfilter/nf_nat_standalone.c

+4 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#ifdef CONFIG_XFRM

static void nat_decode_session(struct sk_buff *skb, struct flowi *fl)

{

	struct nf_conn *ct;

	struct nf_conntrack_tuple *t;

	const struct nf_conn *ct;

	const struct nf_conntrack_tuple *t;

	enum ip_conntrack_info ctinfo;

	enum ip_conntrack_dir dir;

	unsigned long statusbit;
@@ -189,7 +189,7 @@ nf_nat_out(unsigned int hooknum, 
	   int (*okfn)(struct sk_buff *))

{

#ifdef CONFIG_XFRM

	struct nf_conn *ct;

	const struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;

#endif

	unsigned int ret;
@@ -223,7 +223,7 @@ nf_nat_local_fn(unsigned int hooknum, 
		const struct net_device *out,

		int (*okfn)(struct sk_buff *))

{

	struct nf_conn *ct;

	const struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;

	unsigned int ret;