Fix ns3 and gtnets compilation

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 0ff71c7..24d89c2 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -438,7 +438,7 @@ static void surf_network_model_init_internal(void)
     xbt_die("Impossible to initialize GTNetS interface");
   }
 
-  routing_model_create(sizeof(network_link_GTNETS_t), NULL);
+  routing_model_create(NULL);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 6741f6f..7301c5c 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -366,7 +366,7 @@ void surf_network_model_init_NS3()
     xbt_die("Impossible to initialize NS3 interface");
   }
 
-  routing_model_create(sizeof(s_surf_ns3_link_t), NULL);
+  routing_model_create(NULL);
   define_callbacks_ns3();
 
   NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);

diff --git a/src/surf/network_ns3_private.h b/src/surf/network_ns3_private.h
index 544c210..9cd7c6d 100644 (file)
--- a/src/surf/network_ns3_private.h
+++ b/src/surf/network_ns3_private.h
@@ -26,8 +26,8 @@ typedef struct surf_action_network_ns3 {
   s_surf_action_t generic_action;
 #ifdef HAVE_TRACING
   double last_sent;
-  network_element_t src_elm;
-  network_element_t dst_elm;
+  sg_routing_edge_t src_elm;
+  sg_routing_edge_t dst_elm;
 #endif //HAVE_TRACING
 } s_surf_action_network_ns3_t, *surf_action_network_ns3_t;