X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3072be2de56fbf379bb67604b4aef9701cc76244..1059053df344f90ee74d4fc9af05efce32022813:/src/surf/surf_routing_vivaldi.c

diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c
index 687bc872ff..029b1ff14e 100644
--- a/src/surf/surf_routing_vivaldi.c
+++ b/src/surf/surf_routing_vivaldi.c
@@ -58,10 +58,10 @@ static double base_vivaldi_get_latency (const char *src, const char *dst)
 
 static double vivaldi_get_link_latency (AS_t rc,const char *src, const char *dst, route_extended_t e_route)
 {
-  if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
+  if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
 	  int need_to_clean = e_route?0:1;
 	  double latency;
-	  e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst);
+	  e_route = e_route ? e_route : rc->get_route(rc, src, dst);
 	  latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway);
 	  if(need_to_clean) generic_free_extended_route(e_route);
 	  return latency;
@@ -73,7 +73,7 @@ static double vivaldi_get_link_latency (AS_t rc,const char *src, const char *dst
 /* Creation routing model functions */
 AS_t model_vivaldi_create(void)
 {
-	  AS_t new_component = model_none_create();
+	  AS_t new_component = model_rulebased_create();
 	  new_component->get_route = vivaldi_get_route;
 	  new_component->get_latency = vivaldi_get_link_latency;
 	  return new_component;