git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag sliver-openvswitch-2.2.90-1
[sliver-openvswitch.git]
/
lib
/
route-table.c
diff --git
a/lib/route-table.c
b/lib/route-table.c
index
1afc01d
..
2986d3d
100644
(file)
--- a/
lib/route-table.c
+++ b/
lib/route-table.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013
, 2014
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.
@@
-65,6
+65,10
@@
struct name_node {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
+/* Global change number for route-table, which should be incremented
+ * every time route_table_reset() is called. */
+static uint64_t rt_change_seq;
+
static unsigned int register_count = 0;
static struct nln *nln = NULL;
static struct route_table_msg rtmsg;
static unsigned int register_count = 0;
static struct nln *nln = NULL;
static struct route_table_msg rtmsg;
@@
-154,6
+158,12
@@
route_table_get_ifindex(ovs_be32 ip_, int *ifindex)
return false;
}
return false;
}
+uint64_t
+route_table_get_change_seq(void)
+{
+ return rt_change_seq;
+}
+
/* Users of the route_table module should register themselves with this
* function before making any other route_table function calls. */
void
/* Users of the route_table module should register themselves with this
* function before making any other route_table function calls. */
void
@@
-205,6
+215,10
@@
route_table_run(void)
if (nln) {
rtnetlink_link_run();
nln_run(nln);
if (nln) {
rtnetlink_link_run();
nln_run(nln);
+
+ if (!route_table_valid) {
+ route_table_reset();
+ }
}
}
}
}
@@
-223,10
+237,12
@@
route_table_reset(void)
{
struct nl_dump dump;
struct rtgenmsg *rtmsg;
{
struct nl_dump dump;
struct rtgenmsg *rtmsg;
- struct ofpbuf request, reply;
+ uint64_t reply_stub[NL_DUMP_BUFSIZE / 8];
+ struct ofpbuf request, reply, buf;
route_map_clear();
route_table_valid = true;
route_map_clear();
route_table_valid = true;
+ rt_change_seq++;
ofpbuf_init(&request, 0);
ofpbuf_init(&request, 0);
@@
-238,13
+254,15
@@
route_table_reset(void)
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
- while (nl_dump_next(&dump, &reply)) {
+ ofpbuf_use_stub(&buf, reply_stub, sizeof reply_stub);
+ while (nl_dump_next(&dump, &reply, &buf)) {
struct route_table_msg msg;
if (route_table_parse(&reply, &msg)) {
route_table_handle_msg(&msg);
}
}
struct route_table_msg msg;
if (route_table_parse(&reply, &msg)) {
route_table_handle_msg(&msg);
}
}
+ ofpbuf_uninit(&buf);
return nl_dump_done(&dump);
}
return nl_dump_done(&dump);
}
@@
-269,7
+287,7
@@
route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
const struct rtmsg *rtm;
const struct nlmsghdr *nlmsg;
const struct rtmsg *rtm;
const struct nlmsghdr *nlmsg;
- nlmsg =
buf->data
;
+ nlmsg =
ofpbuf_data(buf)
;
rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
if (rtm->rtm_family != AF_INET) {
rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
if (rtm->rtm_family != AF_INET) {
@@
-407,7
+425,8
@@
name_table_reset(void)
{
struct nl_dump dump;
struct rtgenmsg *rtmsg;
{
struct nl_dump dump;
struct rtgenmsg *rtmsg;
- struct ofpbuf request, reply;
+ uint64_t reply_stub[NL_DUMP_BUFSIZE / 8];
+ struct ofpbuf request, reply, buf;
name_table_valid = true;
name_map_clear();
name_table_valid = true;
name_map_clear();
@@
-420,7
+439,8
@@
name_table_reset(void)
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
nl_dump_start(&dump, NETLINK_ROUTE, &request);
ofpbuf_uninit(&request);
- while (nl_dump_next(&dump, &reply)) {
+ ofpbuf_use_stub(&buf, reply_stub, sizeof reply_stub);
+ while (nl_dump_next(&dump, &reply, &buf)) {
struct rtnetlink_link_change change;
if (rtnetlink_link_parse(&reply, &change)
struct rtnetlink_link_change change;
if (rtnetlink_link_parse(&reply, &change)
@@
-434,6
+454,7
@@
name_table_reset(void)
hmap_insert(&name_map, &nn->node, hash_int(nn->ifi_index, 0));
}
}
hmap_insert(&name_map, &nn->node, hash_int(nn->ifi_index, 0));
}
}
+ ofpbuf_uninit(&buf);
return nl_dump_done(&dump);
}
return nl_dump_done(&dump);
}