enhance channel so that messages can be queued.

src/channel.c

@@ -19,6 +19,9 @@
 
 #include "belle_sip_internal.h"
 
+static void channel_prepare_continue(belle_sip_channel_t *obj);
+static void channel_process_queue(belle_sip_channel_t *obj);
+
 const char *belle_sip_channel_state_to_string(belle_sip_channel_state_t state){
 	switch(state){
 		case BELLE_SIP_CHANNEL_INIT:
@@ -416,32 +419,47 @@ static void send_message(belle_sip_channel_t *obj, belle_sip_message_t *msg){
 }
 
 void belle_sip_channel_prepare(belle_sip_channel_t *obj){
-	obj->prepare=1;
-	channel_process_queue(obj);
+	channel_prepare_continue(obj);
 }
 
-void channel_process_queue(belle_sip_channel_t *obj){
-	belle_sip_object_ref(obj);/* we need to ref ourself because code below may trigger our destruction*/
+static void channel_push_outgoing(belle_sip_channel_t *obj, belle_sip_message_t *msg){
+	obj->outgoing_messages=belle_sip_list_append(obj->outgoing_messages,msg);
+}
+
+static belle_sip_message_t *channel_pop_outgoing(belle_sip_channel_t *obj){
+	belle_sip_message_t *msg=NULL;
+	if (obj->outgoing_messages){
+		msg=(belle_sip_message_t*)obj->outgoing_messages->data;
+		obj->outgoing_messages=belle_sip_list_delete_link(obj->outgoing_messages,obj->outgoing_messages);
+	}
+	return msg;
+}
+
+static void channel_prepare_continue(belle_sip_channel_t *obj){
 	switch(obj->state){
 		case BELLE_SIP_CHANNEL_INIT:
-			if (obj->prepare) belle_sip_channel_resolve(obj);
+			belle_sip_channel_resolve(obj);
 		break;
 		case BELLE_SIP_CHANNEL_RES_DONE:
-			if (obj->prepare) belle_sip_channel_connect(obj);
+			belle_sip_channel_connect(obj);
 		break;
 		case BELLE_SIP_CHANNEL_READY:
-			if (obj->msg) {
-				send_message(obj, obj->msg);
-				belle_sip_object_unref(obj->msg);
-				obj->msg=NULL;
-			}
-		break;
-		case BELLE_SIP_CHANNEL_ERROR:
-			if (obj->msg) belle_sip_error("channel %p: trying to send a message over a broken channel ???",obj);
+			channel_process_queue(obj);
 		break;
 		default:
 		break;
 	}
+}
+
+static void channel_process_queue(belle_sip_channel_t *obj){
+	belle_sip_message_t *msg;
+	belle_sip_object_ref(obj);/* we need to ref ourself because code below may trigger our destruction*/
+
+	while((msg=channel_pop_outgoing(obj))!=NULL) {
+		send_message(obj, msg);
+		belle_sip_object_unref(msg);
+	}
+
 	belle_sip_object_unref(obj);
 }
 
@@ -460,7 +478,6 @@ void belle_sip_channel_set_ready(belle_sip_channel_t *obj, const struct sockaddr
 		}
 	}
 	channel_set_state(obj,BELLE_SIP_CHANNEL_READY);
-	obj->prepare=0;
 	channel_process_queue(obj);
 }
 
@@ -470,10 +487,10 @@ static void channel_res_done(void *data, const char *name, struct addrinfo *res)
 	if (res){
 		obj->peer=res;
 		channel_set_state(obj,BELLE_SIP_CHANNEL_RES_DONE);
+		channel_prepare_continue(obj);
 	}else{
 		channel_set_state(obj,BELLE_SIP_CHANNEL_ERROR);
 	}
-	channel_process_queue(obj);
 }
 
 void belle_sip_channel_resolve(belle_sip_channel_t *obj){
@@ -487,20 +504,18 @@ void belle_sip_channel_connect(belle_sip_channel_t *obj){
 	if(BELLE_SIP_OBJECT_VPTR(obj,belle_sip_channel_t)->connect(obj,obj->peer)) {
 		belle_sip_error("Cannot connect to [%s://%s:%i]",belle_sip_channel_get_transport_name(obj),obj->peer_name,obj->peer_port);
 		channel_set_state(obj,BELLE_SIP_CHANNEL_ERROR);
-		channel_process_queue(obj);
 	}
 	return;
 }
 
 int belle_sip_channel_queue_message(belle_sip_channel_t *obj, belle_sip_message_t *msg){
-	if (obj->msg!=NULL){
-		belle_sip_error("Queue is not a queue, state=%s", belle_sip_channel_state_to_string(obj->state));
-		return -1;
-	}
-	obj->msg=(belle_sip_message_t*)belle_sip_object_ref(msg);
-	if (obj->state==BELLE_SIP_CHANNEL_INIT)
+	belle_sip_object_ref(msg);
+	channel_push_outgoing(obj,msg);
+	if (obj->state==BELLE_SIP_CHANNEL_INIT){
 		belle_sip_channel_prepare(obj);
-	channel_process_queue(obj);
+	}else if (obj->state==BELLE_SIP_CHANNEL_READY) {
+		channel_process_queue(obj);
+	}		
 	return 0;
 }
 

src/channel.h

@@ -82,10 +82,9 @@ struct belle_sip_channel{
 	int peer_port;
 	char *local_ip;
 	int local_port;
-	int prepare;
 	unsigned long resolver_id;
 	struct addrinfo *peer;
-	belle_sip_message_t *msg;
+	belle_sip_list_t *outgoing_messages;
 	belle_sip_list_t* incoming_messages;
 	belle_sip_channel_input_stream_t input_stream;
 	unsigned int recv_error:1; /* used to simulate network error. if <=0, channel_recv will return this value*/
@@ -140,9 +139,6 @@ const char *belle_sip_channel_get_local_address(belle_sip_channel_t *obj, int *p
 
 void channel_set_state(belle_sip_channel_t *obj, belle_sip_channel_state_t state);
 
-/*remember that channel_process_queue() might trigger the destruction of the channel*/
-void channel_process_queue(belle_sip_channel_t *obj);
-
 /*just invokes the listeners to process data*/
 int belle_sip_channel_process_data(belle_sip_channel_t *obj,unsigned int revents);
 

src/listeningpoint.c

@@ -69,7 +69,7 @@ void belle_sip_listening_point_clean_channels(belle_sip_listening_point_t *lp){
 	belle_sip_list_t* iterator;
 	
 	if ((existing_channels=belle_sip_list_size(lp->channels)) > 0) {
-		belle_sip_warning("Listening point destroying [%i] channels",existing_channels);
+		belle_sip_message("Listening point destroying [%i] channels",existing_channels);
 	}
 	for (iterator=lp->channels;iterator!=NULL;iterator=iterator->next) {
 		belle_sip_channel_t *chan=(belle_sip_channel_t*)iterator->data;

src/transports/stream_channel.c

@@ -146,7 +146,6 @@ static int stream_channel_process_data(belle_sip_channel_t *obj,unsigned int rev
 		if (finalize_stream_connection(fd,(struct sockaddr*)&ss,&addrlen)) {
 			belle_sip_error("Cannot connect to [%s://%s:%s]",belle_sip_channel_get_transport_name(obj),obj->peer_name,obj->peer_port);
 			channel_set_state(obj,BELLE_SIP_CHANNEL_ERROR);
-			channel_process_queue(obj);
 			return BELLE_SIP_STOP;
 		}
 		belle_sip_source_set_events((belle_sip_source_t*)obj,BELLE_SIP_EVENT_READ|BELLE_SIP_EVENT_ERROR);

src/transports/tls_channel.c

@@ -200,7 +200,6 @@ static int tls_process_data(belle_sip_channel_t *obj,unsigned int revents){
 	process_error:
 	belle_sip_error("Cannot connect to [%s://%s:%i]",belle_sip_channel_get_transport_name(obj),obj->peer_name,obj->peer_port);
 	channel_set_state(obj,BELLE_SIP_CHANNEL_ERROR);
-	channel_process_queue(obj);
 	return BELLE_SIP_STOP;
 }
 

tester/belle_sip_register_tester.c

@@ -47,7 +47,7 @@ static void process_dialog_terminated(void *user_ctx, const belle_sip_dialog_ter
 static void process_io_error(void *user_ctx, const belle_sip_io_error_event_t *event){
 	BELLESIP_UNUSED(user_ctx);
 	BELLESIP_UNUSED(event);
-	belle_sip_warning("process_io_error");
+	belle_sip_message("process_io_error");
 	belle_sip_main_loop_quit(belle_sip_stack_get_main_loop(stack));
 	/*CU_ASSERT(CU_FALSE);*/
 }