Skip to contentSkip to conversation

iproute2: Fix case of -o (oneline) broken in xfrm

PATCH New [email protected] 1 participant 1 message Mar 16, 2015

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 iproute2: Fix case of -o (oneline) broken in xfrm

Don't insert newline in -o mode; print mark as hex.

Signed-off-by Philip Prindeville <[email protected]>
---
 ip/ipxfrm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ip/ipxfrm.c +1 -1
index f55bff9..810a2bf 100644
@@ -694,7 +694,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
 	if (tb[XFRMA_MARK]) {
 		struct rtattr *rta = tb[XFRMA_MARK];
 		struct xfrm_mark *m = (struct xfrm_mark *) RTA_DATA(rta);
-		fprintf(fp, "\tmark %d/0x%x\n", m->v, m->m);
+		fprintf(fp, "\tmark %#x/%#x%s", m->v, m->m, _SL_);
 	}
 
 	if (tb[XFRMA_ALG_AUTH] && !tb[XFRMA_ALG_AUTH_TRUNC]) {