From: Philip Homburg <philip@cs.vu.nl>
Date: Wed, 3 Aug 2005 11:28:43 +0000 (+0000)
Subject: Removed old socket library.
X-Git-Tag: v3.1.0~468
X-Git-Url: http://zhaoyanbai.com/repos/man.rndc.conf.html?a=commitdiff_plain;h=343bd97aeb6cb25a2542fbaf0b51fd552f0d848a;p=minix.git

Removed old socket library.
---

diff --git a/include/net/gen/emu.h b/include/net/gen/emu.h
deleted file mode 100644
index a020290d8..000000000
--- a/include/net/gen/emu.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-emu.h - bsd sockets lookalike interface
-*/
-
-#ifndef __EMU_H__
-#define __EMU_H__
-
-typedef int socklen_t;
-typedef int sa_family_t;
-typedef int in_port_t;
-typedef unsigned long sin_addr_t;
-typedef unsigned long in_addr_t;
-
-/* generic socket address */
-struct sockaddr {
-	unsigned char	sa_len;		/* total address size */
-	sa_family_t	sa_family;	/* address type (family) */
-	char		sa_data[14];	/* family-dependent addr (may be longer) */
-};
-
-struct in_addr {
-	in_addr_t	s_addr;
-};
-
-/* internet-domain (AF_INET) socket address */
-struct sockaddr_in {
-	unsigned char	sin_len;
-	sa_family_t	sin_family;
-	in_port_t	sin_port;
-	struct in_addr	sin_addr;
-	char		sin_zero[8];
-};
-
-/* type argument to socket() */
-#define SOCK_STREAM	2
-#define SOCK_DGRAM	3
-
-/* protocol argument to socket() */
-#define IPPROTO_ICMP	1
-#define IPPROTO_TCP	6
-#define IPPROTO_UDP	17
-
-/* 2nd args to shutdown() */
-#define SHUT_RD		0
-#define SHUT_WR		1
-#define SHUT_RDWR	2
-
-/* bsd-lookalike functions */
-int socket(int, int, int);
-int bind(int, struct sockaddr *, socklen_t);
-int listen(int, int);
-int shutdown(int, int);
-int connect(int, struct sockaddr *, socklen_t);
-
-int recv(int s, void *buf, size_t len, int flags);
-int send(int s, void *buf, size_t len, int flags);
-
-#endif /* __EMU_H__ */
-
diff --git a/include/net/socket.h b/include/net/socket.h
deleted file mode 100644
index 7e17a470a..000000000
--- a/include/net/socket.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef __NET_SOCKET_H__
-#define __NET_SOCKET_H__ 1
-
-#include <sys/types.h>
-#include <net/hton.h>
-#include <net/gen/in.h>
-#include <net/gen/socket.h>
-#include <net/gen/emu.h>
-#include <net/gen/netdb.h>
-
-#endif 
-
diff --git a/lib/Makefile b/lib/Makefile
index a918b0f94..f5bd6c3fb 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,7 +30,7 @@ all:
 	test `arch` = i86 || { cd regex && $(MAKE); }
 	cd rts && $(MAKE)
 	cd stdio && $(MAKE)
-	cd socket && $(MAKE)
+	#cd socket && $(MAKE)
 	cd syscall && $(MAKE)
 	cd syslib && $(MAKE)
 	cd util && $(MAKE)
@@ -144,7 +144,7 @@ install_i386:	\
 	$(LIB386)/libcurses.a \
 	$(LIB386)/libedit.a \
 	$(LIB386)/liby.a \
-	$(LIB386)/libsocket.a \
+#	$(LIB386)/libsocket.a \
 #	$(LIB86)/libc.a \
 #	$(LIB86)/end.a \
 
@@ -202,9 +202,9 @@ $(LIB386)/libedit.a:	libedit.a
 $(LIB386)/liby.a:	liby.a
 	install -c -o bin $? $@
 
-$(LIB386)/libsocket.a:	libsocket.a
-	install -c -o bin $? $@
-
+#$(LIB386)/libsocket.a:	libsocket.a
+#	install -c -o bin $? $@
+#
 #$(LIB86)/libc.a:	libc86.a
 #	install -c -o bin $? $@
 #