X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Froute-table.c;h=2986d3d9a186715f744cd3048bb4ef3792d22c82;hb=41ca1e0afb4b261a217c9fdaf672ef606e8434f9;hp=22d12f7a163ff8a3b2198e667d76cc051e108d93;hpb=45c8d3a189843f0f45398caa420b952d5acd1f19;p=sliver-openvswitch.git diff --git a/lib/route-table.c b/lib/route-table.c index 22d12f7a1..2986d3d9a 100644 --- a/lib/route-table.c +++ b/lib/route-table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Nicira Networks. + * 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. @@ -18,7 +18,6 @@ #include "route-table.h" -#include #include #include #include @@ -66,11 +65,15 @@ struct name_node { 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 rtnetlink *rtn = NULL; +static struct nln *nln = NULL; static struct route_table_msg rtmsg; -static struct rtnetlink_notifier route_notifier; -static struct rtnetlink_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; @@ -155,22 +158,27 @@ route_table_get_ifindex(ovs_be32 ip_, int *ifindex) 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 route_table_register(void) { if (!register_count) { - rtnetlink_parse_func *pf; - rtnetlink_notify_func *nf; + ovs_assert(!nln); + ovs_assert(!route_notifier); - assert(!rtn); + nln = nln_create(NETLINK_ROUTE, RTNLGRP_IPV4_ROUTE, + (nln_parse_func *) route_table_parse, &rtmsg); - pf = (rtnetlink_parse_func *) route_table_parse; - nf = (rtnetlink_notify_func *) route_table_change; - - rtn = rtnetlink_create(RTNLGRP_IPV4_ROUTE, pf, &rtmsg); - rtnetlink_notifier_register(rtn, &route_notifier, nf, NULL); + route_notifier = + nln_notifier_create(nln, (nln_notify_func *) route_table_change, + NULL); hmap_init(&route_map); route_table_reset(); @@ -189,8 +197,10 @@ route_table_unregister(void) register_count--; if (!register_count) { - rtnetlink_destroy(rtn); - rtn = NULL; + nln_notifier_destroy(route_notifier); + route_notifier = NULL; + nln_destroy(nln); + nln = NULL; route_map_clear(); hmap_destroy(&route_map); @@ -202,9 +212,13 @@ route_table_unregister(void) void route_table_run(void) { - if (rtn) { - rtnetlink_link_notifier_run(); - rtnetlink_notifier_run(rtn); + if (nln) { + rtnetlink_link_run(); + nln_run(nln); + + if (!route_table_valid) { + route_table_reset(); + } } } @@ -212,30 +226,23 @@ route_table_run(void) void route_table_wait(void) { - if (rtn) { - rtnetlink_link_notifier_wait(); - rtnetlink_notifier_wait(rtn); + if (nln) { + rtnetlink_link_wait(); + nln_wait(nln); } } static int route_table_reset(void) { - int error; struct nl_dump dump; struct rtgenmsg *rtmsg; - struct ofpbuf request, reply; - static struct nl_sock *rtnl_sock; + uint64_t reply_stub[NL_DUMP_BUFSIZE / 8]; + struct ofpbuf request, reply, buf; route_map_clear(); route_table_valid = true; - - error = nl_sock_create(NETLINK_ROUTE, &rtnl_sock); - if (error) { - VLOG_WARN_RL(&rl, "failed to reset routing table, " - "cannot create RTNETLINK_ROUTE socket"); - return error; - } + rt_change_seq++; ofpbuf_init(&request, 0); @@ -244,20 +251,20 @@ route_table_reset(void) rtmsg = ofpbuf_put_zeros(&request, sizeof *rtmsg); rtmsg->rtgen_family = AF_INET; - nl_dump_start(&dump, rtnl_sock, &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); } } + ofpbuf_uninit(&buf); - error = nl_dump_done(&dump); - nl_sock_destroy(rtnl_sock); - - return error; + return nl_dump_done(&dump); } @@ -271,7 +278,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) [RTA_OIF] = { .type = NL_A_U32, .optional = false }, }; - static struct nlattr *attrs[ARRAY_SIZE(policy)]; + struct nlattr *attrs[ARRAY_SIZE(policy)]; parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg), policy, attrs, ARRAY_SIZE(policy)); @@ -280,8 +287,8 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) const struct rtmsg *rtm; const struct nlmsghdr *nlmsg; - nlmsg = buf->data; - rtm = (const struct rtmsg *) ((const char *) buf->data + NLMSG_HDRLEN); + nlmsg = ofpbuf_data(buf); + rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm); if (rtm->rtm_family != AF_INET) { VLOG_DBG_RL(&rl, "received non AF_INET rtnetlink route message"); @@ -400,14 +407,15 @@ static void 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); } @@ -415,27 +423,24 @@ name_table_uninit(void) static int name_table_reset(void) { - int error; struct nl_dump dump; struct rtgenmsg *rtmsg; - struct ofpbuf request, reply; - static struct nl_sock *rtnl_sock; + uint64_t reply_stub[NL_DUMP_BUFSIZE / 8]; + struct ofpbuf request, reply, buf; name_table_valid = true; name_map_clear(); - error = nl_sock_create(NETLINK_ROUTE, &rtnl_sock); - if (error) { - VLOG_WARN_RL(&rl, "failed to create NETLINK_ROUTE socket"); - return error; - } ofpbuf_init(&request, 0); nl_msg_put_nlmsghdr(&request, sizeof *rtmsg, RTM_GETLINK, NLM_F_REQUEST); rtmsg = ofpbuf_put_zeros(&request, sizeof *rtmsg); rtmsg->rtgen_family = AF_INET; - nl_dump_start(&dump, rtnl_sock, &request); - while (nl_dump_next(&dump, &reply)) { + nl_dump_start(&dump, NETLINK_ROUTE, &request); + ofpbuf_uninit(&request); + + 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) @@ -449,7 +454,7 @@ name_table_reset(void) hmap_insert(&name_map, &nn->node, hash_int(nn->ifi_index, 0)); } } - nl_sock_destroy(rtnl_sock); + ofpbuf_uninit(&buf); return nl_dump_done(&dump); }