Add new QoS implementation

Code formatting

6 files changed, 97 insertions, 107 deletions

diff --git a/tinySIP/include/tinysip/transactions/tsip_transac.h b/tinySIP/include/tinysip/transactions/tsip_transac.h
index 3a896a0..772788d 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -67,15 +67,14 @@ TSIP_BEGIN_DECLS
 #define TRANSAC_TIMER_CANCEL(TX) \
 	tsk_timer_mgr_global_cancel(self->timer##TX.id)
 
-typedef enum tsip_transac_event_type_e
-{
-	tsip_transac_incoming_msg,
-	tsip_transac_outgoing_msg,
-	tsip_transac_canceled,
-	tsip_transac_terminated,
-	tsip_transac_timedout,
-	tsip_transac_error,
-	tsip_transac_transport_error
+typedef enum tsip_transac_event_type_e {
+    tsip_transac_incoming_msg,
+    tsip_transac_outgoing_msg,
+    tsip_transac_canceled,
+    tsip_transac_terminated,
+    tsip_transac_timedout,
+    tsip_transac_error,
+    tsip_transac_transport_error
 }
 tsip_transac_event_type_t;
 
@@ -93,66 +92,62 @@ tsip_transac_event_t;
 typedef int (*tsip_transac_event_callback_f)(const void *arg, tsip_transac_event_type_t type, const tsip_message_t *msg);
 #define TSIP_TRANSAC_EVENT_CALLBACK_F(callback)	 ((tsip_transac_event_callback_f)(callback))
 
-typedef enum tsip_transac_type_e
-{
-	tsip_transac_type_ict, /**< Invite Client Transaction. */
-	tsip_transac_type_ist, /**< Invite Server Transaction. */
-	tsip_transac_type_nict, /**< Non-Invite Client Transaction. */
-	tsip_transac_type_nist, /**< Non-Invite Server Transaction. */
+typedef enum tsip_transac_type_e {
+    tsip_transac_type_ict, /**< Invite Client Transaction. */
+    tsip_transac_type_ist, /**< Invite Server Transaction. */
+    tsip_transac_type_nict, /**< Non-Invite Client Transaction. */
+    tsip_transac_type_nist, /**< Non-Invite Server Transaction. */
 }
 tsip_transac_type_t;
 
 
 
-typedef enum tsip_transac_dst_type_e
-{
-	tsip_transac_dst_type_dialog,
-	tsip_transac_dst_type_net
+typedef enum tsip_transac_dst_type_e {
+    tsip_transac_dst_type_dialog,
+    tsip_transac_dst_type_net
 }
 tsip_transac_dst_type_t;
 
-typedef struct tsip_transac_dst_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_transac_dst_s {
+    TSK_DECLARE_OBJECT;
 
-	tsip_transac_dst_type_t type;
-	struct tsip_stack_s* stack;
+    tsip_transac_dst_type_t type;
+    struct tsip_stack_s* stack;
 
-	union{
-		struct{
-			tsip_dialog_t *dlg;
-		}dialog;
+    union {
+        struct {
+            tsip_dialog_t *dlg;
+        } dialog;
 
-		//struct{
-		//}net;
-	};
+        //struct{
+        //}net;
+    };
 }
 tsip_transac_dst_t;
 #define TSIP_TRANSAC_DST(self)	((tsip_transac_dst_t*)(self))
 #define TSIP_DECLARE_TRANSAC_DST tsip_transac_dst_t __transac__
 
 
-typedef struct tsip_transac_s
-{
-	TSK_DECLARE_OBJECT;
-	
-	tsip_transac_type_t type;
-
-	struct tsip_transac_dst_s* dst;
-	tsk_fsm_t *fsm;
-	
-	tsk_bool_t reliable;
-	tsk_bool_t running;
-	tsk_bool_t initialized;
-	
-	char *branch;
-	
-	int32_t cseq_value;
-	char* cseq_method;
-	
-	char* callid;
-	
-	tsip_transac_event_callback_f callback;
+typedef struct tsip_transac_s {
+    TSK_DECLARE_OBJECT;
+
+    tsip_transac_type_t type;
+
+    struct tsip_transac_dst_s* dst;
+    tsk_fsm_t *fsm;
+
+    tsk_bool_t reliable;
+    tsk_bool_t running;
+    tsk_bool_t initialized;
+
+    char *branch;
+
+    int32_t cseq_value;
+    char* cseq_method;
+
+    char* callid;
+
+    tsip_transac_event_callback_f callback;
 }
 tsip_transac_t;
 
diff --git a/tinySIP/include/tinysip/transactions/tsip_transac_ict.h b/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
index a34a413..f8cfb1d 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac_ict.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -39,16 +39,15 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_TRANSAC_ICT(self)															((tsip_transac_ict_t*)(self))
 
-typedef struct tsip_transac_ict
-{
-	TSIP_DECLARE_TRANSAC;
-	
-	tsip_request_t* request;
+typedef struct tsip_transac_ict {
+    TSIP_DECLARE_TRANSAC;
+
+    tsip_request_t* request;
 
-	tsip_timer_t timerA;
-	tsip_timer_t timerB;
-	tsip_timer_t timerD;
-	tsip_timer_t timerM;
+    tsip_timer_t timerA;
+    tsip_timer_t timerB;
+    tsip_timer_t timerD;
+    tsip_timer_t timerM;
 }
 tsip_transac_ict_t;
 
diff --git a/tinySIP/include/tinysip/transactions/tsip_transac_ist.h b/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
index 82abdbe..6acd08f 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac_ist.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -38,18 +38,17 @@ TSIP_BEGIN_DECLS
 #define TSIP_TRANSAC_IST(self)												((tsip_transac_ist_t*)(self))
 
 
-typedef struct tsip_transac_ist
-{
-	TSIP_DECLARE_TRANSAC;
+typedef struct tsip_transac_ist {
+    TSIP_DECLARE_TRANSAC;
 
-	tsip_response_t* lastResponse;
-	tsk_bool_t acked;
+    tsip_response_t* lastResponse;
+    tsk_bool_t acked;
 
-	tsip_timer_t timerH;
-	tsip_timer_t timerI;
-	tsip_timer_t timerG;
-	tsip_timer_t timerL;
-	tsip_timer_t timerX;
+    tsip_timer_t timerH;
+    tsip_timer_t timerI;
+    tsip_timer_t timerG;
+    tsip_timer_t timerL;
+    tsip_timer_t timerX;
 }
 tsip_transac_ist_t;
 
diff --git a/tinySIP/include/tinysip/transactions/tsip_transac_layer.h b/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
index acc532c..b24bb84 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac_layer.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -40,15 +40,14 @@
 
 TSIP_BEGIN_DECLS
 
-typedef struct tsip_transac_layer_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_transac_layer_s {
+    TSK_DECLARE_OBJECT;
 
-	const struct tsip_stack_s *stack;
+    const struct tsip_stack_s *stack;
 
-	tsip_transacs_L_t *transactions;
+    tsip_transacs_L_t *transactions;
 
-	TSK_DECLARE_SAFEOBJ;
+    TSK_DECLARE_SAFEOBJ;
 }
 tsip_transac_layer_t;
 
diff --git a/tinySIP/include/tinysip/transactions/tsip_transac_nict.h b/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
index 4052bd0..2734393 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac_nict.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -39,14 +39,13 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_TRANSAC_NICT(self)															((tsip_transac_nict_t*)(self))
 
-typedef struct tsip_transac_nict
-{
-	TSIP_DECLARE_TRANSAC;
+typedef struct tsip_transac_nict {
+    TSIP_DECLARE_TRANSAC;
 
-	tsip_request_t* request;
-	tsip_timer_t timerE;
-	tsip_timer_t timerF;
-	tsip_timer_t timerK;
+    tsip_request_t* request;
+    tsip_timer_t timerE;
+    tsip_timer_t timerF;
+    tsip_timer_t timerK;
 }
 tsip_transac_nict_t;
 
diff --git a/tinySIP/include/tinysip/transactions/tsip_transac_nist.h b/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
index f2234a1..8b4479e 100755
--- a/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
+++ b/tinySIP/include/tinysip/transactions/tsip_transac_nist.h
@@ -2,19 +2,19 @@
 * Copyright (C) 2010-2011 Mamadou Diop.
 *
 * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
-*	
+*
 * This file is part of Open Source Doubango Framework.
 *
 * DOUBANGO is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*	
+*
 * DOUBANGO is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*	
+*
 * You should have received a copy of the GNU General Public License
 * along with DOUBANGO.
 *
@@ -39,12 +39,11 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_TRANSAC_NIST(self)															((tsip_transac_nist_t*)(self))
 
-typedef struct tsip_transac_nist
-{
-	TSIP_DECLARE_TRANSAC;
+typedef struct tsip_transac_nist {
+    TSIP_DECLARE_TRANSAC;
 
-	tsip_response_t* lastResponse;
-	tsip_timer_t timerJ;
+    tsip_response_t* lastResponse;
+    tsip_timer_t timerJ;
 }
 tsip_transac_nist_t;