X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-jsonrpc.c;h=7251265fe40608b1c72a2d8ff44e446f104ea414;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=7f2166f4ec387b4e0d1cf1567e10967996240b23;hpb=f212909325be9bc7e296e1a32e2fc89694a0049f;p=sliver-openvswitch.git diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index 7f2166f4e..7251265fe 100644 --- a/tests/test-jsonrpc.c +++ b/tests/test-jsonrpc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,35 +28,40 @@ #include "daemon.h" #include "json.h" #include "poll-loop.h" +#include "stream-ssl.h" #include "stream.h" #include "timeval.h" #include "util.h" #include "vlog.h" - -static struct command all_commands[]; +#include "ovstest.h" static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static struct command *get_all_commands(void); -int -main(int argc, char *argv[]) +static void +test_jsonrpc_main(int argc, char *argv[]) { + proctitle_init(argc, argv); set_program_name(argv[0]); - time_init(); - vlog_init(); parse_options(argc, argv); - run_command(argc - optind, argv + optind, all_commands); - return 0; + run_command(argc - optind, argv + optind, get_all_commands()); } static void parse_options(int argc, char *argv[]) { - static struct option long_options[] = { - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, + enum { + OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1, + DAEMON_OPTION_ENUMS + }; + static const struct option long_options[] = { + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, DAEMON_LONG_OPTIONS, - {0, 0, 0, 0}, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + STREAM_SSL_LONG_OPTIONS, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -76,6 +81,12 @@ parse_options(int argc, char *argv[]) DAEMON_OPTION_HANDLERS + STREAM_SSL_OPTION_HANDLERS + + case OPT_BOOTSTRAP_CA_CERT: + stream_ssl_set_ca_cert_file(optarg, true); + break; + case '?': exit(EXIT_FAILURE); @@ -95,7 +106,7 @@ usage(void) " request REMOTE METHOD PARAMS send request, print reply\n" " notify REMOTE METHOD PARAMS send notification and exit\n", program_name, program_name); - stream_usage("JSON-RPC", true, true); + stream_usage("JSON-RPC", true, true, true); daemon_usage(); vlog_usage(); printf("\nOther options:\n" @@ -126,11 +137,11 @@ print_and_free_json(struct json *json) /* Command implementations. */ -static void +static int handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done) { - struct jsonrpc_msg *reply = NULL; if (msg->type == JSONRPC_REQUEST) { + struct jsonrpc_msg *reply = NULL; if (!strcmp(msg->method, "echo")) { reply = jsonrpc_create_reply(json_clone(msg->params), msg->id); } else { @@ -139,26 +150,24 @@ handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done) reply = jsonrpc_create_error(error, msg->id); ovs_error(0, "unknown request %s", msg->method); } - + jsonrpc_send(rpc, reply); + return 0; } else if (msg->type == JSONRPC_NOTIFY) { if (!strcmp(msg->method, "shutdown")) { *done = true; + return 0; } else { - jsonrpc_error(rpc, ENOTTY); ovs_error(0, "unknown notification %s", msg->method); + return ENOTTY; } } else { - jsonrpc_error(rpc, EPROTO); ovs_error(0, "unsolicited JSON-RPC reply or error"); - } - - if (reply) { - jsonrpc_send(rpc, reply); + return EPROTO; } } static void -do_listen(int argc UNUSED, char *argv[]) +do_listen(int argc OVS_UNUSED, char *argv[]) { struct pstream *pstream; struct jsonrpc **rpcs; @@ -166,9 +175,7 @@ do_listen(int argc UNUSED, char *argv[]) bool done; int error; - die_if_already_running(); - - error = pstream_open(argv[1], &pstream); + error = jsonrpc_pstream_open(argv[1], &pstream, DSCP_DEFAULT); if (error) { ovs_fatal(error, "could not listen on \"%s\"", argv[1]); } @@ -202,12 +209,16 @@ do_listen(int argc UNUSED, char *argv[]) if (!jsonrpc_get_backlog(rpc)) { error = jsonrpc_recv(rpc, &msg); if (!error) { - handle_rpc(rpc, msg, &done); + error = handle_rpc(rpc, msg, &done); jsonrpc_msg_destroy(msg); + } else if (error == EAGAIN) { + error = 0; } } - error = jsonrpc_get_status(rpc); + if (!error) { + error = jsonrpc_get_status(rpc); + } if (error) { jsonrpc_close(rpc); ovs_error(error, "connection closed"); @@ -234,11 +245,12 @@ do_listen(int argc UNUSED, char *argv[]) } poll_block(); } + free(rpcs); + pstream_close(pstream); } - static void -do_request(int argc UNUSED, char *argv[]) +do_request(int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *msg; struct jsonrpc *rpc; @@ -250,13 +262,14 @@ do_request(int argc UNUSED, char *argv[]) method = argv[2]; params = parse_json(argv[3]); - msg = jsonrpc_create_request(method, params); + msg = jsonrpc_create_request(method, params, NULL); string = jsonrpc_msg_is_valid(msg); if (string) { ovs_fatal(0, "not a valid JSON-RPC request: %s", string); } - error = stream_open_block(argv[1], &stream); + error = stream_open_block(jsonrpc_stream_open(argv[1], &stream, + DSCP_DEFAULT), &stream); if (error) { ovs_fatal(error, "could not open \"%s\"", argv[1]); } @@ -277,7 +290,7 @@ do_request(int argc UNUSED, char *argv[]) } static void -do_notify(int argc UNUSED, char *argv[]) +do_notify(int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *msg; struct jsonrpc *rpc; @@ -295,7 +308,8 @@ do_notify(int argc UNUSED, char *argv[]) ovs_fatal(0, "not a JSON RPC-valid notification: %s", string); } - error = stream_open_block(argv[1], &stream); + error = stream_open_block(jsonrpc_stream_open(argv[1], &stream, + DSCP_DEFAULT), &stream); if (error) { ovs_fatal(error, "could not open \"%s\"", argv[1]); } @@ -303,13 +317,13 @@ do_notify(int argc UNUSED, char *argv[]) error = jsonrpc_send_block(rpc, msg); if (error) { - ovs_fatal(error, "could not send request"); + ovs_fatal(error, "could not send notification"); } jsonrpc_close(rpc); } static void -do_help(int argc UNUSED, char *argv[] UNUSED) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } @@ -321,3 +335,11 @@ static struct command all_commands[] = { { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, }; + +static struct command * +get_all_commands(void) +{ + return all_commands; +} + +OVSTEST_REGISTER("test-jsonrpc", test_jsonrpc_main);