Passive receive adrian

Makefile

@@ -1,17 +1,23 @@
+include cflags.mk
 
 SUBDIRS=lib bin
 
+config all clean install maintainer-clean:
+	for d in $(SUBDIRS); do ( cd $$d && $(MAKE) $@) ||  exit 1 ; done
+	if [ "$@" = "all" -o "$@" = "install" ] ; then $(MAKE) $@-extra ; fi
+	#if [ "$@" = "all" ] ; then rm -f version.extended ; $(MAKE) version.extended ; fi
 easy_start: config all
 
-config:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) config ) ; done
+.PHONY: version.extended
 
-all:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) all ) ; done
+all-extra: version.extended
 
-clean:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) clean ) ; done
-
-install:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) install ) ; done
+install-extra:
+	mkdir -p ${UINET_DESTDIR}/etc/libuinet
+	cp version.extended ${UINET_DESTDIR}/etc/libuinet/version.extended
 
+version.extended:
+	echo "buildroot: ${CURDIR}" > $@
+	echo "date: `date`" >> $@
+	echo "git-sha: `git rev-parse --short HEAD`" >> $@
+	echo "git-branch: `git rev-parse --abbrev-ref HEAD`" >> $@

bin/Makefile

@@ -6,15 +6,5 @@ ifeq (${HOST_OS},FreeBSD)
 SUBDIRS+=sysctl vmstat 
 endif
 
-config:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) config ) ; done
-
-all:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) all ) ; done
-
-clean:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) clean ) ; done
-
-install:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) install ) ; done
-
+config all clean install maintainer-clean:
+	for d in $(SUBDIRS); do ( cd $$d && $(MAKE) $@) ||  exit 1 ; done

bin/echo/Makefile

@@ -2,10 +2,9 @@ TOPDIR?=${CURDIR}/../..
 include ${TOPDIR}/cflags.mk
 
 PROG=echo
-
 UINET_LIBS=uinet
-
 CFLAGS= -I${TOPDIR}/lib/libev
+
 LDADD= -L${UINET_DESTDIR}/lib/ ${TOPDIR}/lib/libev/.libs/libev.a -lm -lpcap
 
 include ${TOPDIR}/mk/prog.mk

bin/passive/Makefile

@@ -11,15 +11,15 @@ UINET_LIBES+=uinetnv
 endif
 
 
-CFLAGS= -I${TOPDIR}/lib/libev
-ifeq (${HOST_OS},FreeBSD)
-CFLAGS+= -I${TOPDIR}/lib/libnv
-endif
-LDADD= -L${UINET_DESTDIR}/lib/ ${TOPDIR}/lib/libev/.libs/libev.a -lm -lpcap
+CFLAGS+= -I${TOPDIR}/lib/libuinetnv -I${TOPDIR}/lib/libev
+LDADD= -L${UINET_DESTDIR}/lib/ ${TOPDIR}/lib/libev/.libs/libev.a ${TOPDIR}/lib/libuinetnv/libuinetnv.a -lm -lpcap
 
 ifndef NO_EXTRACT
 CFLAGS+= -I${TOPDIR}/lib/libhttp_parser -DENABLE_EXTRACT
 LDADD+=  -L${TOPDIR}/lib/libhttp_parser -lhttp_parser -lz
 endif
 
+maintainer-clean:
+	$(MAKE) clean
+
 include ${TOPDIR}/mk/prog.mk

bin/passive/passive.c

@@ -32,13 +32,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 #ifdef ENABLE_EXTRACT
 #include <zlib.h>
 #endif
 
 #include <netinet/in.h>
 
 #include "uinet_api.h"
+#include "uinet_host_sysctl_api.h"
+#include "uinet_host_sysctl_api_priv.h"
 
 #ifdef ENABLE_EXTRACT
 #include "http_parser.h"
@@ -1250,6 +1253,7 @@ int main (int argc, char **argv)
 	struct uinet_in_addr tmpinaddr;
 	int ifnetmap_count = 0;
 	int ifpcap_count = 0;
+	pthread_t sysctl_thr;
 	struct content_type *contype;
 
 	memset(interfaces, 0, sizeof(interfaces));
@@ -1517,12 +1521,21 @@ int main (int argc, char **argv)
 								    interface_thread_start, &interfaces[i]);
 	}
 
+	error = pthread_create(&sysctl_thr, NULL,
+	    uinet_host_sysctl_listener_thread, NULL);
+	if (error != 0) {
+		printf("Failed to bring up sysctl thread: %d\n", errno);
+	}
+
 	for (i = 0; i < num_interfaces; i++) {
 		if (0 == interfaces[i].thread_create_result)
 			pthread_join(interfaces[i].thread, NULL);
 	}
 
 	uinet_shutdown(0);
 
+	/* XXX only do this if we successfully started the thread! */
+	pthread_join(sysctl_thr, NULL);
+
 	return (0);
 }

bin/sysctl/Makefile

@@ -1,4 +1,5 @@
 TOPDIR?=${CURDIR}/../..
+include ${TOPDIR}/cflags.mk
 
 PROG=sysctl
 

bin/vmstat/Makefile

@@ -1,4 +1,5 @@
 TOPDIR?=${CURDIR}/../..
+include ${TOPDIR}/cflags.mk
 
 PROG=vmstat
 

cflags.mk

@@ -4,6 +4,9 @@ DEBUG_FLAGS	?= -O -gdwarf-2
 
 UINET_DESTDIR	?= /usr/local/
 
+#CFLAGS+=	-fPIC
+#LDFLAGS+=	-fPIC
+
 UINET_INSTALL	?= install
 UINET_INSTALL_DIR ?= $(UINET_INSTALL) -m 0755
 UINET_INSTALL_LIB ?= $(UINET_INSTALL) -m 0644

lib.mk

@@ -9,3 +9,6 @@ LDADD+=		-lcrypto
 else
 LDADD+=		-lssl
 endif
+ifeq "${OSNAME}" "FreeBSD"
+LDADD+=		-lcrypto
+endif

lib/Makefile

@@ -11,13 +11,7 @@ default: all
 config:
 	(cd libev ; env CFLAGS="${DEBUG_FLAGS}" ./configure --with-uinet=../libuinet/api_include --prefix="${UINET_DESTDIR}" --includedir="${UINET_DESTDIR}/include/libev" --enable-shared=no )
 
-all:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) all ) ; done
-
-clean:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) clean ) ; done
-
-install:
-	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) install ) ; done
+all clean install maintainer-clean:
+	for d in $(SUBDIRS); do ( cd $$d && $(MAKE) $@ ) || exit 1 ; done
 
 default: config all