/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "stream.h"
#include "stream-provider.h"
#include "svec.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(unixctl);
};
struct unixctl_conn {
- struct list node;
+ struct ovs_list node;
struct jsonrpc *rpc;
/* Only one request can be in progress at a time. While the request is
/* Server for control connection. */
struct unixctl_server {
struct pstream *listener;
- struct list conns;
+ struct ovs_list conns;
};
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
static struct shash commands = SHASH_INITIALIZER(&commands);
static void
-unixctl_help(struct unixctl_conn *conn, int argc OVS_UNUSED,
- const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
+unixctl_list_commands(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct shash_node **nodes = shash_sort(&commands);
unixctl_version(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
- unixctl_command_reply(conn, get_program_version());
+ unixctl_command_reply(conn, ovs_get_program_version());
}
/* Registers a unixctl command with the given 'name'. 'usage' describes the
* arguments to the command; it is used only for presentation to the user in
- * "help" output.
+ * "list-commands" output.
*
* 'cb' is called when the command is received. It is passed an array
* containing the command name and arguments, plus a copy of 'aux'. Normally
reply = jsonrpc_create_error(body_json, conn->request_id);
}
+ if (VLOG_IS_DBG_ENABLED()) {
+ char *id = json_to_string(conn->request_id, 0);
+ VLOG_DBG("replying with %s, id=%s: \"%s\"",
+ success ? "success" : "error", id, body);
+ free(id);
+ }
+
/* If jsonrpc_send() returns an error, the run loop will take care of the
* problem eventually. */
jsonrpc_send(conn->rpc, reply);
goto exit;
}
- unixctl_command_register("help", "", 0, 0, unixctl_help, NULL);
+ unixctl_command_register("list-commands", "", 0, 0, unixctl_list_commands,
+ NULL);
unixctl_command_register("version", "", 0, 0, unixctl_version, NULL);
server = xmalloc(sizeof *server);
COVERAGE_INC(unixctl_received);
conn->request_id = json_clone(request->id);
+ if (VLOG_IS_DBG_ENABLED()) {
+ char *params_s = json_to_string(request->params, 0);
+ char *id_s = json_to_string(request->id, 0);
+ VLOG_DBG("received request %s%s, id=%s",
+ request->method, params_s, id_s);
+ free(params_s);
+ free(id_s);
+ }
+
params = json_array(request->params);
command = shash_find_data(&commands, request->method);
if (!command) {