commit 17aa750a49ebaecfc7b063c770aa8d36f5078b2c

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Jul 10 15:39:28 2017 +0800

    rtnl: replace obsolete RTMGRP_LINK with RTNLGRP_LINK for nl groups

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/rtnl.c b/rtnl.c

index 5cddc4b..d7a430d 100644

--- a/rtnl.c

+++ b/rtnl.c

@@ -151,7 +151,7 @@ int rtnl_open(void)

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

 	sa.nl_family = AF_NETLINK;

-	sa.nl_groups = RTMGRP_LINK;

+	sa.nl_groups = RTNLGRP_LINK;

 	fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);

 	if (fd < 0) {

commit c149a3dbc1b38e833de783ae863038562baca0fe

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Jul 10 15:39:29 2017 +0800

    port: add FD_RTNL event to track per-port status

    With rtnl socket we can track link status per port(except UDS port).

    We can make sure we get the correct interface and latest status with function

    port_link_status().

    At the same time we need to set clock sde after link down. But we return

    EV_FAULT_DETECTED in port_event(), which will not set clock sde. So we need

    to set it in port_link_status().

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/clock.c b/clock.c

index b6afba9..4c5c4e3 100644

--- a/clock.c

+++ b/clock.c

@@ -1469,6 +1469,11 @@ struct PortIdentity clock_parent_identity(struct clock *c)

 	return c->dad.pds.parentPortIdentity;

 }

+void clock_set_sde(struct clock *c, int sde)

+{

+	c->sde = sde;

+}

+

 int clock_poll(struct clock *c)

 {

 	int cnt, i;

diff --git a/clock.h b/clock.h

index fcd9328..49ecb76 100644

--- a/clock.h

+++ b/clock.h

@@ -205,6 +205,13 @@ void clock_peer_delay(struct clock *c, tmv_t ppd, tmv_t req, tmv_t rx,

 		      double nrr);

 /**

+ * Set clock sde

+ * @param c     A pointer to a clock instance obtained with clock_create().

+ * @param sde   Pass one (1) if need a decision event and zero if not.

+ */

+void clock_set_sde(struct clock *c, int sde);

+

+/**

  * Poll for events and dispatch them.

  * @param c A pointer to a clock instance obtained with clock_create().

  * @return  Zero on success, non-zero otherwise.

diff --git a/fd.h b/fd.h

index e328e98..23401f4 100644

--- a/fd.h

+++ b/fd.h

@@ -31,6 +31,7 @@ enum {

 	FD_QUALIFICATION_TIMER,

 	FD_MANNO_TIMER,

 	FD_SYNC_TX_TIMER,

+	FD_RTNL,

 	N_POLLFD,

 };

diff --git a/port.c b/port.c

index ec02825..2896d1a 100644

--- a/port.c

+++ b/port.c

@@ -23,6 +23,7 @@

 #include <string.h>

 #include <unistd.h>

 #include <sys/queue.h>

+#include <net/if.h>

 #include "bmc.h"

 #include "clock.h"

@@ -32,6 +33,7 @@

 #include "phc.h"

 #include "port.h"

 #include "print.h"

+#include "rtnl.h"

 #include "sk.h"

 #include "tlv.h"

 #include "tmv.h"

@@ -1458,7 +1460,9 @@ static void port_disable(struct port *p)

 	for (i = 0; i < N_TIMER_FDS; i++) {

 		close(p->fda.fd[FD_ANNOUNCE_TIMER + i]);

 	}

-	port_clear_fda(p, N_POLLFD);

+

+	/* Keep rtnl socket to get link status info. */

+	port_clear_fda(p, FD_RTNL);

 	clock_fda_changed(p->clock);

 }

@@ -1502,6 +1506,14 @@ static int port_initialize(struct port *p)

 	if (port_set_announce_tmo(p))

 		goto no_tmo;

+	/* No need to open rtnl socket on UDS port. */

+	if (transport_type(p->trp) != TRANS_UDS) {

+		if (p->fda.fd[FD_RTNL] == -1)

+			p->fda.fd[FD_RTNL] = rtnl_open();

+		if (p->fda.fd[FD_RTNL] >= 0)

+			rtnl_link_query(p->fda.fd[FD_RTNL]);

+	}

