Add support for `-V' to slattach and plipconfig

Add support for netstat --groups, from Tuan Hoang.
Add support for netstat --programs, from Jan Kratochvil
Don't delete .pot files when making clean in po/
Bump VERSION to 1.51

Makefile

@@ -92,7 +92,7 @@ RESLIB = # -L/usr/inet6/lib -linet6
 # -------- end of user definitions --------
 
 MAINTAINER = Philip.Blundell@pobox.com
-RELEASE	   = 1.50
+RELEASE	   = 1.51
 
 .EXPORT_ALL_VARIABLES:
 

README

@@ -28,7 +28,15 @@ Contents:
                           Notes
                           -----
 
-This is net-tools 1.50.  Notable changes since 1.49 include:
+This is net-tools 1.51.  Notable changes since 1.50 include:
+
+ - a compilation problem with 2.0 kernels has been fixed
+ - Tuan Hoang added support to netstat for printing multicast group 
+   information (option --groups)
+ - Jan Kratochvil added support to netstat for displaying details of
+   the process owning a socket (option --programs)
+
+Notable changes since 1.49 include:
 
  - netstat supports a new option `--listening' to show only listening
    sockets.

lib/pathnames.h

@@ -11,6 +11,8 @@
  */
 
 /* pathnames of the procfs files used by NET. */
+#define _PATH_PROCNET_IGMP		"/proc/net/igmp"
+#define _PATH_PROCNET_IGMP6		"/proc/net/igmp6"
 #define _PATH_PROCNET_TCP		"/proc/net/tcp"
 #define _PATH_PROCNET_TCP6		"/proc/net/tcp6"
 #define _PATH_PROCNET_UDP		"/proc/net/udp"

man/en_US/netstat.8

@@ -39,7 +39,7 @@ netstat \- Display network connections, routing tables, interface statistics, ma
 .PP
 
 .B netstat
-.RB [ \-veenac ]
+.RB [ \-veenpac ]
 .RB { \-\-interfaces | \-i }
 .RI [ iface ]
 
@@ -77,7 +77,9 @@ you get some additional informations (userid). With the
 switch you can make netstat complain about known address families which are
 not supported by the kernel. The
 .B -o
-option displays some additional information on networking timers. 
+option displays some additional information on networking timers. Enabling the
+.B -p
+will show you the process PID and name of the program holding the socket.
 .B -a
 print all sockets, including the listening server sockets. The address
 family
@@ -143,6 +145,13 @@ usefull informations about unconfigured address families.
 shows numerical addresses instead of trying to determine symbolic host, port
 or user names.
 
+.SS "\-p, \-\-programs"
+displays process name and PID of the owner of each socket it dumps. You
+have to be the owner of such process to have all it's sockets matched to it
+or generally
+.B root
+user will see all the necessary information in place.
+
 .SS "\-A, \-\-af \fIfamily\fI"
 use a different method to set the address families.
 .I family 
@@ -260,6 +269,16 @@ The state of the socket is unknown.
 .SS "User"
 The name or the UID of the owner of the socket.
 
+.SS "PID/Program name"
+Slash-separated pair of the PID and process name of the program holding
+this socket. Option
+.B -p
+enables display of this column. You will also need
+.B root
+privileges as you have to have access rights to process to be able to see
+the program's sockets matched up to it. This identification information
+is not yet available for IPX sockets.
+
 .SS "Timer"
 (this needs to be written)
 
@@ -352,6 +371,11 @@ The socket is not connected to another one.
 UNKNOWN
 This state should never happen.
 
+.SS "PID/Program name"
+PID and process name of the program holding this socket. More info available in
+.B "Active Internet connections"
+section written above.
+
 .SS "Path"
 This displays the path name as which the corresponding processes attached
 to the socket.

plipconfig.c

@@ -40,6 +40,9 @@
 #include "config.h"
 #include "intl.h"
 
+#include "net-support.h"
+#include "version.h"
+
 int opt_a = 0;
 int opt_i = 0;
 int opt_v = 0;
@@ -48,10 +51,21 @@ int skfd = -1;
 struct ifreq ifr;
 struct plipconf *plip;
 
+char *Release = RELEASE,
+     *Version = "plipconfig 0.2",
+     *Signature = "John Paul Morrison, Alan Cox et al.";
+
+static void version(void)
+{
+    printf("%s\n%s\n%s\n", Release, Version, Signature);
+    exit(E_VERSION);
+}
+
 void usage(void)
 {
     fprintf(stderr, _("Usage: plipconfig [-a] [-i] [-v] interface\n"));
     fprintf(stderr, _("                  [nibble NN] [trigger NN]\n"));
+    fprintf(stderr, _("       plipconfig -V\n"));
     exit(-1);
 }
 
@@ -77,6 +91,8 @@ int main(int argc, char **argv)
 	    opt_a = 1;
 	if (!strcmp(*argv, "-v"))
 	    opt_v = 1;
+	if (!strcmp(*argv, "-V"))
+	    version();
 	argv++;
 	argc--;
     }

po/Makefile

@@ -51,7 +51,7 @@ update-po: Makefile
 	done
 
 clean:
-	rm -f *mo $(NLSPACKAGE).pot
+	rm -f *mo
 
 distclean: clean
 	rm -f .depend Makefile

slattach.c

@@ -67,7 +67,8 @@
 
 
 char *Release = RELEASE,
-     *Version = "@(#) slattach 1.1.91 (12-Feb-95)";
+     *Version = "@(#) slattach 1.1.91 (12-Feb-95)",
+     *Signature = "Fred N. van Kempen et al.";
 
 
 struct {
@@ -541,13 +542,22 @@ usage(void)
 #ifdef SIOCSOUTFILL
 	  "[-o outfill] "
 #endif
-	  "[-c cmd] [-s speed] [-p protocol] tty | -\n";
+	  "[-c cmd] [-s speed] [-p protocol] tty | -\n"
+	  "       slattach -V\n";
 
   fprintf(stderr, usage_msg);
   exit(1);
 }
 
 
+static void 
+version(void)
+{
+    printf("%s\n%s\n%s\n", Release, Version, Signature);
+    exit(E_VERSION);
+}
+
+
 int
 main(int argc, char *argv[])
 {
@@ -564,7 +574,7 @@ main(int argc, char *argv[])
 
   /* Scan command line for any arguments. */
   opterr = 0;
-  while ((s = getopt(argc, argv, "c:ehlLmnp:qs:vd"
+  while ((s = getopt(argc, argv, "c:ehlLmnp:qs:vdV"
 #ifdef SIOCSKEEPALIVE
 		     "k:"
 #endif
@@ -632,8 +642,13 @@ main(int argc, char *argv[])
 		opt_v = 1 - opt_v;
 		break;
 
+        case 'V':
+		version();
+		/*NOTREACHED*/
+
 	default:
 		usage();
+		/*NOTREACHED*/
   }
   
   activate_init();