#include <net/if.h>
#include "netlink.h"
+#include "netlink-notifier.h"
#include "ofpbuf.h"
-#include "rtnetlink.h"
-static struct rtnetlink *rtn = NULL;
+static struct nln *nln = NULL;
static struct rtnetlink_link_change rtn_change;
/* Parses a rtnetlink message 'buf' into 'change'. If 'buf' is unparseable,
return parsed;
}
+static bool
+rtnetlink_link_parse_cb(struct ofpbuf *buf, void *change)
+{
+ return rtnetlink_link_parse(buf, change);
+}
+
/* Registers 'cb' to be called with auxiliary data 'aux' with network device
* change notifications. The notifier is stored in 'notifier', which the
* caller must not modify or free.
*
* Returns 0 if successful, otherwise a positive errno value. */
int
-rtnetlink_link_notifier_register(struct rtnetlink_notifier *notifier,
+rtnetlink_link_notifier_register(struct nln_notifier *notifier,
rtnetlink_link_notify_func *cb, void *aux)
{
- rtnetlink_parse_func *pf = (rtnetlink_parse_func *) rtnetlink_link_parse;
- rtnetlink_notify_func *nf = (rtnetlink_notify_func *) cb;
-
- if (!rtn) {
- rtn = rtnetlink_create(RTNLGRP_LINK, pf, &rtn_change);
+ if (!nln) {
+ nln = nln_create(NETLINK_ROUTE, RTNLGRP_LINK, rtnetlink_link_parse_cb,
+ &rtn_change);
}
- return rtnetlink_notifier_register(rtn, notifier, nf, aux);
+ return nln_notifier_register(nln, notifier, (nln_notify_func *) cb, aux);
}
/* Cancels notification on 'notifier', which must have previously been
* registered with rtnetlink_link_notifier_register(). */
void
-rtnetlink_link_notifier_unregister(struct rtnetlink_notifier *notifier)
+rtnetlink_link_notifier_unregister(struct nln_notifier *notifier)
{
- rtnetlink_notifier_unregister(rtn, notifier);
+ nln_notifier_unregister(nln, notifier);
}
/* Calls all of the registered notifiers, passing along any as-yet-unreported
void
rtnetlink_link_notifier_run(void)
{
- if (rtn) {
- rtnetlink_notifier_run(rtn);
+ if (nln) {
+ nln_notifier_run(nln);
}
}
void
rtnetlink_link_notifier_wait(void)
{
- if (rtn) {
- rtnetlink_notifier_wait(rtn);
+ if (nln) {
+ nln_notifier_wait(nln);
}
}