Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index dafbfc4..ff8b6b0 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -108,7 +108,7 @@ typedef struct s_network_element_info {
   e_surf_network_element_type_t rc_type;
   int id;
   char *name;
-} s_network_element_t, *network_element_t;
+} s_network_element_t;
 
 /*
  * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3
@@ -152,6 +152,7 @@ typedef struct s_as {
   struct s_as *routing_father;
   xbt_dict_t routing_sons;
   network_element_t net_elem;
+  xbt_dynar_t link_up_down_list;
 
   void (*get_route_and_latency) (AS_t as, network_element_t src, network_element_t dst, route_t into, double *latency);
 
@@ -184,6 +185,7 @@ struct s_routing_global {
 
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
+XBT_PUBLIC(void) storage_register_callbacks(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) generic_free_route(route_t route); // FIXME rename to routing_route_free
  // FIXME: make previous function private to routing again?