-typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_AVAILABILITY,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY,A_surfxml_trace_c_connect_kind_POWER } AT_surfxml_trace_c_connect_kind;
-typedef int AT_surfxml_trace_c_connect_connector_id;
-#define AU_surfxml_trace_c_connect_connector_id NULL
-typedef int AT_surfxml_route_c_multi_dst;
-#define AU_surfxml_route_c_multi_dst NULL
+typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_HOST_AVAIL,A_surfxml_trace_c_connect_kind_POWER,A_surfxml_trace_c_connect_kind_LINK_AVAIL,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY } AT_surfxml_trace_c_connect_kind;
+typedef int AT_surfxml_bypassRoute_gw_src;
+#define AU_surfxml_bypassRoute_gw_src NULL