Switch IPv4 saddr/daddr to u32's within tools/tcpstates.py (#1862)
make types appropriate for ipaddr/protocol etc.
diff --git a/tools/tcpaccept.py b/tools/tcpaccept.py
index d52d209..eab6627 100755
--- a/tools/tcpaccept.py
+++ b/tools/tcpaccept.py
@@ -51,22 +51,22 @@
struct ipv4_data_t {
// XXX: switch some to u32's when supported
u64 ts_us;
- u64 pid;
+ u32 pid;
u32 saddr;
u32 daddr;
u64 ip;
- u64 lport;
+ u16 lport;
char task[TASK_COMM_LEN];
};
BPF_PERF_OUTPUT(ipv4_events);
struct ipv6_data_t {
u64 ts_us;
- u64 pid;
+ u32 pid;
unsigned __int128 saddr;
unsigned __int128 daddr;
u64 ip;
- u64 lport;
+ u16 lport;
char task[TASK_COMM_LEN];
};
BPF_PERF_OUTPUT(ipv6_events);
@@ -212,22 +212,22 @@
class Data_ipv4(ct.Structure):
_fields_ = [
("ts_us", ct.c_ulonglong),
- ("pid", ct.c_ulonglong),
+ ("pid", ct.c_uint),
("saddr", ct.c_uint),
("daddr", ct.c_uint),
("ip", ct.c_ulonglong),
- ("lport", ct.c_ulonglong),
+ ("lport", ct.c_ushort),
("task", ct.c_char * TASK_COMM_LEN)
]
class Data_ipv6(ct.Structure):
_fields_ = [
("ts_us", ct.c_ulonglong),
- ("pid", ct.c_ulonglong),
+ ("pid", ct.c_uint),
("saddr", (ct.c_ulonglong * 2)),
("daddr", (ct.c_ulonglong * 2)),
("ip", ct.c_ulonglong),
- ("lport", ct.c_ulonglong),
+ ("lport", ct.c_ushort),
("task", ct.c_char * TASK_COMM_LEN)
]