projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random: Get random seed from /dev/urandom.
[openvswitch]
/
utilities
/
ovs-discover.c
diff --git
a/utilities/ovs-discover.c
b/utilities/ovs-discover.c
index 2a7ba41dfb37c621f8b68a4c26a6cb45994c2029..7cd1edf103fe801c30127546f6a8998f8013f7c0 100644
(file)
--- a/
utilities/ovs-discover.c
+++ b/
utilities/ovs-discover.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-33,9
+33,9
@@
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_ovs_discover
+
+VLOG_DEFINE_THIS_MODULE(ovs_discover)
struct iface {
const char *name;
struct iface {
const char *name;
@@
-60,7
+60,7
@@
static bool exit_without_bind;
static bool exit_after_bind;
static bool iface_init(struct iface *, const char *netdev_name);
static bool exit_after_bind;
static bool iface_init(struct iface *, const char *netdev_name);
-static void release_ifaces(void *aux UNUSED);
+static void release_ifaces(void *aux
OVS_
UNUSED);
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
@@
-75,9
+75,8
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
argc -= optind;
parse_options(argc, argv);
argc -= optind;
@@
-102,7
+101,7
@@
main(int argc, char *argv[])
struct iface *iface = &ifaces[i];
dhclient_init(iface->dhcp, 0);
}
struct iface *iface = &ifaces[i];
dhclient_init(iface->dhcp, 0);
}
- fatal_signal_add_hook(release_ifaces, NULL, true);
+ fatal_signal_add_hook(release_ifaces, NULL,
NULL,
true);
retval = regcomp(&accept_controller_regex, accept_controller_re,
REG_NOSUB | REG_EXTENDED);
retval = regcomp(&accept_controller_regex, accept_controller_re,
REG_NOSUB | REG_EXTENDED);
@@
-115,14
+114,13
@@
main(int argc, char *argv[])
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
-
ovs_fatal(retval, "Could not listen for unixctl connections"
);
+
exit(EXIT_FAILURE
);
}
die_if_already_running();
signal(SIGPIPE, SIG_IGN);
for (;;) {
}
die_if_already_running();
signal(SIGPIPE, SIG_IGN);
for (;;) {
- fatal_signal_block();
for (i = 0; i < n_ifaces; i++) {
struct iface *iface = &ifaces[i];
dhclient_run(iface->dhcp);
for (i = 0; i < n_ifaces; i++) {
struct iface *iface = &ifaces[i];
dhclient_run(iface->dhcp);
@@
-195,7
+193,6
@@
main(int argc, char *argv[])
dhclient_wait(iface->dhcp);
}
unixctl_server_wait(unixctl);
dhclient_wait(iface->dhcp);
}
unixctl_server_wait(unixctl);
- fatal_signal_unblock();
poll_block();
}
poll_block();
}
@@
-215,7
+212,7
@@
iface_init(struct iface *iface, const char *netdev_name)
* persists past program termination. */
struct netdev *netdev;
* persists past program termination. */
struct netdev *netdev;
- retval = netdev_open
(iface->name, NETDEV_ETH_TYPE_NONE
, &netdev);
+ retval = netdev_open
_default(iface->name
, &netdev);
if (retval) {
ovs_error(retval, "Could not open %s device", iface->name);
return false;
if (retval) {
ovs_error(retval, "Could not open %s device", iface->name);
return false;
@@
-239,7
+236,7
@@
iface_init(struct iface *iface, const char *netdev_name)
}
static void
}
static void
-release_ifaces(void *aux UNUSED)
+release_ifaces(void *aux
OVS_
UNUSED)
{
int i;
{
int i;
@@
-253,13
+250,13
@@
release_ifaces(void *aux UNUSED)
}
static void
}
static void
-modify_dhcp_request(struct dhcp_msg *msg, void *aux UNUSED)
+modify_dhcp_request(struct dhcp_msg *msg, void *aux
OVS_
UNUSED)
{
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, "OpenFlow");
}
static bool
{
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, "OpenFlow");
}
static bool
-validate_dhcp_offer(const struct dhcp_msg *msg, void *aux UNUSED)
+validate_dhcp_offer(const struct dhcp_msg *msg, void *aux
OVS_
UNUSED)
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 60);
char *vconn_name;
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 60);
char *vconn_name;