diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-11-30 16:54:50 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-12-03 09:32:31 -0800 |
| commit | 5b16f00916dbae0c2a3f91e504332b61f021a91a (patch) | |
| tree | 90468942709740d87a00257dc2f8ec465bc2439b /lib/odp-util.c | |
| parent | 8e6c8ff5ae19b04f45905cc35163a855c096d0a3 (diff) | |
| download | openvswitch-5b16f00916dbae0c2a3f91e504332b61f021a91a.tar.gz | |
Format tunnel IDs consistently.
Some code failed to convert tunnel IDs to host byte order for printing,
so this fixes that. Some code printed tunnel IDs with a 0x prefix and
other code didn't, so this code uses the '#' flag consistently (which
prints 0x for nonzero values and omits it for zero).
This commit also stops always printing all 8 digits. When tunnel IDs
are expanded to 64 bits, as they will be soon, printing 16 digits all the
time wastes too much space.
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'lib/odp-util.c')
| -rw-r--r-- | lib/odp-util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/odp-util.c b/lib/odp-util.c index 0c8caabb0..6b4f5fada 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -42,8 +42,8 @@ odp_actions_add(struct odp_actions *actions, uint16_t type) void format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key) { - ds_put_format(ds, "tun_id0x%08x in_port%d tci(", - key->tun_id, key->in_port); + ds_put_format(ds, "tun_id%#"PRIx32" in_port%d tci(", + ntohl(key->tun_id), key->in_port); if (key->dl_tci) { ds_put_format(ds, "vlan%"PRIu16",pcp%d", vlan_tci_to_vid(key->dl_tci), @@ -70,7 +70,7 @@ format_odp_action(struct ds *ds, const union odp_action *a) ds_put_format(ds, "ctl(%"PRIu32")", a->controller.arg); break; case ODPAT_SET_TUNNEL: - ds_put_format(ds, "set_tunnel(0x%08"PRIx32")", ntohl(a->tunnel.tun_id)); + ds_put_format(ds, "set_tunnel(%#"PRIx32")", ntohl(a->tunnel.tun_id)); break; case ODPAT_SET_DL_TCI: ds_put_format(ds, "set_tci(vid=%"PRIu16",pcp=%d)", |