X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=utilities%2Fovs-discover.c;h=3aa28fad88dd490c9ad583e2f98f8220cbf465e5;hb=d35a4ea82fb76398025d833d30d11d0d68050e56;hp=308c40531e2869f3498ec21677b46291592fdee7;hpb=e7bd7d78b1e1dbc2162f991374c7889c7d7bf60c;p=openvswitch diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index 308c4053..3aa28fad 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -48,7 +48,7 @@ static int n_ifaces; /* --accept-vconn: Regular expression specifying the class of controller vconns * that we will accept during autodiscovery. */ -static const char *accept_controller_re = ".*"; +static const char *accept_controller_re = "tcp:.*"; static regex_t accept_controller_regex; /* --exit-without-bind: Exit after discovering the controller, without binding @@ -122,7 +122,6 @@ main(int argc, char *argv[]) signal(SIGPIPE, SIG_IGN); for (;;) { - fatal_signal_block(); for (i = 0; i < n_ifaces; i++) { struct iface *iface = &ifaces[i]; dhclient_run(iface->dhcp); @@ -195,7 +194,6 @@ main(int argc, char *argv[]) dhclient_wait(iface->dhcp); } unixctl_server_wait(unixctl); - fatal_signal_unblock(); poll_block(); }