projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Fix typo in netdev provider enumerate.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index 583e5548bca1f25021fa8000bbd220de8551e4c5..e873ed7ba2a41567057290ddae5eeddbbf4d6832 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-251,7
+251,7
@@
static void run(int retval, const char *message, ...)
static void
open_vconn(const char *name, struct vconn **vconnp)
{
static void
open_vconn(const char *name, struct vconn **vconnp)
{
- struct dpif dpif;
+ struct dpif
*
dpif;
struct stat s;
if (strstr(name, ":")) {
struct stat s;
if (strstr(name, ":")) {
@@
-268,9
+268,9
@@
open_vconn(const char *name, struct vconn **vconnp)
char *socket_name;
char *vconn_name;
char *socket_name;
char *vconn_name;
- run(dpif_
get_name(&dpif
, dpif_name, sizeof dpif_name),
+ run(dpif_
port_get_name(dpif, ODPP_LOCAL
, dpif_name, sizeof dpif_name),
"obtaining name of %s", dpif_name);
"obtaining name of %s", dpif_name);
- dpif_close(
&
dpif);
+ dpif_close(dpif);
if (strcmp(dpif_name, name)) {
VLOG_INFO("datapath %s is named %s", name, dpif_name);
}
if (strcmp(dpif_name, name)) {
VLOG_INFO("datapath %s is named %s", name, dpif_name);
}
@@
-442,8
+442,8
@@
str_to_u32(const char *str)
static void
str_to_mac(const char *str, uint8_t mac[6])
{
static void
str_to_mac(const char *str, uint8_t mac[6])
{
- if (sscanf(str,
"%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8,
-
&mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6
) {
+ if (sscanf(str,
ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))
+
!= ETH_ADDR_SCAN_COUNT
) {
ovs_fatal(0, "invalid mac address %s", str);
}
}
ovs_fatal(0, "invalid mac address %s", str);
}
}
@@
-617,6
+617,8
@@
str_to_action(char *str, struct ofpbuf *b)
* packet to the controller. */
if (arg && (strspn(act, "0123456789") == strlen(act))) {
oao->max_len = htons(str_to_u32(arg));
* packet to the controller. */
if (arg && (strspn(act, "0123456789") == strlen(act))) {
oao->max_len = htons(str_to_u32(arg));
+ } else {
+ oao->max_len = htons(UINT16_MAX);
}
} else if (parse_port_name(act, &port)) {
put_output_action(b, port);
}
} else if (parse_port_name(act, &port)) {
put_output_action(b, port);