From 0f2e60171c5104a9a2ad17f1e970f3cd09cefcce Mon Sep 17 00:00:00 2001 From: Brendan Gregg Date: Wed, 21 Mar 2018 15:30:49 -0700 Subject: [PATCH] fix ipv6 struct alignment --- tools/tcpstates.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tcpstates.py b/tools/tcpstates.py index 0c48f51f87c2..24a4290efa36 100755 --- a/tools/tcpstates.py +++ b/tools/tcpstates.py @@ -70,9 +70,9 @@ u64 ts_us; u64 skaddr; u64 pid; + u64 ports; u64 saddr; u64 daddr; - u64 ports; u64 span_us; u64 oldstate; u64 newstate; @@ -84,9 +84,9 @@ u64 ts_us; u64 skaddr; u64 pid; + u64 ports; unsigned __int128 saddr; unsigned __int128 daddr; - u64 ports; u64 span_us; u64 oldstate; u64 newstate; @@ -193,9 +193,9 @@ class Data_ipv4(ct.Structure): ("ts_us", ct.c_ulonglong), ("skaddr", ct.c_ulonglong), ("pid", ct.c_ulonglong), + ("ports", ct.c_ulonglong), ("saddr", ct.c_ulonglong), ("daddr", ct.c_ulonglong), - ("ports", ct.c_ulonglong), ("span_us", ct.c_ulonglong), ("oldstate", ct.c_ulonglong), ("newstate", ct.c_ulonglong), @@ -207,9 +207,9 @@ class Data_ipv6(ct.Structure): ("ts_us", ct.c_ulonglong), ("skaddr", ct.c_ulonglong), ("pid", ct.c_ulonglong), + ("ports", ct.c_ulonglong), ("saddr", (ct.c_ulonglong * 2)), ("daddr", (ct.c_ulonglong * 2)), - ("ports", ct.c_ulonglong), ("span_us", ct.c_ulonglong), ("oldstate", ct.c_ulonglong), ("newstate", ct.c_ulonglong),