Counter and TUI improvements

Author: dkorunic

counter.c

@@ -744,21 +744,25 @@ int BPF_KPROBE(skb_consume_udp, struct sock *sk, struct sk_buff *skb, int len) {
 }
 
 /**
- * Hook function for kprobe on icmp_send function.
+ * Hook function for kprobe on __icmp_send function.
  *
- * Populates the statkey structure with information from the ICMP packet and
+ * Populates the statkey structure with information from the ICMPv4 packet and
  * the process ID associated with the packet, and updates the packet and byte
  * counters in the packet count map.
  *
- * @param skb pointer to the socket buffer containing the ICMP packet
- * @param type type of ICMP packet
+ * @param skb pointer to the socket buffer containing the ICMPv4 packet
+ * @param type type of ICMPv4 packet
+ * @param code code of ICMPv4 packet
+ * @param info additional information for the ICMPv4 packet
+ * @param opt pointer to the ip_options structure
  *
  * @return 0
  *
  * @throws none
  */
 SEC("kprobe/__icmp_send")
-int BPF_KPROBE(__icmp_send, struct sk_buff *skb, int type) {
+int BPF_KPROBE(__icmp_send, struct sk_buff *skb, __u8 type, __u8 code,
+               __be32 info, const struct ip_options *opt) {
   statkey key;
   __builtin_memset(&key, 0, sizeof(key));
 
@@ -782,13 +786,16 @@ int BPF_KPROBE(__icmp_send, struct sk_buff *skb, int type) {
  *
  * @param skb pointer to the socket buffer containing the ICMPv6 packet
  * @param type type of ICMPv6 packet
+ * @param code code of ICMPv6 packet
+ * @param info additional information for the ICMPv6 packet
  *
  * @return 0
  *
  * @throws none
  */
 SEC("kprobe/icmp6_send")
-int BPF_KPROBE(icmp6_send, struct sk_buff *skb, int type) {
+int BPF_KPROBE(icmp6_send, struct sk_buff *skb, __u8 type, __u8 code,
+               __u32 info) {
   statkey key;
   __builtin_memset(&key, 0, sizeof(key));
 
@@ -811,14 +818,13 @@ int BPF_KPROBE(icmp6_send, struct sk_buff *skb, int type) {
  * counters in the packet count map.
  *
  * @param skb pointer to the socket buffer containing the ICMP packet
- * @param type type of ICMP packet
  *
  * @return 0
  *
  * @throws none
  */
 SEC("kprobe/icmp_rcv")
-int BPF_KPROBE(icmp_rcv, struct sk_buff *skb, int type) {
+int BPF_KPROBE(icmp_rcv, struct sk_buff *skb) {
   statkey key;
   __builtin_memset(&key, 0, sizeof(key));
 
@@ -841,14 +847,13 @@ int BPF_KPROBE(icmp_rcv, struct sk_buff *skb, int type) {
  * counters in the packet count map.
  *
  * @param skb pointer to the socket buffer containing the ICMPv6 packet
- * @param type type of ICMPv6 packet
  *
  * @return 0
  *
  * @throws none
  */
 SEC("kprobe/icmpv6_rcv")
-int BPF_KPROBE(icmpv6_rcv, struct sk_buff *skb, int type) {
+int BPF_KPROBE(icmpv6_rcv, struct sk_buff *skb) {
   statkey key;
   __builtin_memset(&key, 0, sizeof(key));
 

main.go

@@ -87,7 +87,7 @@ func main() {
 		links = startXDP(objs, iface, links)
 	// TC
 	default:
-		startTC(objs, iface, links)
+		links = startTC(objs, iface, links)
 	}
 
 	c1, cancel := context.WithCancel(context.Background())
@@ -108,6 +108,8 @@ func main() {
 		}()
 
 		if *timeout > 0 {
+			log.Printf("Listening for %v before exiting", durafmt.Parse(*timeout))
+
 			go func() {
 				time.Sleep(*timeout)
 				cancel()
@@ -173,8 +175,7 @@ func startKProbes(hooks []kprobeHook, links []link.Link) []link.Link {
 		links = append(links, l)
 	}
 
-	log.Printf("Using KProbes mode w/ PID tracking, listening for %v",
-		durafmt.Parse(*timeout))
+	log.Printf("Using KProbes mode w/ PID/comm tracking")
 
 	return links
 }
@@ -222,9 +223,9 @@ func startXDP(objs counterObjects, iface *net.Interface, links []link.Link) []li
 
 	links = append(links, l)
 
-	log.Printf("Starting on interface %q using XDP (eXpress Data Path) eBPF mode, listening for %v",
-		*ifname, durafmt.Parse(*timeout))
+	log.Printf("Starting on interface %q using XDP (eXpress Data Path) eBPF mode", *ifname)
 	log.Printf("Due to XDP mode, egress statistics are not available. Upon program exit, interface reset may happen on some cards.")
+
 	return links
 }
 
@@ -247,7 +248,7 @@ func startXDP(objs counterObjects, iface *net.Interface, links []link.Link) []li
 //
 //	[]link.Link: The updated slice of link.Link objects, now including the newly
 //	             attached TC links.
-func startTC(objs counterObjects, iface *net.Interface, links []link.Link) {
+func startTC(objs counterObjects, iface *net.Interface, links []link.Link) []link.Link {
 	var l link.Link
 
 	err := features.HaveProgramType(ebpf.SchedACT)
@@ -284,6 +285,7 @@ func startTC(objs counterObjects, iface *net.Interface, links []link.Link) {
 
 	links = append(links, l)
 
-	log.Printf("Starting on interface %q using TC (Traffic Control) eBPF mode, listening for %v",
-		*ifname, durafmt.Parse(*timeout))
+	log.Printf("Starting on interface %q using TC (Traffic Control) eBPF mode", *ifname)
+
+	return links
 }

tui.go

@@ -90,7 +90,7 @@ func drawTUI(objs counterObjects, startTime time.Time) {
 	// navigation
 	naviView := tview.NewTextView().
 		SetTextColor(tcell.ColorYellow)
-	naviView.SetText("Press 'q' or 'x' to exit. Press 'r' or 'l' for a redraw.")
+	naviView.SetText("Use cursor keys to move through the table. Press 'q' or 'x' to exit. Press 'r' or 'l' for a redraw.")
 
 	// grid layout
 	grid := tview.NewGrid().SetRows(2, 0, 2).