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

Commit 47f68512 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[IPV4]: Convert address dumping to new netlink api 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dfdd5fd4

net/ipv4/devinet.c

+23 −19
Original line number Diff line number Diff line
@@ -1112,32 +1112,37 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa, 
{

	struct ifaddrmsg *ifm;

	struct nlmsghdr  *nlh;

	unsigned char	 *b = skb->tail;



	nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*ifm), flags);

	ifm = NLMSG_DATA(nlh);

	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*ifm), flags);

	if (nlh == NULL)

		return -ENOBUFS;



	ifm = nlmsg_data(nlh);

	ifm->ifa_family = AF_INET;

	ifm->ifa_prefixlen = ifa->ifa_prefixlen;

	ifm->ifa_flags = ifa->ifa_flags|IFA_F_PERMANENT;

	ifm->ifa_scope = ifa->ifa_scope;

	ifm->ifa_index = ifa->ifa_dev->dev->ifindex;



	if (ifa->ifa_address)

		RTA_PUT(skb, IFA_ADDRESS, 4, &ifa->ifa_address);

		NLA_PUT_U32(skb, IFA_ADDRESS, ifa->ifa_address);



	if (ifa->ifa_local)

		RTA_PUT(skb, IFA_LOCAL, 4, &ifa->ifa_local);

		NLA_PUT_U32(skb, IFA_LOCAL, ifa->ifa_local);



	if (ifa->ifa_broadcast)

		RTA_PUT(skb, IFA_BROADCAST, 4, &ifa->ifa_broadcast);

		NLA_PUT_U32(skb, IFA_BROADCAST, ifa->ifa_broadcast);



	if (ifa->ifa_anycast)

		RTA_PUT(skb, IFA_ANYCAST, 4, &ifa->ifa_anycast);

		NLA_PUT_U32(skb, IFA_ANYCAST, ifa->ifa_anycast);



	if (ifa->ifa_label[0])

		RTA_PUT(skb, IFA_LABEL, IFNAMSIZ, &ifa->ifa_label);

	nlh->nlmsg_len = skb->tail - b;

	return skb->len;

		NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);



nlmsg_failure:

rtattr_failure:

	skb_trim(skb, b - skb->data);

	return -1;

	return nlmsg_end(skb, nlh);



nla_put_failure:

	return nlmsg_cancel(skb, nlh);

}



static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
@@ -1185,18 +1190,17 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) 


static void rtmsg_ifa(int event, struct in_ifaddr* ifa)

{

	int size = NLMSG_SPACE(sizeof(struct ifaddrmsg) + 128);

	struct sk_buff *skb = alloc_skb(size, GFP_KERNEL);

	struct sk_buff *skb;



	if (!skb)

	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);

	if (skb == NULL)

		netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, ENOBUFS);

	else if (inet_fill_ifaddr(skb, ifa, 0, 0, event, 0) < 0) {

		kfree_skb(skb);

		netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, EINVAL);

	} else {

	} else

		netlink_broadcast(rtnl, skb, 0, RTNLGRP_IPV4_IFADDR, GFP_KERNEL);

}

}



static struct rtnetlink_link inet_rtnetlink_table[RTM_NR_MSGTYPES] = {

	[RTM_NEWADDR  - RTM_BASE] = { .doit	= inet_rtm_newaddr,	},