X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc8444cfcfd9eb6957c32bbc3f851c07439eeafd..a251a46feac3eac126243e066a947e153464a29e:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 8b4ee260bd..cba58fbacc 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -12,19 +12,20 @@
 #include "xbt/dict.h"
 
 typedef struct network_link_CM02 {
-  surf_resource_t resource;	/* Any such object, added in a trace
+  surf_model_t model;	/* Any such object, added in a trace
 				   should start by this field!!! */
+  xbt_dict_t properties;
   /* Using this object with the public part of
-     resource does not make sense */
+     model does not make sense */
   char *name;
   double bw_current;
   tmgr_trace_event_t bw_event;
   double lat_current;
   tmgr_trace_event_t lat_event;
-  e_surf_network_link_state_t state_current;
+  e_surf_link_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
-} s_network_link_CM02_t, *network_link_CM02_t;
+} s_link_CM02_t, *link_CM02_t;
 
 
 typedef struct network_card_CM02 {
@@ -47,7 +48,7 @@ extern xbt_dict_t network_card_set;
 
 
 extern int card_number;
-extern network_link_CM02_t **routing_table;
+extern link_CM02_t **routing_table;
 extern int *routing_table_size;
 
 #define ROUTE(i,j) routing_table[(i)+(j)*card_number]