]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ss: Make sstate_name local to sock_state_print()
authorPhil Sutter <phil@nwl.cc>
Fri, 2 Dec 2016 10:40:00 +0000 (11:40 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 2 Dec 2016 22:07:47 +0000 (14:07 -0800)
Signed-off-by: Phil Sutter <phil@nwl.cc>
misc/ss.c

index 1609cddde8eaaaa192499201f5378b6832306b23..a502fc5cab524483e45a1350aef92ebff51ba951 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -655,21 +655,6 @@ static unsigned long long cookie_sk_get(const uint32_t *cookie)
        return (((unsigned long long)cookie[1] << 31) << 1) | cookie[0];
 }
 
-static const char *sstate_name[] = {
-       "UNKNOWN",
-       [SS_ESTABLISHED] = "ESTAB",
-       [SS_SYN_SENT] = "SYN-SENT",
-       [SS_SYN_RECV] = "SYN-RECV",
-       [SS_FIN_WAIT1] = "FIN-WAIT-1",
-       [SS_FIN_WAIT2] = "FIN-WAIT-2",
-       [SS_TIME_WAIT] = "TIME-WAIT",
-       [SS_CLOSE] = "UNCONN",
-       [SS_CLOSE_WAIT] = "CLOSE-WAIT",
-       [SS_LAST_ACK] = "LAST-ACK",
-       [SS_LISTEN] =   "LISTEN",
-       [SS_CLOSING] = "CLOSING",
-};
-
 static const char *sctp_sstate_name[] = {
        [SCTP_STATE_CLOSED] = "CLOSED",
        [SCTP_STATE_COOKIE_WAIT] = "COOKIE_WAIT",
@@ -821,6 +806,20 @@ static const char *proto_name(int protocol)
 static void sock_state_print(struct sockstat *s)
 {
        const char *sock_name;
+       static const char * const sstate_name[] = {
+               "UNKNOWN",
+               [SS_ESTABLISHED] = "ESTAB",
+               [SS_SYN_SENT] = "SYN-SENT",
+               [SS_SYN_RECV] = "SYN-RECV",
+               [SS_FIN_WAIT1] = "FIN-WAIT-1",
+               [SS_FIN_WAIT2] = "FIN-WAIT-2",
+               [SS_TIME_WAIT] = "TIME-WAIT",
+               [SS_CLOSE] = "UNCONN",
+               [SS_CLOSE_WAIT] = "CLOSE-WAIT",
+               [SS_LAST_ACK] = "LAST-ACK",
+               [SS_LISTEN] =   "LISTEN",
+               [SS_CLOSING] = "CLOSING",
+       };
 
        switch (s->local.family) {
        case AF_UNIX: