X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fvconn-netlink.c;h=a0fcc8d1264d0e6e9973f381443f270a3661a09a;hb=21e087cf0dff612754649f43fdf9715f701cae7a;hp=ab0773982806341fede877408a3ecfaf04b28b4b;hpb=981a0b3dd7cae0108af37fa77df65ab725b063ea;p=sliver-openvswitch.git diff --git a/lib/vconn-netlink.c b/lib/vconn-netlink.c index ab0773982..a0fcc8d12 100644 --- a/lib/vconn-netlink.c +++ b/lib/vconn-netlink.c @@ -1,24 +1,37 @@ -/* Copyright (C) 2007 Board of Trustees, Leland Stanford Jr. University. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. +/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford + * Junior University + * + * We are making the OpenFlow specification and associated documentation + * (Software) available for public use and benefit with the expectation + * that others will use, modify and enhance the Software and contribute + * those enhancements back to the community. However, since we would + * like to make the Software available for broadest use, with as few + * restrictions as possible permission is hereby granted, free of + * charge, to any person obtaining a copy of this Software to deal in + * the Software under the copyrights without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * The name and trademarks of copyright holder(s) may NOT be used in + * advertising or publicity pertaining to the Software or any + * derivatives without specific, written prior permission. */ +#include #include "vconn.h" #include #include @@ -30,13 +43,15 @@ #include #include #include -#include "openflow-netlink.h" -#include "buffer.h" #include "dpif.h" #include "netlink.h" +#include "ofpbuf.h" +#include "openflow/openflow-netlink.h" +#include "openflow/openflow.h" +#include "poll-loop.h" #include "socket-util.h" #include "util.h" -#include "openflow.h" +#include "vconn-provider.h" #include "vlog.h" #define THIS_MODULE VLM_VCONN_NETLINK @@ -50,7 +65,7 @@ struct netlink_vconn static struct netlink_vconn * netlink_vconn_cast(struct vconn *vconn) { - assert(vconn->class == &netlink_vconn_class); + vconn_assert_class(vconn, &netlink_vconn_class); return CONTAINER_OF(vconn, struct netlink_vconn, vconn); } @@ -59,15 +74,18 @@ netlink_open(const char *name, char *suffix, struct vconn **vconnp) { struct netlink_vconn *netlink; int dp_idx; + int subscribe; int retval; - if (sscanf(suffix, "%d", &dp_idx) != 1) { - fatal(0, "%s: bad peer name format", name); + subscribe = 1; + if (sscanf(suffix, "%d:%d", &dp_idx, &subscribe) < 1) { + ofp_error(0, "%s: syntax error", name); + return EAFNOSUPPORT; } netlink = xmalloc(sizeof *netlink); - netlink->vconn.class = &netlink_vconn_class; - retval = dpif_open(dp_idx, true, &netlink->dp); + vconn_init(&netlink->vconn, &netlink_vconn_class, 0, 0, name); + retval = dpif_open(dp_idx, subscribe, &netlink->dp); if (retval) { free(netlink); *vconnp = NULL; @@ -85,43 +103,50 @@ netlink_close(struct vconn *vconn) free(netlink); } -static bool -netlink_prepoll(struct vconn *vconn, int want, struct pollfd *pfd) -{ - struct netlink_vconn *netlink = netlink_vconn_cast(vconn); - pfd->fd = nl_sock_fd(netlink->dp.sock); - if (want & WANT_RECV) { - pfd->events |= POLLIN; - } - if (want & WANT_SEND) { - pfd->events |= POLLOUT; - } - return false; -} - static int -netlink_recv(struct vconn *vconn, struct buffer **bufferp) +netlink_recv(struct vconn *vconn, struct ofpbuf **bufferp) { struct netlink_vconn *netlink = netlink_vconn_cast(vconn); return dpif_recv_openflow(&netlink->dp, bufferp, false); } static int -netlink_send(struct vconn *vconn, struct buffer *buffer) +netlink_send(struct vconn *vconn, struct ofpbuf *buffer) { struct netlink_vconn *netlink = netlink_vconn_cast(vconn); int retval = dpif_send_openflow(&netlink->dp, buffer, false); if (!retval) { - buffer_delete(buffer); + ofpbuf_delete(buffer); } return retval; } +static void +netlink_wait(struct vconn *vconn, enum vconn_wait_type wait) +{ + struct netlink_vconn *netlink = netlink_vconn_cast(vconn); + short int events = 0; + switch (wait) { + case WAIT_RECV: + events = POLLIN; + break; + + case WAIT_SEND: + events = 0; + break; + + default: + NOT_REACHED(); + } + poll_fd_wait(nl_sock_fd(netlink->dp.sock), events); +} + struct vconn_class netlink_vconn_class = { - .name = "nl", - .open = netlink_open, - .close = netlink_close, - .prepoll = netlink_prepoll, - .recv = netlink_recv, - .send = netlink_send, + "nl", /* name */ + netlink_open, /* open */ + netlink_close, /* close */ + NULL, /* connect */ + netlink_recv, /* recv */ + netlink_send, /* send */ + netlink_wait, /* wait */ };