Permalink
Browse files

Imported Upstream version 2.35~rc9

  • Loading branch information...
1 parent ae3d1be commit 1920091e5c48a9d440df95cf330247c3ab1227df @wzssyqa wzssyqa committed Oct 24, 2011
Showing with 1,692 additions and 2,031 deletions.
  1. +9 −0 CHANGES.html
  2. +5 −2 Makefile.in
  3. +1 −1 VERSION
  4. +1 −4 adc/adaptive-receiver.cc
  5. +2 −5 adc/tbf.cc
  6. +4 −3 asim/asim.cc
  7. +5 −1 common/agent.h
  8. +1 −2 diffserv/dsEdge.cc
  9. +0 −2 diffserv/dsPolicy.cc
  10. +0 −4 diffserv/dsred.cc
  11. +2 −4 diffusion/diffusion.cc
  12. +2 −6 diffusion/flooding.cc
  13. +2 −6 diffusion/omni_mcast.cc
  14. +2 −3 diffusion3/apps/gear_examples/gear_sender.cc
  15. +2 −3 diffusion3/apps/ping/1pp_ping_sender.cc
  16. +2 −3 diffusion3/apps/ping/2pp_ping_sender.cc
  17. +2 −3 diffusion3/apps/ping/push_sender.cc
  18. +2 −3 diffusion3/apps/rmst_examples/rmst_source.cc
  19. +8 −5 diffusion3/filter_core/filter_core.cc
  20. +2 −3 diffusion3/filters/gear/gear.cc
  21. +3 −4 diffusion3/lib/dr.cc
  22. +554 −565 doc/tmix.tex
  23. +5 −9 mac/mac-802_11.cc
  24. +1 −2 mac/mac-802_11Ext.cc
  25. +1 −0 mac/mac-802_11Ext.h
  26. +3 −20 mac/mac-tdma.cc
  27. +9 −11 mac/wireless-phyExt.cc
  28. +1 −2 mcast/srm-topo.cc
  29. +8 −0 mdart/mdart_table.cc
  30. +3 −4 mpls/classifier-addr-mpls.cc
  31. +4 −1 pushback/pushback-queue.cc
  32. +3 −1 pushback/pushback.cc
  33. +4 −1 pushback/rate-limit-strategy.cc
  34. +2 −6 queue/drr.cc
  35. +2 −5 queue/jobs.cc
  36. +6 −5 queue/red.cc
  37. +3 −5 queue/srr.cc
  38. +9 −5 rap/media-app.cc
  39. +1 −3 satellite/sathandoff.cc
  40. +1 −4 satellite/sattrace.cc
  41. +0 −11 sctp/sctp-cmt.cc
  42. +1 −10 sctp/sctp-multipleFastRtx.cc
  43. +1 −10 sctp/sctp.cc
  44. +15 −1 tcl/ex/tmix/test-tmix-oneway.tcl
  45. +17 −2 tcl/ex/tmix/test-tmix.tcl
  46. +5 −3 tcl/lib/ns-packet.tcl
  47. BIN tcl/test/test-output-mcache/media5.gz
  48. BIN tcl/test/test-output-tmix/Lossless-alt.gz
  49. BIN tcl/test/test-output-tmix/Lossless-orig.gz
  50. BIN tcl/test/test-output-tmix/Lossy-alt.gz
  51. BIN tcl/test/test-output-tmix/Lossy-orig.gz
  52. BIN tcl/test/test-output-tmix/Oneway-lossless-alt.gz
  53. BIN tcl/test/test-output-tmix/Oneway-lossless-orig.gz
  54. BIN tcl/test/test-output-tmix/Oneway-lossy-alt.gz
  55. BIN tcl/test/test-output-tmix/Oneway-lossy-orig.gz
  56. +2 −2 tcl/test/test-suite-mcache.tcl
  57. +17 −153 tcl/test/test-suite-tmix.tcl
  58. +23 −10 tcl/test/test-suite-webcache.tcl
  59. +4 −3 tcl/tmix/tmix.tcl
  60. +1 −1 tcl/webcache/webtraf.tcl
  61. +1 −6 tcp/chost.cc
  62. +8 −1 tcp/linux/src/tcp_compound.c
  63. +3 −0 tcp/linux/src/tcp_illinois.c
  64. +1 −2 tcp/scoreboard.cc
  65. +2 −3 tcp/tcp-sack-rh.cc
  66. +5 −1 tcp/tcp.h
  67. +0 −2 tcp/tfrc-sink.cc
  68. +729 −455 tmix/tmix.cc
  69. +92 −26 tmix/tmix.h
  70. +19 −16 tmix/tmixAgent.cc
  71. +12 −7 tmix/tmixAgent.h
  72. +6 −12 tmix/tmix_delaybox.cc
  73. +1 −0 tmix/tmix_delaybox.h
  74. +1 −12 trace/cmu-trace.cc
  75. +7 −48 validate
  76. +0 −174 webcache.diff
  77. +2 −2 webcache/logweb.cc
  78. +15 −12 webcache/mcache.cc
  79. +10 −13 webcache/pagepool.cc
  80. +1 −1 webcache/webserver.cc
  81. +1 −1 webcache/webserver.h
  82. +2 −2 webcache/webtraf.cc
  83. +2 −2 webcache/webtraf.h
  84. +0 −296 webtraf.patch
  85. +2 −3 wpan/p802_15_4csmaca.cc
  86. +6 −11 wpan/p802_15_4mac.cc
  87. +1 −1 xcp/xcpq.cc
