/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "route-table.h"
-#include <assert.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <linux/rtnetlink.h>
static unsigned int register_count = 0;
static struct nln *nln = NULL;
static struct route_table_msg rtmsg;
-static struct nln_notifier route_notifier;
-static struct nln_notifier name_notifier;
+static struct nln_notifier *route_notifier = NULL;
+static struct nln_notifier *name_notifier = NULL;
static bool route_table_valid = false;
static bool name_table_valid = false;
route_table_register(void)
{
if (!register_count) {
- assert(!nln);
+ ovs_assert(!nln);
+ ovs_assert(!route_notifier);
nln = nln_create(NETLINK_ROUTE, RTNLGRP_IPV4_ROUTE,
(nln_parse_func *) route_table_parse, &rtmsg);
- nln_notifier_register(nln, &route_notifier,
- (nln_notify_func *) route_table_change, NULL);
+
+ route_notifier =
+ nln_notifier_create(nln, (nln_notify_func *) route_table_change,
+ NULL);
hmap_init(&route_map);
route_table_reset();
register_count--;
if (!register_count) {
+ nln_notifier_destroy(route_notifier);
+ route_notifier = NULL;
nln_destroy(nln);
nln = NULL;
rtmsg->rtgen_family = AF_INET;
nl_dump_start(&dump, rtnl_sock, &request);
+ ofpbuf_uninit(&request);
while (nl_dump_next(&dump, &reply)) {
struct route_table_msg msg;
name_table_init(void)
{
hmap_init(&name_map);
- rtnetlink_link_notifier_register(&name_notifier, name_table_change, NULL);
+ name_notifier = rtnetlink_link_notifier_create(name_table_change, NULL);
name_table_valid = false;
}
static void
name_table_uninit(void)
{
- rtnetlink_link_notifier_unregister(&name_notifier);
+ rtnetlink_link_notifier_destroy(name_notifier);
+ name_notifier = NULL;
name_map_clear();
hmap_destroy(&name_map);
}
rtmsg->rtgen_family = AF_INET;
nl_dump_start(&dump, rtnl_sock, &request);
+ ofpbuf_uninit(&request);
+
while (nl_dump_next(&dump, &reply)) {
struct rtnetlink_link_change change;