/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#endif
VLOG_DEFINE_THIS_MODULE(unixctl);
+
+COVERAGE_DEFINE(unixctl_received);
+COVERAGE_DEFINE(unixctl_replied);
\f
struct unixctl_command {
unixctl_cb_func *cb;
list_init(&server->conns);
if (path) {
- server->path = abs_file_name(ovs_rundir, path);
+ server->path = abs_file_name(ovs_rundir(), path);
} else {
- server->path = xasprintf("%s/%s.%ld.ctl", ovs_rundir,
+ server->path = xasprintf("%s/%s.%ld.ctl", ovs_rundir(),
program_name, (long int) getpid());
}
\f
/* Connects to a Vlog server socket. 'path' should be the name of a Vlog
* server socket. If it does not start with '/', it will be prefixed with
- * ovs_rundir (e.g. /var/run/openvswitch).
+ * the rundir (e.g. /usr/local/var/run/openvswitch).
*
* Returns 0 if successful, otherwise a positive errno value. If successful,
* sets '*clientp' to the new unixctl_client, otherwise to NULL. */
/* Determine location. */
client = xmalloc(sizeof *client);
- client->connect_path = abs_file_name(ovs_rundir, path);
+ client->connect_path = abs_file_name(ovs_rundir(), path);
client->bind_path = xasprintf("/tmp/vlog.%ld.%d",
(long int) getpid(), counter++);
if (error) {
VLOG_WARN("error reading reply from %s: %s",
client->connect_path,
- (error == EOF ? "unexpected end of file"
- : strerror(error)));
+ ovs_retval_to_string(error));
goto error;
}