[ovs-dev] [PATCH v2 1/2] tunnel: Accept 'set options:tos' as hex value.
Pravin B Shelar
pshelar at nicira.com
Wed May 16 23:13:14 UTC 2012
Fixed according to comments from Ben.
- Use 0x prefix for ToS.
--8<--------------------------cut here-------------------------->8--
Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Bug #8822
---
lib/netdev-vport.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 1721f6b..a9eb3eb 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -612,7 +612,12 @@ parse_tunnel_config(const char *name, const char *type,
if (!strcmp(node->data, "inherit")) {
flags |= TNL_F_TOS_INHERIT;
} else {
- nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, atoi(node->data));
+ char *endptr;
+ int tos;
+ tos = strtol(node->data, &endptr, 0);
+ if (*endptr == '\0') {
+ nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, tos);
+ }
}
} else if (!strcmp(node->name, "ttl")) {
if (!strcmp(node->data, "inherit")) {
@@ -814,7 +819,7 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
smap_add(args, "tos", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TOS]) {
int tos = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
- shash_add(args, "tos", xasprintf("%d", tos));
+ shash_add(args, "tos", xasprintf("0x%x", tos));
}
if (flags & TNL_F_CSUM) {
--
1.7.10
More information about the dev
mailing list