* Routing logic
*/
-// FIXME: the next lines cant be comented without fix the code in network.c file.
-struct s_routing {
- const char *name;
- xbt_dict_t host_id; /* char* -> int* */
- xbt_dynar_t (*get_route)(int src, int dst);
- xbt_dict_t (*get_onelink_routes)(void);
- int (*is_router)(int id);
- void (*finalize)(void);
- int host_count;
- int router_count;
-};
-
////////////////////////////////////////////////////////////////////////////////
// HERE START THE NEW STRUCTURES
////////////////////////////////////////////////////////////////////////////////
+typedef enum {
+ SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */
+ SURF_NETWORK_ELEMENT_HOST, /* host type */
+ SURF_NETWORK_ELEMENT_ROUTER, /* router type */
+ SURF_NETWORK_ELEMENT_GATEWAY, /* gateway type of the AS */
+ SURF_NETWORK_ELEMENT_AS, /* AS type */
+ SURF_NETWORK_ELEMENT_AS_GATEWAY, /* gateway type for internals AS */
+ SURF_NETWORK_ELEMENT_LINK /* link type */
+} e_surf_network_element_type_t;
+
typedef struct s_model_type s_model_type_t, *model_type_t;
+typedef struct s_network_element s_network_element_t, *network_element_t;
typedef struct s_route s_route_t, *route_t;
+typedef struct s_route_limits s_route_limits_t, *route_limits_t;
typedef struct s_route_extended s_route_extended_t, *route_extended_t;
typedef struct s_routing_component s_routing_component_t, *routing_component_t;
-typedef struct s_routing_global s_routing_global_t, *routing_global_t;
+//typedef struct s_routing_global s_routing_global_t, *routing_global_t;
struct s_model_type {
const char *name;
void (*end)();
};
+struct s_network_element {
+ int id;
+ e_surf_network_element_type_t type;
+};
+
struct s_route {
xbt_dynar_t link_list;
};
+struct s_route_limits {
+ char* src_gateway;
+ char* dst_gateway;
+};
+
struct s_route_extended {
s_route_t generic_route;
char* src_gateway;
char* dst_gateway;
};
+/* This enum used in the routing structure helps knowing in which situation we are. */
+typedef enum {
+ SURF_ROUTING_NULL = 0, /**< Indefined type */
+ SURF_ROUTING_BASE, /**< Base case: use simple link lists for routing */
+ SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */
+} e_surf_routing_hierarchy_t;
+
struct s_routing_component {
model_type_t routing;
+ e_surf_routing_hierarchy_t hierarchy;
char *name;
struct s_routing_component* routing_father;
xbt_dict_t routing_sons;
route_extended_t (*get_route)(routing_component_t rc, const char* src, const char* dst);
+ route_extended_t (*get_bypass_route)(routing_component_t rc, const char* src, const char* dst);
void (*finalize)(routing_component_t rc);
+ void (*set_processing_units)(routing_component_t rc, const char* name);
+ void (*set_autonomous_system)(routing_component_t rc, const char* name);
+ void (*set_route)(routing_component_t rc, const char* src, const char* dst, route_t route);
+ void (*set_ASroute)(routing_component_t rc, const char* src, const char* dst, route_extended_t route);
+ void (*set_bypassroute)(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
};
struct s_routing_global {
