FS-9952: More work on the connection and transport code, couple things left to…

FS-9952: More work on the connection and transport code, couple things left to do but nearly ready for testing upto starting session negotiations

libs/libblade/src/include/blade_connection.h

@@ -41,9 +41,11 @@ KS_DECLARE(ks_status_t) blade_connection_create(blade_connection_t **bcP,
 												void *transport_data,
 												blade_transport_callbacks_t *transport_callbacks);
 KS_DECLARE(ks_status_t) blade_connection_destroy(blade_connection_t **bcP);
-KS_DECLARE(ks_status_t) blade_connection_startup(blade_connection_t *bc);
+KS_DECLARE(ks_status_t) blade_connection_startup(blade_connection_t *bc, blade_connection_direction_t direction);
 KS_DECLARE(ks_status_t) blade_connection_shutdown(blade_connection_t *bc);
+KS_DECLARE(void *) blade_connection_transport_init_get(blade_connection_t *bc);
 KS_DECLARE(void *) blade_connection_transport_get(blade_connection_t *bc);
+KS_DECLARE(void) blade_connection_transport_set(blade_connection_t *bc, void *transport_data);
 KS_DECLARE(void) blade_connection_state_set(blade_connection_t *bc, blade_connection_state_t state);
 KS_DECLARE(void) blade_connection_disconnect(blade_connection_t *bc);
 KS_DECLARE(blade_connection_rank_t) blade_connection_rank(blade_connection_t *bc, blade_identity_t *target);

libs/libblade/src/include/blade_types.h

@@ -62,8 +62,8 @@ typedef enum {
 } blade_connection_state_t;
 
 typedef enum {
-	BLADE_CONNECTION_DIRECTION_IN,
-	BLADE_CONNECTION_DIRECTION_OUT,
+	BLADE_CONNECTION_DIRECTION_INBOUND,
+	BLADE_CONNECTION_DIRECTION_OUTBOUND,
 } blade_connection_direction_t;
 
 typedef enum {
@@ -99,14 +99,28 @@ struct blade_module_callbacks_s {
 
 typedef ks_status_t (*blade_transport_connect_callback_t)(blade_connection_t **bcP, blade_module_t *bm, blade_identity_t *target);
 typedef blade_connection_rank_t (*blade_transport_rank_callback_t)(blade_connection_t *bc, blade_identity_t *target);
-typedef blade_connection_state_hook_t (*blade_transport_state_callback_t)(blade_connection_t *bc,
-																		  blade_connection_state_t state,
-																		  blade_connection_state_condition_t condition);
+typedef ks_status_t (*blade_transport_send_callback_t)(blade_connection_t *bc, blade_identity_t *target, cJSON *json);
+typedef ks_status_t (*blade_transport_receive_callback_t)(blade_connection_t *bc, cJSON **json);
+typedef blade_connection_state_hook_t (*blade_transport_state_callback_t)(blade_connection_t *bc, blade_connection_state_condition_t condition);
 
 struct blade_transport_callbacks_s {
 	blade_transport_connect_callback_t onconnect;
 	blade_transport_rank_callback_t onrank;
-	blade_transport_state_callback_t onstate;
+	blade_transport_send_callback_t onsend;
+	blade_transport_receive_callback_t onreceive;
+
+	blade_transport_state_callback_t onstate_disconnect_inbound;
+	blade_transport_state_callback_t onstate_disconnect_outbound;
+	blade_transport_state_callback_t onstate_new_inbound;
+	blade_transport_state_callback_t onstate_new_outbound;
+	blade_transport_state_callback_t onstate_connect_inbound;
+	blade_transport_state_callback_t onstate_connect_outbound;
+	blade_transport_state_callback_t onstate_attach_inbound;
+	blade_transport_state_callback_t onstate_attach_outbound;
+	blade_transport_state_callback_t onstate_detach_inbound;
+	blade_transport_state_callback_t onstate_detach_outbound;
+	blade_transport_state_callback_t onstate_ready_inbound;
+	blade_transport_state_callback_t onstate_ready_outbound;
 };