projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ctl: Start the rest of Open vSwitch if loading brcompat module fails.
[openvswitch]
/
lib
/
stress.c
diff --git
a/lib/stress.c
b/lib/stress.c
index 0fdc79aa0a6e77cf0788852e4b1554b828e4223c..a14209ec7a2c14e6239f5f472a15f0fe155c7e65 100644
(file)
--- a/
lib/stress.c
+++ b/
lib/stress.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2011 Nicira
Networks
.
+ * Copyright (c) 2010, 2011 Nicira
, Inc
.
*
* 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.
@@
-154,9
+154,9
@@
stress_unixctl_list(struct unixctl_conn *conn, int argc OVS_UNUSED,
}
}
if (found) {
}
}
if (found) {
- unixctl_command_reply(conn,
200,
ds_cstr(&results));
+ unixctl_command_reply(conn, ds_cstr(&results));
} else {
} else {
- unixctl_command_reply
(conn, 404, ""
);
+ unixctl_command_reply
_error(conn, NULL
);
}
ds_destroy(&results);
}
}
ds_destroy(&results);
}
@@
-166,7
+166,7
@@
stress_unixctl_enable(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
stress_enable(true);
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
stress_enable(true);
- unixctl_command_reply(conn,
200, ""
);
+ unixctl_command_reply(conn,
NULL
);
}
static void
}
static void
@@
-174,14
+174,13
@@
stress_unixctl_disable(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
stress_enable(false);
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
{
stress_enable(false);
- unixctl_command_reply(conn,
200, ""
);
+ unixctl_command_reply(conn,
NULL
);
}
static void
stress_unixctl_set(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[], void *aux OVS_UNUSED)
{
}
static void
stress_unixctl_set(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[], void *aux OVS_UNUSED)
{
- int code = 404;
const char *option_name = argv[1];
const char *option_val = argv[2];
int i;
const char *option_name = argv[1];
const char *option_val = argv[2];
int i;
@@
-193,11
+192,12
@@
stress_unixctl_set(struct unixctl_conn *conn, int argc OVS_UNUSED,
bool random = !strcmp(argv[3], "random");
stress_set(option, period, random);
bool random = !strcmp(argv[3], "random");
stress_set(option, period, random);
-
code = 200
;
-
break
;
+
unixctl_command_reply(conn, NULL)
;
+
return
;
}
}
}
}
- unixctl_command_reply(conn, code, "");
+
+ unixctl_command_reply_error(conn, NULL);
}
/* Exposes ovs-appctl access to the stress options.
}
/* Exposes ovs-appctl access to the stress options.