X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2Flib%2Flogin_functions.sh;h=ac788be8fe482d84515efd91f31765b92786c831;hb=8bb31e8f1389a16449f504cffb8aaa66c112ba40;hp=2b985e6de0b55b2f8c0c004b72bca277041d6b4b;hpb=e5eff223aee1f17ae09f1f51e6c52bafc4603491;p=khome.git

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 2b985e6..ac788be 100644
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -149,8 +149,7 @@ tdu() {
             sub("^" $1 "\t+", "", path)
             gb = size / 1024 / 1024
             printf("%f\t%s\n", gb, path)
-        }' \
-    | cut -c 1-115
+        }'
 }
 
 # Top Disk-Using Files
@@ -584,21 +583,36 @@ status() {
 
     echo "${indent_unit}-->"
 
-    printf '%sUDP: ' "${indent_unit}${indent_unit}"
-    sudo -n netstat -ulnp \
-    | awk 'NR > 2 {print $6}' \
-    | awk -F/ '{print $2}' \
-    | sort -u \
-    | xargs \
-    | column -t
-
-    printf '%sTCP: ' "${indent_unit}${indent_unit}"
-    sudo -n netstat -tlnp \
-    | awk 'NR > 2 {print $7}' \
-    | awk -F/ '{print $2}' \
-    | sort -u \
-    | xargs \
-    | column -t
+    sudo -n netstat -tulnp \
+    | awk -v indent="${indent_unit}${indent_unit}" '
+        NR > 2 && ((/^tcp/ && proc = $7) || (/^udp/ && proc = $6)) {
+	    protocol = $1
+	    addr = $4
+	    port = a[split(addr, a, ":")]
+	    name = p[split(proc, p, "/")]
+	    names[name] = 1
+	    protocols[protocol] = 1
+	    if (!seen[protocol, name, port]++)
+		ports[protocol, name, ++seen[protocol, name]] = port
+	}
+
+	END {
+	    for (protocol in protocols) {
+		printf "%s%s\t", indent, toupper(protocol)
+		for (name in names) {
+		    if (n = seen[protocol, name]) {
+			sep = ""
+			printf "%s:", name
+			for (i = 1; i <= n; i++) {
+			    printf "%s%d", sep, ports[protocol, name, i]
+			    sep = ","
+			}
+			printf "  "
+		    }
+		}
+		printf "\n"
+	    }
+	}'
 
     echo "${indent_unit}<->"