/*
- * 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.
int
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;
}
static void
-do_listen(int argc UNUSED, char *argv[])
+do_listen(int argc OVS_UNUSED, char *argv[])
{
struct pstream *pstream;
struct jsonrpc **rpcs;
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]);
}
}
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;
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]);
}
}
static void
-do_notify(int argc UNUSED, char *argv[])
+do_notify(int argc OVS_UNUSED, char *argv[])
{
struct jsonrpc_msg *msg;
struct jsonrpc *rpc;
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]);
}
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();
}