X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=secchan%2Fsecchan.c;h=6f0a385bb2e69dd26eff42542367e77e923c1cb5;hb=c3a7107e9ef6d4c744c86b239042a20f58f81a9b;hp=f1ac6d21805acef809c41577cdaa35fa0ac383fd;hpb=6b617bac12401ffad57c47ec9815860b87fa4152;p=sliver-openvswitch.git diff --git a/secchan/secchan.c b/secchan/secchan.c index f1ac6d218..6f0a385bb 100644 --- a/secchan/secchan.c +++ b/secchan/secchan.c @@ -140,16 +140,16 @@ main(int argc, char *argv[]) /* Initialize switch status hook. */ switch_status_start(&secchan, &s, &switch_status); + die_if_already_running(); + daemonize(); + /* Start listening for vlogconf requests. */ retval = vlog_server_listen(NULL, NULL); if (retval) { ofp_fatal(retval, "Could not listen for vlog connections"); } - die_if_already_running(); - daemonize(); - - VLOG_WARN("OpenFlow reference implementation version %s", VERSION); + VLOG_WARN("OpenFlow reference implementation version %s", VERSION BUILDNR); VLOG_WARN("OpenFlow protocol version 0x%02x", OFP_VERSION); /* Connect to datapath. */ @@ -195,8 +195,7 @@ main(int argc, char *argv[]) local_rconn, remote_rconn); } if (s.rate_limit) { - rate_limit_start(&secchan, &s, switch_status, - local_rconn, remote_rconn); + rate_limit_start(&secchan, &s, switch_status, remote_rconn); } if (s.command_acl[0]) { executer_start(&secchan, &s); @@ -706,7 +705,8 @@ parse_options(int argc, char *argv[], struct settings *s) usage(); case 'V': - printf("%s "VERSION" compiled "__DATE__" "__TIME__"\n", argv[0]); + printf("%s %s compiled "__DATE__" "__TIME__"\n", + program_name, VERSION BUILDNR); exit(EXIT_SUCCESS); DAEMON_OPTION_HANDLERS