View
@@ -16,6 +16,15 @@ <h1>
<hr>
<h3>ns-2.35 pending</h3>
<ul>
+<p><li><b>[mweigle]</b> Fri Aug 26 15:50:00 EDT 2011:
+<br> Provide fixes to the Tmix traffic generator, mainly to the one-way
+TCP implementation, but some changes to the Full-TCP version as well. Tmix
+with one-way TCP now performs comparably to Tmix with Full-TCP (albeit
+with longer running times and higher memory consumption). Includes
+contributions from David Hayes and DongXia Xu at
+<a href="http://caia.swin.edu.au">Swinburne</a> and relevant updates to the
+documentation and tests. More information is available at
+<a href="http://www.cs.odu.edu/inets/Tmix/">http://www.cs.odu.edu/inets/Tmix/</a>.
<p><li><b>[tomh]</b> Sun May 9 18:28:00 EDT 2010:
<br> Add Marcello Caleffi's Multi-path Dynamic Address RouTing (M-DART)
protocol.
View
@@ -382,7 +382,7 @@ SRC = $(OBJ_C:.o=.c) $(OBJ_CC:.o=.cc) \
OBJ = $(OBJ_C) $(OBJ_CC) $(OBJ_GEN) $(OBJ_COMPAT)
CLEANFILES = ns nse nsx ns.dyn $(OBJ) $(OBJ_EMULATE_CC) \
- $(OBJ_EMULATE_C) common/tclAppInit.o \
+ $(OBJ_EMULATE_C) common/tclAppInit.o common/main-monolithic.o \
common/tkAppInit.o nstk \
$(GEN_DIR)* $(NS).core core core.$(NS) core.$(NSX) core.$(NSE) \
common/ptypes2tcl common/ptypes2tcl.o
@@ -560,9 +560,12 @@ install-man: force
install-recursive: force
for i in $(SUBDIRS); do ( cd $$i; $(MAKE) install; ) done
-clean:
+clean: clean-recursive
$(RM) $(CLEANFILES)
+clean-recursive:
+ for i in $(SUBDIRS); do ( cd $$i; $(MAKE) clean; ) done
+
AUTOCONF_GEN = tcl/lib/ns-autoconf.tcl
distclean: distclean-recursive
$(RM) $(CLEANFILES) Makefile config.cache config.log config.status \
View
@@ -1 +1 @@
-2.35-RC8
+2.34
View
@@ -41,7 +41,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /cvsroot/nsnam/ns-2/adc/adaptive-receiver.cc,v 1.8 2005/08/26 05:05:27 tomh Exp $";
+ "@(#) $Header: /cvsroot/nsnam/ns-2/adc/adaptive-receiver.cc,v 1.9 2011/10/02 22:32:34 tom_henderson Exp $";
#endif
#include "config.h"
@@ -65,11 +65,8 @@ AdaptiveRcvr::AdaptiveRcvr() : Agent(PT_NTYPE)
void AdaptiveRcvr::recv(Packet *pkt,Handler*)
{
int delay;
- int seq_no;
hdr_cmn* ch= hdr_cmn::access(pkt);
- hdr_rtp *rh = hdr_rtp::access(pkt);
- seq_no= rh->seqno();
register u_int32_t send_time = (int)ch->timestamp();
u_int32_t local_time= (u_int32_t)(Scheduler::instance().clock() * SAMPLERATE);
View
@@ -94,9 +94,7 @@ void TBF::recv(Packet *p, Handler *)
return;
}
- double tok;
- tok = getupdatedtokens();
-
+ getupdatedtokens();
int pktsize = ch->size()<<3;
if (tokens_ >=pktsize) {
target_->recv(p);
@@ -133,8 +131,7 @@ void TBF::timeout(int)
}
Packet *p=q_->deque();
- double tok;
- tok = getupdatedtokens();
+ getupdatedtokens();
hdr_cmn *ch=hdr_cmn::access(p);
int pktsize = ch->size()<<3;
View
@@ -2,7 +2,7 @@
/*
* asim.cc
* Copyright (C) 2000 by the University of Southern California
- * $Id: asim.cc,v 1.12 2010/03/08 05:54:49 tom_henderson Exp $
+ * $Id: asim.cc,v 1.13 2011/10/02 22:32:34 tom_henderson Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -582,12 +582,13 @@ void CalcLinkDelays(int flag = 0){
// Special code for RED gateways
if(flag){
if(links[i].red){
- double minth, maxth, pmin, pmax, delay,p;
+ double p, delay;
+ /* Debo's RED approx
+ double minth, maxth, pmin, pmax;
minth = links[i].minth;
maxth = links[i].maxth;
pmin = links[i].pmin;
pmax = links[i].pmax;
- /* Debo's RED approx
links[i].drop = redFn(minth,pmin,maxth,pmax,qlength/links[i].buffer);
qlength = (1-links[i].drop)*links[i].buffer;
links[i].qdelay = qlength/links[i].mu;
View
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#) $Header: /cvsroot/nsnam/ns-2/common/agent.h,v 1.37 2010/03/08 05:54:49 tom_henderson Exp $ (LBL)
+ * @(#) $Header: /cvsroot/nsnam/ns-2/common/agent.h,v 1.38 2011/08/26 19:26:39 tom_henderson Exp $ (LBL)
*/
#ifndef ns_agent_h
@@ -77,6 +77,10 @@ class Agent : public Connector {
//added for edrop tracing - ratul
void recvOnly(Packet *) {};
+ /* These two functions aid Tmix one-way TCP agents */
+ virtual int is_closed() {return 0;}
+ virtual void clr_closed() {}
+
void send(Packet* p, Handler* h) { target_->recv(p, h); }
virtual void timeout(int tno);
View
@@ -76,11 +76,10 @@ Post: The incoming packet pointed to by pkt is marked with an appropriate code
Uses: Methods Policy::mark(), lookupPHBTable(), and redQueue::enque().
------------------------------------------------------------------------------*/
void edgeQueue::enque(Packet* pkt) {
- int codePt;
// Mark the packet with the specified priority:
//printf("before ,mark\n");
- codePt = policy.mark(pkt);
+ policy.mark(pkt);
// printf("after ,mark\n");
dsREDQueue::enque(pkt);
}
View
@@ -330,10 +330,8 @@ int PolicyClassifier::mark(Packet *pkt) {
int policy_index;
int codePt;
hdr_ip* iph;
- int fid;
iph = hdr_ip::access(pkt);
- fid = iph->flowid();
policy = getPolicyTableEntry(iph->saddr(), iph->daddr());
if (policy) {
codePt = policy->codePt;
View
@@ -216,8 +216,6 @@ void dsREDQueue::enque(Packet* pkt) {
Packet* dsREDQueue::deque() {
Packet *p = NULL;
int queue, prec;
- hdr_ip* iph;
- int fid;
int dq_id;
// Select queue to deque under the scheduling scheme specified.
@@ -228,8 +226,6 @@ Packet* dsREDQueue::deque() {
p = redq_[dq_id].deque();
if (p) {
- iph= hdr_ip::access(p);
- fid = iph->flowid()/32;
pktcount[dq_id]+=1;
// update the average rate for pri-queue
View
@@ -2,7 +2,7 @@
/*
* diffusion.cc
* Copyright (C) 2000 by the University of Southern California
- * $Id: diffusion.cc,v 1.14 2006/03/10 12:25:28 mahrenho Exp $
+ * $Id: diffusion.cc,v 1.15 2011/10/02 22:32:34 tom_henderson Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -44,7 +44,7 @@
*/
//
-// $Header: /cvsroot/nsnam/ns-2/diffusion/diffusion.cc,v 1.14 2006/03/10 12:25:28 mahrenho Exp $
+// $Header: /cvsroot/nsnam/ns-2/diffusion/diffusion.cc,v 1.15 2011/10/02 22:32:34 tom_henderson Exp $
/****************************************************************/
/* diffusion.cc : Chalermek Intanagonwiwat (USC/ISI) 05/18/99 */
@@ -586,7 +586,6 @@ void DiffusionAgent::SendBufferCheck()
{
int c;
hdr_cdiff *dfh;
- hdr_cmn *cmh;
hdr_ip *iph;
int dtype;
PrvCurPtr RetVal;
@@ -596,7 +595,6 @@ void DiffusionAgent::SendBufferCheck()
continue;
dfh = HDR_CDIFF(send_buf[c].p);
- cmh = HDR_CMN(send_buf[c].p);
iph = HDR_IP(send_buf[c].p);
dtype = dfh->data_type;
View
@@ -2,7 +2,7 @@
/*
* flooding.cc
* Copyright (C) 2000 by the University of Southern California
- * $Id: flooding.cc,v 1.10 2010/03/08 05:54:49 tom_henderson Exp $
+ * $Id: flooding.cc,v 1.11 2011/10/02 22:32:34 tom_henderson Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -132,24 +132,20 @@ void FloodingAgent::ConsiderNew(Packet *pkt)
unsigned char msg_type = dfh->mess_type;
unsigned int dtype = dfh->data_type;
- Pkt_Hash_Entry *hashPtr;
Agent_List *agentPtr;
PrvCurPtr RetVal;
- nsaddr_t from_nodeID, forward_nodeID;
+ nsaddr_t from_nodeID;
Packet *gen_pkt;
hdr_cdiff *gen_dfh;
switch (msg_type) {
case INTEREST :
- hashPtr = PktTable.GetHash(dfh->sender_id, dfh->pk_num);
-
// Check if it comes from sink agent of this node
// If so we have to keep it in sink list
from_nodeID = (dfh->sender_id).addr_;
- forward_nodeID = (dfh->forward_agent_id).addr_;
if (THIS_NODE == from_nodeID) {
View
@@ -2,7 +2,7 @@
/*
* omni_mcast.cc
* Copyright (C) 2000 by the University of Southern California
- * $Id: omni_mcast.cc,v 1.15 2010/03/08 05:54:49 tom_henderson Exp $
+ * $Id: omni_mcast.cc,v 1.16 2011/10/02 22:32:34 tom_henderson Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -248,24 +248,20 @@ void OmniMcastAgent::ConsiderNew(Packet *pkt)
unsigned char msg_type = dfh->mess_type;
unsigned int dtype = dfh->data_type;
- Pkt_Hash_Entry *hashPtr;
Agent_List *agentPtr;
PrvCurPtr RetVal;
- nsaddr_t from_nodeID, forward_nodeID;
+ nsaddr_t from_nodeID;
Packet *gen_pkt;
hdr_cdiff *gen_dfh;
switch (msg_type) {
case INTEREST :
- hashPtr = PktTable.GetHash(dfh->sender_id, dfh->pk_num);
-
// Check if it comes from sink agent of this node
// If so we have to keep it in sink list
from_nodeID = (dfh->sender_id).addr_;
- forward_nodeID = (dfh->forward_agent_id).addr_;
if (THIS_NODE == from_nodeID) {
@@ -3,7 +3,7 @@
// author : Fabio Silva
//
// Copyright (C) 2000-2003 by the University of Southern California
-// $Id: gear_sender.cc,v 1.6 2010/03/08 05:54:49 tom_henderson Exp $
+// $Id: gear_sender.cc,v 1.7 2011/10/02 22:32:34 tom_henderson Exp $
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License,
@@ -59,7 +59,6 @@ void GearSendDataTimer::expire(Event *) {
void GearSenderApp::send()
{
struct timeval tmv;
- int retval;
// Send data if we have active subscriptions
if ((num_subscriptions_ > 0) || using_push_)
@@ -71,7 +70,7 @@ void GearSenderApp::send()
// Send data probe
DiffPrint(DEBUG_ALWAYS, "Node%d: Sending Data %d\n", ((DiffusionRouting *)dr_)->getNodeId(), last_seq_sent_);
- retval = dr_->send(pubHandle_, &data_attr_);
+ dr_->send(pubHandle_, &data_attr_);
// Update counter
last_seq_sent_++;
@@ -3,7 +3,7 @@
// author : Fabio Silva
//
// Copyright (C) 2000-2002 by the University of Southern California
-// $Id: 1pp_ping_sender.cc,v 1.3 2010/03/08 05:54:49 tom_henderson Exp $
+// $Id: 1pp_ping_sender.cc,v 1.4 2011/10/02 22:32:34 tom_henderson Exp $
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License,
@@ -60,7 +60,6 @@ void OPPPingSendDataTimer::expire(Event *) {
void OPPPingSenderApp::send()
{
struct timeval tmv;
- int retval;
// Send data if we have active subscriptions
if (num_subscriptions_ > 0){
@@ -71,7 +70,7 @@ void OPPPingSenderApp::send()
// Send data probe
DiffPrint(DEBUG_ALWAYS, "Node%d: Sending Data %d\n", ((DiffusionRouting *)dr_)->getNodeId(), last_seq_sent_);
- retval = dr_->send(pubHandle_, &data_attr_);
+ dr_->send(pubHandle_, &data_attr_);
// Update counter
last_seq_sent_++;
@@ -3,7 +3,7 @@
// author : Fabio Silva
//
// Copyright (C) 2000-2002 by the University of Southern California
-// $Id: 2pp_ping_sender.cc,v 1.4 2010/03/08 05:54:49 tom_henderson Exp $
+// $Id: 2pp_ping_sender.cc,v 1.5 2011/10/02 22:32:34 tom_henderson Exp $
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License,
@@ -59,7 +59,6 @@ void TPPPingSendDataTimer::expire(Event *) {
void TPPPingSenderApp::send()
{
struct timeval tmv;
- int retval;
// Send data if we have active subscriptions
if (num_subscriptions_ > 0){
@@ -70,7 +69,7 @@ void TPPPingSenderApp::send()
// Send data probe
DiffPrint(DEBUG_ALWAYS, "Node%d: Sending Data %d\n", ((DiffusionRouting *)dr_)->getNodeId(), last_seq_sent_);
- retval = dr_->send(pubHandle_, &data_attr_);
+ dr_->send(pubHandle_, &data_attr_);
// Update counter
last_seq_sent_++;
@@ -3,7 +3,7 @@
// author : Fabio Silva
//
// Copyright (C) 2000-2002 by the University of Southern California
-// $Id: push_sender.cc,v 1.4 2010/03/08 05:54:49 tom_henderson Exp $
+// $Id: push_sender.cc,v 1.5 2011/10/02 22:32:34 tom_henderson Exp $
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License,
@@ -59,7 +59,6 @@ void PushSendDataTimer::expire(Event *) {
void PushSenderApp::send()
{
struct timeval tmv;
- int retval;
// Update time in the packet
GetTime(&tmv);
@@ -68,7 +67,7 @@ void PushSenderApp::send()
// Send data probe
DiffPrint(DEBUG_ALWAYS, "Node%d: Sending Data %d\n", ((DiffusionRouting *)dr_)->getNodeId(), last_seq_sent_);
- retval = dr_->send(pubHandle_, &data_attr_);
+ dr_->send(pubHandle_, &data_attr_);
// Update counter
last_seq_sent_++;
Oops, something went wrong.

0 comments on commit 1920091

Please sign in to comment.