Merge pull request #24 from coroot/non_blocking_tcp_connect

Fix TCP connection timestamp handling

Author: def

containers/container.go

@@ -562,7 +562,7 @@ func (c *Container) onL7Request(pid uint32, fd uint64, timestamp uint64, r *ebpf
 	c.lock.Lock()
 	defer c.lock.Unlock()
 	for dest, conn := range c.connectionsActive {
-		if conn.Pid == pid && conn.Fd == fd && (conn.Timestamp == 0 || conn.Timestamp == timestamp) {
+		if conn.Pid == pid && conn.Fd == fd && (timestamp == 0 || conn.Timestamp == timestamp) {
 			key := AddrPair{src: dest.dst, dst: conn.ActualDest}
 			stats := c.l7Stats[r.Protocol]
 			if stats == nil {

ebpftracer/ebpf.go

@@ -163,10 +163,6 @@ int sys_enter_connect(void *ctx) {
     }
     __u64 id = bpf_get_current_pid_tgid();
     bpf_map_update_elem(&fd_by_pid_tgid, &id, &args.fd, BPF_ANY);
-    struct sk_info k = {};
-    k.pid = id >> 32;
-    k.fd = args.fd;
-    bpf_map_delete_elem(&connection_timestamps, &k);
     return 0;
 }