X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=d5060f1f549d4336c36c96a08b383a54cab4e2a1;hb=060ea9d5152b5c8cc6646ead1175484e07c583fe;hp=6838800cd21b0ee8148a7e0d1a00383f4b67d14a;hpb=086041cc8fbbb6e3eb7416fbed78006dd35e75a4;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 6838800cd..d5060f1f5 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -106,6 +106,8 @@ struct dp_netdev_port { int port_no; /* Index into dp_netdev's 'ports'. */ struct list node; /* Element in dp_netdev's 'port_list'. */ struct netdev *netdev; + struct netdev_saved_flags *sf; + struct netdev_rx *rx; char *type; /* Port type as requested by user. */ }; @@ -187,10 +189,17 @@ dpif_netdev_class_is_dummy(const struct dpif_class *class) return class != &dpif_netdev_class; } +static bool +dpif_netdev_class_is_planetlab(const struct dpif_class *class) +{ + return class == &dpif_planetlab_class; +} + static const char * dpif_netdev_port_open_type(const struct dpif_class *class, const char *type) { return strcmp(type, "internal") ? type + : dpif_netdev_class_is_planetlab(class) ? "pltap" : dpif_netdev_class_is_dummy(class) ? "dummy" : "tap"; } @@ -216,7 +225,8 @@ choose_port(struct dp_netdev *dp, const char *name) { int port_no; - if (dp->class != &dpif_netdev_class) { + if (dp->class != &dpif_netdev_class && + dp->class != &dpif_planetlab_class) { const char *p; int start_no = 0; @@ -374,8 +384,10 @@ static int do_add_port(struct dp_netdev *dp, const char *devname, const char *type, uint32_t port_no) { + struct netdev_saved_flags *sf; struct dp_netdev_port *port; struct netdev *netdev; + struct netdev_rx *rx; const char *open_type; int mtu; int error; @@ -391,7 +403,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, /* XXX reject loopback devices */ /* XXX reject non-Ethernet devices */ - error = netdev_listen(netdev); + error = netdev_rx_open(netdev, &rx); if (error && !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) { VLOG_ERR("%s: cannot receive packets on this network device (%s)", @@ -400,8 +412,9 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, return error; } - error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, false); + error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf); if (error) { + netdev_rx_close(rx); netdev_close(netdev); return error; } @@ -409,6 +422,8 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, port = xmalloc(sizeof *port); port->port_no = port_no; port->netdev = netdev; + port->sf = sf; + port->rx = rx; port->type = xstrdup(type); error = netdev_get_mtu(netdev, &mtu); @@ -493,7 +508,6 @@ static int do_del_port(struct dp_netdev *dp, uint32_t port_no) { struct dp_netdev_port *port; - char *name; int error; error = get_port_by_number(dp, port_no, &port); @@ -505,11 +519,10 @@ do_del_port(struct dp_netdev *dp, uint32_t port_no) dp->ports[port->port_no] = NULL; dp->serial++; - name = xstrdup(netdev_vport_get_dpif_port(port->netdev)); netdev_close(port->netdev); + netdev_restore_flags(port->sf); + netdev_rx_close(port->rx); free(port->type); - - free(name); free(port); return 0; @@ -1063,7 +1076,7 @@ dpif_netdev_run(struct dpif *dpif) ofpbuf_clear(&packet); ofpbuf_reserve(&packet, DP_NETDEV_HEADROOM); - error = netdev_recv(port->netdev, &packet); + error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP; if (!error) { dp_netdev_port_input(dp, port, &packet); } else if (error != EAGAIN && error != EOPNOTSUPP) { @@ -1083,7 +1096,9 @@ dpif_netdev_wait(struct dpif *dpif) struct dp_netdev_port *port; LIST_FOR_EACH (port, node, &dp->port_list) { - netdev_recv_wait(port->netdev); + if (port->rx) { + netdev_rx_wait(port->rx); + } } } @@ -1319,41 +1334,49 @@ dp_netdev_execute_actions(struct dp_netdev *dp, } } +#define DPIF_NETDEV_CLASS_FUNCTIONS \ + dpif_netdev_enumerate, \ + dpif_netdev_port_open_type, \ + dpif_netdev_open, \ + dpif_netdev_close, \ + dpif_netdev_destroy, \ + dpif_netdev_run, \ + dpif_netdev_wait, \ + dpif_netdev_get_stats, \ + dpif_netdev_port_add, \ + dpif_netdev_port_del, \ + dpif_netdev_port_query_by_number, \ + dpif_netdev_port_query_by_name, \ + dpif_netdev_get_max_ports, \ + NULL, /* port_get_pid */ \ + dpif_netdev_port_dump_start, \ + dpif_netdev_port_dump_next, \ + dpif_netdev_port_dump_done, \ + dpif_netdev_port_poll, \ + dpif_netdev_port_poll_wait, \ + dpif_netdev_flow_get, \ + dpif_netdev_flow_put, \ + dpif_netdev_flow_del, \ + dpif_netdev_flow_flush, \ + dpif_netdev_flow_dump_start, \ + dpif_netdev_flow_dump_next, \ + dpif_netdev_flow_dump_done, \ + dpif_netdev_execute, \ + NULL, /* operate */ \ + dpif_netdev_recv_set, \ + dpif_netdev_queue_to_priority, \ + dpif_netdev_recv, \ + dpif_netdev_recv_wait, \ + dpif_netdev_recv_purge, \ + const struct dpif_class dpif_netdev_class = { "netdev", - dpif_netdev_enumerate, - dpif_netdev_port_open_type, - dpif_netdev_open, - dpif_netdev_close, - dpif_netdev_destroy, - dpif_netdev_run, - dpif_netdev_wait, - dpif_netdev_get_stats, - dpif_netdev_port_add, - dpif_netdev_port_del, - dpif_netdev_port_query_by_number, - dpif_netdev_port_query_by_name, - dpif_netdev_get_max_ports, - NULL, /* port_get_pid */ - dpif_netdev_port_dump_start, - dpif_netdev_port_dump_next, - dpif_netdev_port_dump_done, - dpif_netdev_port_poll, - dpif_netdev_port_poll_wait, - dpif_netdev_flow_get, - dpif_netdev_flow_put, - dpif_netdev_flow_del, - dpif_netdev_flow_flush, - dpif_netdev_flow_dump_start, - dpif_netdev_flow_dump_next, - dpif_netdev_flow_dump_done, - dpif_netdev_execute, - NULL, /* operate */ - dpif_netdev_recv_set, - dpif_netdev_queue_to_priority, - dpif_netdev_recv, - dpif_netdev_recv_wait, - dpif_netdev_recv_purge, + DPIF_NETDEV_CLASS_FUNCTIONS +}; + +const struct dpif_class dpif_planetlab_class = { + "planetlab", + DPIF_NETDEV_CLASS_FUNCTIONS }; static void @@ -1386,3 +1409,4 @@ dpif_dummy_register(bool override) dpif_dummy_register__("dummy"); } +