HSR/PRP: Add printing for HSR/PRP Supervision frames

Supervision frames are sent out by the nodes to notify about their
existence, and in the case of a RedBox it will notify about the
upstream devices.

Signed-off-by: Casper Andersson <[email protected]>

Author: cappe987

ethertype.h

@@ -188,6 +188,9 @@
 #ifndef ETHERTYPE_HSR
 #define ETHERTYPE_HSR		0x892f
 #endif
+#ifndef ETHERTYPE_HSR_PRP_SUP
+#define ETHERTYPE_HSR_PRP_SUP	0x88fb
+#endif
 #ifndef	ETHERTYPE_LOOPBACK
 #define	ETHERTYPE_LOOPBACK	0x9000
 #endif

netdissect.h

@@ -655,6 +655,7 @@ extern void hex_print(netdissect_options *, const char *indent, const u_char *cp
 extern void hex_print_with_offset(netdissect_options *, const char *indent, const u_char *cp, u_int, u_int);
 extern void hncp_print(netdissect_options *, const u_char *, u_int);
 extern void hsr_print(netdissect_options *, const u_char *, u_int);
+extern void hsr_prp_supervision_print(netdissect_options *ndo, const u_char *bp, u_int length);
 extern void hsrp_print(netdissect_options *, const u_char *, u_int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);

print-ether.c

@@ -104,6 +104,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_AOE,            "AoE" },
     { ETHERTYPE_PTP,            "PTP" },
     { ETHERTYPE_HSR,            "HSR" },
+    { ETHERTYPE_HSR_PRP_SUP,    "HSR/PRP Supervision" },
     { ETHERTYPE_ARISTA,         "Arista Vendor Specific Protocol" },
     { 0, NULL}
 };
@@ -672,6 +673,10 @@ ethertype_print(netdissect_options *ndo,
 		ptp_print(ndo, p, length);
 		return (1);
 
+	case ETHERTYPE_HSR_PRP_SUP:
+		hsr_prp_supervision_print(ndo, p, length);
+		return (1);
+
 	case ETHERTYPE_LAT:
 	case ETHERTYPE_SCA:
 	case ETHERTYPE_MOPRC:

print-hsr-prp.c

@@ -39,9 +39,32 @@
  * LSDUsize = Link Service Data Unit size = size of the packet excluding MAC
  * header, tags before the HSR tag (e.g. VLAN), and the HSR ethertype field.
  * For PRP it includes the PRP suffix.
+ *
+ * HSR/PRP Supervision frame
+ *     0                   1                   2                   3
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |PathId |       version         |         Sequence number       |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |   TLV1 Type   |  TLV1 Length  |   MAC Address of DANP/DANH    |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               +
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |   TLV2 Type   |  TLV2 Length  |     RedBox MAC Address        |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               +
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |   TLV0 Type   |  TLV0 Length  |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *     0                   1                   2                   3
+ *
+ * DANP = Doubly Attached Node PRP
+ * DANH = Doubly Attached Node HSR
  */
 
 #define HSR_HDR_LEN 6
+#define HSR_PRP_SUPERVISION_LEN 22
 
 void hsr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
@@ -70,3 +93,95 @@ void hsr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	nd_print_invalid(ndo);
 }
 
+void hsr_prp_supervision_print(netdissect_options *ndo, const u_char *bp, u_int length)
+{
+	int tlvtype, tlvlength;
+	uint32_t seq_nr;
+	uint16_t hdr;
+	int version;
+	int pathid;
+
+	ndo->ndo_protocol = "hsr-prp-supervision";
+	if (!ndo->ndo_eflag) {
+		nd_print_protocol_caps(ndo);
+		ND_PRINT(", ");
+	}
+	ND_ICHECK_U(length, <, HSR_PRP_SUPERVISION_LEN);
+
+	hdr = GET_BE_U_2(bp);
+	version = hdr & 0xFFF;
+	/* PathId is always set to 0 according to current standard */
+	pathid = (hdr >> 12);
+	length -= 2;
+	bp += 2;
+	seq_nr = GET_BE_U_2(bp);
+	length -= 2;
+	bp += 2;
+	ND_PRINT("Version %d, SeqNr %d, PathId %d", version, seq_nr, pathid);
+
+	tlvtype = GET_BE_U_2(bp) >> 8;
+	tlvlength = GET_BE_U_2(bp) & 0xFF;
+	length -= 2;
+	bp += 2;
+
+	if (tlvlength != 6)
+		goto invalid;
+
+	/* TLV1 */
+	if (tlvtype == 20) {
+		/* PRP: VDAN MAC for RedBox or DANP MAC for both ports in PRP Duplicate Discard */
+		ND_PRINT(", VDAN/DANP %s", GET_MAC48_STRING(bp));
+	} else if (tlvtype == 21) {
+		/* PRP: Not valid for RedBox. DANP MAC for both ports in PRP Duplicate Accept mode */
+		ND_PRINT(", DANP %s", GET_MAC48_STRING(bp));
+	} else if (tlvtype == 23) {
+		/* HSR: MAC address of DANH */
+		ND_PRINT(", DANH %s", GET_MAC48_STRING(bp));
+	} else {
+		goto invalid;
+	}
+	length -= 6;
+	bp += 6;
+
+	tlvtype = GET_BE_U_2(bp) >> 8;
+	tlvlength = GET_BE_U_2(bp) & 0xFF;
+	length -= 2;
+	bp += 2;
+
+	/* No TLV2 indicates the device is not a RedBox */
+	if (tlvtype == 0 && tlvlength == 0)
+		return;
+	if (tlvlength != 6) {
+		goto invalid;
+	}
+
+	/* TLV2 */
+	if (tlvtype == 30) {
+		/* HSR and PRP: RedBox MAC */
+		ND_PRINT(", RedBox %s", GET_MAC48_STRING(bp));
+		length -= 6;
+		bp += 6;
+	} else {
+		goto invalid;
+	}
+
+	tlvtype = GET_BE_U_2(bp) >> 8;
+	tlvlength = GET_BE_U_2(bp) & 0xFF;
+	length -= 2;
+	bp += 2;
+
+	/* TLV0 */
+	if (tlvtype == 0 && tlvlength == 0) {
+		/* HSR and PRP closing TLV, should always be type and length 0.
+		 */
+		return;
+	} else {
+		goto invalid;
+    	}
+
+	return;
+
+invalid:
+	nd_print_invalid(ndo);
+}
+