svn commit: r201423 - user/kmacy/releng_8_rump/lib/libunet

[Kip Macy]

Author: kmacy
Date: Sun Jan  3 09:52:36 2010
New Revision: 201423
URL: http://svn.freebsd.org/changeset/base/201423

Log:
  - enable ipv4
  - further reduce undefined symbols by ~35%

Modified:
  user/kmacy/releng_8_rump/lib/libunet/Makefile
  user/kmacy/releng_8_rump/lib/libunet/opt_inet.h

Modified: user/kmacy/releng_8_rump/lib/libunet/Makefile
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/Makefile	Sun Jan  3 09:31:33 2010	(r201422)
+++ user/kmacy/releng_8_rump/lib/libunet/Makefile	Sun Jan  3 09:52:36 2010	(r201423)
@@ -2,6 +2,7 @@
 PREFIX= ${.CURDIR}/../../sys
 
 .PATH: ${PREFIX}/kern
+.PATH: ${PREFIX}/libkern
 .PATH: ${PREFIX}/net
 .PATH: ${PREFIX}/netinet
 
@@ -9,26 +10,39 @@ LIB=	unet
 
 UNET_KERN_COMMON_OBJS +=	\
 	kern_mbuf.o		\
+	kern_subr.o		\
+	subr_eventhandler.o	\
+	subr_sbuf.o		\
 	uipc_mbuf.o		\
 	uipc_mbuf2.o		\
+	uipc_domain.o		\
 	uipc_sockbuf.o		\
 	uipc_socket.o
 
 UNET_NET_COMMON_OBJS +=		\
 	if.o			\
+	if_clone.o		\
+	if_dead.o		\
+	if_ether.o		\
 	if_loop.o		\
+	if_llatbl.o		\
 	netisr.o		\
+	pfil.o			\
 	radix.o			\
+	raw_cb.o		\
+	raw_usrreq.o		\
 	route.o			\
 	rtsock.o		
 
 UNET_NETINET_COMMON_OBJS +=	\
-	if_ether.o		\
+	igmp.o			\
 	in.o			\
 	in_cksum.o		\
+	in_mcast.o		\
 	in_pcb.o		\
 	in_proto.o		\
 	in_rmx.o		\
+	ip_encap.o		\
 	ip_icmp.o		\
 	ip_id.o			\
 	ip_input.o		\
@@ -50,6 +64,19 @@ UNET_NETINET_COMMON_OBJS +=	\
 	tcp_usrreq.o		\
 	udp_usrreq.o
 
+UNET_LIBKERN_COMMON_OBJS =	\
+	bcmp.o			\
+	inet_aton.o		\
+	inet_ntoa.o		\
+	memcmp.o		\
+	strcat.o		\
+	strcmp.o		\
+	strcpy.o		\
+	strlcpy.o		\
+	strlen.o		\
+	strncmp.o		\
+	strtoul.o
+
 UNET_GLUE_COMMON_OBJS =		\
 	unet_init.o		\
 	unet_uipc_syscalls.o
@@ -57,6 +84,7 @@ UNET_GLUE_COMMON_OBJS =		\
 
 UNET_COMMON_OBJS =			\
 	${UNET_KERN_COMMON_OBJS}	\
+	${UNET_LIBKERN_COMMON_OBJS}	\
 	${UNET_NET_COMMON_OBJS}		\
 	${UNET_NETINET_COMMON_OBJS}	
 
@@ -67,6 +95,7 @@ SRCS=	${UNET_COMMON_SRCS}
 CFLAGS+=	-I${PREFIX}
 CFLAGS+=	-I.
 CFLAGS+=	-D_KERNEL
+CFLAGS+=	-DUNET
 CFLAGS+=	-fno-builtin
 
 .include <bsd.lib.mk>

Modified: user/kmacy/releng_8_rump/lib/libunet/opt_inet.h
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/opt_inet.h	Sun Jan  3 09:31:33 2010	(r201422)
+++ user/kmacy/releng_8_rump/lib/libunet/opt_inet.h	Sun Jan  3 09:52:36 2010	(r201423)
@@ -0,0 +1 @@
+#define INET 1