X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84b6ab29e2861d096c8d500c6bd56289bfe90664..6de03ecc4e630732984a0673512a5d15fd75e270:/src/surf/ns3/ns3_interface.cc diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index 0640c954f0..4c3d591560 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,6 +10,7 @@ #include "xbt/log.h" #include "xbt/dynar.h" + using namespace ns3; extern xbt_lib_t host_lib; @@ -24,8 +25,6 @@ NodeContainer nodes; NodeContainer Cluster_nodes; Ipv4InterfaceContainer interfaces; - - int number_of_nodes = 0; int number_of_clusters_nodes = 0; int number_of_links = 1; @@ -35,8 +34,7 @@ int port_number = 1025; //Port number is limited from 1025 to 65 000 static NS3Sim* ns3_sim = 0; void ns3_simulator(double min){ - ns3_sim->simulator_stop(min); - ns3_sim->simulator_start(); + ns3_sim->simulator_start(min); } void* ns3_get_socket_action(void *socket){ @@ -67,7 +65,7 @@ int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByte Ptr src_node = nodes.Get(node1->node_num); Ptr dst_node = nodes.Get(node2->node_num); - char* addr = (char*)xbt_dynar_get_ptr(IPV4addr,node2->node_num); + char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*); XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr); ns3_sim->create_flow_NS3(src_node, @@ -101,7 +99,7 @@ int ns3_initialize(const char* TcpProtocol){ // "ns3::TcpReno" // "ns3::TcpTahoe" - Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000)); // 1000-byte packet for easier reading + Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1024)); // 1024-byte packet for easier reading Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1)); if(!strcmp(TcpProtocol,"default")){ @@ -126,7 +124,7 @@ int ns3_initialize(const char* TcpProtocol){ XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe"); } -void * ns3_add_host(char * id) +void * ns3_add_host(const char * id) { ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1); XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id); @@ -140,7 +138,7 @@ void * ns3_add_host(char * id) return host; } -void * ns3_add_host_cluster(char * id) +void * ns3_add_host_cluster(const char * id) { ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1); XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id); @@ -155,7 +153,7 @@ void * ns3_add_host_cluster(char * id) return host; } -void * ns3_add_router(char * id) +void * ns3_add_router(const char * id) { ns3_nodes_t router = xbt_new0(s_ns3_nodes_t,1); XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id); @@ -169,7 +167,7 @@ void * ns3_add_router(char * id) return router; } -void * ns3_add_cluster(char * bw,char * lat,char *id) +void * ns3_add_cluster(char * bw,char * lat,const char *id) { XBT_DEBUG("cluster_id: %s",id); @@ -200,6 +198,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id) XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr); Ipv4AddressHelper ipv4; ipv4.SetBase (adr, "255.255.0.0"); + free(adr); interfaces.Add(ipv4.Assign (devices)); if(number_of_links == 255){ @@ -213,7 +212,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id) XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN()); } -void * ns3_add_AS(char * id) +void * ns3_add_AS(const char * id) { XBT_DEBUG("Interface ns3 add AS '%s'",id); return NULL; @@ -223,19 +222,20 @@ static char* transformIpv4Address (Ipv4Address from){ std::stringstream sstream; sstream << from ; std::string s = sstream.str(); - size_t size = s.size() + 1; - char* IPaddr = bprintf("%s",s.c_str()); - return IPaddr; + return bprintf("%s",s.c_str()); } -void * ns3_add_link(int src,int dst,char * bw,char * lat) +void * ns3_add_link(int src, e_ns3_network_element_type_t type_src, + int dst, e_ns3_network_element_type_t type_dst, + char * bw,char * lat) { if(number_of_links == 1 ) { LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO); } - PointToPointHelper pointToPoint; + MyPointToPointHelper pointToPoint; + NetDeviceContainer netA; Ipv4AddressHelper address; @@ -247,7 +247,7 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat) pointToPoint.SetChannelAttribute ("Delay", StringValue (lat)); //pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG - netA.Add(pointToPoint.Install (a, b)); + netA.Add(pointToPoint.Install (a, type_src, b, type_dst)); char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links); address.SetBase (adr, "255.255.0.0"); @@ -255,13 +255,13 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat) free(adr); interfaces.Add(address.Assign (netA)); - XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)),src); - xbt_dynar_set(IPV4addr,src, - transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2))); + char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)); + xbt_dynar_set_as(IPV4addr,src,char*,tmp); + XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,src,char*),src); - XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)),dst); - xbt_dynar_set(IPV4addr,dst, - transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1))); + tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)); + xbt_dynar_set_as(IPV4addr,dst,char*,tmp); + XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,dst,char*),dst); if(number_of_links == 255){ if(number_of_networks == 255)