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

Commit 613fa3ca authored by David Lebrun's avatar David Lebrun Committed by David S. Miller
Browse files

ipv6: add source address argument for ipv6_push_nfrag_opts 



This patch prepares for insertion of SRH through setsockopt().
The new source address argument is used when an HMAC field is
present in the SRH, which must be filled. The HMAC signature
process requires the source address as input text.

Signed-off-by: default avatarDavid Lebrun <david.lebrun@uclouvain.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9baee834

include/net/ipv6.h

+2 −1
Original line number Diff line number Diff line
@@ -932,7 +932,8 @@ int ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb); 
 */



void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt,

			  u8 *proto, struct in6_addr **daddr_p);

			  u8 *proto, struct in6_addr **daddr_p,

			  struct in6_addr *saddr);

void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt,

			 u8 *proto);

net/ipv6/exthdrs.c

+3 −3
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ int ipv6_parse_hopopts(struct sk_buff *skb) 


static void ipv6_push_rthdr(struct sk_buff *skb, u8 *proto,

			    struct ipv6_rt_hdr *opt,

			    struct in6_addr **addr_p)

			    struct in6_addr **addr_p, struct in6_addr *saddr)

{

	struct rt0_hdr *phdr, *ihdr;

	int hops;
@@ -900,10 +900,10 @@ static void ipv6_push_exthdr(struct sk_buff *skb, u8 *proto, u8 type, struct ipv 


void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt,

			  u8 *proto,

			  struct in6_addr **daddr)

			  struct in6_addr **daddr, struct in6_addr *saddr)

{

	if (opt->srcrt) {

		ipv6_push_rthdr(skb, proto, opt->srcrt, daddr);

		ipv6_push_rthdr(skb, proto, opt->srcrt, daddr, saddr);

		/*

		 * IPV6_RTHDRDSTOPTS is ignored

		 * unless IPV6_RTHDR is set (RFC3542).

net/ipv6/ip6_output.c

+3 −2
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, 
		if (opt->opt_flen)

			ipv6_push_frag_opts(skb, opt, &proto);

		if (opt->opt_nflen)

			ipv6_push_nfrag_opts(skb, opt, &proto, &first_hop);

			ipv6_push_nfrag_opts(skb, opt, &proto, &first_hop,

					     &fl6->saddr);

	}



	skb_push(skb, sizeof(struct ipv6hdr));
@@ -1672,7 +1673,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 
	if (opt && opt->opt_flen)

		ipv6_push_frag_opts(skb, opt, &proto);

	if (opt && opt->opt_nflen)

		ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst);

		ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst, &fl6->saddr);



	skb_push(skb, sizeof(struct ipv6hdr));

	skb_reset_network_header(skb);

net/ipv6/ip6_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, 


	if (encap_limit >= 0) {

		init_tel_txopt(&opt, encap_limit);

		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);

		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL, NULL);

	}



	/* Calculate max headroom for all the headers and adjust