2009-07-08 13:19:16 -07:00
|
|
|
|
/*
|
2016-03-07 15:13:15 -08:00
|
|
|
|
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
|
* You may obtain a copy of the License at:
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include "unixctl.h"
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include "coverage.h"
|
|
|
|
|
#include "dirs.h"
|
2016-03-03 10:20:46 -08:00
|
|
|
|
#include "openvswitch/dynamic-string.h"
|
2016-07-12 16:37:34 -05:00
|
|
|
|
#include "openvswitch/json.h"
|
2012-02-14 20:53:59 -08:00
|
|
|
|
#include "jsonrpc.h"
|
2016-03-25 14:10:21 -07:00
|
|
|
|
#include "openvswitch/list.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include "poll-loop.h"
|
2016-07-12 16:37:34 -05:00
|
|
|
|
#include "openvswitch/shash.h"
|
2012-02-14 20:53:59 -08:00
|
|
|
|
#include "stream.h"
|
2014-03-28 08:19:59 -07:00
|
|
|
|
#include "stream-provider.h"
|
2010-05-25 15:49:26 -07:00
|
|
|
|
#include "svec.h"
|
2014-12-15 14:10:38 +01:00
|
|
|
|
#include "openvswitch/vlog.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2010-10-19 14:47:01 -07:00
|
|
|
|
VLOG_DEFINE_THIS_MODULE(unixctl);
|
coverage: Make the coverage counters catalog program-specific.
Until now, the collection of coverage counters supported by a given OVS
program was not specific to that program. That means that, for example,
even though ovs-dpctl does not have anything to do with mac_learning, it
still has a coverage counter for it. This is confusing, at best.
This commit fixes the problem on some systems, in particular on ones that
use GCC and the GNU linker. It uses the feature of the GNU linker
described in its manual as:
If an orphaned section's name is representable as a C identifier then
the linker will automatically see PROVIDE two symbols: __start_SECNAME
and __end_SECNAME, where SECNAME is the name of the section. These
indicate the start address and end address of the orphaned section
respectively.
Systems that don't support these features retain the earlier behavior.
This commit also fixes the annoyance that files that include coverage
counters must be listed on COVERAGE_FILES in lib/automake.mk.
This commit also fixes the annoyance that modifying any source file that
includes a coverage counter caused all programs that link against
libopenvswitch.a to relink, even programs that the source file was not
linked into. For example, modifying ofproto/ofproto.c (which includes
coverage counters) caused tests/test-aes128 to relink, even though
test-aes128 does not link again ofproto.o.
2010-11-01 14:14:27 -07:00
|
|
|
|
|
|
|
|
|
COVERAGE_DEFINE(unixctl_received);
|
|
|
|
|
COVERAGE_DEFINE(unixctl_replied);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
struct unixctl_command {
|
2011-12-02 15:29:19 -08:00
|
|
|
|
const char *usage;
|
|
|
|
|
int min_args, max_args;
|
2009-10-29 15:20:21 -07:00
|
|
|
|
unixctl_cb_func *cb;
|
|
|
|
|
void *aux;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct unixctl_conn {
|
2014-12-15 14:10:38 +01:00
|
|
|
|
struct ovs_list node;
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct jsonrpc *rpc;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
/* Only one request can be in progress at a time. While the request is
|
|
|
|
|
* being processed, 'request_id' is populated, otherwise it is null. */
|
|
|
|
|
struct json *request_id; /* ID of the currently active request. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Server for control connection. */
|
|
|
|
|
struct unixctl_server {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct pstream *listener;
|
2014-12-15 14:10:38 +01:00
|
|
|
|
struct ovs_list conns;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
|
|
|
|
|
|
|
|
|
|
static struct shash commands = SHASH_INITIALIZER(&commands);
|
|
|
|
|
|
|
|
|
|
static void
|
2014-10-17 11:11:36 -07:00
|
|
|
|
unixctl_list_commands(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
2011-09-26 14:59:35 -07:00
|
|
|
|
const struct shash_node **nodes = shash_sort(&commands);
|
2010-05-25 15:49:26 -07:00
|
|
|
|
size_t i;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
ds_put_cstr(&ds, "The available commands are:\n");
|
2010-05-25 15:49:26 -07:00
|
|
|
|
|
2011-09-26 14:59:35 -07:00
|
|
|
|
for (i = 0; i < shash_count(&commands); i++) {
|
|
|
|
|
const struct shash_node *node = nodes[i];
|
|
|
|
|
const struct unixctl_command *command = node->data;
|
2012-02-14 20:53:59 -08:00
|
|
|
|
|
2011-12-22 15:51:39 -08:00
|
|
|
|
ds_put_format(&ds, " %-23s %s\n", node->name, command->usage);
|
2010-05-25 15:49:26 -07:00
|
|
|
|
}
|
2011-09-26 14:59:35 -07:00
|
|
|
|
free(nodes);
|
2010-05-25 15:49:26 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_command_reply(conn, ds_cstr(&ds));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-01 21:18:00 -07:00
|
|
|
|
static void
|
2011-12-02 15:29:19 -08:00
|
|
|
|
unixctl_version(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
2011-08-01 21:18:00 -07:00
|
|
|
|
{
|
2014-11-24 12:49:01 +01:00
|
|
|
|
unixctl_command_reply(conn, ovs_get_program_version());
|
2011-08-01 21:18:00 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-02 15:29:19 -08:00
|
|
|
|
/* 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
|
2014-10-17 11:11:36 -07:00
|
|
|
|
* "list-commands" output.
|
2011-12-02 15:29:19 -08:00
|
|
|
|
*
|
2012-09-06 15:41:11 -07:00
|
|
|
|
* '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
|
|
|
|
|
* 'cb' should reply by calling unixctl_command_reply() or
|
|
|
|
|
* unixctl_command_reply_error() before it returns, but if the command cannot
|
|
|
|
|
* be handled immediately then it can defer the reply until later. A given
|
|
|
|
|
* connection can only process a single request at a time, so a reply must be
|
|
|
|
|
* made eventually to avoid blocking that connection. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
void
|
2011-12-02 15:29:19 -08:00
|
|
|
|
unixctl_command_register(const char *name, const char *usage,
|
|
|
|
|
int min_args, int max_args,
|
|
|
|
|
unixctl_cb_func *cb, void *aux)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
struct unixctl_command *command;
|
2011-11-14 17:41:28 +09:00
|
|
|
|
struct unixctl_command *lookup = shash_find_data(&commands, name);
|
|
|
|
|
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(!lookup || lookup->cb == cb);
|
2011-11-14 17:41:28 +09:00
|
|
|
|
|
|
|
|
|
if (lookup) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
command = xmalloc(sizeof *command);
|
2011-12-02 15:29:19 -08:00
|
|
|
|
command->usage = usage;
|
|
|
|
|
command->min_args = min_args;
|
|
|
|
|
command->max_args = max_args;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
command->cb = cb;
|
2009-10-29 15:20:21 -07:00
|
|
|
|
command->aux = aux;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
shash_add(&commands, name, command);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
static void
|
|
|
|
|
unixctl_command_reply__(struct unixctl_conn *conn,
|
|
|
|
|
bool success, const char *body)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct json *body_json;
|
|
|
|
|
struct jsonrpc_msg *reply;
|
|
|
|
|
|
|
|
|
|
COVERAGE_INC(unixctl_replied);
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(conn->request_id);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
|
|
|
|
|
if (!body) {
|
|
|
|
|
body = "";
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
|
|
|
|
|
if (body[0] && body[strlen(body) - 1] != '\n') {
|
|
|
|
|
body_json = json_string_create_nocopy(xasprintf("%s\n", body));
|
|
|
|
|
} else {
|
|
|
|
|
body_json = json_string_create(body);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
|
reply = jsonrpc_create_reply(body_json, conn->request_id);
|
|
|
|
|
} else {
|
|
|
|
|
reply = jsonrpc_create_error(body_json, conn->request_id);
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-07 15:13:15 -08:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
/* If jsonrpc_send() returns an error, the run loop will take care of the
|
|
|
|
|
* problem eventually. */
|
|
|
|
|
jsonrpc_send(conn->rpc, reply);
|
|
|
|
|
json_destroy(conn->request_id);
|
|
|
|
|
conn->request_id = NULL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
/* Replies to the active unixctl connection 'conn'. 'result' is sent to the
|
|
|
|
|
* client indicating the command was processed successfully. Only one call to
|
|
|
|
|
* unixctl_command_reply() or unixctl_command_reply_error() may be made per
|
|
|
|
|
* request. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
void
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_command_reply(struct unixctl_conn *conn, const char *result)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_command_reply__(conn, true, result);
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
/* Replies to the active unixctl connection 'conn'. 'error' is sent to the
|
2013-06-04 17:35:36 -05:00
|
|
|
|
* client indicating an error occurred processing the command. Only one call to
|
2012-02-14 20:53:59 -08:00
|
|
|
|
* unixctl_command_reply() or unixctl_command_reply_error() may be made per
|
|
|
|
|
* request. */
|
|
|
|
|
void
|
|
|
|
|
unixctl_command_reply_error(struct unixctl_conn *conn, const char *error)
|
|
|
|
|
{
|
|
|
|
|
unixctl_command_reply__(conn, false, error);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-28 08:19:59 -07:00
|
|
|
|
/* Creates a unixctl server listening on 'path', which for POSIX may be:
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
|
|
|
|
* - NULL, in which case <rundir>/<program>.<pid>.ctl is used.
|
|
|
|
|
*
|
|
|
|
|
* - A name that does not start with '/', in which case it is put in
|
|
|
|
|
* <rundir>.
|
|
|
|
|
*
|
|
|
|
|
* - An absolute path (starting with '/') that gives the exact name of
|
|
|
|
|
* the Unix domain socket to listen on.
|
|
|
|
|
*
|
2016-08-02 18:19:34 +00:00
|
|
|
|
* For Windows, a local named pipe is used. A file is created in 'path'
|
2014-03-28 08:19:59 -07:00
|
|
|
|
* which may be:
|
|
|
|
|
*
|
|
|
|
|
* - NULL, in which case <rundir>/<program>.ctl is used.
|
|
|
|
|
*
|
|
|
|
|
* - An absolute path that gives the name of the file.
|
|
|
|
|
*
|
|
|
|
|
* For both POSIX and Windows, if the path is "none", the function will
|
|
|
|
|
* return successfully but no socket will actually be created.
|
|
|
|
|
*
|
2009-07-08 13:19:16 -07:00
|
|
|
|
* A program that (optionally) daemonizes itself should call this function
|
|
|
|
|
* *after* daemonization, so that the socket name contains the pid of the
|
|
|
|
|
* daemon instead of the pid of the program that exited. (Otherwise,
|
2009-11-09 14:46:38 -08:00
|
|
|
|
* "ovs-appctl --target=<program>" will fail.)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
|
|
|
|
* Returns 0 if successful, otherwise a positive errno value. If successful,
|
2010-11-29 12:21:08 -08:00
|
|
|
|
* sets '*serverp' to the new unixctl_server (or to NULL if 'path' was "none"),
|
|
|
|
|
* otherwise to NULL. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int
|
|
|
|
|
unixctl_server_create(const char *path, struct unixctl_server **serverp)
|
|
|
|
|
{
|
|
|
|
|
struct unixctl_server *server;
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct pstream *listener;
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
char *punix_path;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
*serverp = NULL;
|
2010-11-29 12:21:08 -08:00
|
|
|
|
if (path && !strcmp(path, "none")) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (path) {
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
char *abs_path;
|
|
|
|
|
#ifndef _WIN32
|
2014-03-28 08:19:59 -07:00
|
|
|
|
abs_path = abs_file_name(ovs_rundir(), path);
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
#else
|
2014-07-22 15:46:25 -07:00
|
|
|
|
abs_path = xstrdup(path);
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
#endif
|
2012-02-14 20:53:59 -08:00
|
|
|
|
punix_path = xasprintf("punix:%s", abs_path);
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
free(abs_path);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
} else {
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
#ifndef _WIN32
|
2012-02-14 20:53:59 -08:00
|
|
|
|
punix_path = xasprintf("punix:%s/%s.%ld.ctl", ovs_rundir(),
|
|
|
|
|
program_name, (long int) getpid());
|
2014-03-28 08:19:59 -07:00
|
|
|
|
#else
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
punix_path = xasprintf("punix:%s/%s.ctl", ovs_rundir(), program_name);
|
2014-03-28 08:19:59 -07:00
|
|
|
|
#endif
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-04-16 13:56:58 -07:00
|
|
|
|
error = pstream_open(punix_path, &listener, 0);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
if (error) {
|
2012-03-23 13:42:12 -07:00
|
|
|
|
ovs_error(error, "could not initialize control socket %s", punix_path);
|
|
|
|
|
goto exit;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 11:11:36 -07:00
|
|
|
|
unixctl_command_register("list-commands", "", 0, 0, unixctl_list_commands,
|
|
|
|
|
NULL);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_command_register("version", "", 0, 0, unixctl_version, NULL);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
server = xmalloc(sizeof *server);
|
|
|
|
|
server->listener = listener;
|
2016-03-25 14:10:22 -07:00
|
|
|
|
ovs_list_init(&server->conns);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*serverp = server;
|
2012-03-23 13:42:12 -07:00
|
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
free(punix_path);
|
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2012-02-14 20:53:59 -08:00
|
|
|
|
process_command(struct unixctl_conn *conn, struct jsonrpc_msg *request)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
char *error = NULL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
struct unixctl_command *command;
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct json_array *params;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
COVERAGE_INC(unixctl_received);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
conn->request_id = json_clone(request->id);
|
|
|
|
|
|
2016-03-07 15:13:15 -08:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
params = json_array(request->params);
|
|
|
|
|
command = shash_find_data(&commands, request->method);
|
|
|
|
|
if (!command) {
|
2017-10-14 12:47:46 -07:00
|
|
|
|
error = xasprintf("\"%s\" is not a valid command (use "
|
|
|
|
|
"\"list-commands\" to see a list of valid commands)",
|
|
|
|
|
request->method);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
} else if (params->n < command->min_args) {
|
|
|
|
|
error = xasprintf("\"%s\" command requires at least %d arguments",
|
|
|
|
|
request->method, command->min_args);
|
|
|
|
|
} else if (params->n > command->max_args) {
|
|
|
|
|
error = xasprintf("\"%s\" command takes at most %d arguments",
|
|
|
|
|
request->method, command->max_args);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
} else {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct svec argv = SVEC_EMPTY_INITIALIZER;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
svec_add(&argv, request->method);
|
|
|
|
|
for (i = 0; i < params->n; i++) {
|
|
|
|
|
if (params->elems[i]->type != JSON_STRING) {
|
|
|
|
|
error = xasprintf("\"%s\" command has non-string argument",
|
|
|
|
|
request->method);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
svec_add(&argv, json_string(params->elems[i]));
|
|
|
|
|
}
|
|
|
|
|
svec_terminate(&argv);
|
|
|
|
|
|
|
|
|
|
if (!error) {
|
2011-12-02 15:29:19 -08:00
|
|
|
|
command->cb(conn, argv.n, (const char **) argv.names,
|
|
|
|
|
command->aux);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
svec_destroy(&argv);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2011-12-02 15:29:19 -08:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
unixctl_command_reply_error(conn, error);
|
|
|
|
|
free(error);
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2012-02-14 20:53:59 -08:00
|
|
|
|
run_connection(struct unixctl_conn *conn)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
int error, i;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_run(conn->rpc);
|
|
|
|
|
error = jsonrpc_get_status(conn->rpc);
|
|
|
|
|
if (error || jsonrpc_get_backlog(conn->rpc)) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
|
|
struct jsonrpc_msg *msg;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
if (error || conn->request_id) {
|
|
|
|
|
break;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_recv(conn->rpc, &msg);
|
|
|
|
|
if (msg) {
|
|
|
|
|
if (msg->type == JSONRPC_REQUEST) {
|
|
|
|
|
process_command(conn, msg);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
} else {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
VLOG_WARN_RL(&rl, "%s: received unexpected %s message",
|
|
|
|
|
jsonrpc_get_name(conn->rpc),
|
|
|
|
|
jsonrpc_msg_type_to_string(msg->type));
|
|
|
|
|
error = EINVAL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_msg_destroy(msg);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
error = error ? error : jsonrpc_get_status(conn->rpc);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
kill_connection(struct unixctl_conn *conn)
|
|
|
|
|
{
|
2016-03-25 14:10:22 -07:00
|
|
|
|
ovs_list_remove(&conn->node);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_close(conn->rpc);
|
|
|
|
|
json_destroy(conn->request_id);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
free(conn);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
unixctl_server_run(struct unixctl_server *server)
|
|
|
|
|
{
|
2010-11-29 12:21:08 -08:00
|
|
|
|
if (!server) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-02 15:03:06 -07:00
|
|
|
|
for (int i = 0; i < 10; i++) {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct stream *stream;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
error = pstream_accept(server->listener, &stream);
|
|
|
|
|
if (!error) {
|
|
|
|
|
struct unixctl_conn *conn = xzalloc(sizeof *conn);
|
2016-03-25 14:10:22 -07:00
|
|
|
|
ovs_list_push_back(&server->conns, &conn->node);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
conn->rpc = jsonrpc_open(stream);
|
|
|
|
|
} else if (error == EAGAIN) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
break;
|
2012-02-14 20:53:59 -08:00
|
|
|
|
} else {
|
|
|
|
|
VLOG_WARN_RL(&rl, "%s: accept failed: %s",
|
|
|
|
|
pstream_get_name(server->listener),
|
2013-06-24 10:54:49 -07:00
|
|
|
|
ovs_strerror(error));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-02 15:03:06 -07:00
|
|
|
|
struct unixctl_conn *conn, *next;
|
2010-09-17 10:33:10 -07:00
|
|
|
|
LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int error = run_connection(conn);
|
|
|
|
|
if (error && error != EAGAIN) {
|
|
|
|
|
kill_connection(conn);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
unixctl_server_wait(struct unixctl_server *server)
|
|
|
|
|
{
|
|
|
|
|
struct unixctl_conn *conn;
|
|
|
|
|
|
2010-11-29 12:21:08 -08:00
|
|
|
|
if (!server) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
pstream_wait(server->listener);
|
2010-09-17 10:33:10 -07:00
|
|
|
|
LIST_FOR_EACH (conn, node, &server->conns) {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_wait(conn->rpc);
|
|
|
|
|
if (!jsonrpc_get_backlog(conn->rpc)) {
|
|
|
|
|
jsonrpc_recv_wait(conn->rpc);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Destroys 'server' and stops listening for connections. */
|
|
|
|
|
void
|
|
|
|
|
unixctl_server_destroy(struct unixctl_server *server)
|
|
|
|
|
{
|
|
|
|
|
if (server) {
|
|
|
|
|
struct unixctl_conn *conn, *next;
|
|
|
|
|
|
2010-09-17 10:33:10 -07:00
|
|
|
|
LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
kill_connection(conn);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
pstream_close(server->listener);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
free(server);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-28 08:19:59 -07:00
|
|
|
|
/* On POSIX based systems, connects to a unixctl server socket. 'path' should
|
|
|
|
|
* be the name of a unixctl server socket. If it does not start with '/', it
|
|
|
|
|
* will be prefixed with the rundir (e.g. /usr/local/var/run/openvswitch).
|
|
|
|
|
*
|
2016-08-02 18:19:34 +00:00
|
|
|
|
* On Windows, connects to a local named pipe. A file which resides in
|
|
|
|
|
* 'path' is used to mimic the behavior of a Unix domain socket.
|
2014-03-28 08:19:59 -07:00
|
|
|
|
* 'path' should be an absolute path of the file.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
|
|
|
|
* Returns 0 if successful, otherwise a positive errno value. If successful,
|
2012-02-14 20:53:59 -08:00
|
|
|
|
* sets '*client' to the new jsonrpc, otherwise to NULL. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_client_create(const char *path, struct jsonrpc **client)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
char *abs_path, *unix_path;
|
|
|
|
|
struct stream *stream;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int error;
|
2014-03-28 08:19:59 -07:00
|
|
|
|
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
#ifdef _WIN32
|
2014-07-22 15:46:25 -07:00
|
|
|
|
abs_path = xstrdup(path);
|
2014-03-28 08:19:59 -07:00
|
|
|
|
#else
|
2012-02-14 20:53:59 -08:00
|
|
|
|
abs_path = abs_file_name(ovs_rundir(), path);
|
2014-03-28 08:19:59 -07:00
|
|
|
|
#endif
|
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
2014-04-04 14:13:32 -07:00
|
|
|
|
unix_path = xasprintf("unix:%s", abs_path);
|
2014-03-28 08:19:59 -07:00
|
|
|
|
|
|
|
|
|
*client = NULL;
|
|
|
|
|
|
2012-03-10 15:58:10 -08:00
|
|
|
|
error = stream_open_block(stream_open(unix_path, &stream, DSCP_DEFAULT),
|
|
|
|
|
&stream);
|
2012-02-14 20:53:59 -08:00
|
|
|
|
free(unix_path);
|
|
|
|
|
free(abs_path);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_WARN("failed to connect to %s", path);
|
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
|
|
|
|
|
*client = jsonrpc_open(stream);
|
|
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
/* Executes 'command' on the server with an argument vector 'argv' containing
|
|
|
|
|
* 'argc' elements. If successfully communicated with the server, returns 0
|
|
|
|
|
* and sets '*result', or '*err' (not both) to the result or error the server
|
|
|
|
|
* returned. Otherwise, sets '*result' and '*err' to NULL and returns a
|
|
|
|
|
* positive errno value. The caller is responsible for freeing '*result' or
|
|
|
|
|
* '*err' if not NULL. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int
|
2012-02-14 20:53:59 -08:00
|
|
|
|
unixctl_client_transact(struct jsonrpc *client, const char *command, int argc,
|
|
|
|
|
char *argv[], char **result, char **err)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-02-14 20:53:59 -08:00
|
|
|
|
struct jsonrpc_msg *request, *reply;
|
|
|
|
|
struct json **json_args, *params;
|
|
|
|
|
int error, i;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
*result = NULL;
|
|
|
|
|
*err = NULL;
|
|
|
|
|
|
|
|
|
|
json_args = xmalloc(argc * sizeof *json_args);
|
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
|
json_args[i] = json_string_create(argv[i]);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
params = json_array_create(json_args, argc);
|
|
|
|
|
request = jsonrpc_create_request(command, params, NULL);
|
|
|
|
|
|
|
|
|
|
error = jsonrpc_transact_block(client, request, &reply);
|
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_WARN("error communicating with %s: %s", jsonrpc_get_name(client),
|
2013-01-24 13:46:23 -08:00
|
|
|
|
ovs_retval_to_string(error));
|
2012-02-14 20:53:59 -08:00
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
if (reply->error) {
|
|
|
|
|
if (reply->error->type == JSON_STRING) {
|
|
|
|
|
*err = xstrdup(json_string(reply->error));
|
|
|
|
|
} else {
|
|
|
|
|
VLOG_WARN("%s: unexpected error type in JSON RPC reply: %s",
|
|
|
|
|
jsonrpc_get_name(client),
|
|
|
|
|
json_type_to_string(reply->error->type));
|
|
|
|
|
error = EINVAL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2012-02-14 20:53:59 -08:00
|
|
|
|
} else if (reply->result) {
|
|
|
|
|
if (reply->result->type == JSON_STRING) {
|
|
|
|
|
*result = xstrdup(json_string(reply->result));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
} else {
|
2012-02-14 20:53:59 -08:00
|
|
|
|
VLOG_WARN("%s: unexpected result type in JSON rpc reply: %s",
|
|
|
|
|
jsonrpc_get_name(client),
|
|
|
|
|
json_type_to_string(reply->result->type));
|
|
|
|
|
error = EINVAL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-14 20:53:59 -08:00
|
|
|
|
jsonrpc_msg_destroy(reply);
|
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|