fix and count non tcp/udp packets

Author: weyrick

cmd/pktvisor/pktvisor.go

@@ -112,6 +112,7 @@ type StatSnapshot struct {
 		Udp   int64 `json:"udp"`
 		In    int64 `json:"in"`
 		Out   int64 `json:"out"`
+		Other_L4 int64 `json:"other_l4"`
 		Rates struct {
 			Pps_in struct {
 				P50 int64 `json:"p50"`
@@ -165,12 +166,14 @@ func updateHeader(v *gocui.View, rates *InstantRates, stats *StatSnapshot) {
 	pcounts := stats.Packets
 	// there may be some unknown
 	inOutDiff := pcounts.Total - (pcounts.In + pcounts.Out)
-	_, _ = fmt.Fprintf(v, "Pkts  %d | UDP %d (%3.1f%%) | TCP %d (%3.1f%%) | IPv4 %d (%3.1f%%) | IPv6 %d (%3.1f%%) | In %d (%3.1f%%) | Out %d (%3.1f%%)\n",
+	_, _ = fmt.Fprintf(v, "Pkts  %d | UDP %d (%3.1f%%) | TCP %d (%3.1f%%) | Other %d (%3.1f%%) | IPv4 %d (%3.1f%%) | IPv6 %d (%3.1f%%) | In %d (%3.1f%%) | Out %d (%3.1f%%)\n",
 		pcounts.Total,
 		pcounts.Udp,
 		(float64(pcounts.Udp)/float64(pcounts.Total))*100,
 		pcounts.Tcp,
 		(float64(pcounts.Tcp)/float64(pcounts.Total))*100,
+		pcounts.Other_L4,
+		(float64(pcounts.Other_L4)/float64(pcounts.Total))*100,
 		pcounts.Ipv4,
 		(float64(pcounts.Ipv4)/float64(pcounts.Total))*100,
 		pcounts.Ipv6,

src/main.cpp

@@ -92,10 +92,20 @@ static void onApplicationInterrupted(void *cookie)
 static void processRawPacket(pcpp::RawPacket *rawPacket, pktvisor::TcpDnsReassembly *tcpReassembly)
 {
 
-    pcpp::ProtocolType l3, l4;
+    pcpp::ProtocolType l3(pcpp::UnknownProtocol), l4(pcpp::UnknownProtocol);
     pcpp::Packet packet(rawPacket);
-    l3 = (packet.isPacketOfType(pcpp::IPv4)) ? pcpp::IPv4 : pcpp::IPv6;
-    l4 = (packet.isPacketOfType(pcpp::UDP)) ? pcpp::UDP : pcpp::TCP;
+    if (packet.isPacketOfType(pcpp::IPv4)) {
+        l3 = pcpp::IPv4;
+    }
+    else if (packet.isPacketOfType(pcpp::IPv6)) {
+        l3 = pcpp::IPv6;
+    }
+    if (packet.isPacketOfType(pcpp::UDP)) {
+        l4 = pcpp::UDP;
+    }
+    else if (packet.isPacketOfType(pcpp::TCP)) {
+        l4 = pcpp::TCP;
+    }
     // determine packet direction by matching source/dest ips
     // note the direction may be indeterminate!
     pktvisor::Direction dir = pktvisor::unknown;

src/metrics.cpp

@@ -33,6 +33,7 @@ void Metrics::merge(Metrics &other)
     _numPackets += other._numPackets;
     _numPackets_UDP += other._numPackets_UDP;
     _numPackets_TCP += other._numPackets_TCP;
+    _numPackets_OtherL4 += other._numPackets_OtherL4;
     _numPackets_IPv6 += other._numPackets_IPv6;
     _numPackets_in += other._numPackets_in;
     _numPackets_out += other._numPackets_out;
@@ -269,6 +270,7 @@ void Metrics::newPacket(const pcpp::Packet &packet, pcpp::ProtocolType l3, pcpp:
         _numPackets_TCP++;
         break;
     default:
+        _numPackets_OtherL4++;
         break;
     }
 
@@ -425,6 +427,7 @@ void Metrics::toJSON(nlohmann::json &j, const std::string &key)
     j[key]["packets"]["total"] = _numPackets.load();
     j[key]["packets"]["udp"] = _numPackets_UDP.load();
     j[key]["packets"]["tcp"] = _numPackets_TCP.load();
+    j[key]["packets"]["other_l4"] = _numPackets_OtherL4.load();
     j[key]["packets"]["ipv4"] = _numPackets - _numPackets_IPv6;
     j[key]["packets"]["ipv6"] = _numPackets_IPv6.load();
     j[key]["packets"]["in"] = _numPackets_in.load();

src/metrics.h

@@ -197,6 +197,7 @@ class Metrics
     std::atomic_uint64_t _numPackets = 0;
     std::atomic_uint64_t _numPackets_UDP = 0;
     std::atomic_uint64_t _numPackets_TCP = 0;
+    std::atomic_uint64_t _numPackets_OtherL4 = 0;
     std::atomic_uint64_t _numPackets_IPv6 = 0;
     std::atomic_uint64_t _numPackets_in = 0;
     std::atomic_uint64_t _numPackets_out = 0;