sFlow: display input/output interfaces for expanded flows

These were already present for regular flows.

Author: vincentbernat

print-sflow.c

@@ -795,13 +795,17 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
 
     nrecords = GET_BE_U_4(sflow_expanded_flow_sample->records);
 
-    ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, records %u",
+    ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, input %u (%u), output %u (%u), records %u",
 	   GET_BE_U_4(sflow_expanded_flow_sample->seqnum),
 	   GET_BE_U_4(sflow_expanded_flow_sample->type),
 	   GET_BE_U_4(sflow_expanded_flow_sample->index),
 	   GET_BE_U_4(sflow_expanded_flow_sample->rate),
 	   GET_BE_U_4(sflow_expanded_flow_sample->pool),
 	   GET_BE_U_4(sflow_expanded_flow_sample->drops),
+       GET_BE_U_4(sflow_expanded_flow_sample->in_interface_value),
+       GET_BE_U_4(sflow_expanded_flow_sample->in_interface_format),
+       GET_BE_U_4(sflow_expanded_flow_sample->out_interface_value),
+       GET_BE_U_4(sflow_expanded_flow_sample->out_interface_format),
 	   nrecords);
 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_expanded_flow_sample_t),

tests/TESTLIST

@@ -195,6 +195,7 @@ qinqv           QinQpacket.pcap         QinQpacketv.out  -e -v
 # now SFLOW tests
 sflow1          sflow_multiple_counter_30_pdus.pcap     sflow_multiple_counter_30_pdus.out      -v
 sflow2          sflow_multiple_counter_30_pdus.pcap     sflow_multiple_counter_30_pdus-nv.out
+sflow-expanded  sflow_expanded.pcap                     sflow_expanded.out                      -v
 # ipv6 sflow support
 sflow-v6	sflow-print-v6.pcap			sflow-print-v6.out			-vvv
 

tests/sflow_expanded.out

@@ -0,0 +1,7 @@
+    1  2022-12-29 15:03:48.557763 IP (tos 0x0, ttl 64, id 1, offset 0, flags [none], proto UDP (17), length 356)
+    192.0.2.100.47873 > 192.0.2.101.6343: sFlowv5, IPv4 agent 49.49.49.49, agent-id 0, seqnum 115694180, uptime 3465002224, samples 1, length 328
+	expanded flow sample (3), length 292, seqnum 2170480284, type 0, idx 11001, rate 1000, pool 1521799520, drops 0, input 29001 (0), output 1285816721 (0), records 3
+	    enterprise 0 Raw packet (1) length 140
+	      protocol Ethernet (1), length 126, stripped bytes 4, header_size 122
+	    enterprise 0 Extended Gateway data (1003) length 68
+	    enterprise 0 Extended Router data (1002) length 16