Only in ns-2.32-new: autoconf.h diff -rc ns-2.32/common/packet.h ns-2.32-new/common/packet.h *** ns-2.32/common/packet.h 2006-02-22 08:32:23.000000000 -0500 --- ns-2.32-new/common/packet.h 2008-03-25 12:52:19.000000000 -0400 *************** *** 170,175 **** --- 170,178 ---- // Bell Labs Traffic Trace Type (PackMime OL) PT_BLTRACE, + // delay tolerant network multicast packet time + PT_DTNMC, + // insert new packet types here PT_NTYPE // This MUST be the LAST one }; *************** *** 268,273 **** --- 271,279 ---- // Bell Labs (PackMime OL) name_[PT_BLTRACE]="BellLabsTrace"; + + // DTN multicast + name_[PT_DTNMC]="dtnmc"; name_[PT_NTYPE]= "undefined"; } diff -rc ns-2.32/config.log ns-2.32-new/config.log *** ns-2.32/config.log 2007-08-22 00:10:01.000000000 -0400 --- ns-2.32-new/config.log 2008-03-25 10:28:27.000000000 -0400 *************** *** 4,25 **** It was created by configure, which was generated by GNU Autoconf 2.59. Invocation command line was ! $ ./configure ## --------- ## ## Platform. ## ## --------- ## ! hostname = ns-old.ee.washington.edu ! uname -m = i686 ! uname -r = 2.6.20-1.2307.fc5 uname -s = Linux ! uname -v = #1 Sun Mar 18 20:44:48 EDT 2007 /usr/bin/uname -p = unknown /bin/uname -X = unknown ! /bin/arch = i686 /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown hostinfo = unknown --- 4,25 ---- It was created by configure, which was generated by GNU Autoconf 2.59. Invocation command line was ! $ ./configure --with-otcl=../otcl-1.13 --with-tclcl=../tclcl-1.19 ## --------- ## ## Platform. ## ## --------- ## ! hostname = hydra.cs.gmu.edu ! uname -m = x86_64 ! uname -r = 2.6.18-53.1.14.el5 uname -s = Linux ! uname -v = #1 SMP Wed Mar 5 11:37:38 EST 2008 /usr/bin/uname -p = unknown /bin/uname -X = unknown ! /bin/arch = x86_64 /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown hostinfo = unknown *************** *** 27,47 **** /usr/bin/oslevel = unknown /bin/universe = unknown ! PATH: /home/tomh/bin ! PATH: /home/tomh/perl PATH: /usr/kerberos/bin - PATH: /bin - PATH: /usr/mash/bin PATH: /usr/local/bin PATH: /usr/bin ! PATH: /usr/X11/bin ! PATH: /usr/X11R6/bin ! PATH: /usr/contrib/bin ! PATH: /usr/ucb ! PATH: /sbin ! PATH: /usr/local/mysql/bin PATH: /usr/sbin PATH: . ## ----------- ## --- 27,54 ---- /usr/bin/oslevel = unknown /bin/universe = unknown ! PATH: /home/mabdulla/ns2/tcl8.4.15/unix ! PATH: /home/mabdulla/ns2/tk8.4.15/unix ! PATH: /home/mabdulla/ns2/bin ! PATH: /apps/java/default/bin PATH: /usr/kerberos/bin PATH: /usr/local/bin + PATH: /bin PATH: /usr/bin ! PATH: /apps/cadp/bin.iX86 ! PATH: /apps/cadp/com PATH: /usr/sbin + PATH: /usr/local/firefox + PATH: /usr/local/thunderbird + PATH: /sbin + PATH: /usr/bin + PATH: /home/mabdulla/bin/acrobat/bin + PATH: /home/mabdulla/ns2/bin + PATH: /home/mabdulla/ns2/tcl8.4.11/unix + PATH: /home/mabdulla/ns2/tk8.4.11/unix + PATH: /home/mabdulla/ns2/ns-2.29/indep-utils/cmu-scen-gen/setdest PATH: . + PATH: /home/mabdulla/bin ## ----------- ## *************** *** 49,64 **** ## ----------- ## configure:1443: checking build system type ! configure:1461: result: i686-pc-linux-gnu configure:1469: checking host system type ! configure:1483: result: i686-pc-linux-gnu configure:1491: checking target system type ! configure:1505: result: i686-pc-linux-gnu configure:1566: checking for gcc configure:1592: result: gcc configure:1836: checking for C compiler version configure:1839: gcc --version &5 ! gcc (GCC) 4.1.1 20070105 (Red Hat 4.1.1-51) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --- 56,72 ---- ## ----------- ## configure:1443: checking build system type ! configure:1461: result: x86_64-unknown-linux-gnu configure:1469: checking host system type ! configure:1483: result: x86_64-unknown-linux-gnu configure:1491: checking target system type ! configure:1505: result: x86_64-unknown-linux-gnu configure:1566: checking for gcc + configure:1582: found /usr/bin/gcc configure:1592: result: gcc configure:1836: checking for C compiler version configure:1839: gcc --version &5 ! gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-14) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *************** *** 66,75 **** configure:1842: $? = 0 configure:1844: gcc -v &5 Using built-in specs. ! Target: i386-redhat-linux ! Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=i386-redhat-linux Thread model: posix ! gcc version 4.1.1 20070105 (Red Hat 4.1.1-51) configure:1847: $? = 0 configure:1849: gcc -V &5 gcc: '-V' option must have argument --- 74,83 ---- configure:1842: $? = 0 configure:1844: gcc -v &5 Using built-in specs. ! Target: x86_64-redhat-linux ! Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=x86_64-redhat-linux Thread model: posix ! gcc version 4.1.2 20070626 (Red Hat 4.1.2-14) configure:1847: $? = 0 configure:1849: gcc -V &5 gcc: '-V' option must have argument *************** *** 131,137 **** configure:2528: result: g++ configure:2544: checking for C++ compiler version configure:2547: g++ --version &5 ! g++ (GCC) 4.1.1 20070105 (Red Hat 4.1.1-51) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --- 139,145 ---- configure:2528: result: g++ configure:2544: checking for C++ compiler version configure:2547: g++ --version &5 ! g++ (GCC) 4.1.2 20070626 (Red Hat 4.1.2-14) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *************** *** 139,148 **** configure:2550: $? = 0 configure:2552: g++ -v &5 Using built-in specs. ! Target: i386-redhat-linux ! Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=i386-redhat-linux Thread model: posix ! gcc version 4.1.1 20070105 (Red Hat 4.1.1-51) configure:2555: $? = 0 configure:2557: g++ -V &5 g++: '-V' option must have argument --- 147,156 ---- configure:2550: $? = 0 configure:2552: g++ -v &5 Using built-in specs. ! Target: x86_64-redhat-linux ! Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-libgcj-multifile --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic --host=x86_64-redhat-linux Thread model: posix ! gcc version 4.1.2 20070626 (Red Hat 4.1.2-14) configure:2555: $? = 0 configure:2557: g++ -V &5 g++: '-V' option must have argument *************** *** 684,715 **** configure:4298: checking should use STL configure:4323: result: yes configure:4546: checking for tcl.h ! configure:4599: result: -I/usr/include configure:4605: checking for libtcl8.4 ! configure:4669: result: -L/usr/lib -ltcl8.4 configure:4675: checking for init.tcl ! configure:4714: result: /usr/lib/tcl8.4 configure:4731: checking for tclsh8.4.15 configure:4764: result: no configure:4731: checking for tclsh8.4 ! configure:4749: found /usr/bin/tclsh8.4 ! configure:4761: result: /usr/bin/tclsh8.4 configure:4992: checking for tk.h ! configure:5045: result: -I/usr/include configure:5051: checking for libtk8.4 ! configure:5115: result: -L/usr/lib -ltk8.4 configure:5121: checking for tk.tcl ! configure:5160: result: /usr/share/tk8.4 configure:5259: checking for otcl.h ! configure:5312: result: -I../otcl configure:5318: checking for libotcl1.13 ! configure:5382: result: -L../otcl -lotcl configure:5509: checking for tclcl.h ! configure:5562: result: -I../tclcl configure:5568: checking for libtclcl ! configure:5632: result: -L../tclcl -ltclcl configure:5638: checking for tcl2c++ ! configure:5677: result: ../tclcl configure:5878: gcc -E conftest.c configure:5884: $? = 0 configure:5924: checking for XOpenDisplay in -lX11 --- 692,723 ---- configure:4298: checking should use STL configure:4323: result: yes configure:4546: checking for tcl.h ! configure:4599: result: -I../include configure:4605: checking for libtcl8.4 ! configure:4669: result: -L../lib -ltcl8.4 configure:4675: checking for init.tcl ! configure:4714: result: ../lib/tcl8.4 configure:4731: checking for tclsh8.4.15 configure:4764: result: no configure:4731: checking for tclsh8.4 ! configure:4749: found ../bin/tclsh8.4 ! configure:4761: result: ../bin/tclsh8.4 configure:4992: checking for tk.h ! configure:5045: result: -I../include configure:5051: checking for libtk8.4 ! configure:5115: result: -L../lib -ltk8.4 configure:5121: checking for tk.tcl ! configure:5160: result: ../lib/tk8.4 configure:5259: checking for otcl.h ! configure:5312: result: -I../otcl-1.13 configure:5318: checking for libotcl1.13 ! configure:5382: result: -L../otcl-1.13 -lotcl configure:5509: checking for tclcl.h ! configure:5562: result: -I../tclcl-1.19 configure:5568: checking for libtclcl ! configure:5632: result: -L../tclcl-1.19 -ltclcl configure:5638: checking for tcl2c++ ! configure:5677: result: ../tclcl-1.19 configure:5878: gcc -E conftest.c configure:5884: $? = 0 configure:5924: checking for XOpenDisplay in -lX11 *************** *** 723,735 **** configure:5986: result: yes configure:6012: checking for XShmAttach in -lXext configure:6042: gcc -o conftest -g -O2 conftest.c -lXext -lX11 >&5 ! configure:6048: $? = 0 ! configure:6052: test -z ! || test ! -s conftest.err ! configure:6055: $? = 0 ! configure:6058: test -s conftest ! configure:6061: $? = 0 ! configure:6074: result: yes configure:6145: checking for libtcldbg configure:6190: result: no configure:6300: checking dmalloc --- 731,789 ---- configure:5986: result: yes configure:6012: checking for XShmAttach in -lXext configure:6042: gcc -o conftest -g -O2 conftest.c -lXext -lX11 >&5 ! /usr/bin/ld: cannot find -lXext ! collect2: ld returned 1 exit status ! configure:6048: $? = 1 ! configure: failed program was: ! | /* confdefs.h. */ ! | ! | #define PACKAGE_NAME "" ! | #define PACKAGE_TARNAME "" ! | #define PACKAGE_VERSION "" ! | #define PACKAGE_STRING "" ! | #define PACKAGE_BUGREPORT "" ! | #define _GNU_SOURCE 1 ! | #ifdef __cplusplus ! | extern "C" void std::exit (int) throw (); using std::exit; ! | #endif ! | #define STDC_HEADERS 1 ! | #define HAVE_SYS_TYPES_H 1 ! | #define HAVE_SYS_STAT_H 1 ! | #define HAVE_STDLIB_H 1 ! | #define HAVE_STRING_H 1 ! | #define HAVE_MEMORY_H 1 ! | #define HAVE_STRINGS_H 1 ! | #define HAVE_INTTYPES_H 1 ! | #define HAVE_STDINT_H 1 ! | #define HAVE_UNISTD_H 1 ! | #define HAVE_STRING_H 1 ! | #define HAVE_STL 1 ! | #define CPP_REQUIRES_NAMESPACE 1 ! | #define HAVE_TCL_H 1 ! | #define HAVE_LIBTCL8_4 1 ! | #define HAVE_TK_H 1 ! | #define HAVE_LIBTK8_4 1 ! | #define HAVE_OTCL_H 1 ! | #define HAVE_LIBOTCL1_13 1 ! | #define HAVE_TCLCL_H 1 ! | #define HAVE_LIBTCLCL 1 ! | /* end confdefs.h. */ ! | ! | /* Override any gcc2 internal prototype to avoid an error. */ ! | #ifdef __cplusplus ! | extern "C" ! | #endif ! | /* We use char because int might match the return type of a gcc2 ! | builtin and then its argument prototype would still apply. */ ! | char XShmAttach (); ! | int ! | main () ! | { ! | XShmAttach (); ! | ; ! | return 0; ! | } ! configure:6074: result: no configure:6145: checking for libtcldbg configure:6190: result: no configure:6300: checking dmalloc *************** *** 851,859 **** configure:7225: result: yes configure:7137: checking for fesetprecision configure:7194: gcc -o conftest -g -O2 conftest.c -lm >&5 ! /tmp/ccmwP9rm.o: In function `main': ! /home/tomh/cvs/ns-2/conftest.c:85: undefined reference to `fesetprecision' ! /tmp/ccmwP9rm.o:(.data+0x0): undefined reference to `fesetprecision' collect2: ld returned 1 exit status configure:7200: $? = 1 configure: failed program was: --- 905,913 ---- configure:7225: result: yes configure:7137: checking for fesetprecision configure:7194: gcc -o conftest -g -O2 conftest.c -lm >&5 ! /tmp/ccgfvRtx.o: In function `main': ! /home/mabdulla/ns2/ns-2.32/conftest.c:85: undefined reference to `fesetprecision' ! /tmp/ccgfvRtx.o:(.data+0x0): undefined reference to `fesetprecision' collect2: ld returned 1 exit status configure:7200: $? = 1 configure: failed program was: *************** *** 1094,1100 **** configure:8312: $? = 0 configure:8314: ./conftest configure:8317: $? = 0 ! configure:8340: result: 4 configure:8443: checking for __int64_t configure:8463: gcc -o conftest -g -O2 conftest.c -lm >&5 conftest.c: In function 'main': --- 1148,1163 ---- configure:8312: $? = 0 configure:8314: ./conftest configure:8317: $? = 0 ! configure:8340: result: 8 ! configure:8350: checking for strtol ! configure:8407: gcc -o conftest -g -O2 conftest.c -lm >&5 ! configure:8413: $? = 0 ! configure:8417: test -z ! || test ! -s conftest.err ! configure:8420: $? = 0 ! configure:8423: test -s conftest ! configure:8426: $? = 0 ! configure:8438: result: yes configure:8443: checking for __int64_t configure:8463: gcc -o conftest -g -O2 conftest.c -lm >&5 conftest.c: In function 'main': *************** *** 1158,1164 **** | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 4 | /* end confdefs.h. */ | | main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); } --- 1221,1227 ---- | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 8 | /* end confdefs.h. */ | | main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); } *************** *** 1196,1204 **** configure:8733: result: found configure:8752: checking for addr2ascii configure:8809: gcc -o conftest -g -O2 conftest.c -lm >&5 ! /tmp/ccEBtcgO.o: In function `main': ! /home/tomh/cvs/ns-2/conftest.c:96: undefined reference to `addr2ascii' ! /tmp/ccEBtcgO.o:(.data+0x0): undefined reference to `addr2ascii' collect2: ld returned 1 exit status configure:8815: $? = 1 configure: failed program was: --- 1259,1267 ---- configure:8733: result: found configure:8752: checking for addr2ascii configure:8809: gcc -o conftest -g -O2 conftest.c -lm >&5 ! /tmp/ccQ4KPGC.o: In function `main': ! /home/mabdulla/ns2/ns-2.32/conftest.c:96: undefined reference to `addr2ascii' ! /tmp/ccQ4KPGC.o:(.data+0x0): undefined reference to `addr2ascii' collect2: ld returned 1 exit status configure:8815: $? = 1 configure: failed program was: *************** *** 1253,1259 **** | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 4 | #define HAVE_INT64 1 | #define HAVE_ETHER_HEADER_STRUCT 1 | #define HAVE_ETHER_ADDRESS_STRUCT 1 --- 1316,1322 ---- | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 8 | #define HAVE_INT64 1 | #define HAVE_ETHER_HEADER_STRUCT 1 | #define HAVE_ETHER_ADDRESS_STRUCT 1 *************** *** 1373,1379 **** | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 4 | #define HAVE_INT64 1 | #define HAVE_ETHER_HEADER_STRUCT 1 | #define HAVE_ETHER_ADDRESS_STRUCT 1 --- 1436,1442 ---- | #define RANDOM_RETURN_TYPE long | #define HAVE_STRTOQ 1 | #define HAVE_STRTOLL 1 ! | #define SIZEOF_LONG 8 | #define HAVE_INT64 1 | #define HAVE_ETHER_HEADER_STRUCT 1 | #define HAVE_ETHER_ADDRESS_STRUCT 1 *************** *** 1445,1451 **** CONFIG_COMMANDS = $ ./config.status ! on ns-old.ee.washington.edu config.status:707: creating Makefile config.status:707: creating tcl/lib/ns-autoconf.tcl --- 1508,1514 ---- CONFIG_COMMANDS = $ ./config.status ! on hydra.cs.gmu.edu config.status:707: creating Makefile config.status:707: creating tcl/lib/ns-autoconf.tcl *************** *** 1460,1471 **** ## Cache variables. ## ## ---------------- ## ! ac_cv_build=i686-pc-linux-gnu ! ac_cv_build_alias=i686-pc-linux-gnu ac_cv_c_compiler_gnu=yes ac_cv_cxx_compiler_gnu=yes ! ac_cv_env_CC_set=set ! ac_cv_env_CC_value=gcc ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= --- 1523,1534 ---- ## Cache variables. ## ## ---------------- ## ! ac_cv_build=x86_64-unknown-linux-gnu ! ac_cv_build_alias=x86_64-unknown-linux-gnu ac_cv_c_compiler_gnu=yes ac_cv_cxx_compiler_gnu=yes ! ac_cv_env_CC_set= ! ac_cv_env_CC_value= ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= *************** *** 1493,1498 **** --- 1556,1562 ---- ac_cv_func_getrusage=yes ac_cv_func_sbrk=yes ac_cv_func_snprintf=yes + ac_cv_func_strtol=yes ac_cv_func_strtoll=yes ac_cv_func_strtoq=yes ac_cv_header_arpa_inet_h=yes *************** *** 1510,1520 **** ac_cv_header_sys_types_h=yes ac_cv_header_time_h=yes ac_cv_header_unistd_h=yes ! ac_cv_host=i686-pc-linux-gnu ! ac_cv_host_alias=i686-pc-linux-gnu ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xbsd_main=no ! ac_cv_lib_Xext_XShmAttach=yes ac_cv_lib_dl_dlopen=yes ac_cv_lib_dnet_stub_getnodebyname=no ac_cv_lib_intl_dcgettext=no --- 1574,1584 ---- ac_cv_header_sys_types_h=yes ac_cv_header_time_h=yes ac_cv_header_unistd_h=yes ! ac_cv_host=x86_64-unknown-linux-gnu ! ac_cv_host_alias=x86_64-unknown-linux-gnu ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xbsd_main=no ! ac_cv_lib_Xext_XShmAttach=no ac_cv_lib_dl_dlopen=yes ac_cv_lib_dnet_stub_getnodebyname=no ac_cv_lib_intl_dcgettext=no *************** *** 1523,1529 **** ac_cv_lib_pcap_main=yes ac_cv_lib_socket_socket=no ac_cv_objext=o ! ac_cv_path_V_TCLSH=/usr/bin/tclsh8.4 ac_cv_path_install='/usr/bin/install -c' ac_cv_prog_CPP='gcc -E' ac_cv_prog_ac_ct_CC=gcc --- 1587,1593 ---- ac_cv_lib_pcap_main=yes ac_cv_lib_socket_socket=no ac_cv_objext=o ! ac_cv_path_V_TCLSH=../bin/tclsh8.4 ac_cv_path_install='/usr/bin/install -c' ac_cv_prog_CPP='gcc -E' ac_cv_prog_ac_ct_CC=gcc *************** *** 1532,1540 **** ac_cv_prog_cc_stdc= ac_cv_prog_cxx_g=yes ac_cv_prog_egrep='grep -E' ! ac_cv_sizeof_long=4 ! ac_cv_target=i686-pc-linux-gnu ! ac_cv_target_alias=i686-pc-linux-gnu ac_cv_type_int16_t=yes ac_cv_type_int32_t=yes ac_cv_type_int64_t=yes --- 1596,1604 ---- ac_cv_prog_cc_stdc= ac_cv_prog_cxx_g=yes ac_cv_prog_egrep='grep -E' ! ac_cv_sizeof_long=8 ! ac_cv_target=x86_64-unknown-linux-gnu ! ac_cv_target_alias=x86_64-unknown-linux-gnu ac_cv_type_int16_t=yes ac_cv_type_int32_t=yes ac_cv_type_int64_t=yes *************** *** 1587,1603 **** V_DEFINE='-DTCLCL_CLASSINSTVAR -DNDEBUG -DLINUX_TCP_HEADER -DUSE_SHM' V_DEFINES='-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_4 -DHAVE_TK_H -DHAVE_LIBTCL8_4 -DHAVE_TCL_H ' V_INCLUDE='' ! V_INCLUDES='-I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap' V_INCLUDE_X11='' V_LIB=' -lnsl -lpcap -ldl' ! V_LIBRARY_TCL='/usr/lib/tcl8.4' ! V_LIBRARY_TK='/usr/share/tk8.4' ! V_LIBS='-L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.4 -L/usr/lib -ltcl8.4' ! V_LIB_OTCL='-L/home/tomh/cvs/otcl -lotcl' ! V_LIB_TCL='-L/usr/lib -ltcl8.4' ! V_LIB_TCLCL='-L/home/tomh/cvs/tclcl -ltclcl' ! V_LIB_TK='-L/usr/lib -ltk8.4' ! V_LIB_X11='-lXext -lX11' V_LSSCRIPT='' V_NS_TCL_LIB_STL='$(NS_TCL_LIB_STL)' V_OBJ='' --- 1651,1667 ---- V_DEFINE='-DTCLCL_CLASSINSTVAR -DNDEBUG -DLINUX_TCP_HEADER -DUSE_SHM' V_DEFINES='-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_4 -DHAVE_TK_H -DHAVE_LIBTCL8_4 -DHAVE_TCL_H ' V_INCLUDE='' ! V_INCLUDES='-I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap' V_INCLUDE_X11='' V_LIB=' -lnsl -lpcap -ldl' ! V_LIBRARY_TCL='../lib/tcl8.4' ! V_LIBRARY_TK='../lib/tk8.4' ! V_LIBS='-L/home/mabdulla/ns2/tclcl-1.19 -ltclcl -L/home/mabdulla/ns2/otcl-1.13 -lotcl -L/home/mabdulla/ns2/lib -ltk8.4 -L/home/mabdulla/ns2/lib -ltcl8.4' ! V_LIB_OTCL='-L/home/mabdulla/ns2/otcl-1.13 -lotcl' ! V_LIB_TCL='-L/home/mabdulla/ns2/lib -ltcl8.4' ! V_LIB_TCLCL='-L/home/mabdulla/ns2/tclcl-1.19 -ltclcl' ! V_LIB_TK='-L/home/mabdulla/ns2/lib -ltk8.4' ! V_LIB_X11='-lX11' V_LSSCRIPT='' V_NS_TCL_LIB_STL='$(NS_TCL_LIB_STL)' V_OBJ='' *************** *** 1610,1635 **** V_TARCMD='tar cfh' V_TAR_EXTRA='' V_TAR_TARGET='linux-gnu' ! V_TCL2CPP='../tclcl/tcl2c++' ! V_TCLSH='/usr/bin/tclsh8.4' V_TCL_LIBRARY_FILES='$(TCL_84_LIBRARY_FILES)' V_TKDOSNAMES='$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl' ac_ct_CC='gcc' ac_ct_CXX='g++' bindir='${exec_prefix}/bin' ! build='i686-pc-linux-gnu' build_alias='' ! build_cpu='i686' build_nse='nse' build_os='linux-gnu' ! build_vendor='pc' datadir='${prefix}/share' exec_prefix='${prefix}' ! host='i686-pc-linux-gnu' host_alias='' ! host_cpu='i686' host_os='linux-gnu' ! host_vendor='pc' includedir='${prefix}/include' infodir='${prefix}/info' libdir='${exec_prefix}/lib' --- 1674,1699 ---- V_TARCMD='tar cfh' V_TAR_EXTRA='' V_TAR_TARGET='linux-gnu' ! V_TCL2CPP='../tclcl-1.19/tcl2c++' ! V_TCLSH='/home/mabdulla/ns2/bin/tclsh8.4' V_TCL_LIBRARY_FILES='$(TCL_84_LIBRARY_FILES)' V_TKDOSNAMES='$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl' ac_ct_CC='gcc' ac_ct_CXX='g++' bindir='${exec_prefix}/bin' ! build='x86_64-unknown-linux-gnu' build_alias='' ! build_cpu='x86_64' build_nse='nse' build_os='linux-gnu' ! build_vendor='unknown' datadir='${prefix}/share' exec_prefix='${prefix}' ! host='x86_64-unknown-linux-gnu' host_alias='' ! host_cpu='x86_64' host_os='linux-gnu' ! host_vendor='unknown' includedir='${prefix}/include' infodir='${prefix}/info' libdir='${exec_prefix}/lib' *************** *** 1642,1652 **** sbindir='${exec_prefix}/sbin' sharedstatedir='${prefix}/com' sysconfdir='${prefix}/etc' ! target='i686-pc-linux-gnu' target_alias='' ! target_cpu='i686' target_os='linux-gnu' ! target_vendor='pc' ## ----------- ## ## confdefs.h. ## --- 1706,1716 ---- sbindir='${exec_prefix}/sbin' sharedstatedir='${prefix}/com' sysconfdir='${prefix}/etc' ! target='x86_64-unknown-linux-gnu' target_alias='' ! target_cpu='x86_64' target_os='linux-gnu' ! target_vendor='unknown' ## ----------- ## ## confdefs.h. ## *************** *** 1700,1706 **** #define PACKAGE_TARNAME "" #define PACKAGE_VERSION "" #define RANDOM_RETURN_TYPE long ! #define SIZEOF_LONG 4 #define STDC_HEADERS 1 #define STDC_HEADERS 1 #define _GNU_SOURCE 1 --- 1764,1770 ---- #define PACKAGE_TARNAME "" #define PACKAGE_VERSION "" #define RANDOM_RETURN_TYPE long ! #define SIZEOF_LONG 8 #define STDC_HEADERS 1 #define STDC_HEADERS 1 #define _GNU_SOURCE 1 diff -rc ns-2.32/config.status ns-2.32-new/config.status *** ns-2.32/config.status 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/config.status 2008-03-25 10:28:26.000000000 -0400 *************** *** 300,306 **** ac_cs_version="\ config.status configured by ./configure, generated by GNU Autoconf 2.59, ! with options \" 'CC=gcc'\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation --- 300,306 ---- ac_cs_version="\ config.status configured by ./configure, generated by GNU Autoconf 2.59, ! with options \"'--with-otcl=../otcl-1.13' '--with-tclcl=../tclcl-1.19'\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation *************** *** 379,386 **** fi if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " 'CC=gcc' $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure 'CC=gcc' $ac_configure_extra_args --no-create --no-recursion fi for ac_config_target in $ac_config_targets --- 379,386 ---- fi if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " '--with-otcl=../otcl-1.13' '--with-tclcl=../tclcl-1.19' $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure '--with-otcl=../otcl-1.13' '--with-tclcl=../tclcl-1.19' $ac_configure_extra_args --no-create --no-recursion fi for ac_config_target in $ac_config_targets *************** *** 476,492 **** s,@ECHO_N@,-n,;t t s,@ECHO_T@,,;t t s,@LIBS@,-lm ,;t t ! s,@build@,i686-pc-linux-gnu,;t t ! s,@build_cpu@,i686,;t t ! s,@build_vendor@,pc,;t t s,@build_os@,linux-gnu,;t t ! s,@host@,i686-pc-linux-gnu,;t t ! s,@host_cpu@,i686,;t t ! s,@host_vendor@,pc,;t t s,@host_os@,linux-gnu,;t t ! s,@target@,i686-pc-linux-gnu,;t t ! s,@target_cpu@,i686,;t t ! s,@target_vendor@,pc,;t t s,@target_os@,linux-gnu,;t t s,@CC@,gcc,;t t s,@CFLAGS@,-g -O2,;t t --- 476,492 ---- s,@ECHO_N@,-n,;t t s,@ECHO_T@,,;t t s,@LIBS@,-lm ,;t t ! s,@build@,x86_64-unknown-linux-gnu,;t t ! s,@build_cpu@,x86_64,;t t ! s,@build_vendor@,unknown,;t t s,@build_os@,linux-gnu,;t t ! s,@host@,x86_64-unknown-linux-gnu,;t t ! s,@host_cpu@,x86_64,;t t ! s,@host_vendor@,unknown,;t t s,@host_os@,linux-gnu,;t t ! s,@target@,x86_64-unknown-linux-gnu,;t t ! s,@target_cpu@,x86_64,;t t ! s,@target_vendor@,unknown,;t t s,@target_os@,linux-gnu,;t t s,@CC@,gcc,;t t s,@CFLAGS@,-g -O2,;t t *************** *** 502,525 **** s,@EGREP@,grep -E,;t t s,@CPP_NAMESPACE@,std,;t t s,@V_TCL_LIBRARY_FILES@,$(TCL_84_LIBRARY_FILES),;t t ! s,@V_TCLSH@,/usr/bin/tclsh8.4,;t t ! s,@V_LIBRARY_TCL@,/usr/lib/tcl8.4,;t t s,@V_TKDOSNAMES@,$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl,;t t ! s,@V_LIBRARY_TK@,/usr/share/tk8.4,;t t ! s,@V_TCL2CPP@,../tclcl/tcl2c++,;t t s,@V_INCLUDE_X11@,,;t t ! s,@V_LIB_X11@,-lXext -lX11,;t t s,@PERL@,/usr/bin/perl,;t t s,@build_nse@,nse,;t t ! s,@V_INCLUDES@,-I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap,;t t ! s,@V_LIBS@,-L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.4 -L/usr/lib -ltcl8.4,;t t s,@V_DEFINES@,-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_4 -DHAVE_TK_H -DHAVE_LIBTCL8_4 -DHAVE_TCL_H ,;t t s,@V_STATIC@,,;t t s,@V_TAR_TARGET@,linux-gnu,;t t ! s,@V_LIB_TCLCL@,-L/home/tomh/cvs/tclcl -ltclcl,;t t ! s,@V_LIB_OTCL@,-L/home/tomh/cvs/otcl -lotcl,;t t ! s,@V_LIB_TCL@,-L/usr/lib -ltcl8.4,;t t ! s,@V_LIB_TK@,-L/usr/lib -ltk8.4,;t t s,@V_ALL@,,;t t s,@V_CCOPT@, -Wall,;t t s,@V_TAR_EXTRA@,,;t t --- 502,525 ---- s,@EGREP@,grep -E,;t t s,@CPP_NAMESPACE@,std,;t t s,@V_TCL_LIBRARY_FILES@,$(TCL_84_LIBRARY_FILES),;t t ! s,@V_TCLSH@,/home/mabdulla/ns2/bin/tclsh8.4,;t t ! s,@V_LIBRARY_TCL@,../lib/tcl8.4,;t t s,@V_TKDOSNAMES@,$(LIBRARY_TK)/optMenu.tcl $(LIBRARY_TK)/scrlbar.tcl,;t t ! s,@V_LIBRARY_TK@,../lib/tk8.4,;t t ! s,@V_TCL2CPP@,../tclcl-1.19/tcl2c++,;t t s,@V_INCLUDE_X11@,,;t t ! s,@V_LIB_X11@,-lX11,;t t s,@PERL@,/usr/bin/perl,;t t s,@build_nse@,nse,;t t ! s,@V_INCLUDES@,-I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap,;t t ! s,@V_LIBS@,-L/home/mabdulla/ns2/tclcl-1.19 -ltclcl -L/home/mabdulla/ns2/otcl-1.13 -lotcl -L/home/mabdulla/ns2/lib -ltk8.4 -L/home/mabdulla/ns2/lib -ltcl8.4,;t t s,@V_DEFINES@,-DHAVE_LIBTCLCL -DHAVE_TCLCL_H -DHAVE_LIBOTCL1_13 -DHAVE_OTCL_H -DHAVE_LIBTK8_4 -DHAVE_TK_H -DHAVE_LIBTCL8_4 -DHAVE_TCL_H ,;t t s,@V_STATIC@,,;t t s,@V_TAR_TARGET@,linux-gnu,;t t ! s,@V_LIB_TCLCL@,-L/home/mabdulla/ns2/tclcl-1.19 -ltclcl,;t t ! s,@V_LIB_OTCL@,-L/home/mabdulla/ns2/otcl-1.13 -lotcl,;t t ! s,@V_LIB_TCL@,-L/home/mabdulla/ns2/lib -ltcl8.4,;t t ! s,@V_LIB_TK@,-L/home/mabdulla/ns2/lib -ltk8.4,;t t s,@V_ALL@,,;t t s,@V_CCOPT@, -Wall,;t t s,@V_TAR_EXTRA@,,;t t *************** *** 905,911 **** ${ac_dA}RANDOM_RETURN_TYPE${ac_dB}RANDOM_RETURN_TYPE${ac_dC}long${ac_dD} ${ac_dA}HAVE_STRTOQ${ac_dB}HAVE_STRTOQ${ac_dC}1${ac_dD} ${ac_dA}HAVE_STRTOLL${ac_dB}HAVE_STRTOLL${ac_dC}1${ac_dD} ! ${ac_dA}SIZEOF_LONG${ac_dB}SIZEOF_LONG${ac_dC}4${ac_dD} ${ac_dA}HAVE_INT64${ac_dB}HAVE_INT64${ac_dC}1${ac_dD} ${ac_dA}HAVE_ETHER_HEADER_STRUCT${ac_dB}HAVE_ETHER_HEADER_STRUCT${ac_dC}1${ac_dD} ${ac_dA}HAVE_ETHER_ADDRESS_STRUCT${ac_dB}HAVE_ETHER_ADDRESS_STRUCT${ac_dC}1${ac_dD} --- 905,911 ---- ${ac_dA}RANDOM_RETURN_TYPE${ac_dB}RANDOM_RETURN_TYPE${ac_dC}long${ac_dD} ${ac_dA}HAVE_STRTOQ${ac_dB}HAVE_STRTOQ${ac_dC}1${ac_dD} ${ac_dA}HAVE_STRTOLL${ac_dB}HAVE_STRTOLL${ac_dC}1${ac_dD} ! ${ac_dA}SIZEOF_LONG${ac_dB}SIZEOF_LONG${ac_dC}8${ac_dD} ${ac_dA}HAVE_INT64${ac_dB}HAVE_INT64${ac_dC}1${ac_dD} ${ac_dA}HAVE_ETHER_HEADER_STRUCT${ac_dB}HAVE_ETHER_HEADER_STRUCT${ac_dC}1${ac_dD} ${ac_dA}HAVE_ETHER_ADDRESS_STRUCT${ac_dB}HAVE_ETHER_ADDRESS_STRUCT${ac_dC}1${ac_dD} *************** *** 978,984 **** ${ac_uA}RANDOM_RETURN_TYPE${ac_uB}RANDOM_RETURN_TYPE${ac_uC}long${ac_uD} ${ac_uA}HAVE_STRTOQ${ac_uB}HAVE_STRTOQ${ac_uC}1${ac_uD} ${ac_uA}HAVE_STRTOLL${ac_uB}HAVE_STRTOLL${ac_uC}1${ac_uD} ! ${ac_uA}SIZEOF_LONG${ac_uB}SIZEOF_LONG${ac_uC}4${ac_uD} ${ac_uA}HAVE_INT64${ac_uB}HAVE_INT64${ac_uC}1${ac_uD} ${ac_uA}HAVE_ETHER_HEADER_STRUCT${ac_uB}HAVE_ETHER_HEADER_STRUCT${ac_uC}1${ac_uD} ${ac_uA}HAVE_ETHER_ADDRESS_STRUCT${ac_uB}HAVE_ETHER_ADDRESS_STRUCT${ac_uC}1${ac_uD} --- 978,984 ---- ${ac_uA}RANDOM_RETURN_TYPE${ac_uB}RANDOM_RETURN_TYPE${ac_uC}long${ac_uD} ${ac_uA}HAVE_STRTOQ${ac_uB}HAVE_STRTOQ${ac_uC}1${ac_uD} ${ac_uA}HAVE_STRTOLL${ac_uB}HAVE_STRTOLL${ac_uC}1${ac_uD} ! ${ac_uA}SIZEOF_LONG${ac_uB}SIZEOF_LONG${ac_uC}8${ac_uD} ${ac_uA}HAVE_INT64${ac_uB}HAVE_INT64${ac_uC}1${ac_uD} ${ac_uA}HAVE_ETHER_HEADER_STRUCT${ac_uB}HAVE_ETHER_HEADER_STRUCT${ac_uC}1${ac_uD} ${ac_uA}HAVE_ETHER_ADDRESS_STRUCT${ac_uB}HAVE_ETHER_ADDRESS_STRUCT${ac_uC}1${ac_uD} Only in ns-2.32-new: dtnmc Only in ns-2.32-new: gen Only in ns-2.32-new/indep-utils/cmu-scen-gen/setdest: calcdest Only in ns-2.32-new/indep-utils/cmu-scen-gen/setdest: calcdest.o Only in ns-2.32-new/indep-utils/cmu-scen-gen/setdest: rng.o Only in ns-2.32-new/indep-utils/cmu-scen-gen/setdest: setdest Only in ns-2.32-new/indep-utils/cmu-scen-gen/setdest: setdest.o Only in ns-2.32-new/indep-utils/webtrace-conv/dec: dec-tr-stat Only in ns-2.32-new/indep-utils/webtrace-conv/dec: formsquid.o Only in ns-2.32-new/indep-utils/webtrace-conv/dec: formtxt.o diff -rc ns-2.32/indep-utils/webtrace-conv/dec/Makefile ns-2.32-new/indep-utils/webtrace-conv/dec/Makefile *** ns-2.32/indep-utils/webtrace-conv/dec/Makefile 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/indep-utils/webtrace-conv/dec/Makefile 2008-03-25 10:28:26.000000000 -0400 *************** *** 52,61 **** BINDEST = /usr/local/bin CC = g++ ! INCLUDE = -I. -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/usr/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = proxytrace.cc formsquid.cc formtxt.cc my-endian.cc \ --- 52,61 ---- BINDEST = /usr/local/bin CC = g++ ! INCLUDE = -I. -I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/home/mabdulla/ns2/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = proxytrace.cc formsquid.cc formtxt.cc my-endian.cc \ Only in ns-2.32-new/indep-utils/webtrace-conv/dec: my-endian.o Only in ns-2.32-new/indep-utils/webtrace-conv/dec: proxytrace2any.o Only in ns-2.32-new/indep-utils/webtrace-conv/dec: proxytrace.o Only in ns-2.32-new/indep-utils/webtrace-conv/dec: tr-stat.o Only in ns-2.32-new/indep-utils/webtrace-conv/epa: epa-tr-stat diff -rc ns-2.32/indep-utils/webtrace-conv/epa/Makefile ns-2.32-new/indep-utils/webtrace-conv/epa/Makefile *** ns-2.32/indep-utils/webtrace-conv/epa/Makefile 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/indep-utils/webtrace-conv/epa/Makefile 2008-03-25 10:28:26.000000000 -0400 *************** *** 49,58 **** CC = g++ MKDEP = ../../../conf/mkdep ! INCLUDE = -I. -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/usr/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc --- 49,58 ---- CC = g++ MKDEP = ../../../conf/mkdep ! INCLUDE = -I. -I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/home/mabdulla/ns2/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc Only in ns-2.32-new/indep-utils/webtrace-conv/epa: tr-stat.o Only in ns-2.32-new/indep-utils/webtrace-conv/nlanr: logparse.o diff -rc ns-2.32/indep-utils/webtrace-conv/nlanr/Makefile ns-2.32-new/indep-utils/webtrace-conv/nlanr/Makefile *** ns-2.32/indep-utils/webtrace-conv/nlanr/Makefile 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/indep-utils/webtrace-conv/nlanr/Makefile 2008-03-25 10:28:26.000000000 -0400 *************** *** 49,58 **** BINDEST = /usr/local/bin CC = g++ ! INCLUDE = -I. -I../../.. -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/usr/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc logparse.cc --- 49,58 ---- BINDEST = /usr/local/bin CC = g++ ! INCLUDE = -I. -I../../.. -I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/home/mabdulla/ns2/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc logparse.cc Only in ns-2.32-new/indep-utils/webtrace-conv/nlanr: nlanr-tr-stat Only in ns-2.32-new/indep-utils/webtrace-conv/nlanr: tr-stat.o Only in ns-2.32-new/indep-utils/webtrace-conv/ucb: logparse.o diff -rc ns-2.32/indep-utils/webtrace-conv/ucb/Makefile ns-2.32-new/indep-utils/webtrace-conv/ucb/Makefile *** ns-2.32/indep-utils/webtrace-conv/ucb/Makefile 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/indep-utils/webtrace-conv/ucb/Makefile 2008-04-10 16:53:24.000000000 -0400 *************** *** 27,36 **** CC = g++ MKDEP = ../../../conf/mkdep ! INCLUDE = -I. -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/usr/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc logparse.cc utils.cc --- 27,36 ---- CC = g++ MKDEP = ../../../conf/mkdep ! INCLUDE = -I. -I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap CFLAGS = -Wall -DCPP_NAMESPACE=std LDFLAGS = ! LIBS = -L/home/mabdulla/ns2/lib -ltcl8.4 -lnsl -lpcap -ldl -lm INSTALL = /usr/bin/install -c SRC = tr-stat.cc logparse.cc utils.cc Only in ns-2.32-new/indep-utils/webtrace-conv/ucb: tr-stat.o Only in ns-2.32-new/indep-utils/webtrace-conv/ucb: ucb-tr-stat Only in ns-2.32-new/indep-utils/webtrace-conv/ucb: utils.o diff -rc ns-2.32/Makefile ns-2.32-new/Makefile *** ns-2.32/Makefile 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/Makefile 2008-03-25 12:28:53.000000000 -0400 *************** *** 37,44 **** CPP = g++ LINK = $(CPP) MKDEP = ./conf/mkdep ! TCLSH = /usr/bin/tclsh8.4 ! TCL2C = ../tclcl/tcl2c++ AR = ar rc $(BLANK) RANLIB = ranlib --- 37,44 ---- CPP = g++ LINK = $(CPP) MKDEP = ./conf/mkdep ! TCLSH = /home/mabdulla/ns2/bin/tclsh8.4 ! TCL2C = ../tclcl-1.19/tcl2c++ AR = ar rc $(BLANK) RANLIB = ranlib *************** *** 63,69 **** INCLUDES = \ -I. \ -I. \ ! -I/home/tomh/cvs/tclcl -I/home/tomh/cvs/otcl -I/usr/include -I/usr/include -I/usr/include/pcap \ -I./tcp -I./sctp -I./common -I./link -I./queue \ -I./adc -I./apps -I./mac -I./mobile -I./trace \ -I./routing -I./tools -I./classifier -I./mcast \ --- 63,69 ---- INCLUDES = \ -I. \ -I. \ ! -I/home/mabdulla/ns2/tclcl-1.19 -I/home/mabdulla/ns2/otcl-1.13 -I/home/mabdulla/ns2/include -I/home/mabdulla/ns2/include -I/usr/include/pcap \ -I./tcp -I./sctp -I./common -I./link -I./queue \ -I./adc -I./apps -I./mac -I./mobile -I./trace \ -I./routing -I./tools -I./classifier -I./mcast \ *************** *** 75,82 **** LIB = \ ! -L/home/tomh/cvs/tclcl -ltclcl -L/home/tomh/cvs/otcl -lotcl -L/usr/lib -ltk8.4 -L/usr/lib -ltcl8.4 \ ! -lXext -lX11 \ -lnsl -lpcap -ldl \ -lm -lm # -L${exec_prefix}/lib \ --- 75,82 ---- LIB = \ ! -L/home/mabdulla/ns2/tclcl-1.19 -ltclcl -L/home/mabdulla/ns2/otcl-1.13 -lotcl -L/home/mabdulla/ns2/lib -ltk8.4 -L/home/mabdulla/ns2/lib -ltcl8.4 \ ! -lX11 \ -lnsl -lpcap -ldl \ -lm -lm # -L${exec_prefix}/lib \ *************** *** 310,318 **** wpan/p802_15_4nam.o wpan/p802_15_4phy.o \ wpan/p802_15_4sscs.o wpan/p802_15_4timer.o \ wpan/p802_15_4trace.o wpan/p802_15_4transac.o \ $(OBJ_STL) - # don't allow comments to follow continuation lines # mac-csma.o mac-multihop.o\ --- 310,318 ---- wpan/p802_15_4nam.o wpan/p802_15_4phy.o \ wpan/p802_15_4sscs.o wpan/p802_15_4timer.o \ wpan/p802_15_4trace.o wpan/p802_15_4transac.o \ + dtnmc/dtnmc.o dtnmc/dtnmc_rtable.o \ $(OBJ_STL) # don't allow comments to follow continuation lines # mac-csma.o mac-multihop.o\ *************** *** 368,373 **** --- 368,375 ---- all: $(NS) $(BUILD_NSE) $(NSTK) all-recursive + dclean: + rm -rf dtnmc/*.o all-recursive: for i in $(SUBDIRS); do ( cd $$i; $(MAKE) all; ) done *************** *** 386,395 **** common/tclAppInit.o $(OBJ) \ $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C) $(LIB) ! $(NSTK): $(OBJ) common/tkAppInit.o $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C) $(LINK) $(LDFLAGS) $(LDOUT)$@ \ ! common/tkAppInit.o $(OBJ) \ ! $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C) $(LIB) ns.dyn: $(OBJ) common/tclAppInit.o $(LINK) $(LDFLAGS) -o $@ \ --- 388,396 ---- common/tclAppInit.o $(OBJ) \ $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C) $(LIB) ! $(NSTK): $(OBJ) common/tkAppInit.o $(LINK) $(LDFLAGS) $(LDOUT)$@ \ ! common/tkAppInit.o $(OBJ) $(LIB) ns.dyn: $(OBJ) common/tclAppInit.o $(LINK) $(LDFLAGS) -o $@ \ diff -rc ns-2.32/queue/priqueue.cc ns-2.32-new/queue/priqueue.cc *** ns-2.32/queue/priqueue.cc 2004-10-07 13:56:03.000000000 -0400 --- ns-2.32-new/queue/priqueue.cc 2008-04-10 17:00:39.000000000 -0400 *************** *** 90,95 **** --- 90,96 ---- case PT_MESSAGE: case PT_TORA: case PT_AODV: + case PT_DTNMC: recvHighPriority(p, h); break; diff -rc ns-2.32/tcl/lib/ns-autoconf.tcl ns-2.32-new/tcl/lib/ns-autoconf.tcl *** ns-2.32/tcl/lib/ns-autoconf.tcl 2007-08-22 00:10:00.000000000 -0400 --- ns-2.32-new/tcl/lib/ns-autoconf.tcl 2008-04-10 16:53:24.000000000 -0400 *************** *** 40,48 **** The wrong version of perl may break the test suites.\ Reconfigure and rebuild ns if this is a problem.\ " ! checkout_executable TCLSH "/usr/bin/tclsh8.4" tclsh "\ When configured, ns found the right version of tclsh in\ ! /usr/bin/tclsh8.4 but it doesn't seem to be there anymore, so\ ns will fall back on running the first tclsh in your path.\ The wrong version of tclsh may break the test suites.\ --- 40,48 ---- The wrong version of perl may break the test suites.\ Reconfigure and rebuild ns if this is a problem.\ " ! checkout_executable TCLSH "/home/mabdulla/ns2/bin/tclsh8.4" tclsh "\ When configured, ns found the right version of tclsh in\ ! /home/mabdulla/ns2/bin/tclsh8.4 but it doesn't seem to be there anymore, so\ ns will fall back on running the first tclsh in your path.\ The wrong version of tclsh may break the test suites.\ diff -rc ns-2.32/tcl/lib/ns-default.tcl ns-2.32-new/tcl/lib/ns-default.tcl *** ns-2.32/tcl/lib/ns-default.tcl 2007-06-17 17:44:46.000000000 -0400 --- ns-2.32-new/tcl/lib/ns-default.tcl 2008-04-10 13:09:24.000000000 -0400 *************** *** 757,762 **** --- 757,777 ---- Agent/Ping set packetSize_ 64 + Agent/Dtnmc set spray_ 1 ;# spray type: 1 is for binary spray, 2 is source spray, 3 is epidemic + Agent/Dtnmc set nocopy_ 8 ;# number of copies to spray + Agent/Dtnmc set core_ 0 ;# specifies if the node is a core node + Agent/Dtnmc set nstat_ 0 ;# specifies if the node is static + Agent/Dtnmc set infect_ 0 ;# currently unused + Agent/Dtnmc set xpos_ 0 ;# x coordinate of node + Agent/Dtnmc set ypos_ 0 ;# y coordinate of node + Agent/Dtnmc set num_nodes_ 2 ;# number of nodes in the system + Agent/Dtnmc set mcast_base_addr 0 ;# multicast group address (id) + Agent/Dtnmc set time_stop_ 999999999.9 ;# this has to be large by default, or nodes will stop transmitting early + Agent/Dtnmc set msg_ttk_ 8000.0 ;# time to kill for a message + Agent/Dtnmc set msg_ttl_ 32 ;# time to live for a message + Agent/Dtnmc set intra_group_ 0 ;# indicates if messages are communicated within group only + Agent/Dtnmc set inter_group_prob_ 1.0 ;# indicates the probability with witch nodes exchange packets with non-group members + Agent/UDP set packetSize_ 1000 Agent/UDP instproc done {} { } Agent/UDP instproc process_data {from data} { } diff -rc ns-2.32/tcl/lib/ns-lib.tcl ns-2.32-new/tcl/lib/ns-lib.tcl *** ns-2.32/tcl/lib/ns-lib.tcl 2007-01-30 00:00:51.000000000 -0500 --- ns-2.32-new/tcl/lib/ns-lib.tcl 2008-04-10 13:24:32.000000000 -0400 *************** *** 615,620 **** --- 615,623 ---- AODV { set ragent [$self create-aodv-agent $node] } + DTNMC { + set ragent [$self create-dtnmc-agent $node] + } TORA { Simulator set IMEPFlag_ ON set ragent [$self create-tora-agent $node] *************** *** 834,839 **** --- 837,850 ---- return $ragent } + Simulator instproc create-dtnmc-agent { node } { + # Create Dtnmc routing agent + set ragent [new Agent/Dtnmc [$node node-addr]] + $self at 0.0 "$ragent start" + $node set ragent_ $ragent + return $ragent + } + Simulator instproc use-newtrace {} { Simulator set WirelessNewTrace_ 1 } diff -rc ns-2.32/tcl/lib/ns-packet.tcl ns-2.32-new/tcl/lib/ns-packet.tcl *** ns-2.32/tcl/lib/ns-packet.tcl 2005-06-17 13:41:16.000000000 -0400 --- ns-2.32-new/tcl/lib/ns-packet.tcl 2008-03-25 12:59:54.000000000 -0400 *************** *** 161,166 **** --- 161,167 ---- Mac # network wireless stack # Mobility, Ad-Hoc Networks, Sensor Nets: AODV # routing protocol for ad-hoc networks + Dtnmc # multicast routing protocol for delay tolerant networks Diffusion # diffusion/diffusion.cc IMEP # Internet MANET Encapsulation Protocol, for ad-hoc networks MIP # Mobile IP, mobile/mip-reg.cc Only in ns-2.32-new/tcl/test: all.cwnd Only in ns-2.32-new/tcl/test: all.cwnd1 Only in ns-2.32-new/tcl/test: all.nam Only in ns-2.32-new/tcl/test: all.q Only in ns-2.32-new/tcl/test: all.tr Only in ns-2.32-new/tcl/test: cwnd.xgr Only in ns-2.32-new/tcl/test: estudy.tr Only in ns-2.32-new/tcl/test: fairflow.tr Only in ns-2.32-new/tcl/test: fairflow.xgr Only in ns-2.32-new/tcl/test: flooding.tr Only in ns-2.32-new/tcl/test: gkeeper.nam Only in ns-2.32-new/tcl/test: out.seq Only in ns-2.32-new/tcl/test: out.tr Only in ns-2.32-new/tcl/test: out.xg Only in ns-2.32-new/tcl/test: rto.tr Only in ns-2.32-new/tcl/test: rtt.tr Only in ns-2.32-new/tcl/test: seqn.tr Only in ns-2.32-new/tcl/test: srr_out.txt Only in ns-2.32-new/tcl/test: srtt.tr Only in ns-2.32-new/tcl/test: t Only in ns-2.32-new/tcl/test: t1 Only in ns-2.32-new/tcl/test: t2 Only in ns-2.32-new/tcl/test: temp.1 Only in ns-2.32-new/tcl/test: temp1.rands Only in ns-2.32-new/tcl/test: temp.2 Only in ns-2.32-new/tcl/test: temp2.rands Only in ns-2.32-new/tcl/test: temp.3 Only in ns-2.32-new/tcl/test: temp.4 Only in ns-2.32-new/tcl/test: temp.5 Only in ns-2.32-new/tcl/test: temp.all Only in ns-2.32-new/tcl/test: temp.c Only in ns-2.32-new/tcl/test: temp.cwnd Only in ns-2.32-new/tcl/test: temp.p Only in ns-2.32-new/tcl/test: temp.q Only in ns-2.32-new/tcl/test: temp.rands Only in ns-2.32-new/tcl/test: temp.randsgz Only in ns-2.32-new/tcl/test: temp.rands.nam Only in ns-2.32-new/tcl/test: temp.rands.tmp Only in ns-2.32-new/tcl/test: temp.s Only in ns-2.32/tcl/test: test-output-adaptive-red Only in ns-2.32/tcl/test: test-output-aimd Only in ns-2.32/tcl/test: test-output-algo-routing Only in ns-2.32/tcl/test: test-output-broken Only in ns-2.32/tcl/test: test-output-cbq Only in ns-2.32/tcl/test: test-output-cbq-v1 Only in ns-2.32/tcl/test: test-output-delaybox Only in ns-2.32/tcl/test: test-output-diffserv Only in ns-2.32/tcl/test: test-output-diffusion3 Only in ns-2.32/tcl/test: test-output-ecn Only in ns-2.32/tcl/test: test-output-ecn-ack Only in ns-2.32/tcl/test: test-output-ecn-full Only in ns-2.32/tcl/test: test-output-energy Only in ns-2.32/tcl/test: test-output-examples Only in ns-2.32/tcl/test: test-output-friendly Only in ns-2.32/tcl/test: test-output-frto Only in ns-2.32/tcl/test: test-output-full Only in ns-2.32/tcl/test: test-output-full-fixes Only in ns-2.32/tcl/test: test-output-gk Only in ns-2.32/tcl/test: test-output-greis Only in ns-2.32/tcl/test: test-output-hier-routing Only in ns-2.32/tcl/test: test-output-intserv Only in ns-2.32/tcl/test: test-output-jobs Only in ns-2.32/tcl/test: test-output-lan Only in ns-2.32/tcl/test: test-output-LimTransmit Only in ns-2.32/tcl/test: test-output-links Only in ns-2.32/tcl/test: test-output-linkstate Only in ns-2.32/tcl/test: test-output-manual-routing Only in ns-2.32/tcl/test: test-output-mcache Only in ns-2.32/tcl/test: test-output-mcast Only in ns-2.32/tcl/test: test-output-message Only in ns-2.32/tcl/test: test-output-mip Only in ns-2.32/tcl/test: test-output-misc Only in ns-2.32/tcl/test: test-output-mixmode Only in ns-2.32/tcl/test: test-output-monitor Only in ns-2.32/tcl/test: test-output-mpls Only in ns-2.32/tcl/test: test-output-newreno Only in ns-2.32/tcl/test: test-output-nixvec Only in ns-2.32/tcl/test: test-output-oddBehaviors Only in ns-2.32/tcl/test: test-output-packmime Only in ns-2.32/tcl/test: test-output-pi Only in ns-2.32/tcl/test: test-output-plm Only in ns-2.32/tcl/test: test-output-pushback Only in ns-2.32/tcl/test: test-output-quickstart Only in ns-2.32/tcl/test: test-output-quiescent Only in ns-2.32/tcl/test: test-output-rap Only in ns-2.32/tcl/test: test-output-rbp Only in ns-2.32/tcl/test: test-output-realaudio Only in ns-2.32/tcl/test: test-output-red Only in ns-2.32/tcl/test: test-output-red-pd Only in ns-2.32/tcl/test: test-output-red-v1 Only in ns-2.32/tcl/test: test-output-rem Only in ns-2.32/tcl/test: test-output-rfc2581 Only in ns-2.32/tcl/test: test-output-rfc793edu Only in ns-2.32/tcl/test: test-output-rio Only in ns-2.32/tcl/test: test-output-rng Only in ns-2.32/tcl/test: test-output-sack Only in ns-2.32/tcl/test: test-output-sack-full Only in ns-2.32/tcl/test: test-output-sack-v1 Only in ns-2.32/tcl/test: test-output-satellite Only in ns-2.32/tcl/test: test-output-schedule Only in ns-2.32/tcl/test: test-output-sctp Only in ns-2.32/tcl/test: test-output-session Only in ns-2.32/tcl/test: test-output-simple Only in ns-2.32/tcl/test: test-output-simple-full Only in ns-2.32/tcl/test: test-output-sliding-window Only in ns-2.32/tcl/test: test-output-smac Only in ns-2.32/tcl/test: test-output-smac-multihop Only in ns-2.32/tcl/test: test-output-snoop Only in ns-2.32/tcl/test: test-output-source-routing Only in ns-2.32/tcl/test: test-output-srm Only in ns-2.32/tcl/test: test-output-tagged-trace Only in ns-2.32/tcl/test: test-output-tcp Only in ns-2.32/tcl/test: test-output-tcpHighspeed Only in ns-2.32/tcl/test: test-output-tcp-init-win Only in ns-2.32/tcl/test: test-output-tcp-init-win-full Only in ns-2.32/tcl/test: test-output-tcpOptions Only in ns-2.32/tcl/test: test-output-tcpReset Only in ns-2.32/tcl/test: test-output-tcpVariants Only in ns-2.32/tcl/test: test-output-testReno Only in ns-2.32/tcl/test: test-output-testReno-bayfull Only in ns-2.32/tcl/test: test-output-testReno-full Only in ns-2.32/tcl/test: test-output-v1 Only in ns-2.32/tcl/test: test-output-vc Only in ns-2.32/tcl/test: test-output-vegas-v1 Only in ns-2.32/tcl/test: test-output-vq Only in ns-2.32/tcl/test: test-output-webcache Only in ns-2.32/tcl/test: test-output-webtraf Only in ns-2.32/tcl/test: test-output-wireless-diffusion Only in ns-2.32/tcl/test: test-output-wireless-gridkeeper Only in ns-2.32/tcl/test: test-output-wireless-lan Only in ns-2.32/tcl/test: test-output-wireless-shadowing Only in ns-2.32/tcl/test: test-output-wireless-tdma Only in ns-2.32/tcl/test: test-output-WLtutorial Only in ns-2.32/tcl/test: test-output-wpan Only in ns-2.32/tcl/test: test-output-xcp diff -rc ns-2.32/trace/cmu-trace.cc ns-2.32-new/trace/cmu-trace.cc *** ns-2.32/trace/cmu-trace.cc 2006-03-21 17:31:32.000000000 -0500 --- ns-2.32-new/trace/cmu-trace.cc 2008-04-10 17:00:39.000000000 -0400 *************** *** 59,64 **** --- 59,65 ---- #include "wpan/p802_15_4trace.h" #include "wpan/p802_15_4nam.h" // + #include //DTN multicast #include "diffusion/diff_header.h" // DIFFUSION -- Chalermek *************** *** 887,892 **** --- 888,920 ---- } void + CMUTrace::format_dtnmc(Packet *p, int offset) + { + struct hdr_dtnmc_pkt* ph = HDR_DTNMC_PKT(p); + if (pt_->tagged()) { + sprintf(pt_->buffer() + offset, + "-dtnmc:o %d -dtnmc:s %d -dtnmc:l %d ", + ph->pkt_src(), + ph->pkt_seq_num(), + ph->size()); + } + else if (newtrace_) { + sprintf(pt_->buffer() + offset, + "-P dtnmc -Po %d -Ps %d -Pl %d ", + ph->pkt_src(), + ph->pkt_seq_num(), + ph->size()); + } + else { + sprintf(pt_->buffer() + offset, + "[dtnmc %d %d %d] ", + ph->pkt_src(), + ph->pkt_seq_num(), + ph->size()); + } + } + + void CMUTrace::nam_format(Packet *p, int offset) { Node* srcnode = 0 ; *************** *** 1150,1155 **** --- 1178,1186 ---- case PT_AODV: format_aodv(p, offset); break; + case PT_DTNMC: + format_dtnmc(p, offset); + break; case PT_TORA: format_tora(p, offset); break; diff -rc ns-2.32/trace/cmu-trace.h ns-2.32-new/trace/cmu-trace.h *** ns-2.32/trace/cmu-trace.h 2005-07-26 21:13:45.000000000 -0400 --- ns-2.32-new/trace/cmu-trace.h 2008-03-25 12:55:27.000000000 -0400 *************** *** 133,138 **** --- 133,139 ---- void format_tora(Packet *p, int offset); void format_imep(Packet *p, int offset); void format_aodv(Packet *p, int offset); + void format_dtnmc(Packet *p, int offset); }; #endif /* __cmu_trace__ */