Attachment #37660 for bug #60776

Lines 1-5 Link Here

(-)nistnet/include/nistnet.h (-1 / +2 lines)
1	/* $Header: /src/carson/nistnet/RCS/nistnet.h,v 1.6 2000/03/22 16:06:26 carson Exp $ carson */	1	/* $Header: /src/carson/nistnet/RCS/nistnet.h,v 1.6 2000/03/22 16:06:26 carson Exp $ carson */
2		2	#include <asm/types.h>
		3	#include <linux/igmp.h>
3	#ifndef _NISTNET_H	4	#ifndef _NISTNET_H
4	#define _NISTNET_H	5	#define _NISTNET_H




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");
	-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);
}




	-rm -f *.o $(ALL_TARGETS)

install: all sub_inst
	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

Lines 15-21 Link Here

(-)nistnet/lib/Makefile (-1 / +1 lines)
15	all: $(LIB_TARGET)	15	all: $(LIB_TARGET)
16		16
17	install: all	17	install: all
18	install -m 444 $(LIB_TARGET) /usr/local/lib	18	install -m 444 $(LIB_TARGET) ${D}usr/local/lib
19		19
20	$(LIB_TARGET): nistnetlib.o nistnetutil.o tabledist.o random.o alarmingdns.o	20	$(LIB_TARGET): nistnetlib.o nistnetutil.o tabledist.o random.o alarmingdns.o
21	ar vr $@ $?	21	ar vr $@ $?





echo Kernel headers found at $TOPDIR/include/linux

# 2. Ask whether they want ECN or COS support (Not anymore)

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

ECN='-DCONFIG_ECN'
COS='-DCONFIG_COS'

# 3. Update the Config file appropriately
ex Config << below.Config

Lines 23-32 Link Here

(-)nistnet/cli/Makefile (-4 / +4 lines)
23	-rm -f *.o $(ALL_TARGETS)	23	-rm -f *.o $(ALL_TARGETS)
24		24
25	install: all	25	install: all
26	-mkdir /usr/local/bin	26	-mkdir -p ${D}usr/local/bin
27	install -o root hitbox cnistnet /usr/local/bin	27	install -o root hitbox cnistnet ${D}usr/local/bin
28	install -o root mungebox /usr/local/bin	28	install -o root mungebox ${D}usr/local/bin
29	install -o root nistspy /usr/local/bin	29	install -o root nistspy ${D}usr/local/bin
30		30
31	ship: all	31	ship: all
32	# Ship target not relevant for released Makefile	32	# Ship target not relevant for released Makefile




# relocations required by build roots.  This is not defined in the
# makefile but the argument can be passed to make if needed.

MODLIB=${D}$(INSTALL_MOD_PATH)/lib/modules/`uname -r`/misc

install: all
	-mkdir -p $(MODLIB)
	install -o root nistnet.o $(MODLIB) 
	install -o root mungemod.o $(MODLIB)
	install -o root spymod.o $(MODLIB)
	-/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





all: 

install: 
	-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:




HPATH = $(TOPDIR)/include

# 2. Device node names and major numbers -- edit here and recompile if needed
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
MUNGEMAJOR = 63
SPYMAJOR = 64


Lines 34-40 Link Here

(-)nistnet/include/Makefile (-2 / +2 lines)
34	all:	34	all:
35		35
36	install: $(HEADERS).h	36	install: $(HEADERS).h
37	install -m 444 $(HEADERS) /usr/local/include	37	install -m 444 $(HEADERS) ${D}usr/local/include
38	install -m 444 $(LIB_TARGET) /usr/local/lib	38	install -m 444 $(LIB_TARGET) ${D}usr/local/lib
39		39
40	clean:	40	clean:

Return to bug 60776

Lines 177-194 Link Here

