# HG changeset patch # User Pavel Boyko # Date 1238580773 -14400 # Node ID a6eb7e9d3680d9648ac464290836bc3d6fc5c8ab # Parent 4d667b16fbd53d3b39076c54f1c2f0786d39c2fc Old HWMP routing table test removed from examples. diff -r 4d667b16fbd5 -r a6eb7e9d3680 examples/routing-table-test.cc --- a/examples/routing-table-test.cc Wed Apr 01 14:08:52 2009 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,293 +0,0 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ -/* - * Copyright (c) 2009 IITP RAS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: Kirill Andreev - */ - - -#include -#include -#include "ns3/core-module.h" -#include -#include "ns3/mac48-address.h" -#include "ns3/simulator-module.h" -#include -#include "ns3/hwmp-rtable.h" - - - -using namespace ns3; - -NS_LOG_COMPONENT_DEFINE ("RoutingTableTest"); - - -void -aux_function (Ptr ptr, Mac48Address addr, std::vector *results, std::vector *seconds) -{ - if (ptr->LookupReactive (addr).retransmitter.IsBroadcast () && ptr->LookupReactive (addr).metric == 0xffffffff) - results->push_back (false); - else - results->push_back (true); - - seconds->push_back (Simulator::Now ()); - NS_LOG_UNCOND ("Reactive retransmitter is " << ptr->LookupReactive (addr).retransmitter << - "\nport is " << ptr->LookupReactive (addr).ifIndex << - "\nmetric is " << ptr->LookupReactive (addr).metric << - "\nseqnum is " << ptr->LookupReactive (addr).seqnum); - NS_LOG_UNCOND ("Checked at " << Simulator::Now ().GetSeconds () << " seconds\n\n"); -}; - - -void -aux_function1 (Ptr ptr, uint32_t port, std::vector *results, std::vector *seconds) -{ - if (ptr->LookupProactive (port).retransmitter.IsBroadcast () && ptr->LookupProactive (port).metric == 0xffffffff) - results->push_back (false); - else - results->push_back (true); - - seconds->push_back (Simulator::Now ()); - NS_LOG_UNCOND ("Proactive retransmitter is " << ptr->LookupProactive (port).retransmitter << - "\nport is " << ptr->LookupProactive (port).ifIndex << - "\nmetric is " << ptr->LookupProactive (port).metric << - "\nseqnum is " << ptr->LookupProactive (port).seqnum); - NS_LOG_UNCOND ("Checked at " << Simulator::Now ().GetSeconds () << " seconds\n\n"); -}; - -void -print_results (std::vector *results, std::vector *seconds) -{ - NS_LOG_UNCOND ("Fulfilled " << results->size () << " tests\n"); - for (unsigned int i = 0; i != results->size (); i++) - { - NS_LOG_UNCOND ("Result: " << results->at (i)); - NS_LOG_UNCOND ("Tested at " << seconds->at (i).GetSeconds () << " seconds\n"); - } -} - -void -get_conclusion (std::vector *results) -{ - if ( - results->at (0) - && results->at (1) - && results->at (2) - && results->at (3) - && results->at (4) - && results->at (5) - && results->at (6) - && results->at (7) - && !results->at (8) - && !results->at (9) - && !results->at (10) - && !results->at (11) - && !results->at (12) - && !results->at (13) - && !results->at (14)) - NS_LOG_UNCOND ("\n\n\nPASSED\n\n\n"); - else - NS_LOG_UNCOND ("\n\n\nNOT PASSED\n\n\n"); - -} - -int main (int argc, char *argv[]) -{ - // Create Table - Ptr table = CreateObject (); - std::vector test_results = std::vector (); - std::vector test_time = std::vector (); - //Add reactive paths - table->AddReactivePath (Mac48Address ("01:00:00:01:00:01"), Mac48Address ("01:00:00:01:00:03"), 8010, 10, Seconds (20), 1); - table->AddReactivePath (Mac48Address ("01:00:00:02:00:01"), Mac48Address ("01:00:00:02:00:03"), 8020, 20, Seconds (30), 2); -// table->AddReactivePath (Mac48Address("01:00:00:03:00:01"),Mac48Address("01:00:00:03:00:03"),8030,30,Seconds(30),3); -// table->AddReactivePath (Mac48Address("01:00:00:04:00:01"),Mac48Address("01:00:00:04:00:03"),8040,40,Seconds(35),4); - //Add proactive paths - table->AddProactivePath (10, Mac48Address ("01:00:00:01:00:01"), Mac48Address ("01:00:00:01:00:03"), 8010, Seconds (20), 1); - table->AddProactivePath (20, Mac48Address ("01:00:00:02:00:01"), Mac48Address ("01:00:00:02:00:03"), 8020, Seconds (30), 2); - table->AddProactivePath (30, Mac48Address ("01:00:00:03:00:01"), Mac48Address ("01:00:00:03:00:03"), 8030, Seconds (20), 3); - table->AddProactivePath (40, Mac48Address ("01:00:00:04:00:01"), Mac48Address ("01:00:00:04:00:03"), 8040, Seconds (30), 4); - Simulator::Schedule (Seconds (0.0), - &aux_function, - table, - Mac48Address ("01:00:00:01:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (0.0), - &aux_function1, - table, - 8010, - &test_results, - &test_time); - Simulator::Schedule (Seconds (0.0), - &aux_function, - table, - Mac48Address ("01:00:00:02:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (0.0), - &aux_function1, - table, - 8020, - &test_results, - &test_time); - Simulator::Schedule (Seconds (1.0), - &aux_function, - table, - Mac48Address ("01:00:00:01:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (1.0), - &aux_function1, - table, - 8010, - &test_results, - &test_time); - Simulator::Schedule (Seconds (1.0), - &aux_function, - table, - Mac48Address ("01:00:00:02:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (1.0), - &aux_function1, - table, - 8020, - &test_results, - &test_time); - //Print routing info - NS_LOG_UNCOND ("Added reactive path number " << - table->LookupReactive (Mac48Address ("01:00:00:01:00:01")).seqnum << - " at dest " << - table->LookupReactive (Mac48Address ("01:00:00:01:00:01")).retransmitter << - " with metric " << - table->LookupReactive (Mac48Address ("01:00:00:01:00:01")).metric << "\n"); - NS_LOG_UNCOND ("Added reactive path number " << - table->LookupReactive (Mac48Address ("01:00:00:02:00:01")).seqnum << - " at dest " << - table->LookupReactive (Mac48Address ("01:00:00:02:00:01")).retransmitter << - " with metric " << - table->LookupReactive (Mac48Address ("01:00:00:02:00:01")).metric << "\n"); - NS_LOG_UNCOND ("Added reactive path number " << - table->LookupReactive (Mac48Address ("01:00:00:03:00:01")).seqnum << - " at dest " << - table->LookupReactive (Mac48Address ("01:00:00:03:00:01")).retransmitter << - " with metric " << - table->LookupReactive (Mac48Address ("01:00:00:03:00:01")).metric << "\n"); - NS_LOG_UNCOND ("Added reactive path number " << - table->LookupReactive (Mac48Address ("01:00:00:04:00:01")).seqnum << - " at dest " << - table->LookupReactive (Mac48Address ("01:00:00:04:00:01")).retransmitter << - " with metric " << table->LookupReactive (Mac48Address ("01:00:00:04:00:01")).metric <<"\n"); - - NS_LOG_UNCOND ("Added proactive path number " << - table->LookupProactive (8010).seqnum << - " with retr " << - table->LookupProactive (8010).retransmitter << - " at port " << - table->LookupProactive (8010).ifIndex << - " with metric " << - table->LookupProactive (8010).metric << "\n"); - NS_LOG_UNCOND ("Added proactive path number " << - table->LookupProactive (8020).seqnum << - " with retr " << - table->LookupProactive (8020).retransmitter << - " at port " << - table->LookupProactive (8020).ifIndex << - " with metric " << - table->LookupProactive (8020).metric <<"\n"); - NS_LOG_UNCOND ("Added proactive path number " << - table->LookupProactive (8030).seqnum << - " with retr " << - table->LookupProactive (8030).retransmitter << - " at port " << - table->LookupProactive (8030).ifIndex << - " with metric " << - table->LookupProactive (8030).metric << "\n"); - NS_LOG_UNCOND ("Added proactive path number " << - table->LookupProactive (8040).seqnum << - " with retr " << - table->LookupProactive (8040).retransmitter << - " at port " << - table->LookupProactive (8040).ifIndex << - " with metric " << - table->LookupProactive (8040).metric << "\n"); - - table->DeleteProactivePath (8030); - table->DeleteProactivePath (Mac48Address ("01:00:00:04:00:01"), 8040); - Simulator::Schedule (Seconds (1.0), - &aux_function1, - table, - 8030, - &test_results, - &test_time); - Simulator::Schedule (Seconds (1.0), - &aux_function1, - table, - 8040, - &test_results, - &test_time); - - Simulator::Schedule (Seconds (10.0), - &HwmpRtable::DeleteReactivePath, - table, - Mac48Address ("01:00:00:02:00:01"), - 8020); - - Simulator::Schedule (Seconds (15.0), - &aux_function, - table, - Mac48Address ("01:00:00:02:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (25.0), - &aux_function, - table, - Mac48Address ("01:00:00:01:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (25.0), - &aux_function, - table, - Mac48Address ("01:00:00:02:00:01"), - &test_results, - &test_time); - Simulator::Schedule (Seconds (25.0), - &aux_function1, - table, - 8010, - &test_results, - &test_time); - Simulator::Schedule (Seconds (30.0), - &aux_function, - table, - Mac48Address ("01:00:00:01:00:01"), - &test_results, - &test_time); - - Simulator::Schedule (Seconds (40.0), - &print_results, - &test_results, - &test_time); - Simulator::Schedule (Seconds (41.0), - &get_conclusion, - &test_results); - - Simulator::Run (); - Simulator::Destroy (); - return 0; -} - diff -r 4d667b16fbd5 -r a6eb7e9d3680 examples/wscript --- a/examples/wscript Wed Apr 01 14:08:52 2009 +0400 +++ b/examples/wscript Wed Apr 01 14:12:53 2009 +0400 @@ -7,10 +7,6 @@ obj = bld.create_ns3_program('first', ['core', 'simulator', 'point-to-point', 'internet-stack']) obj.source = 'first.cc' -# -# obj = bld.create_ns3_program('routing-table-test', -# ['core','l2-routing-table','simulator']) -# obj.source = 'routing-table-test.cc' obj = bld.create_ns3_program('second', ['core', 'simulator', 'point-to-point', 'csma', 'internet-stack'])