projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: New function ovs_strzcpy().
[openvswitch]
/
ovsdb
/
ovsdb-server.c
diff --git
a/ovsdb/ovsdb-server.c
b/ovsdb/ovsdb-server.c
index 41f1146cc105f0d87899e33e9e331fc9bbab7b9c..fac78c80785c02472bd8a5e38dc425a6fe621ca5 100644
(file)
--- a/
ovsdb/ovsdb-server.c
+++ b/
ovsdb/ovsdb-server.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010
, 2011
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.
@@
-171,7
+171,7
@@
main(int argc, char *argv[])
}
ovsdb_jsonrpc_server_destroy(jsonrpc);
ovsdb_destroy(db);
}
ovsdb_jsonrpc_server_destroy(jsonrpc);
ovsdb_destroy(db);
- shash_destroy(&remotes);
+ shash_destroy
_free_data
(&remotes);
unixctl_server_destroy(unixctl);
if (run_process && process_exited(run_process)) {
unixctl_server_destroy(unixctl);
if (run_process && process_exited(run_process)) {
@@
-242,8
+242,7
@@
parse_db_string_column(const struct ovsdb *db,
*tablep = table;
}
*tablep = table;
}
-#if HAVE_OPENSSL
-static const char *
+static OVS_UNUSED const char *
query_db_string(const struct ovsdb *db, const char *name)
{
if (!name || strncmp(name, "db:", 3)) {
query_db_string(const struct ovsdb *db, const char *name)
{
if (!name || strncmp(name, "db:", 3)) {
@@
-269,7
+268,6
@@
query_db_string(const struct ovsdb *db, const char *name)
return NULL;
}
}
return NULL;
}
}
-#endif /* HAVE_OPENSSL */
static struct ovsdb_jsonrpc_options *
add_remote(struct shash *remotes, const char *target)
static struct ovsdb_jsonrpc_options *
add_remote(struct shash *remotes, const char *target)
@@
-595,7
+593,7
@@
reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
}
}
ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
}
}
ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
- shash_destroy(&resolved_remotes);
+ shash_destroy
_free_data
(&resolved_remotes);
#if HAVE_OPENSSL
/* Configure SSL. */
#if HAVE_OPENSSL
/* Configure SSL. */
@@
-658,7
+656,8
@@
parse_options(int argc, char *argv[], char **file_namep,
OPT_RUN,
OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
OPT_RUN,
OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS
+ LEAK_CHECKER_OPTION_ENUMS,
+ DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
{"remote", required_argument, 0, OPT_REMOTE},
};
static struct option long_options[] = {
{"remote", required_argument, 0, OPT_REMOTE},