projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hmap: New functions, macros for iterating buckets without comparing hashes.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 28491fc6c17f5a9d6261e6b4bf4672c09c4a8ee0..fd2144abb0da2e20d4ecf7decb7e55f990ffb21a 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-50,7
+50,7
@@
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;
-static
void reload(struct unixctl_conn *, const char *args)
;
+static
unixctl_cb_func reload
;
static bool need_reconfigure;
static struct unixctl_conn **conns;
static bool need_reconfigure;
static struct unixctl_conn **conns;
@@
-79,7
+79,7
@@
main(int argc, char *argv[])
if (retval) {
ovs_fatal(retval, "could not listen for control connections");
}
if (retval) {
ovs_fatal(retval, "could not listen for control connections");
}
- unixctl_command_register("vswitchd/reload", reload);
+ unixctl_command_register("vswitchd/reload", reload
, NULL
);
retval = cfg_read();
if (retval) {
retval = cfg_read();
if (retval) {
@@
-122,7
+122,7
@@
main(int argc, char *argv[])
}
static void
}
static void
-reload(struct unixctl_conn *conn, const char *args UNUSED)
+reload(struct unixctl_conn *conn, const char *args UNUSED
, void *aux UNUSED
)
{
need_reconfigure = true;
conns = xrealloc(conns, sizeof *conns * (n_conns + 1));
{
need_reconfigure = true;
conns = xrealloc(conns, sizeof *conns * (n_conns + 1));