X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-appctl.c;h=a6fbebd0ec03f826e07637deaf4268e13d0810f3;hb=7efa3dccd1968535ae32caf59746aa11ce7532f2;hp=9fd0234e3a46dceb9e8d36537c8d267053c92f19;hpb=4b0424809b823101c969a0691fc1db0c880ae64a;p=sliver-openvswitch.git diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c index 9fd0234e3..a6fbebd0e 100644 --- a/utilities/ovs-appctl.c +++ b/utilities/ovs-appctl.c @@ -63,6 +63,7 @@ main(int argc, char *argv[]) } if (cmd_error) { + jsonrpc_close(client); fputs(cmd_error, stderr); ovs_error(0, "%s: server returned an error", target); exit(2); @@ -180,6 +181,7 @@ connect_to_target(const char *target) char *socket_name; int error; +#ifndef _WIN32 if (target[0] != '/') { char *pidfile_name; pid_t pid; @@ -192,6 +194,12 @@ connect_to_target(const char *target) free(pidfile_name); socket_name = xasprintf("%s/%s.%ld.ctl", ovs_rundir(), target, (long int) pid); +#else + /* On windows, if the 'target' contains ':', we make an assumption that + * it is an absolute path. */ + if (!strchr(target, ':')) { + socket_name = xasprintf("%s/%s.ctl", ovs_rundir(), target); +#endif } else { socket_name = xstrdup(target); }