[net,cmds] Light cleanup of unused network/cmds code, add UDP display to netstat

elks/include/linuxmt/net.h

@@ -61,8 +61,6 @@ struct proto_ops {
     int (*select) ();
     int (*ioctl) ();
     int (*listen) ();
-    int (*send) ();
-    int (*recv) ();
 };
 #endif
 

elks/net/ipv4/af_inet.c

@@ -418,24 +418,6 @@ static int inet_select(register struct socket *sock, int sel_type)
     return 0;
 }
 
-static int inet_send(struct socket *sock, void *buff, int len, int nonblock,
-                     unsigned int flags)
-{
-    if (flags != 0)
-        return -EINVAL;
-
-    return inet_write(sock, buff, len, nonblock);
-}
-
-static int inet_recv(struct socket *sock, void *buff, int len, int nonblock,
-                     unsigned int flags)
-{
-    if (flags != 0)
-        return -EINVAL;
-
-    return inet_read(sock, buff, len, nonblock);
-}
-
 static int inet_getname(struct socket *sock, struct sockaddr *usockaddr,
         int *usockaddr_len, int peer)
 {
@@ -462,6 +444,26 @@ int not_implemented(void)
     return 0;
 }
 
+#if UNUSED
+static int inet_send(struct socket *sock, void *buff, int len, int nonblock,
+                     unsigned int flags)
+{
+    if (flags != 0)
+        return -EINVAL;
+
+    return inet_write(sock, buff, len, nonblock);
+}
+
+static int inet_recv(struct socket *sock, void *buff, int len, int nonblock,
+                     unsigned int flags)
+{
+    if (flags != 0)
+        return -EINVAL;
+
+    return inet_read(sock, buff, len, nonblock);
+}
+#endif
+
 static struct proto_ops inet_proto_ops = {
     AF_INET,
     inet_create,
@@ -477,8 +479,6 @@ static struct proto_ops inet_proto_ops = {
     inet_select,
     not_implemented,    /* inet_ioctl */
     inet_listen,
-    inet_send,
-    inet_recv,
 };
 
 void inet_proto_init(struct net_proto *pro)

elks/net/protocols.c

@@ -8,7 +8,6 @@
 
 extern void inet_proto_init();
 extern void unix_proto_init();
-extern void nano_proto_init();
 
 struct net_proto protocols[] = {
 #ifdef	CONFIG_UNIX

elks/net/unix/af_unix.c

@@ -537,27 +537,25 @@ static int unix_listen(struct socket *sock, int backlog)
     return 0;
 }
 
-static int unix_send(struct socket *sock,
-		     void *buff, int len, int nonblock, unsigned int flags)
+#if UNUSED
+static int unix_send(struct socket *sock, void *buff, int len, int nonblock,
+	unsigned int flags)
 {
     if (flags != 0)
 	return -EINVAL;
 
     return unix_write(sock, (char *) buff, len, nonblock);
 }
 
-/*
- *      Receive data. This version of AF_UNIX also lacks MSG_PEEK 8(
- */
-
-static int
-unix_recv(struct socket *sock, void *buff, int len, int nonblock, unsigned flags)
+static int unix_recv(struct socket *sock, void *buff, int len, int nonblock,
+	unsigned flags)
 {
     if (flags != 0)
 	return -EINVAL;
 
     return unix_read(sock, (char *) buff, len, nonblock);
 }
+#endif
 
 struct proto_ops unix_proto_ops = {
     PF_UNIX,
@@ -574,8 +572,6 @@ struct proto_ops unix_proto_ops = {
     unix_select,
     NULL,
     unix_listen,
-    unix_send,
-    unix_recv,
 };
 
 void unix_proto_init(struct net_proto *pro)

elkscmd/Make.install

@@ -228,7 +228,7 @@ install:
 		fi \
 	done < Filelist
 	rm Filelist
-	chmod 4755 $(DESTDIR)/bin/sudo 2>/dev/null || true
+	chmod 4755 $(DESTDIR)/bin/sudo || true
 ifdef CONFIG_APP_BUSYELKS
 	$(MAKE) -C busyelks links
 endif

elkscmd/busyelks/cmd/getty.c

@@ -76,7 +76,6 @@
 #include <unistd.h>
 
 #define LOGIN		"/bin/login"
-#define HOSTFILE	"/etc/HOSTNAME"
 #define ISSUE		"/etc/issue"
 
 char	Buffer[64];
@@ -88,32 +87,6 @@ char	Host[256], *Date = 0, *Time = 0;
 char	*nargv[3] = {NULL, NULL, NULL};
 int	ch, col = 0, fd;
 
-#ifndef SUPER_SMALL
-
-void host(void) {
-    char *ptr;
-    int fp = open(HOSTFILE,O_RDONLY), sz;
-
-    if (fp != NULL) {
-	sz = read( fp, Host, 255);
-	if (sz >= 0)
-	    Host[sz] = '\0';
-	else
-	    *Host = '\0';
-	close(fp);
-    }
-    for (ptr = Host; isprint(*ptr); ptr++)
-	/* Do nothing */;
-    while (ptr[-1] == ' ')
-	ptr--;
-    *ptr = '\0';
-    if (!*Host)
-	strcpy( Host, "LocalHost" );
-    debug1( "DEBUG: host() = <%s>\n", Host );
-}
-
-#endif
-
 void put(int ch) {
     if (ch == '\n' || ch == '\f')
 	col = 0;
@@ -208,7 +181,6 @@ void getty_main(int argc, char **argv) {
 	    write(1,Buffer,n);
 #else
 	when();
-	host();
 	*Buffer = '\0';
 	while (read(fd,Buffer,1) > 0) {
 	    ch = *Buffer;

elkscmd/inet/netstat.c

@@ -104,6 +104,8 @@ int main(int ac, char **av)
     printf("TCP Bad Checksum %7lu  TCP Retrans Memory%6u\n", ns->tcpbadchksum, retrans_mem);
     printf("IP Packets       %7lu  IP Packets       %7lu\n", ns->iprcvcnt, ns->ipsndcnt);
     printf("IP Bad Checksum  %7lu  IP Bad Headers   %7lu\n", ns->ipbadchksum, ns->ipbadhdr);
+    printf("UDP Packets      %7lu  UDP Packets      %7lu\n", ns->udprcvcnt, ns->udpsndcnt);
+    printf("UDP Dropped      %7lu  UDP No Port      %7lu\n", ns->udpdropcnt, ns->udpnoportcnt);
     printf("ICMP Packets     %7lu  ICMP Packets     %7lu\n", ns->icmprcvcnt, ns->icmpsndcnt);
     printf("SLIP Packets     %7lu  SLIP Packets     %7lu\n", ns->sliprcvcnt, ns->slipsndcnt);
     printf("ETH Packets      %7lu  ETH Packets      %7lu\n", ns->ethrcvcnt, ns->ethsndcnt);

elkscmd/ktcp/netconf.h

@@ -52,6 +52,7 @@ struct packet_stats_s {
 	__u32	udpsndcnt;
 	__u32	udprcvcnt;
 	__u32	udpnoportcnt;
+	__u32	udpdropcnt;
 };
 
 extern struct packet_stats_s netstats;