(-)nistnet/cli/hitbox.c (-12 / +1 lines)
177	fprintf(stderr, "Usage: hitbox\n\	177	fprintf(stderr, "Usage: hitbox\n\
178	-u up (on)\n\	178	-u up (on)\n\
179	-d down (off)\n\	179	-d down (off)\n\
180	#ifdef CONFIG_ECN	180	#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");
181	-a src dest delay delsigma bandwidth drop dup drdmin drdmax drdcongestion add new\n\
182	#else
183	-a src dest delay delsigma bandwidth drop dup drdmin drdmax add new\n\
184	#endif
185	-r src dest remove\n\
186	-s src dest see stats\n\
187	-S src dest see stats continuously\n\
188	-R read table\n\
189	-D debug on\n\
190	-U debug off\n\
191	-G global stats\n");
192	exit(1);	181	exit(1);
193	}	182	}

Lines 49-62 Link Here

(-)nistnet/kernel/Makefile (-3 / +3 lines)
49	# relocations required by build roots. This is not defined in the	49	# relocations required by build roots. This is not defined in the
50	# makefile but the argument can be passed to make if needed.	50	# makefile but the argument can be passed to make if needed.
51		51
52	MODLIB=$(INSTALL_MOD_PATH)/lib/modules/`uname -r`/misc	52	MODLIB=${D}$(INSTALL_MOD_PATH)/lib/modules/`uname -r`/misc
53		53
54	install: all	54	install: all
55	-mkdir $(MODLIB)	55	-mkdir -p $(MODLIB)
56	install -o root nistnet.o $(MODLIB)	56	install -o root nistnet.o $(MODLIB)
57	install -o root mungemod.o $(MODLIB)	57	install -o root mungemod.o $(MODLIB)
58	install -o root spymod.o $(MODLIB)	58	install -o root spymod.o $(MODLIB)
59	-/sbin/depmod -a > /dev/null 2>&1	59	-/sbin/depmod -a -b ${D} > ${D}dev/null 2>&1
60	# -q flag doesn't work with older versions	60	# -q flag doesn't work with older versions
61	# Ignore errors; can get with leftover irrelevant modules	61	# Ignore errors; can get with leftover irrelevant modules
62		62

Lines 30-47 Link Here

(-)nistnet/Makefile (-12 / +12 lines)
30	-rm -f *.o $(ALL_TARGETS)	30	-rm -f *.o $(ALL_TARGETS)
31		31
32	install: all sub_inst	32	install: all sub_inst
33	rm -f $(DEVHITBOX)	33	rm -f ${D}$(DEVHITBOX)
34	mknod $(DEVHITBOX) c $(HITMAJOR) $(HITMINOR)	34	mknod ${D}$(DEVHITBOX) c $(HITMAJOR) $(HITMINOR)
35	rm -f $(DEVNISTNET)	35	rm -f ${D}$(DEVNISTNET)
36	mknod $(DEVNISTNET) c $(NISTNETMAJOR) $(NISTNETMINOR)	36	mknod ${D}$(DEVNISTNET) c $(NISTNETMAJOR) $(NISTNETMINOR)
37	chown root $(DEVHITBOX)	37	chown root ${D}$(DEVHITBOX)
38	chown root $(DEVNISTNET)	38	chown root ${D}$(DEVNISTNET)
39	rm -f $(DEVMUNGEBOX)	39	rm -f ${D}$(DEVMUNGEBOX)
40	mknod $(DEVMUNGEBOX) c $(MUNGEMAJOR) 0	40	mknod ${D}$(DEVMUNGEBOX) c $(MUNGEMAJOR) 0
41	chown root $(DEVMUNGEBOX)	41	chown root ${D}$(DEVMUNGEBOX)
42	rm -f $(DEVSPYBOX)	42	rm -f ${D}$(DEVSPYBOX)
43	mknod $(DEVSPYBOX) c $(SPYMAJOR) 0	43	mknod ${D}$(DEVSPYBOX) c $(SPYMAJOR) 0
44	chown root $(DEVSPYBOX)	44	chown root ${D}$(DEVSPYBOX)
45		45
46	ship: all	46	ship: all
47	# Ship target not relevant for released Makefile	47	# Ship target not relevant for released Makefile

Lines 22-65 Link Here

