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

Commit 26879da5 authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

ipv6: add new struct ipcm6_cookie 



In the sendmsg function of UDP, raw, ICMP and l2tp sockets, we use local
variables like hlimits, tclass, opt and dontfrag and pass them to corresponding
functions like ip6_make_skb, ip6_append_data and xxx_push_pending_frames.
This is not a good practice and makes it hard to add new parameters.
This fix introduces a new struct ipcm6_cookie similar to ipcm_cookie in
ipv4 and include the above mentioned variables. And we only pass the
pointer to this structure to corresponding functions. This makes it easier
to add new parameters in the future and makes the function cleaner.

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d2077ac

include/net/ipv6.h

+12 −6
Original line number Diff line number Diff line
@@ -251,6 +251,13 @@ struct ipv6_fl_socklist { 
	struct rcu_head			rcu;

};



struct ipcm6_cookie {

	__s16 hlimit;

	__s16 tclass;

	__s8  dontfrag;

	struct ipv6_txoptions *opt;

};



static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)

{

	struct ipv6_txoptions *opt;
@@ -863,9 +870,9 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr); 
int ip6_append_data(struct sock *sk,

		    int getfrag(void *from, char *to, int offset, int len,

				int odd, struct sk_buff *skb),

		    void *from, int length, int transhdrlen, int hlimit,

		    int tclass, struct ipv6_txoptions *opt, struct flowi6 *fl6,

		    struct rt6_info *rt, unsigned int flags, int dontfrag,

		    void *from, int length, int transhdrlen,

		    struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

		    struct rt6_info *rt, unsigned int flags,

		    const struct sockcm_cookie *sockc);



int ip6_push_pending_frames(struct sock *sk);
@@ -881,9 +888,8 @@ struct sk_buff *ip6_make_skb(struct sock *sk, 
			     int getfrag(void *from, char *to, int offset,

					 int len, int odd, struct sk_buff *skb),

			     void *from, int length, int transhdrlen,

			     int hlimit, int tclass, struct ipv6_txoptions *opt,

			     struct flowi6 *fl6, struct rt6_info *rt,

			     unsigned int flags, int dontfrag,

			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

			     struct rt6_info *rt, unsigned int flags,

			     const struct sockcm_cookie *sockc);



static inline struct sk_buff *ip6_finish_skb(struct sock *sk)

include/net/transp_v6.h

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, 
				    struct sk_buff *skb);



int ip6_datagram_send_ctl(struct net *net, struct sock *sk, struct msghdr *msg,

			  struct flowi6 *fl6, struct ipv6_txoptions *opt,

			  int *hlimit, int *tclass, int *dontfrag,

			  struct flowi6 *fl6, struct ipcm6_cookie *ipc6,

			  struct sockcm_cookie *sockc);



void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,

net/ipv6/datagram.c

+6 −7
Original line number Diff line number Diff line
@@ -727,14 +727,13 @@ EXPORT_SYMBOL_GPL(ip6_datagram_recv_ctl); 


int ip6_datagram_send_ctl(struct net *net, struct sock *sk,

			  struct msghdr *msg, struct flowi6 *fl6,

			  struct ipv6_txoptions *opt,

			  int *hlimit, int *tclass, int *dontfrag,

			  struct sockcm_cookie *sockc)

			  struct ipcm6_cookie *ipc6, struct sockcm_cookie *sockc)

{

	struct in6_pktinfo *src_info;

	struct cmsghdr *cmsg;

	struct ipv6_rt_hdr *rthdr;

	struct ipv6_opt_hdr *hdr;

	struct ipv6_txoptions *opt = ipc6->opt;

	int len;

	int err = 0;
@@ -953,8 +952,8 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, 
				goto exit_f;

			}



			*hlimit = *(int *)CMSG_DATA(cmsg);

			if (*hlimit < -1 || *hlimit > 0xff) {

			ipc6->hlimit = *(int *)CMSG_DATA(cmsg);

			if (ipc6->hlimit < -1 || ipc6->hlimit > 0xff) {

				err = -EINVAL;

				goto exit_f;

			}
@@ -974,7 +973,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, 
				goto exit_f;



			err = 0;

			*tclass = tc;

			ipc6->tclass = tc;



			break;

		    }
@@ -992,7 +991,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, 
				goto exit_f;



			err = 0;

			*dontfrag = df;

			ipc6->dontfrag = df;



			break;

		    }

net/ipv6/icmp.c

+16 −12
Original line number Diff line number Diff line
@@ -401,10 +401,10 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
	struct flowi6 fl6;

	struct icmpv6_msg msg;

	struct sockcm_cookie sockc_unused = {0};

	struct ipcm6_cookie ipc6;

	int iif = 0;

	int addr_type = 0;

	int len;

	int hlimit;

	int err = 0;

	u32 mark = IP6_REPLY_MARK(net, skb->mark);
@@ -507,7 +507,10 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
	if (IS_ERR(dst))

		goto out;



	hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);

	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);

	ipc6.tclass = np->tclass;

	ipc6.dontfrag = np->dontfrag;

	ipc6.opt = NULL;



	msg.skb = skb;

	msg.offset = skb_network_offset(skb);
@@ -526,9 +529,9 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 


	err = ip6_append_data(sk, icmpv6_getfrag, &msg,

			      len + sizeof(struct icmp6hdr),

			      sizeof(struct icmp6hdr), hlimit,

			      np->tclass, NULL, &fl6, (struct rt6_info *)dst,

			      MSG_DONTWAIT, np->dontfrag, &sockc_unused);

			      sizeof(struct icmp6hdr),

			      &ipc6, &fl6, (struct rt6_info *)dst,

			      MSG_DONTWAIT, &sockc_unused);

	if (err) {

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);
@@ -563,9 +566,8 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	struct flowi6 fl6;

	struct icmpv6_msg msg;

	struct dst_entry *dst;

	struct ipcm6_cookie ipc6;

	int err = 0;

	int hlimit;

	u8 tclass;

	u32 mark = IP6_REPLY_MARK(net, skb->mark);

	struct sockcm_cookie sockc_unused = {0};
@@ -607,19 +609,21 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
	if (IS_ERR(dst))

		goto out;



	hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	idev = __in6_dev_get(skb->dev);



	msg.skb = skb;

	msg.offset = 0;

	msg.type = ICMPV6_ECHO_REPLY;



	tclass = ipv6_get_dsfield(ipv6_hdr(skb));

	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);

	ipc6.tclass = ipv6_get_dsfield(ipv6_hdr(skb));

	ipc6.dontfrag = np->dontfrag;

	ipc6.opt = NULL;



	err = ip6_append_data(sk, icmpv6_getfrag, &msg, skb->len + sizeof(struct icmp6hdr),

				sizeof(struct icmp6hdr), hlimit, tclass, NULL, &fl6,

				sizeof(struct icmp6hdr), &ipc6, &fl6,

				(struct rt6_info *)dst, MSG_DONTWAIT,

				np->dontfrag, &sockc_unused);

				&sockc_unused);



	if (err) {

		__ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

net/ipv6/ip6_flowlabel.c

+3 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
		struct msghdr msg;

		struct flowi6 flowi6;

		struct sockcm_cookie sockc_junk;

		int junk;

		struct ipcm6_cookie ipc6;



		err = -ENOMEM;

		fl->opt = kmalloc(sizeof(*fl->opt) + olen, GFP_KERNEL);
@@ -390,8 +390,8 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
		msg.msg_control = (void *)(fl->opt+1);

		memset(&flowi6, 0, sizeof(flowi6));



		err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt,

					    &junk, &junk, &junk, &sockc_junk);

		ipc6.opt = fl->opt;

		err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, &ipc6, &sockc_junk);

		if (err)

			goto done;

		err = -EINVAL;