projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Revert change in flow cookie when an ofoperation fails.
[openvswitch]
/
lib
/
route-table.c
diff --git
a/lib/route-table.c
b/lib/route-table.c
index a0c812105eb33e71c565a3b28cd5371988f97547..63a09f2e8c3cf6e4c8c0429e0a44a4fe7284e231 100644
(file)
--- a/
lib/route-table.c
+++ b/
lib/route-table.c
@@
-1,5
+1,5
@@
/*
/*
- * 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-188,6
+188,8
@@
route_table_unregister(void)
register_count--;
if (!register_count) {
register_count--;
if (!register_count) {
+ nln_notifier_destroy(route_notifier);
+ route_notifier = NULL;
nln_destroy(nln);
nln = NULL;
nln_destroy(nln);
nln = NULL;
@@
-244,6
+246,7
@@
route_table_reset(void)
rtmsg->rtgen_family = AF_INET;
nl_dump_start(&dump, rtnl_sock, &request);
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;
while (nl_dump_next(&dump, &reply)) {
struct route_table_msg msg;
@@
-435,6
+438,8
@@
name_table_reset(void)
rtmsg->rtgen_family = AF_INET;
nl_dump_start(&dump, rtnl_sock, &request);
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;
while (nl_dump_next(&dump, &reply)) {
struct rtnetlink_link_change change;