diff options
| author | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-11-18 18:45:28 +0000 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-11-18 18:45:28 +0000 |
| commit | 66e5927b1708bd3d95b2394980464221dfd62854 (patch) | |
| tree | 296e027a0b3af9a7117f66e7d19da0862a9d256f /usr.sbin/tcpdump/print-ofp.c | |
| parent | dda245d10638853d9273789199532471b33b954c (diff) | |
Add support for printing the missing OpenFlow set-queue action.
Diffstat (limited to 'usr.sbin/tcpdump/print-ofp.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-ofp.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/usr.sbin/tcpdump/print-ofp.c b/usr.sbin/tcpdump/print-ofp.c index 2c3e869d514..a4544115674 100644 --- a/usr.sbin/tcpdump/print-ofp.c +++ b/usr.sbin/tcpdump/print-ofp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ofp.c,v 1.6 2016/11/18 18:35:20 rzalamena Exp $ */ +/* $OpenBSD: print-ofp.c,v 1.7 2016/11/18 18:45:27 rzalamena Exp $ */ /* * Copyright (c) 2016 Rafael Zalamena <rzalamena@openbsd.org> @@ -50,6 +50,7 @@ void ofp_print_oxm(struct ofp_ox_match *, const u_char *, u_int); void action_print_output(const u_char *, u_int); void action_print_group(const u_char *, u_int); +void action_print_setqueue(const u_char *, u_int); void action_print_setmplsttl(const u_char *, u_int); void action_print_setnwttl(const u_char *, u_int); void action_print_push(const u_char *, u_int); @@ -952,6 +953,20 @@ action_print_group(const u_char *bp, u_int length) } void +action_print_setqueue(const u_char *bp, u_int length) +{ + struct ofp_action_set_queue *asq; + + if (length < (sizeof(*asq) - AH_UNPADDED)) { + printf(" [|OpenFlow]"); + return; + } + + asq = (struct ofp_action_set_queue *)(bp - AH_UNPADDED); + printf(" queue_id %u", ntohl(asq->asq_queue_id)); +} + +void action_print_setmplsttl(const u_char *bp, u_int length) { struct ofp_action_mpls_ttl *amt; @@ -1066,7 +1081,7 @@ ofp_print_action(struct ofp_action_header *ah, const u_char *bp, u_int length) break; case OFP_ACTION_SET_QUEUE: - /* TODO missing struct in ofp.h header. */ + action_print_setqueue(bp, length); break; case OFP_ACTION_SET_MPLS_TTL: |