projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename cls_rule_zero_wildcards() to cls_rule_zero_wildcarded_fields().
[openvswitch]
/
tests
/
test-jsonrpc.c
diff --git
a/tests/test-jsonrpc.c
b/tests/test-jsonrpc.c
index da92cec90196a10d296a194e7c0c8c83a5887bd8..e8edec0648acc656bc0fc57c109e182465600743 100644
(file)
--- a/
tests/test-jsonrpc.c
+++ b/
tests/test-jsonrpc.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009
, 2010
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.
@@
-42,9
+42,8
@@
static void parse_options(int argc, char *argv[]);
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
run_command(argc - optind, argv + optind, all_commands);
return 0;
parse_options(argc, argv);
run_command(argc - optind, argv + optind, all_commands);
return 0;
@@
-174,7
+173,7
@@
handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done)
}
static void
}
static void
-do_listen(int argc UNUSED, char *argv[])
+do_listen(int argc
OVS_
UNUSED, char *argv[])
{
struct pstream *pstream;
struct jsonrpc **rpcs;
{
struct pstream *pstream;
struct jsonrpc **rpcs;
@@
-184,7
+183,7
@@
do_listen(int argc UNUSED, char *argv[])
die_if_already_running();
die_if_already_running();
- error = pstream_open(argv[1], &pstream);
+ error =
jsonrpc_
pstream_open(argv[1], &pstream);
if (error) {
ovs_fatal(error, "could not listen on \"%s\"", argv[1]);
}
if (error) {
ovs_fatal(error, "could not listen on \"%s\"", argv[1]);
}
@@
-250,11
+249,12
@@
do_listen(int argc UNUSED, char *argv[])
}
poll_block();
}
}
poll_block();
}
+ free(rpcs);
+ pstream_close(pstream);
}
}
-
static void
static void
-do_request(int argc UNUSED, char *argv[])
+do_request(int argc
OVS_
UNUSED, char *argv[])
{
struct jsonrpc_msg *msg;
struct jsonrpc *rpc;
{
struct jsonrpc_msg *msg;
struct jsonrpc *rpc;
@@
-272,7
+272,7
@@
do_request(int argc UNUSED, char *argv[])
ovs_fatal(0, "not a valid JSON-RPC request: %s", 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)
, &stream);
if (error) {
ovs_fatal(error, "could not open \"%s\"", argv[1]);
}
if (error) {
ovs_fatal(error, "could not open \"%s\"", argv[1]);
}
@@
-293,7
+293,7
@@
do_request(int argc UNUSED, char *argv[])
}
static void
}
static void
-do_notify(int argc UNUSED, char *argv[])
+do_notify(int argc
OVS_
UNUSED, char *argv[])
{
struct jsonrpc_msg *msg;
struct jsonrpc *rpc;
{
struct jsonrpc_msg *msg;
struct jsonrpc *rpc;
@@
-311,7
+311,7
@@
do_notify(int argc UNUSED, char *argv[])
ovs_fatal(0, "not a JSON RPC-valid notification: %s", string);
}
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)
, &stream);
if (error) {
ovs_fatal(error, "could not open \"%s\"", argv[1]);
}
if (error) {
ovs_fatal(error, "could not open \"%s\"", argv[1]);
}
@@
-319,13
+319,13
@@
do_notify(int argc UNUSED, char *argv[])
error = jsonrpc_send_block(rpc, msg);
if (error) {
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
}
jsonrpc_close(rpc);
}
static void
-do_help(int argc
UNUSED, char *argv[]
UNUSED)
+do_help(int argc
OVS_UNUSED, char *argv[] OVS_
UNUSED)
{
usage();
}
{
usage();
}