(-)nistnet/configure (-37 / +3 lines)
22		22
23	echo Kernel headers found at $TOPDIR/include/linux	23	echo Kernel headers found at $TOPDIR/include/linux
24		24
25	# 2. Ask whether they want ECN or COS support	25	# 2. Ask whether they want ECN or COS support (Not anymore)
26
27	grep DCONFIG_ECN Config \| grep '#' > /dev/null
28	if [ $? = 0 ] ; then
29	# ECN off
30	ECN='# -DCONFIG_ECN'
31	echo -n 'Add explicit congestion notification (ECN) support [no]? '
32	else
33	# ECN on
34	ECN='-DCONFIG_ECN'
35	echo -n 'Add explicit congestion notification (ECN) support [yes]? '
36	fi
37	read response junk
38	case $response in
39	Y* \| y*)
40	ECN='-DCONFIG_ECN';;
41	N* \| n*)
42	ECN='# -DCONFIG_ECN';;
43	esac
44
45	grep DCONFIG_COS Config \| grep '#' > /dev/null
46	if [ $? = 0 ] ; then
47	# COS off
48	COS='# -DCONFIG_COS'
49	echo -n 'Add class/type of service (COS) support [no]? '
50	else
51	# COS on
52	COS='-DCONFIG_COS'
53	echo -n 'Add class/type of service (COS) support [yes]? '
54	fi
55	read response junk
56	case $response in
57	Y* \| y*)
58	COS='-DCONFIG_COS';;
59	N* \| n*)
60	COS='# -DCONFIG_COS';;
61	esac
62		26
		27	ECN='-DCONFIG_ECN'
		28	COS='-DCONFIG_COS'
63		29
64	# 3. Update the Config file appropriately	30	# 3. Update the Config file appropriately
65	ex Config << below.Config	31	ex Config << below.Config

Lines 26-37 Link Here

(-)nistnet/man/Makefile (-7 / +7 lines)
26	all:	26	all:
27		27
28	install:	28	install:
29	-mkdir /usr/local/man	29	-mkdir -p ${D}usr/local/man
30	-mkdir /usr/local/man/man1	30	-mkdir -p ${D}usr/local/man/man1
31	install -m 444 $(MAN1) /usr/local/man/man1	31	install -m 444 $(MAN1) ${D}usr/local/man/man1
32	-mkdir /usr/local/man/man3	32	-mkdir ${D}usr/local/man/man3
33	install -m 444 $(MAN3) /usr/local/man/man3	33	install -m 444 $(MAN3) ${D}usr/local/man/man3
34	-mkdir /usr/local/man/man4	34	-mkdir -p ${D}usr/local/man/man4
35	install -m 444 $(MAN4) /usr/local/man/man4	35	install -m 444 $(MAN4) ${D}usr/local/man/man4
36		36
37	clean:	37	clean:

Lines 13-26 Link Here

(-)nistnet/Config (-4 / +4 lines)
13	HPATH = $(TOPDIR)/include	13	HPATH = $(TOPDIR)/include
14		14
15	# 2. Device node names and major numbers -- edit here and recompile if needed	15	# 2. Device node names and major numbers -- edit here and recompile if needed
16	DEVHITBOX = /dev/hitbox	16	DEVHITBOX = /dev/hitbox
17	DEVNISTNET = /dev/nistnet	17	DEVNISTNET = /dev/nistnet
18	HITMAJOR = 62 # .0625 = 1/16, Lina Inverse is 16 in NEXT	18	HITMAJOR = 62 # .0625 = 1/16, Lina Inverse is 16 in NEXT
19	HITMINOR = 0	19	HITMINOR = 0
20	NISTNETMAJOR = 62	20	NISTNETMAJOR = 62
21	NISTNETMINOR = 1	21	NISTNETMINOR = 1
22	DEVMUNGEBOX = /dev/mungebox	22	DEVMUNGEBOX = /dev/mungebox
23	DEVSPYBOX = /dev/spybox	23	DEVSPYBOX = /dev/spybox
24	MUNGEMAJOR = 63	24	MUNGEMAJOR = 63
25	SPYMAJOR = 64	25	SPYMAJOR = 64
26		26