vconn: Make errors in vconn names non-fatal errors.

[openvswitch] / lib / vconn-netlink.c

diff --git a/lib/vconn-netlink.c b/lib/vconn-netlink.c
index 625b524d46c0c86c2bbc76ca93fa1f056d6b108b..84d7d3548196ae1fc87f62e58da939ae64bc9c80 100644 (file)
--- a/lib/vconn-netlink.c
+++ b/lib/vconn-netlink.c
@@ -72,16 +72,20 @@ 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) {
+        error(0, "%s: syntax error", name);
+        return EAFNOSUPPORT;
     }
 
     netlink = xmalloc(sizeof *netlink);
     netlink->vconn.class = &netlink_vconn_class;
     netlink->vconn.connect_status = 0;
-    retval = dpif_open(dp_idx, true, &netlink->dp);
+    netlink->vconn.ip = 0;
+    retval = dpif_open(dp_idx, subscribe, &netlink->dp);
     if (retval) {
         free(netlink);
         *vconnp = NULL;
@@ -134,7 +138,7 @@ netlink_wait(struct vconn *vconn, enum vconn_wait_type wait)
     default:
         NOT_REACHED();
     }
-    poll_fd_wait(nl_sock_fd(netlink->dp.sock), events, NULL);
+    poll_fd_wait(nl_sock_fd(netlink->dp.sock), events);
 }
 
 struct vconn_class netlink_vconn_class = {