+

 	port_nrate_initialize(p);

 	clock_fda_changed(p->clock);

@@ -2025,6 +2037,10 @@ void port_close(struct port *p)

 	if (port_is_enabled(p)) {

 		port_disable(p);

 	}

+

+	if (p->fda.fd[FD_RTNL] >= 0)

+		rtnl_close(p->fda.fd[FD_RTNL]);

+

 	transport_destroy(p->trp);

 	tsproc_destroy(p->tsproc);

 	if (p->fault_fd >= 0)

@@ -2204,6 +2220,24 @@ void port_dispatch(struct port *p, enum fsm_event event, int mdiff)

 	}

 }

+static void port_link_status(void *ctx, int index, int linkup)

+{

+	struct port *p = ctx;

+

+	if (index != if_nametoindex(p->name) || p->link_status == linkup)

+		return;

+

+	p->link_status = linkup;

+	pr_notice("port %hu: link %s", portnum(p), linkup ? "up" : "down");

+

+	/*

+	 * A port going down can affect the BMCA result.

+	 * Force a state decision event.

+	 */

+	if (!p->link_status)

+		clock_set_sde(p->clock, 1);

+}

+

 enum fsm_event port_event(struct port *p, int fd_index)

 {

 	enum fsm_event event = EV_NONE;

@@ -2242,6 +2276,11 @@ enum fsm_event port_event(struct port *p, int fd_index)

 		pr_debug("port %hu: master sync timeout", portnum(p));

 		port_set_sync_tx_tmo(p);

 		return port_tx_sync(p) ? EV_FAULT_DETECTED : EV_NONE;

+

+	case FD_RTNL:

+		pr_debug("port %hu: received link status notification", portnum(p));

+		rtnl_link_status(fd, port_link_status, p);

+		return port_link_status_get(p) ? EV_FAULT_CLEARED : EV_FAULT_DETECTED;

 	}

 	msg = msg_allocate();

commit 25ec8a3b4e2222b394794ff830bd3583e9cf6c71

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Jul 10 15:39:30 2017 +0800

    clock: remove rtnl fd on clock

    Remove rtnl fd on clock since we track the link status per port now.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/clock.c b/clock.c

index 4c5c4e3..354f038 100644

--- a/clock.c

+++ b/clock.c

@@ -39,7 +39,6 @@

 #include "servo.h"

 #include "stats.h"

 #include "print.h"

-#include "rtnl.h"

 #include "sk.h"

 #include "tlv.h"

 #include "tsproc.h"

@@ -274,9 +273,6 @@ void clock_destroy(struct clock *c)

 	LIST_FOREACH_SAFE(p, &c->ports, list, tmp) {

 		clock_remove_port(c, p);

 	}

-	if (c->pollfd[0].fd >= 0) {

-		rtnl_close(c->pollfd[0].fd);

-	}

 	port_close(c->uds_port);

 	free(c->pollfd);

 	hash_destroy(c->index2port, NULL);

@@ -326,30 +322,6 @@ static void clock_freq_est_reset(struct clock *c)

 	c->fest.count = 0;

 }

-static void clock_link_status(void *ctx, int index, int linkup)

-{

-	struct clock *c = ctx;

-	struct port *p;

-	char key[16];

-

-	snprintf(key, sizeof(key), "%d", index);

-	p = hash_lookup(c->index2port, key);

-	if (!p) {

-		return;

-	}

-	port_link_status_set(p, linkup);

-	if (linkup) {

-		port_dispatch(p, EV_FAULT_CLEARED, 0);

-	} else {

-		port_dispatch(p, EV_FAULT_DETECTED, 0);

-		/*

-		 * A port going down can affect the BMCA result.

-		 * Force a state decision event.

-		 */

-		c->sde = 1;

-	}

-}

-

 static void clock_management_send_error(struct port *p,

 					struct ptp_message *msg, int error_id)

 {

@@ -1133,10 +1105,6 @@ struct clock *clock_create(enum clock_type type, struct config *config,

 		return NULL;

 	}

-	/* Open a RT netlink socket. */

-	c->pollfd[0].fd = rtnl_open();

-	c->pollfd[0].events = POLLIN|POLLPRI;

-

 	/* Create the UDS interface. */

 	c->uds_port = port_open(phc_index, timestamping, 0, udsif, c);

 	if (!c->uds_port) {

@@ -1164,9 +1132,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,

 		port_dispatch(p, EV_INITIALIZE, 0);

 	}

 	port_dispatch(c->uds_port, EV_INITIALIZE, 0);

-	if (c->pollfd[0].fd >= 0) {

-		rtnl_link_query(c->pollfd[0].fd);

-	}

+

 	return c;

 }

@@ -1231,12 +1197,9 @@ static int clock_resize_pollfd(struct clock *c, int new_nports)

 {

 	struct pollfd *new_pollfd;

-	/*

-	 * Need to allocate one descriptor for RT netlink and one

-	 * whole extra block of fds for UDS.

-	 */

+	/* Need to allocate one whole extra block of fds for UDS. */

 	new_pollfd = realloc(c->pollfd,

-			     (1 + (new_nports + 1) * N_CLOCK_PFD) *

+			     (new_nports + 1) * N_CLOCK_PFD *

 			     sizeof(struct pollfd));

 	if (!new_pollfd)

 		return -1;

@@ -1261,7 +1224,7 @@ static void clock_fill_pollfd(struct pollfd *dest, struct port *p)

 static void clock_check_pollfd(struct clock *c)

 {

 	struct port *p;

-	struct pollfd *dest = c->pollfd + 1;

+	struct pollfd *dest = c->pollfd;

 	if (c->pollfd_valid)

 		return;

@@ -1482,7 +1445,7 @@ int clock_poll(struct clock *c)

 	struct port *p;

 	clock_check_pollfd(c);

-	cnt = poll(c->pollfd, 1 + (c->nports + 1) * N_CLOCK_PFD, -1);

+	cnt = poll(c->pollfd, (c->nports + 1) * N_CLOCK_PFD, -1);

 	if (cnt < 0) {

 		if (EINTR == errno) {

 			return 0;

@@ -1494,13 +1457,8 @@ int clock_poll(struct clock *c)

 		return 0;

 	}

-	/* Check the RT netlink. */

 	cur = c->pollfd;

-	if (cur->revents & (POLLIN|POLLPRI)) {

-		rtnl_link_status(cur->fd, clock_link_status, c);

-	}

-	cur++;

 	LIST_FOREACH(p, &c->ports, list) {

 		/* Let the ports handle their events. */

 		for (i = 0; i < N_POLLFD; i++) {

diff --git a/port.c b/port.c

index 2896d1a..34837cc 100644

--- a/port.c

+++ b/port.c

@@ -2411,12 +2411,6 @@ int port_link_status_get(struct port *p)

 	return p->link_status;

 }

-void port_link_status_set(struct port *p, int up)

-{

-	p->link_status = up ? 1 : 0;

-	pr_notice("port %hu: link %s", portnum(p), up ? "up" : "down");

-}

-

 int port_manage(struct port *p, struct port *ingress, struct ptp_message *msg)

 {

 	struct management_tlv *mgt;

diff --git a/port.h b/port.h

index b00bc64..60fd0a4 100644

--- a/port.h

+++ b/port.h

@@ -132,13 +132,6 @@ int port_number(struct port *p);

 int port_link_status_get(struct port *p);

 /**

- * Sets the link status for a port.

- * @param p        A port instance.

- * @param up       Pass one (1) if the link is up and zero if down.

- */

-void port_link_status_set(struct port *p, int up);

-

-/**

  * Manage a port according to a given message.

  * @param p        A pointer previously obtained via port_open().

  * @param ingress  The port on which 'msg' was received.

commit 7c3f9579f0c230ee798644a26d664ebd3efc612f

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Jul 10 15:39:31 2017 +0800

    clock: remove hash table index2port

    Remove index2port since we don't need it now.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/clock.c b/clock.c

index 354f038..da15882 100644

--- a/clock.c

+++ b/clock.c

@@ -31,7 +31,6 @@

 #include "clockcheck.h"

 #include "foreign.h"

 #include "filter.h"

-#include "hash.h"

 #include "missing.h"

 #include "msg.h"

 #include "phc.h"

@@ -39,7 +38,6 @@

 #include "servo.h"

 #include "stats.h"

 #include "print.h"

-#include "sk.h"

 #include "tlv.h"

 #include "tsproc.h"

 #include "uds.h"

@@ -96,7 +94,6 @@ struct clock {

 	int nports; /* does not include the UDS port */

 	int last_port_number;

 	int sde;

-	struct hash *index2port;

 	int free_running;

 	int freq_est_interval;

 	int grand_master_capable; /* for 802.1AS only */

@@ -275,7 +272,6 @@ void clock_destroy(struct clock *c)

 	}

 	port_close(c->uds_port);

 	free(c->pollfd);

-	hash_destroy(c->index2port, NULL);

 	if (c->clkid != CLOCK_REALTIME) {

 		phc_close(c->clkid);

 	}

@@ -773,8 +769,6 @@ static int clock_add_port(struct clock *c, int phc_index,

 			  struct interface *iface)

 {

 	struct port *p, *piter, *lastp = NULL;

-	int fd, index;

-	char key[16];

 	if (clock_resize_pollfd(c, c->nports + 1)) {

 		return -1;

@@ -795,24 +789,6 @@ static int clock_add_port(struct clock *c, int phc_index,

 	c->nports++;

 	clock_fda_changed(c);

-	/* Remember the index to port mapping, for link status tracking. */

-	fd = sk_interface_fd();

-	if (fd < 0) {

-		return -1;

-	}

-	index = sk_interface_index(fd, iface->name);

-	if (index < 0) {

-		close(fd);

-		return -1;

-	}

-	snprintf(key, sizeof(key), "%d", index);

-	if (hash_insert(c->index2port, key, p)) {

-		pr_err("failed to add port with index %d twice!", index);

-		close(fd);

-		return -1;

-	}

-	close(fd);

-

 	return 0;

 }

@@ -1113,11 +1089,6 @@ struct clock *clock_create(enum clock_type type, struct config *config,

 	}

 	clock_fda_changed(c);

-	c->index2port = hash_create();

-	if (!c->index2port) {

-		pr_err("failed create index-to-port hash table");

-		return NULL;

-	}

 	/* Create the ports. */

 	STAILQ_FOREACH(iface, &config->interfaces, list) {

 		if (clock_add_port(c, phc_index, timestamping, iface)) {

commit 9e744d9e8a2dab6ec0ea5ece5ac25e7384264575

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Oct 9 22:31:39 2017 +0800

    config: add new element ts_label in struct interface

    Add new element ts_label in struct interface to track real ts interface.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/config.h b/config.h

index 1cc7051..c79855e 100644

--- a/config.h

+++ b/config.h

@@ -36,6 +36,7 @@

 struct interface {

 	STAILQ_ENTRY(interface) list;

 	char name[MAX_IFNAME_SIZE + 1];

+	char ts_label[MAX_IFNAME_SIZE + 1];

 	struct sk_ts_info ts_info;

 };

commit 7e294a4d047654f746c3fcdff7bce512be149e37

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Oct 9 22:31:40 2017 +0800

    port: track interface info in port

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/port.c b/port.c

index 34837cc..849a7c1 100644

--- a/port.c

+++ b/port.c

@@ -68,6 +68,7 @@ struct nrate_estimator {

 struct port {

 	LIST_ENTRY(port) list;

 	char *name;

+	struct interface *iface;

 	struct clock *clock;

 	struct transport *trp;

 	enum timestamp_type timestamping;

@@ -2619,6 +2620,7 @@ struct port *port_open(int phc_index,

 	}

 	p->name = interface->name;

+	p->iface = interface;

 	p->asymmetry = config_get_int(cfg, p->name, "delayAsymmetry");

 	p->asymmetry <<= 16;

 	p->announce_span = transport == TRANS_UDS ? 0 : ANNOUNCE_SPAN;

commit 05bba46198cfc4ccfe0aff2e67e76d78898bbd96

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Oct 9 22:31:41 2017 +0800

    rtnl: update rtgenmsg to ifinfomsg when request link info

    The previous function use general message and will dump all interfaces'

    information. Now update with ifinfomsg so we could get specific interface's

    information.

    We still could get all interfaces' info if set device to NULL.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/port.c b/port.c

index 849a7c1..5b85d87 100644

--- a/port.c

+++ b/port.c

@@ -1512,7 +1512,7 @@ static int port_initialize(struct port *p)

 		if (p->fda.fd[FD_RTNL] == -1)

 			p->fda.fd[FD_RTNL] = rtnl_open();

 		if (p->fda.fd[FD_RTNL] >= 0)

-			rtnl_link_query(p->fda.fd[FD_RTNL]);

+			rtnl_link_query(p->fda.fd[FD_RTNL], p->iface->name);

 	}

 	port_nrate_initialize(p);

diff --git a/rtnl.c b/rtnl.c

index d7a430d..8ecf6fe 100644

--- a/rtnl.c

+++ b/rtnl.c

@@ -42,7 +42,7 @@ int rtnl_close(int fd)

 	return close(fd);

 }

-int rtnl_link_query(int fd)

+int rtnl_link_query(int fd, char *device)

 {

 	struct sockaddr_nl sa;

 	struct msghdr msg;

@@ -51,19 +51,21 @@ int rtnl_link_query(int fd)

 	struct {

 		struct nlmsghdr hdr;

-		struct rtgenmsg gen;

+		struct ifinfomsg ifm;

 	} __attribute__((packed)) request;

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

 	sa.nl_family = AF_NETLINK;

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

-	request.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(request.gen));

+	request.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(request.ifm));

 	request.hdr.nlmsg_type = RTM_GETLINK;

-	request.hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;

+	request.hdr.nlmsg_flags = NLM_F_REQUEST;

 	request.hdr.nlmsg_seq = 1;

 	request.hdr.nlmsg_pid = 0;

-	request.gen.rtgen_family = AF_UNSPEC;

+	request.ifm.ifi_family = AF_UNSPEC;

+	request.ifm.ifi_index = if_nametoindex(device ? device : "");

+	request.ifm.ifi_change = 0xffffffff;

 	iov.iov_base = &request;

 	iov.iov_len = sizeof(request);

diff --git a/rtnl.h b/rtnl.h

index f1871f2..5c93eec 100644

--- a/rtnl.h

+++ b/rtnl.h

@@ -31,10 +31,11 @@ int rtnl_close(int fd);

 /**

  * Request the link status from the kernel.

- * @param fd  A socket obtained via rtnl_open().

- * @return    Zero on success, non-zero otherwise.

+ * @param fd     A socket obtained via rtnl_open().

+ * @param device Interface name. Request all iface's status if set NULL.

+ * @return       Zero on success, non-zero otherwise.

  */

-int rtnl_link_query(int fd);

+int rtnl_link_query(int fd, char *device);

 /**

  * Read kernel messages looking for a link up/down events.

Backport of commit 80bc4d4c2f4d1c3c246091aa6f103bb7943202ec

Author: Hangbin Liu <liuhangbin@gmail.com>

Date:   Mon Oct 9 22:31:42 2017 +0800

    rtnl: update function rtnl_link_status to get bond slave info

    Update function rtnl_link_status to get bond slave info. Pass the slave index

    to call back functions. i.e. port_link_status.

    Also check the interface index of rtnl message in function rtnl_link_status.

    Then we don't need to check it in port_link_status.

    [BACKPORT: not included] Add ifndef IFLA_BOND_MAX in case we build linuxptp

    on kernel before v3.13-rc1.

    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

diff --git a/port.c b/port.c

index 5b85d87..05fc321 100644

--- a/port.c

+++ b/port.c

@@ -2221,11 +2221,11 @@ void port_dispatch(struct port *p, enum fsm_event event, int mdiff)

 	}

 }

-static void port_link_status(void *ctx, int index, int linkup)

+static void port_link_status(void *ctx, int linkup, int ts_index)

 {

 	struct port *p = ctx;

-	if (index != if_nametoindex(p->name) || p->link_status == linkup)

+	if (p->link_status == linkup)

 		return;

 	p->link_status = linkup;

@@ -2280,7 +2280,7 @@ enum fsm_event port_event(struct port *p, int fd_index)

 	case FD_RTNL:

 		pr_debug("port %hu: received link status notification", portnum(p));

-		rtnl_link_status(fd, port_link_status, p);

+		rtnl_link_status(fd, p->name, port_link_status, p);

 		return port_link_status_get(p) ? EV_FAULT_CLEARED : EV_FAULT_DETECTED;

 	}

diff --git a/rtnl.c b/rtnl.c

index 8ecf6fe..3419873 100644

--- a/rtnl.c

+++ b/rtnl.c

@@ -84,15 +85,79 @@ int rtnl_link_query(int fd, char *device)

 	return 0;

 }

-int rtnl_link_status(int fd, rtnl_callback cb, void *ctx)

+static inline __u32 rta_getattr_u32(const struct rtattr *rta)

 {

-	int index, len;

+	return *(__u32 *)RTA_DATA(rta);

+}

+

+static inline const char *rta_getattr_str(const struct rtattr *rta)

+{

+	return (const char *)RTA_DATA(rta);

+}

+

+static int rtnl_rtattr_parse(struct rtattr *tb[], int max, struct rtattr *rta, int len)

+{

+	unsigned short type;

+

+	memset(tb, 0, sizeof(struct rtattr *) * max);

+	while (RTA_OK(rta, len)) {

+		type = rta->rta_type;

+		if ((type < max) && (!tb[type]))

+			tb[type] = rta;

+		rta = RTA_NEXT(rta, len);

+	}

+	if (len) {

+		pr_err("Length mismatch: len %d, rta_len=%d\n", len, rta->rta_len);

+		return -1;

+	}

+

+	return 0;

+}

+

+static inline int rtnl_nested_rtattr_parse(struct rtattr *tb[], int max, struct rtattr *rta)

+{

+	return rtnl_rtattr_parse(tb, max, RTA_DATA(rta), RTA_PAYLOAD(rta));

+}

+

+static int rtnl_linkinfo_parse(struct rtattr *rta)

+{

+	int index = -1;

+	const char *kind;

+	struct rtattr *linkinfo[IFLA_INFO_MAX];

+	struct rtattr *bond[IFLA_BOND_MAX];

+

+	if (rtnl_nested_rtattr_parse(linkinfo, IFLA_INFO_MAX, rta) < 0)

+		return -1;

+

+	if (linkinfo[IFLA_INFO_KIND]) {

+		kind = rta_getattr_str(linkinfo[IFLA_INFO_KIND]);

+

+		if (kind && !strncmp(kind, "bond", 4) &&

+		    linkinfo[IFLA_INFO_DATA]) {

+			if (rtnl_nested_rtattr_parse(bond, IFLA_BOND_MAX,

+						 linkinfo[IFLA_INFO_DATA]) < 0)

+				return -1;

+

+			if (bond[IFLA_BOND_ACTIVE_SLAVE]) {

+				index = rta_getattr_u32(bond[IFLA_BOND_ACTIVE_SLAVE]);

+			}

+		}

+	}

+	return index;

+}

+

+int rtnl_link_status(int fd, char *device, rtnl_callback cb, void *ctx)

+{

+	int index, len, link_up;

+	int slave_index = -1;

 	struct iovec iov;

 	struct sockaddr_nl sa;

 	struct msghdr msg;

 	struct nlmsghdr *nh;

 	struct ifinfomsg *info = NULL;

+	struct rtattr *tb[IFLA_MAX+1];

+	index = if_nametoindex(device);

 	if (!rtnl_buf) {

 		rtnl_len = 4096;

 		rtnl_buf = malloc(rtnl_len);

@@ -135,14 +200,27 @@ int rtnl_link_status(int fd, rtnl_callback cb, void *ctx)

 	nh = (struct nlmsghdr *) rtnl_buf;

 	for ( ; NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, len)) {

-		if (nh->nlmsg_type == RTM_NEWLINK) {

-			info = NLMSG_DATA(nh);

-			index = info->ifi_index;

-			pr_debug("interface index %d is %s", index,

-				 info->ifi_flags & IFF_RUNNING ? "up" : "down");

-			cb(ctx, index, info->ifi_flags & IFF_RUNNING ? 1 : 0);

-		}

+		if (nh->nlmsg_type != RTM_NEWLINK)

+			continue;

+

+		info = NLMSG_DATA(nh);

+		if (index != info->ifi_index)

+			continue;