--- nistnet/include/nistnet.h 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/include/nistnet.h 2004-08-11 14:24:32.000000000 +0000 @@ -1,5 +1,6 @@ /* $Header: /src/carson/nistnet/RCS/nistnet.h,v 1.6 2000/03/22 16:06:26 carson Exp $ carson */ - +#include +#include #ifndef _NISTNET_H #define _NISTNET_H --- nistnet/cli/hitbox.c 2004-08-11 15:36:13.000000000 +0000 +++ nistnet/cli/hitbox.c 2004-08-12 10:57:55.000000000 +0000 @@ -177,18 +177,7 @@ fprintf(stderr, "Usage: hitbox\n\ -u up (on)\n\ -d down (off)\n\ -#ifdef CONFIG_ECN - -a src dest delay delsigma bandwidth drop dup drdmin drdmax drdcongestion add new\n\ -#else - -a src dest delay delsigma bandwidth drop dup drdmin drdmax add new\n\ -#endif - -r src dest remove\n\ - -s src dest see stats\n\ - -S src dest see stats continuously\n\ - -R read table\n\ - -D debug on\n\ - -U debug off\n\ - -G global stats\n"); +#ifdef CONFIG_ECN -a src dest delay delsigma bandwidth drop dup drdmin drdmax drdcongestion add new\n\#else -a src dest delay delsigma bandwidth drop dup drdmin drdmax add new\n\#endif -r src dest remove\n\ -s src dest see stats\n\ -S src dest see stats continuously\n\ -R read table\n\ -D debug on\n\ -U debug off\n\ -G global stats\n"); exit(1); } --- nistnet/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/Makefile 2004-08-18 13:51:45.000000000 +0000 @@ -30,18 +30,18 @@ -rm -f *.o $(ALL_TARGETS) install: all sub_inst - rm -f $(DEVHITBOX) - mknod $(DEVHITBOX) c $(HITMAJOR) $(HITMINOR) - rm -f $(DEVNISTNET) - mknod $(DEVNISTNET) c $(NISTNETMAJOR) $(NISTNETMINOR) - chown root $(DEVHITBOX) - chown root $(DEVNISTNET) - rm -f $(DEVMUNGEBOX) - mknod $(DEVMUNGEBOX) c $(MUNGEMAJOR) 0 - chown root $(DEVMUNGEBOX) - rm -f $(DEVSPYBOX) - mknod $(DEVSPYBOX) c $(SPYMAJOR) 0 - chown root $(DEVSPYBOX) + rm -f ${D}$(DEVHITBOX) + mknod ${D}$(DEVHITBOX) c $(HITMAJOR) $(HITMINOR) + rm -f ${D}$(DEVNISTNET) + mknod ${D}$(DEVNISTNET) c $(NISTNETMAJOR) $(NISTNETMINOR) + chown root ${D}$(DEVHITBOX) + chown root ${D}$(DEVNISTNET) + rm -f ${D}$(DEVMUNGEBOX) + mknod ${D}$(DEVMUNGEBOX) c $(MUNGEMAJOR) 0 + chown root ${D}$(DEVMUNGEBOX) + rm -f ${D}$(DEVSPYBOX) + mknod ${D}$(DEVSPYBOX) c $(SPYMAJOR) 0 + chown root ${D}$(DEVSPYBOX) ship: all # Ship target not relevant for released Makefile --- nistnet/lib/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/lib/Makefile 2004-08-12 15:54:56.000000000 +0000 @@ -15,7 +15,7 @@ all: $(LIB_TARGET) install: all - install -m 444 $(LIB_TARGET) /usr/local/lib + install -m 444 $(LIB_TARGET) ${D}usr/local/lib $(LIB_TARGET): nistnetlib.o nistnetutil.o tabledist.o random.o alarmingdns.o ar vr $@ $? --- nistnet/configure 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/configure 2004-08-12 16:25:44.000000000 +0000 @@ -22,44 +22,10 @@ echo Kernel headers found at $TOPDIR/include/linux -# 2. Ask whether they want ECN or COS support - -grep DCONFIG_ECN Config | grep '#' > /dev/null -if [ $? = 0 ] ; then - # ECN off - ECN='# -DCONFIG_ECN' - echo -n 'Add explicit congestion notification (ECN) support [no]? ' -else - # ECN on - ECN='-DCONFIG_ECN' - echo -n 'Add explicit congestion notification (ECN) support [yes]? ' -fi -read response junk -case $response in - Y* | y*) - ECN='-DCONFIG_ECN';; - N* | n*) - ECN='# -DCONFIG_ECN';; -esac - -grep DCONFIG_COS Config | grep '#' > /dev/null -if [ $? = 0 ] ; then - # COS off - COS='# -DCONFIG_COS' - echo -n 'Add class/type of service (COS) support [no]? ' -else - # COS on - COS='-DCONFIG_COS' - echo -n 'Add class/type of service (COS) support [yes]? ' -fi -read response junk -case $response in - Y* | y*) - COS='-DCONFIG_COS';; - N* | n*) - COS='# -DCONFIG_COS';; -esac +# 2. Ask whether they want ECN or COS support (Not anymore) +ECN='-DCONFIG_ECN' +COS='-DCONFIG_COS' # 3. Update the Config file appropriately ex Config << below.Config --- nistnet/cli/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/cli/Makefile 2004-08-13 12:35:03.000000000 +0000 @@ -23,10 +23,10 @@ -rm -f *.o $(ALL_TARGETS) install: all - -mkdir /usr/local/bin - install -o root hitbox cnistnet /usr/local/bin - install -o root mungebox /usr/local/bin - install -o root nistspy /usr/local/bin + -mkdir -p ${D}usr/local/bin + install -o root hitbox cnistnet ${D}usr/local/bin + install -o root mungebox ${D}usr/local/bin + install -o root nistspy ${D}usr/local/bin ship: all # Ship target not relevant for released Makefile --- nistnet/kernel/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/kernel/Makefile 2004-08-13 14:17:20.000000000 +0000 @@ -49,14 +49,14 @@ # relocations required by build roots. This is not defined in the # makefile but the argument can be passed to make if needed. -MODLIB=$(INSTALL_MOD_PATH)/lib/modules/`uname -r`/misc +MODLIB=${D}$(INSTALL_MOD_PATH)/lib/modules/`uname -r`/misc install: all - -mkdir $(MODLIB) + -mkdir -p $(MODLIB) install -o root nistnet.o $(MODLIB) install -o root mungemod.o $(MODLIB) install -o root spymod.o $(MODLIB) - -/sbin/depmod -a > /dev/null 2>&1 + -/sbin/depmod -a -b ${D} > ${D}dev/null 2>&1 # -q flag doesn't work with older versions # Ignore errors; can get with leftover irrelevant modules --- nistnet/man/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/man/Makefile 2004-08-13 13:15:09.000000000 +0000 @@ -26,12 +26,12 @@ all: install: - -mkdir /usr/local/man - -mkdir /usr/local/man/man1 - install -m 444 $(MAN1) /usr/local/man/man1 - -mkdir /usr/local/man/man3 - install -m 444 $(MAN3) /usr/local/man/man3 - -mkdir /usr/local/man/man4 - install -m 444 $(MAN4) /usr/local/man/man4 + -mkdir -p ${D}usr/local/man + -mkdir -p ${D}usr/local/man/man1 + install -m 444 $(MAN1) ${D}usr/local/man/man1 + -mkdir ${D}usr/local/man/man3 + install -m 444 $(MAN3) ${D}usr/local/man/man3 + -mkdir -p ${D}usr/local/man/man4 + install -m 444 $(MAN4) ${D}usr/local/man/man4 clean: --- nistnet/Config 2004-08-12 13:25:19.000000000 +0000 +++ nistnet/Config 2004-08-13 13:22:42.000000000 +0000 @@ -13,14 +13,14 @@ HPATH = $(TOPDIR)/include # 2. Device node names and major numbers -- edit here and recompile if needed -DEVHITBOX = /dev/hitbox -DEVNISTNET = /dev/nistnet +DEVHITBOX = /dev/hitbox +DEVNISTNET = /dev/nistnet HITMAJOR = 62 # .0625 = 1/16, Lina Inverse is 16 in NEXT HITMINOR = 0 NISTNETMAJOR = 62 NISTNETMINOR = 1 -DEVMUNGEBOX = /dev/mungebox -DEVSPYBOX = /dev/spybox +DEVMUNGEBOX = /dev/mungebox +DEVSPYBOX = /dev/spybox MUNGEMAJOR = 63 SPYMAJOR = 64 --- nistnet/include/Makefile 2004-08-11 14:16:45.000000000 +0000 +++ nistnet/include/Makefile 2004-08-16 13:52:51.000000000 +0000 @@ -34,7 +34,7 @@ all: install: $(HEADERS).h - install -m 444 $(HEADERS) /usr/local/include - install -m 444 $(LIB_TARGET) /usr/local/lib + install -m 444 $(HEADERS) ${D}usr/local/include + install -m 444 $(LIB_TARGET) ${D}usr/local/lib clean: