[networking] Add standard network headers to libc, remove kernel headers from network apps

Author: ghaerr

elks/include/linuxmt/in.h

@@ -11,9 +11,9 @@ struct sockaddr_in {
     struct in_addr sin_addr;
 };
 
-#define INADDR_ANY	((unsigned long) 0x00000000)
-#define PORT_ANY	((unsigned short) 0x0000)
-#define INADDR_NODE	0xffffffff
-#define INADDR_LOOPBACK	0x7f000001
+#define INADDR_ANY      ((unsigned long) 0x00000000)
+#define PORT_ANY        ((unsigned short) 0x0000)
+#define INADDR_NONE     ((unsigned long) 0xffffffff)
+#define INADDR_LOOPBACK ((unsigned long) 0x7f000001)
 
 #endif

elkscmd/inet/httpd/httpd.c

@@ -30,14 +30,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#ifndef __linux__
-#include <linuxmt/in.h>
-#include <linuxmt/net.h>
-#include <linuxmt/arpa/inet.h>
-#else
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#endif
 #include <sys/wait.h>
 extern pid_t waitpid(pid_t, int *, int);
 

elkscmd/inet/nettools/arp.c

@@ -13,27 +13,15 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linuxmt/net.h>
-#include <linuxmt/in.h>
 #include <ktcp/tcp.h>
 #include <ktcp/netconf.h>
 #include <ktcp/deveth.h>
 #include <ktcp/arp.h>
-#include <linuxmt/arpa/inet.h>
+#include <arpa/inet.h>
 
 struct sockaddr_in localadr,remaddr;
 struct arp_cache arp_cache[ARP_CACHE_MAX];
 
-char *in_ntoa(ipaddr_t in)
-{
-    register unsigned char *p;
-    static char b[18];
-
-    p = (unsigned char *)&in;
-    sprintf(b, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
-    return b;
-}
-
 char *mac_ntoa(eth_addr_t eth_addr)
 {
 	unsigned char *p = (unsigned char *)eth_addr;

elkscmd/inet/nettools/netstat.c

@@ -23,11 +23,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linuxmt/net.h>
-#include <linuxmt/in.h>
+#include <arpa/inet.h>
 #include <ktcp/tcp.h>
 #include <ktcp/netconf.h>
-#include <linuxmt/arpa/inet.h>
 
 char tcp_states[11][13] = {
 	"CLOSED",

elkscmd/inet/nettools/nslookup.c

@@ -1,19 +1,10 @@
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <sys/socket.h>
-
-#ifndef __linux__ 
-#include <linuxmt/un.h>
-#include <linuxmt/in.h>
-#include "linuxmt/arpa/inet.h"
-#else
-#include <sys/types.h>
+#include <arpa/inet.h>
 #include <netdb.h>
-#endif
 
 struct DNS_HEADER
 {
@@ -32,28 +23,6 @@ struct QUESTION
     __u16 qclass;
 };
 
-unsigned long int in_aton(const char *str)
-{
-    unsigned long l = 0;
-    unsigned int val;
-    int i;
-
-    for (i = 0; i < 4; i++) {
-	l <<= 8;
-	if (*str != '\0') {
-	    val = 0;
-	    while (*str != '\0' && *str != '.') {
-		val *= 10;
-		val += *str++ - '0';
-	    }
-	    l |= val;
-	    if (*str != '\0')
-		str++;
-	}
-    }
-    return htonl(l);
-}
-
 /* convert e.g. www.google.com (host) to 3www6google3com (dns) */
 void ChangetoDnsNameFormat(unsigned char* dns,unsigned char* host) 
 {
@@ -147,7 +116,7 @@ int main(int argc, char *argv[]) {
   addr.sin_family = AF_INET;
   nameserver=get_dns_server();
   printf("Nameserver queried:%s\n",nameserver);
-  addr.sin_addr.s_addr = in_aton(nameserver); 
+  addr.sin_addr.s_addr = in_gethostbyname(nameserver);
   addr.sin_port = htons(53);
 
   if (connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == -1) {

elkscmd/inet/telnet/Makefile

@@ -12,7 +12,7 @@ include $(BASEDIR)/Make.rules
 
 ###############################################################################
 
-SRCS = ttn.c ttn_conf.c netlib.c
+SRCS = ttn.c ttn_conf.c
 OBJS = $(SRCS:.c=.o)
 
 all:	telnet

elkscmd/inet/telnet/netlib.h

@@ -18,19 +18,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
-
-#ifndef __linux__
-#include <linuxmt/in.h>
-#include <linuxmt/net.h>
-#include <linuxmt/time.h>
-#include <linuxmt/arpa/inet.h>
-#include "netlib.h"
-#else
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#endif
-
 #include "ttn.h"
 
 //#define DEBUG 1

elkscmd/inet/telnet/ttn.c

@@ -13,11 +13,9 @@
 #include <termios.h>
 #include <signal.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <linuxmt/socket.h>
-#include <linuxmt/in.h>
-#include <linuxmt/arpa/inet.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 #include "telnet.h"
 
 //#define RAWTELNET	/* set in telnet and telnetd for raw telnet without IAC*/

elkscmd/inet/telnetd/telnetd.c

@@ -56,15 +56,8 @@
 #include <sys/time.h>
 #include <fcntl.h>
 #include <sys/socket.h>
-#ifdef ELKS
-#include <linuxmt/in.h>
-#include <linuxmt/net.h>
-#include <linuxmt/time.h>
-#include <linuxmt/arpa/inet.h>
-#else
 #include <netinet/in.h>
 #include <netdb.h>
-#endif
 #include <signal.h>
 #include <utmp.h>
 struct dlist {
@@ -111,31 +104,6 @@ int _res_flg;
 	(void) ioctl(my_tty, TIOCSETP, &_tty))
 #endif
 #endif
-#ifdef ELKS
-unsigned long int in_aton(str)
-const char *str;
-{
-    unsigned long l = 0;
-    unsigned int val;
-    int i;
-
-    for (i = 0; i < 4; i++) {
-        l <<= 8;
-        if (*str != '\0') {
-            val = 0;
-            while (*str != '\0' && *str != '.') {
-                val *= 10;
-                val += *str - '0';
-                str++;
-            }
-            l |= val;
-            if (*str != '\0')
-            str++;
-        }
-    }
-    return(htonl(l));
-}
-#endif
 int putchar_x(c)
 int c;
 {
@@ -933,7 +901,7 @@ char *hostname;
 	sa.sin_port = htons((unsigned short) IRCPORT);
 	s = socket(hp->h_addrtype, SOCK_STREAM, 0);
 #else
-	sa.sin_addr.s_addr = in_aton(hostname);
+	sa.sin_addr.s_addr = in_gethostbyname(hostname);
 	sa.sin_family = AF_INET;
 	sa.sin_port = htons((unsigned short) IRCPORT);
 	s = socket(AF_INET, SOCK_STREAM, 0);