diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2009-03-30 13:45:52 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2009-03-30 13:45:52 +0000 |
| commit | 9358c70fe9026a93f1b597383ad21b5f7de53864 (patch) | |
| tree | 87e540fd937a7f452552a865a1bb07dbf1c14c7b /patches/hping3-20051105 | |
| parent | 1379dac6f9ab31f3e067f0e99a2480d1b543d14b (diff) | |
| download | ptxdist-9358c70fe9026a93f1b597383ad21b5f7de53864.tar.gz ptxdist-9358c70fe9026a93f1b597383ad21b5f7de53864.tar.xz | |
* hping: Added for network measurement
- note: experimental yet
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10182 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/hping3-20051105')
| -rw-r--r-- | patches/hping3-20051105/generic/clean_makefile.diff | 71 | ||||
| -rw-r--r-- | patches/hping3-20051105/generic/remove_pcap_header.diff | 23 | ||||
| -rw-r--r-- | patches/hping3-20051105/generic/series | 2 |
3 files changed, 96 insertions, 0 deletions
diff --git a/patches/hping3-20051105/generic/clean_makefile.diff b/patches/hping3-20051105/generic/clean_makefile.diff new file mode 100644 index 000000000..050b756bc --- /dev/null +++ b/patches/hping3-20051105/generic/clean_makefile.diff @@ -0,0 +1,71 @@ +Subject: Don't be smarter than make +From: Juergen Beisert <jbe@pengutronix.de> + +Simplify the makefile and use embedded rules. + +Signed-off-by: Juergen Beisert <jbe@pengutronix.de> + +--- + Makefile.in | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -9,7 +9,7 @@ + CC= gcc + AR=/usr/bin/ar + RANLIB=/usr/bin/ranlib +-CCOPT= -O2 -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@ ++CFLAGS= -O2 -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@ + DEBUG= -g + #uncomment the following if you need libpcap based build under linux + #(not raccomanded) +@@ -50,21 +50,18 @@ libars.a: $(ARSOBJ) + $(RANLIB) $@ + + hping3: byteorder.h $(OBJ) +- $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ ++ $(CC) -o hping3 $(LDFLAGS) $(DEBUG) $(OBJ) $(PCAP) $(LDLIBS) @SOLARISLIB@ @TCL_LIB@ + @echo +- ./hping3 -v +- @echo "use \`make strip' to strip hping3 binary" +- @echo "use \`make install' to install hping3" ++# ./hping3 -v ++# @echo "use \`make strip' to strip hping3 binary" ++# @echo "use \`make install' to install hping3" + + hping3-static: byteorder.h $(OBJ) +- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl ++ $(CC) -static -o hping3-static $(LDFLAGS) $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) $(LDLIBS) @SOLARISLIB@ @TCL_LIB@ -ldl + + byteorder.h: + ./configure + +-.c.o: +- $(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $< +- + clean: + rm -rf hping3 *.o libars.a + +@@ -72,13 +69,13 @@ distclean: + rm -rf hping3 *.o byteorder byteorder.h systype.h Makefile libars.a .depend + + install: hping3 +- cp -f hping3 /usr/sbin/ +- chmod 755 /usr/sbin/hping3 +- ln -s /usr/sbin/hping3 /usr/sbin/hping +- ln -s /usr/sbin/hping3 /usr/sbin/hping2 ++ cp -f hping3 $(DESTDIR)/usr/sbin/ ++ chmod 755 $(DESTDIR)/usr/sbin/hping3 ++ ln -sf $(DESTDIR)/usr/sbin/hping3 $(DESTDIR)/usr/sbin/hping ++ ln -sf $(DESTDIR)/usr/sbin/hping3 $(DESTDIR)/usr/sbin/hping2 + @if [ -d ${INSTALL_MANPATH}/man8 ]; then \ +- cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \ +- chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \ ++ cp ./docs/hping3.8 $(DESTDIR)/${INSTALL_MANPATH}/man8; \ ++ chmod 644 $(DESTDIR)/${INSTALL_MANPATH}/man8/hping3.8; \ + else \ + echo "@@@@@@ WARNING @@@@@@"; \ + echo "Can't install the man page: ${INSTALL_MANPATH}/man8 does not exist"; \ diff --git a/patches/hping3-20051105/generic/remove_pcap_header.diff b/patches/hping3-20051105/generic/remove_pcap_header.diff new file mode 100644 index 000000000..2a9e75735 --- /dev/null +++ b/patches/hping3-20051105/generic/remove_pcap_header.diff @@ -0,0 +1,23 @@ +Subject: The <net/bpf.h> include file does not exist an more +From: Juergen Beisert <jbe@pengutronix.de> + +The <net/bpf.h> include file does not exist an more. Simply removed. + +Signed-off-by: Juergen Beisert <jbe@pengutronix.de> + +--- + libpcap_stuff.c | 1 - + 1 file changed, 1 deletion(-) + +Index: libpcap_stuff.c +=================================================================== +--- libpcap_stuff.c.orig ++++ libpcap_stuff.c +@@ -17,7 +17,6 @@ + #include <stdlib.h> + #include <sys/ioctl.h> + #include <pcap.h> +-#include <net/bpf.h> + + #include "globals.h" + diff --git a/patches/hping3-20051105/generic/series b/patches/hping3-20051105/generic/series new file mode 100644 index 000000000..1a6453311 --- /dev/null +++ b/patches/hping3-20051105/generic/series @@ -0,0 +1,2 @@ +clean_makefile.diff -p0 +remove_pcap_header.diff -p0 |