projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlog: Make the vlog module catalog program-specific.
[openvswitch]
/
lib
/
unixctl.c
diff --git
a/lib/unixctl.c
b/lib/unixctl.c
index 88fe60352453dc4b9531302b13628e5a14f6e9a0..ac756a834bc456c5169868c9ccd76d9b579df6ee 100644
(file)
--- a/
lib/unixctl.c
+++ b/
lib/unixctl.c
@@
-34,14
+34,15
@@
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
+#include "svec.h"
#include "util.h"
#include "util.h"
+#include "vlog.h"
#ifndef SCM_CREDENTIALS
#include <time.h>
#endif
#ifndef SCM_CREDENTIALS
#include <time.h>
#endif
-#define THIS_MODULE VLM_unixctl
-#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(unixctl)
\f
struct unixctl_command {
unixctl_cb_func *cb;
\f
struct unixctl_command {
unixctl_cb_func *cb;
@@
-82,11
+83,23
@@
unixctl_help(struct unixctl_conn *conn, const char *args OVS_UNUSED,
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct shash_node *node;
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct shash_node *node;
+ struct svec names;
+ const char *name;
+ size_t i;
ds_put_cstr(&ds, "The available commands are:\n");
ds_put_cstr(&ds, "The available commands are:\n");
+
+ svec_init(&names);
SHASH_FOR_EACH (node, &commands) {
SHASH_FOR_EACH (node, &commands) {
-
ds_put_format(&ds, "\t%s\n"
, node->name);
+
svec_add(&names
, node->name);
}
}
+ svec_sort(&names);
+
+ SVEC_FOR_EACH (i, name, &names) {
+ ds_put_format(&ds, "\t%s\n", name);
+ }
+ svec_destroy(&names);
+
unixctl_command_reply(conn, 214, ds_cstr(&ds));
ds_destroy(&ds);
}
unixctl_command_reply(conn, 214, ds_cstr(&ds));
ds_destroy(&ds);
}
@@
-443,7
+456,7
@@
unixctl_server_destroy(struct unixctl_server *server)
\f
/* Connects to a Vlog server socket. 'path' should be the name of a Vlog
* server socket. If it does not start with '/', it will be prefixed with
\f
/* Connects to a Vlog server socket. 'path' should be the name of a Vlog
* server socket. If it does not start with '/', it will be prefixed with
- * ovs_rundir (e.g. /var/run).
+ * ovs_rundir (e.g. /var/run
/openvswitch
).
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */