cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ns 2.26

Browse Source 
note: this is not 64bit clean as this would require a minor rewrite of ns

from Nicolas Baldi <openbsd@softhome.net>
This commit is contained in:
sturm 2003-11-01 20:05:01 +00:00
parent afab1b97ac
commit 0caceb1c87
45 changed files with 514 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/ns/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2003/11/01 20:05:01 sturm Exp $
# $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
# $OpenBSD: Makefile,v 1.22 2002/12/23 00:37:52 pvalchev Exp $
COMMENT= "UCB/LBNL Network Simulator Version 2"
DISTNAME= ns-2.1b6
DISTFILES= ns-src-2.1b6.tar.gz
DISTNAME= ns-2.26
DISTFILES= ns-src-2.26.tar.gz
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
@ -12,31 +12,30 @@ MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
http://www.isi.edu/nsnam/dist/
# License: BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
HOMEPAGE= http://www.isi.edu/nsnam/ns/
BUILD_DEPENDS= :tclcl-*:devel/tclcl
RUN_DEPENDS= :tcl-8.3.*:lang/tcl/8.3
LIB_DEPENDS= otcl::lang/otcl \
tcl83::lang/tcl/8.3 \
tk83::x11/tk/8.3
tclcl::devel/tclcl
MODULES= gcc3
MODGCC3_ARCHES= sparc64
MODGCC3_LANGS= c++
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-tcl-ver=8.3 --with-tk-ver=8.3
ALL_TARGET=
do-regress:
cd ${WRKSRC}; ./validate
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ns2
${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
do-regress:
cd ${WRKSRC} && ./validate
.include <bsd.port.mk>

6
net/ns/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ns-src-2.1b6.tar.gz) = b9334da72df329d0367acc782310165e
RMD160 (ns-src-2.1b6.tar.gz) = dc46fe543c0901874046e3ed54c67ccd0b13acb8
SHA1 (ns-src-2.1b6.tar.gz) = 615b71202922492a5d7a27b3c961b5cf311aded1
MD5 (ns-src-2.26.tar.gz) = c75aa2047fa3e13ed2a43881c50e4c65
RMD160 (ns-src-2.26.tar.gz) = 39f13b5bee2008ac1094a7c008a1be37959b197d
SHA1 (ns-src-2.26.tar.gz) = 23da69b5e23356a14e4e1825b7f434731bdc5f68

8
net/ns/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/03/17 15:39:25 wilfried Exp $
--- Makefile.in.orig Thu Jan 6 20:08:23 2000
+++ Makefile.in Fri Mar 16 20:04:02 2001
@@ -67,7 +67,7 @@ LIB = \
$OpenBSD: patch-Makefile_in,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- Makefile.in.orig 2003-02-27 19:51:25.000000000 -0500
+++ Makefile.in 2003-08-22 07:45:17.000000000 -0400
@@ -77,7 +77,7 @@ LIB = \
-lm @LIBS@
# -L@libdir@ \

12
net/ns/patches/patch-aodv_aodv_rtable_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-aodv_aodv_rtable_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- aodv/aodv_rtable.h.orig 2003-02-26 17:07:15.000000000 -0500
+++ aodv/aodv_rtable.h 2003-08-22 07:45:17.000000000 -0400
@@ -36,7 +36,7 @@ The AODV code developed by the CMU/MONAR
#include <assert.h>
#include <sys/types.h>
#include <config.h>
-#include <lib/bsd-list.h>
+#include <sys/queue.h>
#include <scheduler.h>
#define CURRENT_TIME Scheduler::instance().clock()

12
net/ns/patches/patch-common_mobilenode_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-common_mobilenode_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/mobilenode.h.orig 2003-02-26 17:07:40.000000000 -0500
+++ common/mobilenode.h 2003-08-22 07:45:17.000000000 -0400
@@ -53,7 +53,7 @@
#include "object.h"
#include "trace.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "phy.h"
#include "topography.h"
#include "arp.h"

12
net/ns/patches/patch-common_net-interface_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-common_net-interface_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/net-interface.h.orig 2003-02-26 17:07:40.000000000 -0500
+++ common/net-interface.h 2003-08-22 07:45:17.000000000 -0400
@@ -27,7 +27,7 @@
#include "connector.h"
#include "packet.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class NetworkInterface;
LIST_HEAD(netint_head, NetworkInterface); // declare list head structure

12
net/ns/patches/patch-common_node_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-common_node_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/node.h.orig 2003-02-26 17:07:40.000000000 -0500
+++ common/node.h 2003-08-22 07:45:17.000000000 -0400
@@ -52,7 +52,7 @@
#include "connector.h"
#include "object.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "phy.h"
#include "net-interface.h"

16
net/ns/patches/patch-common_packet_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-common_packet_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- common/packet.h.orig 2003-02-26 23:07:18.000000000 +0100
+++ common/packet.h 2003-11-01 19:38:00.000000000 +0100
@@ -40,10 +40,11 @@
#include <string.h>
#include <assert.h>
+#include <sys/queue.h>
+
#include "config.h"
#include "scheduler.h"
#include "object.h"
-#include "lib/bsd-list.h"
#include "packet-stamp.h"
#include "ns-process.h"

11
net/ns/patches/patch-config_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-config_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- config.h.orig 2003-11-01 16:55:26.000000000 +0100
+++ config.h 2003-11-01 16:55:43.000000000 +0100
@@ -151,6 +151,7 @@ struct ns_addr_t {
#endif /* HAVE_TIME_H */
#ifdef HAVE_ARPA_INET_H
+#include <netinet/in.h>
#include <arpa/inet.h>
#endif /* HAVE_ARPA_INET_H */

12
net/ns/patches/patch-drr_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-drr_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- drr.cc.orig Sun Sep 29 13:57:38 2002
+++ drr.cc Sun Sep 29 13:57:48 2002
@@ -32,7 +32,7 @@ class DRR;
class PacketDRR : public PacketQueue {
PacketDRR(): pkts(0),src(-1),bcount(0),prev(0),next(0),deficitCounter(0),turn(0) {}
- friend DRR;
+ friend class DRR;
protected :
int pkts;
int src; //to detect collisions keep track of actual src address

12
net/ns/patches/patch-empweb_empftp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-empweb_empftp_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- empweb/empftp.h.orig 2003-02-26 17:08:38.000000000 -0500
+++ empweb/empftp.h 2003-08-22 07:45:18.000000000 -0400
@@ -37,7 +37,7 @@
#include "random.h"
#include "timer-handler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "node.h"
#include "tcp.h"
#include "tcp-sink.h"

12
net/ns/patches/patch-empweb_empweb_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-empweb_empweb_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- empweb/empweb.h.orig 2003-02-26 17:08:38.000000000 -0500
+++ empweb/empweb.h 2003-08-22 07:45:18.000000000 -0400
@@ -38,7 +38,7 @@
#include "random.h"
#include "timer-handler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "node.h"
#include "tcp.h"
#include "tcp-sink.h"

24
net/ns/patches/patch-emulate_arp_cc Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-emulate_arp_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/arp.cc.orig 2003-02-26 23:08:17.000000000 +0100
+++ emulate/arp.cc 2003-11-01 19:27:49.000000000 +0100
@@ -47,7 +47,7 @@ static const char rcsid[] =
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <net/if.h>
-#include <net/ethernet.h>
+#include <net/ethertypes.h>
#include <net/if_arp.h>
#include <netinet/if_ether.h>
#include <arpa/inet.h>
@@ -60,11 +60,6 @@ static const char rcsid[] =
#include "emulate/internet.h"
// Very very very back hack. Should put this detection in autoconf.
-#ifndef ether_aton
-extern "C" {
-ether_addr* ether_aton(const char *);
-}
-#endif
//
// arp.cc -- this object may be used within nse as

38
net/ns/patches/patch-emulate_ether_cc Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-emulate_ether_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/ether.cc.orig 2003-02-26 17:08:40.000000000 -0500
+++ emulate/ether.cc 2003-08-22 08:26:57.000000000 -0400
@@ -43,13 +43,33 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <net/ethernet.h>
+#include <net/ethertypes.h>
#include "config.h"
#include "ether.h"
char Ethernet::hex[] = "0123456789abcdef";
+/*
+ * Structure of a 10Mb/s Ethernet header. [ported from ether.h]
+ */
+#ifndef HAVE_ETHER_HEADER_STRUCT
+struct ether_header {
+ u_char ether_dhost[ETHER_ADDR_LEN];
+ u_char ether_shost[ETHER_ADDR_LEN];
+ u_short ether_type;
+};
+
+#endif
+/*
+ * Structure of a 48-bit Ethernet address. [ported from ether.h]
+ */
+#ifndef HAVE_ETHER_ADDRESS_STRUCT
+struct ether_addr {
+ u_char octet[ETHER_ADDR_LEN];
+};
+#endif
+
void
Ethernet::ether_print(const u_char *bp)
{

30
net/ns/patches/patch-emulate_ether_h Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-emulate_ether_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/ether.h.orig 2003-02-26 17:08:40.000000000 -0500
+++ emulate/ether.h 2003-08-22 07:45:18.000000000 -0400
@@ -29,22 +29,22 @@
/*
* Structure of a 10Mb/s Ethernet header.
*/
-#ifndef HAVE_ETHER_HEADER_STRUCT
+/* #ifndef HAVE_ETHER_HEADER_STRUCT
struct ether_header {
u_char ether_dhost[ETHER_ADDR_LEN];
u_char ether_shost[ETHER_ADDR_LEN];
u_short ether_type;
};
-#endif
+#endif */
/*
* Structure of a 48-bit Ethernet address.
*/
-#ifndef HAVE_ETHER_ADDRESS_STRUCT
+/* #ifndef HAVE_ETHER_ADDRESS_STRUCT
struct ether_addr {
u_char octet[ETHER_ADDR_LEN];
};
-#endif
+#endif */
#endif

14
net/ns/patches/patch-emulate_net-pcap_cc Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-emulate_net-pcap_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- emulate/net-pcap.cc.orig 2003-02-26 23:08:18.000000000 +0100
+++ emulate/net-pcap.cc 2003-11-01 19:29:41.000000000 +0100
@@ -341,7 +341,9 @@ PcapNetwork::phandler_callback(u_char* u
int s = inst->skiphdr(); // go to IP header
memcpy(p->accessdata(), pkt + s, ph->caplen - s);
- ps->callback(ps->clientdata, p, ph->ts);
+ { struct timeval tv; tv.tv_sec = ph->ts.tv_sec;
+ tv.tv_usec = ph->ts.tv_usec;
+ ps->callback(ps->clientdata, p, tv);}
}
int

12
net/ns/patches/patch-imep_dest_queue_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-imep_dest_queue_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- imep/dest_queue.h.orig 2003-02-26 17:08:44.000000000 -0500
+++ imep/dest_queue.h 2003-08-22 07:45:18.000000000 -0400
@@ -42,7 +42,7 @@
#define __dest_queue_h__
#include <packet.h>
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#define ILLEGAL_SEQ 257

12
net/ns/patches/patch-imep_imep_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-imep_imep_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- imep/imep.h.orig 2003-02-26 17:08:44.000000000 -0500
+++ imep/imep.h 2003-08-22 07:45:19.000000000 -0400
@@ -47,7 +47,7 @@
#include <drop-tail.h>
#include <trace.h>
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include <rtproto/rtproto.h>
#include <imep/rxmit_queue.h>
#include <imep/dest_queue.h>

12
net/ns/patches/patch-imep_rxmit_queue_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-imep_rxmit_queue_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- imep/rxmit_queue.cc.orig 2003-02-26 17:08:44.000000000 -0500
+++ imep/rxmit_queue.cc 2003-08-22 07:45:19.000000000 -0400
@@ -45,7 +45,7 @@
ReXmitQ::ReXmitQ()
{
- LIST_INIT(&head)
+ LIST_INIT(&head);
}
void

33
net/ns/patches/patch-imep_rxmit_queue_h
View File

@ -1,12 +1,23 @@
$OpenBSD: patch-imep_rxmit_queue_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- imep/rxmit_queue.h.orig Sun Sep 29 14:03:21 2002
+++ imep/rxmit_queue.h Sun Sep 29 14:03:32 2002
@@ -58,7 +58,7 @@ LIST_HEAD(rexent_head, rexent);
class ReXmitQ;
$OpenBSD: patch-imep_rxmit_queue_h,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- imep/rxmit_queue.h.orig 2003-02-26 17:08:44.000000000 -0500
+++ imep/rxmit_queue.h 2003-08-22 07:45:19.000000000 -0400
@@ -41,8 +41,8 @@
#ifndef imep_rexmit_queue_h
#define imep_rexmit_queue_h
class ReXmitQIter {
- friend ReXmitQ;
+ friend class ReXmitQ;
public:
inline Packet * next() {
-#include <packet.h>
-#include "lib/bsd-list.h"
+#include "packet.h"
+#include <sys/queue.h>
typedef double Time;
@@ -50,7 +50,7 @@ struct rexent {
double rexmit_at;
int rexmits_left;
Packet *p;
- LIST_ENTRY(struct rexent) next;
+ LIST_ENTRY(rexent) next;
};
LIST_HEAD(rexent_head, rexent);

24
net/ns/patches/patch-indep-utils_cmu-scen-gen_setdest_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Thu Dec 23 00:31:49 1999
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in Sun Sep 29 16:17:52 2002
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig 2003-02-26 17:08:45.000000000 -0500
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in 2003-08-22 07:45:19.000000000 -0400
@@ -32,7 +32,7 @@ prefix = @prefix@
# Pathname of directory to install the binary
BINDEST = @prefix@/bin
@ -10,27 +10,31 @@ $OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_Makefile_in,v 1.1 2002/09/29 14
CC = @CC@
MKDEP = ../../../conf/mkdep
@@ -48,16 +48,16 @@ install: setdest calcdest
@@ -50,19 +50,19 @@ install: setdest calcdest
$(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST)
setdest: rng.o setdest.o
- $(CC) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
- $(CCX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+ $(CXX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
$(LIBS)
calcdest: rng.o calcdest.o
- $(CC) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
- $(CCX) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+ $(CXX) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
$(LIBS)
rng.o:
@rm -f $@
- $(CC) -c $(DEFINE) -o $@ ../../../rng.cc
+ $(CXX) -c $(DEFINE) -o $@ ../../../rng.cc
- $(CCX) -c $(DEFINE) -I../../.. -o $@ ../../../tools/rng.cc
+ $(CXX) -c $(DEFINE) -I../../.. -o $@ ../../../tools/rng.cc
setbox: setbox.o
$(CC) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
@@ -68,5 +68,5 @@ clean:
- $(CCX) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
+ $(CXX) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
clean:
@rm -f setdest setbox *.o *.core
@@ -70,5 +70,5 @@ clean:
.SUFFIXES: .cc
.cc.o:

12
net/ns/patches/patch-indep-utils_cmu-scen-gen_setdest_setdest_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-indep-utils_cmu-scen-gen_setdest_setdest_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/cmu-scen-gen/setdest/setdest.h.orig 2003-02-26 17:08:46.000000000 -0500
+++ indep-utils/cmu-scen-gen/setdest/setdest.h 2003-08-22 07:45:19.000000000 -0400
@@ -3,7 +3,7 @@
/*#include <sys/queue.h>*/
#include "../../../config.h"
-#include "../../../lib/bsd-list.h"
+#include <sys/queue.h>
#ifndef LIST_FIRST
#define LIST_FIRST(head) ((head)->lh_first)

6
net/ns/patches/patch-indep-utils_webtrace-conv_dec_my-endian_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_my-endian_cc,v 1.1 2000/11/09 11:43:34 espie Exp $
--- indep-utils/webtrace-conv/dec/my-endian.cc.orig Sun Nov 5 19:05:22 2000
+++ indep-utils/webtrace-conv/dec/my-endian.cc Sun Nov 5 19:06:00 2000
$OpenBSD: patch-indep-utils_webtrace-conv_dec_my-endian_cc,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/webtrace-conv/dec/my-endian.cc.orig 2003-02-26 17:08:50.000000000 -0500
+++ indep-utils/webtrace-conv/dec/my-endian.cc 2003-08-22 07:45:19.000000000 -0400
@@ -39,14 +39,14 @@ void ToOtherEndian(TEntry *e) {
e -> tail.status = swap2(e -> tail.status);

15
net/ns/patches/patch-indep-utils_webtrace-conv_dec_proxytrace_cc
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_proxytrace_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- indep-utils/webtrace-conv/dec/proxytrace.cc.orig Sun Sep 29 16:25:55 2002
+++ indep-utils/webtrace-conv/dec/proxytrace.cc Sun Sep 29 16:26:10 2002
@@ -1,4 +1,5 @@
$OpenBSD: patch-indep-utils_webtrace-conv_dec_proxytrace_cc,v 1.2 2003/11/01 20:05:01 sturm Exp $
--- indep-utils/webtrace-conv/dec/proxytrace.cc.orig 2003-02-26 17:08:50.000000000 -0500
+++ indep-utils/webtrace-conv/dec/proxytrace.cc 2003-08-22 07:45:19.000000000 -0400
@@ -1,5 +1,6 @@
#include <stdio.h>
+#include <stdlib.h>
#include "proxytrace.h"
#include "../../../autoconf.h"
#ifdef STDC_HEADERS
// for exit()

21
net/ns/patches/patch-indep-utils_webtrace-conv_ucb_utils_cc
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-indep-utils_webtrace-conv_ucb_utils_cc,v 1.1 2000/11/09 11:43:34 espie Exp $
--- indep-utils/webtrace-conv/ucb/utils.cc.orig Sun Nov 5 19:06:43 2000
+++ indep-utils/webtrace-conv/ucb/utils.cc Sun Nov 5 19:07:20 2000
@@ -351,7 +351,7 @@ int correct_read(int s, char *data, int
int saccept(int s)
{
struct sockaddr_in from;
- int fromlen;
+ socklen_t fromlen;
int ns;
fromlen = sizeof (from);
@@ -463,7 +463,7 @@ int slisten(char *servicename)
int sportnum(int s)
{
struct sockaddr sockname;
- int len;
+ socklen_t len;
len = sizeof (sockname);
if (getsockname (s, &sockname, &len) < 0)

12
net/ns/patches/patch-mac_arp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mac_arp_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mac/arp.h.orig 2003-02-26 17:08:55.000000000 -0500
+++ mac/arp.h 2003-08-22 07:45:20.000000000 -0400
@@ -39,7 +39,7 @@
#include "scheduler.h"
#include "delay.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#ifndef EADDRNOTAVAIL
#define EADDRNOTAVAIL 125

12
net/ns/patches/patch-mac_channel_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mac_channel_cc,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mac/channel.cc.orig 2003-02-26 17:08:55.000000000 -0500
+++ mac/channel.cc 2003-08-22 07:45:20.000000000 -0400
@@ -49,7 +49,7 @@ static const char rcsid[] =
#include "packet.h"
#include "mac.h"
#include "channel.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "phy.h"
#include "wireless-phy.h"
#include "mobilenode.h"

12
net/ns/patches/patch-mac_phy_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mac_phy_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mac/phy.h.orig 2003-02-26 17:08:56.000000000 -0500
+++ mac/phy.h 2003-08-22 07:45:20.000000000 -0400
@@ -52,7 +52,7 @@
#include <assert.h>
#include "bi-connector.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class Phy;
LIST_HEAD(if_head, Phy);

12
net/ns/patches/patch-mobile_antenna_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mobile_antenna_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mobile/antenna.h.orig 2003-02-26 17:08:59.000000000 -0500
+++ mobile/antenna.h 2003-08-22 07:45:20.000000000 -0400
@@ -41,7 +41,7 @@
#define ns_antenna_h
#include "object.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class Antenna;
LIST_HEAD(an_head, Antenna);

12
net/ns/patches/patch-mpls_mpls-module_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mpls_mpls-module_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- mpls/mpls-module.h.orig 2003-02-26 17:09:01.000000000 -0500
+++ mpls/mpls-module.h 2003-08-22 07:45:20.000000000 -0400
@@ -26,7 +26,7 @@
#include <tclcl.h>
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "rtmodule.h"
#include "mpls/ldp.h"

12
net/ns/patches/patch-qs_qsagent_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-qs_qsagent_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- qs/qsagent.h.orig 2003-02-26 17:09:12.000000000 -0500
+++ qs/qsagent.h 2003-08-22 07:45:20.000000000 -0400
@@ -40,7 +40,7 @@
#include "packet.h"
#include "hdr_qs.h"
#include "timer-handler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class QSAgent;

12
net/ns/patches/patch-queue_dsr-priqueue_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-queue_dsr-priqueue_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- queue/dsr-priqueue.h.orig 2003-02-26 17:09:12.000000000 -0500
+++ queue/dsr-priqueue.h 2003-08-22 07:45:20.000000000 -0400
@@ -17,7 +17,7 @@
#include <queue.h>
#include <drop-tail.h>
#include <packet.h>
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include <cmu-trace.h>
/* ======================================================================

12
net/ns/patches/patch-queue_priqueue_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-queue_priqueue_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- queue/priqueue.h.orig 2003-02-26 17:09:12.000000000 -0500
+++ queue/priqueue.h 2003-08-22 07:45:20.000000000 -0400
@@ -45,7 +45,7 @@
#include "queue.h"
#include "drop-tail.h"
#include "packet.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
class PriQueue;
typedef int (*PacketFilter)(Packet *, void *);

12
net/ns/patches/patch-routing_rttable_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-routing_rttable_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- routing/rttable.h.orig 2003-02-26 17:09:15.000000000 -0500
+++ routing/rttable.h 2003-08-22 07:45:21.000000000 -0400
@@ -52,7 +52,7 @@ redistribute these changes without encum
#include "config.h"
#include "scheduler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#define CURRENT_TIME Scheduler::instance().clock()
#define INFINITY2 0xff

12
net/ns/patches/patch-satellite_satposition_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-satellite_satposition_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- satellite/satposition.h.orig 2003-02-26 17:09:16.000000000 -0500
+++ satellite/satposition.h 2003-08-22 07:45:21.000000000 -0400
@@ -42,7 +42,7 @@
#include <stdlib.h>
#include "trace.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "phy.h"
#include "node.h"
#include "object.h"

12
net/ns/patches/patch-sfq_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sfq_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- sfq.cc.orig Sun Sep 29 13:57:10 2002
+++ sfq.cc Sun Sep 29 13:57:22 2002
@@ -49,7 +49,7 @@ class SFQ; // a set of SFQ queues
class PacketSFQ : public PacketQueue {
PacketSFQ() : pkts(0), prev(0), next(0) {}
- friend SFQ;
+ friend class SFQ;
protected:
void sfqdebug();
int pkts;

14
net/ns/patches/patch-snoop_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-snoop_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- snoop.h.orig Sun Sep 29 14:01:04 2002
+++ snoop.h Sun Sep 29 14:01:19 2002
@@ -111,8 +111,8 @@ class SnoopRxmitHandler;
class SnoopPersistHandler;
class Snoop : public NsObject {
- friend SnoopRxmitHandler;
- friend SnoopPersistHandler;
+ friend class SnoopRxmitHandler;
+ friend class SnoopPersistHandler;
public:
Snoop();
void recv(Packet *, Handler *);

12
net/ns/patches/patch-tcp-full_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tcp-full_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tcp-full.h.orig Sun Sep 29 13:55:58 2002
+++ tcp-full.h Sun Sep 29 13:56:23 2002
@@ -131,7 +131,7 @@ protected:
};
class FullTcpAgent : public TcpAgent {
- friend ReassemblyQueue;
+ friend class ReassemblyQueue;
public:
FullTcpAgent();
~FullTcpAgent();

21
net/ns/patches/patch-tcp-rbp_cc
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-tcp-rbp_cc,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tcp-rbp.cc.orig Sun Sep 29 13:54:59 2002
+++ tcp-rbp.cc Sun Sep 29 13:55:32 2002
@@ -70,7 +70,7 @@ protected:
// Hmmm... ``a is a'' in the construction of the RBPVegasPaceTimer edifice :->
class RBPVegasTcpAgent : public virtual VegasTcpAgent {
- friend RBPVegasPaceTimer;
+ friend class RBPVegasPaceTimer;
public:
RBPVegasTcpAgent();
virtual void recv(Packet *pkt, Handler *);
@@ -232,7 +232,7 @@ protected:
// Hmmm... ``a is a'' in the construction of the RBPRenoPaceTimer edifice :->
class RBPRenoTcpAgent : public virtual RenoTcpAgent {
- friend RBPRenoPaceTimer;
+ friend class RBPRenoPaceTimer;
public:
RBPRenoTcpAgent();
virtual void recv(Packet *pkt, Handler *);

12
net/ns/patches/patch-tfrc-sink_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tfrc-sink_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tfrc-sink.h.orig Sun Sep 29 14:07:40 2002
+++ tfrc-sink.h Sun Sep 29 14:07:52 2002
@@ -63,7 +63,7 @@ protected:
};
class TfrcSinkAgent : public Agent {
- friend TfrcNackTimer;
+ friend class TfrcNackTimer;
public:
TfrcSinkAgent();
void recv(Packet*, Handler*);

14
net/ns/patches/patch-tfrc_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-tfrc_h,v 1.1 2002/09/29 14:32:45 naddy Exp $
--- tfrc.h.orig Sun Sep 29 13:49:17 2002
+++ tfrc.h Sun Sep 29 13:49:30 2002
@@ -109,8 +109,8 @@ protected:
};
class TfrcAgent : public Agent {
- friend TfrcSendTimer;
- friend TfrcNoFeedbackTimer;
+ friend class TfrcSendTimer;
+ friend class TfrcNoFeedbackTimer;
public:
TfrcAgent();
void recv(Packet*, Handler*);

12
net/ns/patches/patch-tora_tora_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tora_tora_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- tora/tora.h.orig 2003-02-26 17:11:29.000000000 -0500
+++ tora/tora.h 2003-08-22 07:45:21.000000000 -0400
@@ -44,7 +44,7 @@
#include <cmu-trace.h>
#include <priqueue.h>
#include <rtqueue.h>
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include <rtproto/rtproto.h>
#include <imep/imep.h>

12
net/ns/patches/patch-webcache_webtraf_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-webcache_webtraf_h,v 1.1 2003/11/01 20:05:01 sturm Exp $
--- webcache/webtraf.h.orig 2003-02-26 17:11:31.000000000 -0500
+++ webcache/webtraf.h 2003-08-22 07:45:21.000000000 -0400
@@ -39,7 +39,7 @@
#include "random.h"
#include "timer-handler.h"
-#include "lib/bsd-list.h"
+#include <sys/queue.h>
#include "node.h"
#include "tcp.h"
#include "tcp-sink.h"

5
net/ns/pkg/DESCR
View File

@ -1,7 +1,6 @@
NS is a discrete event simulator targeted at networking research.
Ns provides substantial support for simulation of TCP, routing, and multicast
protocols.
NS provides substantial support for simulation of TCP, routing, and
multicast protocols.
A graphical front-end for ns can be found in the nam package.
WWW: ${HOMEPAGE}

47
net/ns/pkg/PLIST
View File

@ -1,27 +1,54 @@
@comment $OpenBSD: PLIST,v 1.2 2000/11/09 11:43:35 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/11/01 20:05:01 sturm Exp $
bin/ns
man/man1/ns.1
share/examples/ns2/agent-gen-script.tcl
share/examples/ns2/agent-gen.tcl
share/examples/ns2/callback_demo.tcl
share/examples/ns2/diffusion-prob-run.tcl
share/examples/ns2/diffusion-rate-run.tcl
share/examples/ns2/dumbbell.tcl
share/examples/ns2/example.tcl
share/examples/ns2/flooding-run.tcl
share/examples/ns2/fq-cbr.tcl
share/examples/ns2/fq.tcl
share/examples/ns2/grid2.tcl
share/examples/ns2/gridkeeper.tcl
share/examples/ns2/hier-rtg-10.tcl
share/examples/ns2/hier-rtg-100.tcl
share/examples/ns2/hts100-0.tcl
share/examples/ns2/lantest.tcl
share/examples/ns2/large-scale-web-traffic-old.tcl
share/examples/ns2/large-scale-web-traffic.tcl
share/examples/ns2/large-sim.tcl
share/examples/ns2/mac-test.tcl
share/examples/ns2/many_tcp.tcl
share/examples/ns2/manytcp_trmodel.tcl
share/examples/ns2/mcast.tcl
share/examples/ns2/miptest.tcl
share/examples/ns2/nam-example-em.tcl
share/examples/ns2/nam-example.tcl
share/examples/ns2/nam-large-flowid.tcl
share/examples/ns2/nam-separate-trace.tcl
share/examples/ns2/nam-simplexlink.tcl
share/examples/ns2/omni-run.tcl
share/examples/ns2/pkts.tcl
share/examples/ns2/ranvar.tcl
share/examples/ns2/rbp_demo.tcl
share/examples/ns2/rc.tcl
share/examples/ns2/redlight.tcl
share/examples/ns2/rng-test.tcl
share/examples/ns2/rng-test2.tcl
share/examples/ns2/route-gen.tcl
share/examples/ns2/sat-aloha.tcl
share/examples/ns2/sat-iridium-links.tcl
share/examples/ns2/sat-iridium-nodes.tcl
share/examples/ns2/sat-iridium.tcl
share/examples/ns2/sat-mixed.tcl
share/examples/ns2/sat-repeater.tcl
share/examples/ns2/sat-teledesic-links.tcl
share/examples/ns2/sat-teledesic-nodes.tcl
share/examples/ns2/sat-teledesic.tcl
share/examples/ns2/sat-wired.tcl
share/examples/ns2/shuttle-mcast.tcl
share/examples/ns2/shuttle.tcl
share/examples/ns2/simple-dyn.tcl
@ -29,12 +56,16 @@ share/examples/ns2/simple-eqp.tcl
share/examples/ns2/simple-eqp1.tcl
share/examples/ns2/simple-fsm-tcp.tcl
share/examples/ns2/simple-heap.tcl
share/examples/ns2/simple-plm.tcl
share/examples/ns2/simple-rtg.tcl
share/examples/ns2/simple-rtp.tcl
share/examples/ns2/simple-tcp.tcl
share/examples/ns2/simple-webcache-comp.tcl
share/examples/ns2/simple-webcache-trace.tcl
share/examples/ns2/simple-webcache.tcl
share/examples/ns2/simple-wireless.tcl
share/examples/ns2/simple.tcl
share/examples/ns2/src_test.tcl
share/examples/ns2/srm-adapt-rep-session.tcl
share/examples/ns2/srm-adapt-rep.tcl
share/examples/ns2/srm-adapt-req-session.tcl
@ -48,7 +79,10 @@ share/examples/ns2/srm-star.tcl
share/examples/ns2/srm.tcl
share/examples/ns2/ss.tcl
share/examples/ns2/swp.tcl
share/examples/ns2/t1000.tcl
share/examples/ns2/tcp-et.tcl
share/examples/ns2/tcp-int.tcl
share/examples/ns2/tcpapp.tcl
share/examples/ns2/tcpecn.tcl
share/examples/ns2/tcpsrm.tcl
share/examples/ns2/test-drr.tcl
@ -63,13 +97,24 @@ share/examples/ns2/topo-gen-script.tcl
share/examples/ns2/topo-gen.tcl
share/examples/ns2/topo-view.tcl
share/examples/ns2/trace-driven.tcl
share/examples/ns2/udpdata.tcl
share/examples/ns2/varybell.tcl
share/examples/ns2/virtual-classifier.tcl
share/examples/ns2/vlantest-flat.tcl
share/examples/ns2/vlantest-hier.tcl
share/examples/ns2/vlantest-mcst.tcl
share/examples/ns2/web-traffic-embobj.tcl
share/examples/ns2/web-traffic.tcl
share/examples/ns2/wired-cum-wireless-sim.tcl
share/examples/ns2/wireless-demo-csci694.tcl
share/examples/ns2/wireless-dsdv-newnode.tcl
share/examples/ns2/wireless-landmark.tcl
share/examples/ns2/wireless-mip-test.tcl
share/examples/ns2/wireless-mitf.tcl
share/examples/ns2/wireless-newnode-energy.tcl
share/examples/ns2/wireless-pkt-demo.tcl
share/examples/ns2/wireless-shadowing-test.tcl
share/examples/ns2/wireless-shadowing-vis-test.tcl
share/examples/ns2/wireless-test.tcl
share/examples/ns2/wireless.tcl
@dirrm share/examples/ns2