finish implement invite server transaction

src/belle_sip_internal.h

@@ -622,6 +622,9 @@ void belle_sip_server_transaction_on_request(belle_sip_server_transaction_t *t,
 
 struct belle_sip_ist{
 	belle_sip_server_transaction_t base;
+	belle_sip_source_t *timer_G;
+	belle_sip_source_t *timer_H;
+	belle_sip_source_t *timer_I;
 };
 
 typedef struct belle_sip_ist belle_sip_ist_t;
@@ -630,6 +633,7 @@ BELLE_SIP_DECLARE_CUSTOM_VPTR_BEGIN(belle_sip_ist_t,belle_sip_server_transaction
 BELLE_SIP_DECLARE_CUSTOM_VPTR_END
 
 belle_sip_ist_t * belle_sip_ist_new(belle_sip_provider_t *prov, belle_sip_request_t *req);
+void belle_sip_ist_process_ack(belle_sip_ist_t *obj, belle_sip_message_t *ack);
 
 struct belle_sip_nist{
 	belle_sip_server_transaction_t base;

src/belle_sip_loop.c

@@ -219,7 +219,7 @@ void belle_sip_main_loop_iterate(belle_sip_main_loop_t *ml){
 				s->index=i;
 				++i;
 			}
-			if (s->timeout>0){
+			if (s->timeout>=0){
 				if (min_time_ms>s->expire_ms){
 					min_time_ms=s->expire_ms;
 				}
@@ -255,7 +255,7 @@ void belle_sip_main_loop_iterate(belle_sip_main_loop_t *ml){
 					revents=belle_sip_poll_to_event(pfd[s->index].revents);		
 				}
 			}
-			if (revents!=0 || (s->timeout>0 && cur>=s->expire_ms)){
+			if (revents!=0 || (s->timeout>=0 && cur>=s->expire_ms)){
 				char *objdesc=belle_sip_object_to_string((belle_sip_object_t*)s);
 				s->expired=TRUE;
 				belle_sip_message("source %s notified revents=%u, timeout=%i",objdesc,revents,s->timeout);

src/ist.c

@@ -27,17 +27,87 @@ static void ist_destroy(belle_sip_ist_t *obj){
 
 
 static void ist_on_terminate(belle_sip_ist_t *obj){
-//	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	if (obj->timer_G){
+		belle_sip_transaction_stop_timer(base,obj->timer_G);
+		belle_sip_object_unref(obj->timer_G);
+	}
+	if (obj->timer_H){
+		belle_sip_transaction_stop_timer(base,obj->timer_H);
+		belle_sip_object_unref(obj->timer_H);
+	}
+	if (obj->timer_I){
+		belle_sip_transaction_stop_timer(base,obj->timer_I);
+		belle_sip_object_unref(obj->timer_I);
+	}
+}
+
+static int ist_on_timer_G(belle_sip_ist_t *obj){
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	if (base->state==BELLE_SIP_TRANSACTION_COMPLETED){
+		const belle_sip_timer_config_t *cfg=belle_sip_transaction_get_timer_config(base);
+		int interval=belle_sip_source_get_timeout(obj->timer_G);
+	
+		belle_sip_channel_queue_message(base->channel,(belle_sip_message_t*)base->last_response);
+		belle_sip_source_set_timeout(obj->timer_G,MIN(2*interval,cfg->T2));
+		return BELLE_SIP_CONTINUE;
+	}
+	return BELLE_SIP_STOP;
+}
+
+static int ist_on_timer_H(belle_sip_ist_t *obj){
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	if (base->state==BELLE_SIP_TRANSACTION_COMPLETED){
+		belle_sip_transaction_terminate(base);
+		/*FIXME: no ACK was received, should report the faillure */
+	}
+	return BELLE_SIP_STOP;
+}
+
+static int ist_on_timer_I(belle_sip_ist_t *obj){
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	belle_sip_transaction_terminate(base);
+	return BELLE_SIP_STOP;
+}
+
+void belle_sip_ist_process_ack(belle_sip_ist_t *obj, belle_sip_message_t *ack){
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	if (base->state==BELLE_SIP_TRANSACTION_COMPLETED){
+		/*clear timer G*/
+		if (obj->timer_G){
+			belle_sip_transaction_stop_timer(base,obj->timer_G);
+			belle_sip_object_unref(obj->timer_G);
+			obj->timer_G=NULL;
+		}
+		base->state=BELLE_SIP_TRANSACTION_CONFIRMED;
+		if (!belle_sip_channel_is_reliable(base->channel)){
+			const belle_sip_timer_config_t *cfg=belle_sip_transaction_get_timer_config(base);
+			obj->timer_I=belle_sip_timeout_source_new((belle_sip_source_func_t)ist_on_timer_I,obj,cfg->T4);
+			belle_sip_transaction_start_timer(base,obj->timer_I);
+		}else ist_on_timer_I(obj);
+	}
 }
 
 static int ist_send_new_response(belle_sip_ist_t *obj, belle_sip_response_t *resp){
 	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
 	int code=belle_sip_response_get_status_code(resp);
-	int ret=0;
+	int ret=-1;
 	switch(base->state){
 		case BELLE_SIP_TRANSACTION_PROCEEDING:
-			if (code==100)
-				belle_sip_channel_queue_message(base->channel,(belle_sip_message_t*)resp);
+			ret=0;
+			belle_sip_channel_queue_message(base->channel,(belle_sip_message_t*)resp);
+			if (code>=200 && code<300)
+				belle_sip_transaction_terminate(base);
+			else if (code>=300){
+				const belle_sip_timer_config_t *cfg=belle_sip_transaction_get_timer_config(base);
+				base->state=BELLE_SIP_TRANSACTION_COMPLETED;
+				if (!belle_sip_channel_is_reliable(base->channel)){
+					obj->timer_G=belle_sip_timeout_source_new((belle_sip_source_func_t)ist_on_timer_G,obj,cfg->T1);
+					belle_sip_transaction_start_timer(base,obj->timer_G);
+				}
+				obj->timer_H=belle_sip_timeout_source_new((belle_sip_source_func_t)ist_on_timer_H,obj,64*cfg->T1);
+				belle_sip_transaction_start_timer(base,obj->timer_H);
+			}
 		break;
 		default:
 		break;
@@ -46,6 +116,15 @@ static int ist_send_new_response(belle_sip_ist_t *obj, belle_sip_response_t *res
 }
 
 static void ist_on_request_retransmission(belle_sip_nist_t *obj){
+	belle_sip_transaction_t *base=(belle_sip_transaction_t*)obj;
+	switch(base->state){
+		case BELLE_SIP_TRANSACTION_PROCEEDING:
+		case BELLE_SIP_TRANSACTION_COMPLETED:
+			belle_sip_channel_queue_message(base->channel,(belle_sip_message_t*)base->last_response);
+		break;
+		default:
+		break;
+	}
 }
 
 

src/transaction.c

@@ -147,9 +147,22 @@ void belle_sip_server_transaction_send_response(belle_sip_server_transaction_t *
 void belle_sip_server_transaction_on_request(belle_sip_server_transaction_t *t, belle_sip_request_t *req){
 	const char *method=belle_sip_request_get_method(req);
 	if (strcmp(method,"ACK")==0){
-		belle_sip_error("please handle this ack");
+		/*this must be for an INVITE server transaction */
+		if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(t,belle_sip_ist_t)){
+			belle_sip_ist_t *ist=(belle_sip_ist_t*)t;
+			belle_sip_ist_process_ack(ist,(belle_sip_message_t*)req);
+		}else{
+			belle_sip_warning("ACK received for non-invite server transaction ?");
+		}
 	}else if (strcmp(method,"CANCEL")==0){
-		belle_sip_error("please handle this cancel ??");
+		/*just notify the application */
+		belle_sip_request_event_t event;
+
+		event.source=t->base.provider;
+		event.server_transaction=t;
+		event.dialog=NULL;
+		event.request=req;
+		BELLE_SIP_PROVIDER_INVOKE_LISTENERS(t->base.provider,process_request_event,&event);
 	}else
 		BELLE_SIP_OBJECT_VPTR(t,belle_sip_server_transaction_t)->on_request_retransmission(t);
 }