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

Commit da3f13c9 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[NETFILTER]: nf_{conntrack,nat}_proto_udp{,lite}: annotate 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 82f568fc

net/ipv4/netfilter/nf_nat_proto_udp.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ udp_manip_pkt(struct sk_buff *skb, 
	      const struct nf_conntrack_tuple *tuple,

	      enum nf_nat_manip_type maniptype)

{

	struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);

	const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);

	struct udphdr *hdr;

	unsigned int hdroff = iphdroff + iph->ihl*4;

	__be32 oldip, newip;

net/netfilter/nf_conntrack_proto_udp.c

+4 −2
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static int udp_pkt_to_tuple(const struct sk_buff *skb, 
			     unsigned int dataoff,

			     struct nf_conntrack_tuple *tuple)

{

	struct udphdr _hdr, *hp;

	const struct udphdr *hp;

	struct udphdr _hdr;



	/* Actually only need first 8 bytes. */

	hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr);
@@ -94,7 +95,8 @@ static int udp_error(struct sk_buff *skb, unsigned int dataoff, 
		     unsigned int hooknum)

{

	unsigned int udplen = skb->len - dataoff;

	struct udphdr _hdr, *hdr;

	const struct udphdr *hdr;

	struct udphdr _hdr;



	/* Header is too small? */

	hdr = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr);

net/netfilter/nf_conntrack_proto_udplite.c

+4 −2
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ static int udplite_pkt_to_tuple(const struct sk_buff *skb, 
				unsigned int dataoff,

				struct nf_conntrack_tuple *tuple)

{

	struct udphdr _hdr, *hp;

	const struct udphdr *hp;

	struct udphdr _hdr;



	hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr);

	if (hp == NULL)
@@ -94,7 +95,8 @@ static int udplite_error(struct sk_buff *skb, unsigned int dataoff, 
			 unsigned int hooknum)

{

	unsigned int udplen = skb->len - dataoff;

	struct udphdr _hdr, *hdr;

	const struct udphdr *hdr;

	struct udphdr _hdr;

	unsigned int cscov;



	/* Header is too small? */