-/* 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
#include "xbt/lib.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
+#include "xbt/Extendable.hpp"
+
using namespace ns3;
-extern xbt_lib_t host_lib;
-extern int NS3_HOST_LEVEL; //host node for ns3
extern xbt_dynar_t IPV4addr;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(interface_ns3, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf,
"Logging specific to the SURF network NS3 module");
InternetStackHelper stack;
NodeContainer Cluster_nodes;
Ipv4InterfaceContainer interfaces;
-
-
int number_of_nodes = 0;
int number_of_clusters_nodes = 0;
int number_of_links = 1;
int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action)
{
- ns3_nodes_t node1 = (ns3_nodes_t) xbt_lib_get_or_null(host_lib,a,NS3_HOST_LEVEL);
- ns3_nodes_t node2 = (ns3_nodes_t) xbt_lib_get_or_null(host_lib,b,NS3_HOST_LEVEL);
+ ns3_nodes_t node1 = ns3_find_host(a);
+ ns3_nodes_t node2 = ns3_find_host(b);
Ptr<Node> src_node = nodes.Get(node1->node_num);
Ptr<Node> 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,
// "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")){
}
XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+ return 0;
}
-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);
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);
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);
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);
XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
NodeContainer Nodes;
- int i;
+ unsigned int i;
for(i = number_of_clusters_nodes; i < Cluster_nodes.GetN() ; i++){
Nodes.Add(Cluster_nodes.Get(i));
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){
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;
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;
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");
interfaces.Add(address.Assign (netA));
char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
- XBT_DEBUG("Have write '%s' for Node '%d'",tmp,src);
- xbt_dynar_set(IPV4addr,src,tmp);
+ 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);
tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1));
- XBT_DEBUG("Have write '%s' for Node '%d'",tmp,dst);
- xbt_dynar_set(IPV4addr,dst,tmp);
+ 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)
}
}
-void * ns3_end_platform(void)
+void ns3_end_platform(void)
{
XBT_DEBUG("InitializeRoutes");
GlobalRouteManager::BuildGlobalRoutingDatabase();
