#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
+#include "dpif.h"
#include "dummy.h"
#include "leak-checker.h"
#include "netdev.h"
if (retval) {
exit(EXIT_FAILURE);
}
- unixctl_command_register("exit", "", ovs_vswitchd_exit, &exiting);
+ unixctl_command_register("exit", "", 0, 0, ovs_vswitchd_exit, &exiting);
bridge_init(remote);
free(remote);
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
+ bridge_run_fast();
bridge_run();
+ bridge_run_fast();
unixctl_server_run(unixctl);
netdev_run();
LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
OPT_ENABLE_DUMMY,
+ OPT_DISABLE_SYSTEM,
DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY},
+ {"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM},
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
dummy_enable();
break;
+ case OPT_DISABLE_SYSTEM:
+ dp_blacklist_provider("system");
+ break;
+
case '?':
exit(EXIT_FAILURE);
}
static void
-ovs_vswitchd_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
- void *exiting_)
+ovs_vswitchd_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[] OVS_UNUSED, void *exiting_)
{
bool *exiting = exiting_;
*exiting = true;