Add new QoS implementation

Code formatting

141 files changed, 2128 insertions, 2289 deletions

diff --git a/tinySIP/include/tinysip.h b/tinySIP/include/tinysip.h
index bf666dc..c20ca41 100755
--- a/tinySIP/include/tinysip.h
+++ b/tinySIP/include/tinysip.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.
 *
diff --git a/tinySIP/include/tinysip/api/tsip_api_common.h b/tinySIP/include/tinysip/api/tsip_api_common.h
index 1f91f66..64bc885 100755
--- a/tinySIP/include/tinysip/api/tsip_api_common.h
+++ b/tinySIP/include/tinysip/api/tsip_api_common.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.
 *
diff --git a/tinySIP/include/tinysip/api/tsip_api_info.h b/tinySIP/include/tinysip/api/tsip_api_info.h
index 5c7f08e..edbacf8 100755
--- a/tinySIP/include/tinysip/api/tsip_api_info.h
+++ b/tinySIP/include/tinysip/api/tsip_api_info.h
@@ -2,19 +2,19 @@
 * Copyright (C) 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,18 +39,16 @@ TSIP_BEGIN_DECLS
 #define TSIP_INFO_EVENT(self)		((tsip_info_event_t*)(self))
 
 //@rinyWRAP
-typedef enum tsip_info_event_type_e
-{
-	tsip_i_info,
-	tsip_ao_info,
+typedef enum tsip_info_event_type_e {
+    tsip_i_info,
+    tsip_ao_info,
 }
 tsip_info_event_type_t;
 
-typedef struct tsip_info_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_info_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_info_event_type_t type;
+    tsip_info_event_type_t type;
 }
 tsip_info_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_invite.h b/tinySIP/include/tinysip/api/tsip_api_invite.h
index 7fa5b01..b71eb5f 100755
--- a/tinySIP/include/tinysip/api/tsip_api_invite.h
+++ b/tinySIP/include/tinysip/api/tsip_api_invite.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.
 *
@@ -41,60 +41,58 @@ TSIP_BEGIN_DECLS
 #define TSIP_INVITE_EVENT(self)		((tsip_invite_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_invite_event_type_e
-{
-	// ============================
-	//	Sip Events
-	//
-	tsip_i_newcall,
-	
-	//! in-dialog requests/reponses
-	tsip_i_request,
-	tsip_ao_request,
-	
-	/* 3GPP TS 24.629: Explicit Call Transfer (ECT) */
-	tsip_o_ect_trying,
-	tsip_o_ect_accepted,
-	tsip_o_ect_completed,
-	tsip_o_ect_failed,
-	tsip_o_ect_notify,
-	tsip_i_ect_requested,
-	tsip_i_ect_newcall,
-	tsip_i_ect_completed,
-	tsip_i_ect_failed,
-	tsip_i_ect_notify,
-	
-	// ============================
-	//	Media Events
-	//
-
-	tsip_m_early_media,
-	tsip_m_updating, // Trying to update from Audio -> Video for example
-	tsip_m_updated, // succeed to update
-	
-	/* 3GPP TS 24.610: Communication Hold */
-	tsip_m_local_hold_ok,
-	tsip_m_local_hold_nok,
-	tsip_m_local_resume_ok,
-	tsip_m_local_resume_nok,
-	tsip_m_remote_hold,
-	tsip_m_remote_resume,
+typedef enum tsip_invite_event_type_e {
+    // ============================
+    //	Sip Events
+    //
+    tsip_i_newcall,
+
+    //! in-dialog requests/reponses
+    tsip_i_request,
+    tsip_ao_request,
+
+    /* 3GPP TS 24.629: Explicit Call Transfer (ECT) */
+    tsip_o_ect_trying,
+    tsip_o_ect_accepted,
+    tsip_o_ect_completed,
+    tsip_o_ect_failed,
+    tsip_o_ect_notify,
+    tsip_i_ect_requested,
+    tsip_i_ect_newcall,
+    tsip_i_ect_completed,
+    tsip_i_ect_failed,
+    tsip_i_ect_notify,
+
+    // ============================
+    //	Media Events
+    //
+
+    tsip_m_early_media,
+    tsip_m_updating, // Trying to update from Audio -> Video for example
+    tsip_m_updated, // succeed to update
+
+    /* 3GPP TS 24.610: Communication Hold */
+    tsip_m_local_hold_ok,
+    tsip_m_local_hold_nok,
+    tsip_m_local_resume_ok,
+    tsip_m_local_resume_nok,
+    tsip_m_remote_hold,
+    tsip_m_remote_resume,
 }
 tsip_invite_event_type_t;
 
-typedef struct tsip_invite_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_invite_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_invite_event_type_t type;
+    tsip_invite_event_type_t type;
 
-	struct{
-		unsigned toto:1;
-	} av;
+    struct {
+        unsigned toto:1;
+    } av;
 
-	/*struct{
-		char* dir;
-	} msrp;*/
+    /*struct{
+    	char* dir;
+    } msrp;*/
 }
 tsip_invite_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_message.h b/tinySIP/include/tinysip/api/tsip_api_message.h
index e52c914..6ace613 100755
--- a/tinySIP/include/tinysip/api/tsip_api_message.h
+++ b/tinySIP/include/tinysip/api/tsip_api_message.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,18 +39,16 @@ TSIP_BEGIN_DECLS
 #define TSIP_MESSAGE_EVENT(self)		((tsip_message_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_message_event_type_e
-{
-	tsip_i_message,
-	tsip_ao_message,
+typedef enum tsip_message_event_type_e {
+    tsip_i_message,
+    tsip_ao_message,
 }
 tsip_message_event_type_t;
 
-typedef struct tsip_message_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_message_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_message_event_type_t type;
+    tsip_message_event_type_t type;
 }
 tsip_message_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_options.h b/tinySIP/include/tinysip/api/tsip_api_options.h
index 1f62211..47ef00a 100755
--- a/tinySIP/include/tinysip/api/tsip_api_options.h
+++ b/tinySIP/include/tinysip/api/tsip_api_options.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,20 +39,18 @@ TSIP_BEGIN_DECLS
 #define TSIP_OPTIONS_EVENT(self)		((tsip_options_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_options_event_type_e
-{
-	tsip_i_options,
-	tsip_ao_options,
+typedef enum tsip_options_event_type_e {
+    tsip_i_options,
+    tsip_ao_options,
 }
 tsip_options_event_type_t;
 
 /**< Event from SIP OPTIONS dialog */
-typedef struct tsip_options_event_e
-{
-	TSIP_DECLARE_EVENT;
-	
-	//! the type of the event
-	tsip_options_event_type_t type;
+typedef struct tsip_options_event_e {
+    TSIP_DECLARE_EVENT;
+
+    //! the type of the event
+    tsip_options_event_type_t type;
 }
 tsip_options_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_publish.h b/tinySIP/include/tinysip/api/tsip_api_publish.h
index c37f239..73449e9 100755
--- a/tinySIP/include/tinysip/api/tsip_api_publish.h
+++ b/tinySIP/include/tinysip/api/tsip_api_publish.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,21 +39,19 @@ TSIP_BEGIN_DECLS
 #define TSIP_PUBLISH_EVENT(self)		((tsip_publish_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_publish_event_type_e
-{
-	tsip_i_publish,
-	tsip_ao_publish,
-	
-	tsip_i_unpublish,
-	tsip_ao_unpublish
+typedef enum tsip_publish_event_type_e {
+    tsip_i_publish,
+    tsip_ao_publish,
+
+    tsip_i_unpublish,
+    tsip_ao_unpublish
 }
 tsip_publish_event_type_t;
 
-typedef struct tsip_publish_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_publish_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_publish_event_type_t type;
+    tsip_publish_event_type_t type;
 }
 tsip_publish_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_register.h b/tinySIP/include/tinysip/api/tsip_api_register.h
index d116006..73d51b4 100755
--- a/tinySIP/include/tinysip/api/tsip_api_register.h
+++ b/tinySIP/include/tinysip/api/tsip_api_register.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,23 +39,21 @@ TSIP_BEGIN_DECLS
 #define TSIP_REGISTER_EVENT(self)		((tsip_register_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_register_event_type_e
-{
-	tsip_i_newreg,
+typedef enum tsip_register_event_type_e {
+    tsip_i_newreg,
 
-	tsip_i_register, // refresh
-	tsip_ao_register,
+    tsip_i_register, // refresh
+    tsip_ao_register,
 
-	tsip_i_unregister,
-	tsip_ao_unregister,
+    tsip_i_unregister,
+    tsip_ao_unregister,
 }
 tsip_register_event_type_t;
 
-typedef struct tsip_register_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_register_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_register_event_type_t type;
+    tsip_register_event_type_t type;
 }
 tsip_register_event_t;
 
diff --git a/tinySIP/include/tinysip/api/tsip_api_subscribe.h b/tinySIP/include/tinysip/api/tsip_api_subscribe.h
index da7f8c9..a7b1b21 100755
--- a/tinySIP/include/tinysip/api/tsip_api_subscribe.h
+++ b/tinySIP/include/tinysip/api/tsip_api_subscribe.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,24 +39,22 @@ TSIP_BEGIN_DECLS
 #define TSIP_SUBSCRIBE_EVENT(self)		((tsip_subscribe_event_t*)(self))
 
 //@tinyWRAP
-typedef enum tsip_subscribe_event_type_e
-{
-	tsip_i_subscribe,
-	tsip_ao_subscribe,
-	
-	tsip_i_unsubscribe,
-	tsip_ao_unsubscribe,
-
-	tsip_i_notify,
-	tsip_ao_notify
+typedef enum tsip_subscribe_event_type_e {
+    tsip_i_subscribe,
+    tsip_ao_subscribe,
+
+    tsip_i_unsubscribe,
+    tsip_ao_unsubscribe,
+
+    tsip_i_notify,
+    tsip_ao_notify
 }
 tsip_subscribe_event_type_t;
 
-typedef struct tsip_subscribe_event_e
-{
-	TSIP_DECLARE_EVENT;
+typedef struct tsip_subscribe_event_e {
+    TSIP_DECLARE_EVENT;
 
-	tsip_subscribe_event_type_t type;
+    tsip_subscribe_event_type_t type;
 }
 tsip_subscribe_event_t;
 
diff --git a/tinySIP/include/tinysip/authentication/tsip_challenge.h b/tinySIP/include/tinysip/authentication/tsip_challenge.h
index 38f7690..7de2659 100755
--- a/tinySIP/include/tinysip/authentication/tsip_challenge.h
+++ b/tinySIP/include/tinysip/authentication/tsip_challenge.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.
 *
@@ -48,29 +48,28 @@
 TSIP_BEGIN_DECLS
 
 
-typedef struct tsip_challenge_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_challenge_s {
+    TSK_DECLARE_OBJECT;
 
-	const tsip_stack_handle_t *stack;
+    const tsip_stack_handle_t *stack;
 
-	tsk_bool_t isproxy;
+    tsk_bool_t isproxy;
 
-	char* username;
-	char* scheme;
-	char* realm;
-	char* nonce;
-	char* opaque;
-	char* algorithm;
-	const char* qop;
+    char* username;
+    char* scheme;
+    char* realm;
+    char* nonce;
+    char* opaque;
+    char* algorithm;
+    const char* qop;
 
-	char* ha1_hexstr;
+    char* ha1_hexstr;
 
-	AKA_CK_T ck;
-	AKA_IK_T ik;
+    AKA_CK_T ck;
+    AKA_IK_T ik;
 
-	tsk_md5string_t cnonce;
-	unsigned nc;
+    tsk_md5string_t cnonce;
+    unsigned nc;
 }
 tsip_challenge_t;
 
diff --git a/tinySIP/include/tinysip/authentication/tsip_milenage.h b/tinySIP/include/tinysip/authentication/tsip_milenage.h
index dbf72de..6f4aea7 100755
--- a/tinySIP/include/tinysip/authentication/tsip_milenage.h
+++ b/tinySIP/include/tinysip/authentication/tsip_milenage.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.
 *
@@ -42,7 +42,7 @@
  *
  *  This has been coded for clarity, not necessarily for efficiency.
  *
- *  The functions f2, f3, f4 and f5 share the same inputs and have 
+ *  The functions f2, f3, f4 and f5 share the same inputs and have
  *  been coded together as a single function.  f1, f1* and f5* are
  *  all coded separately.
  *
@@ -59,7 +59,7 @@
 #include "tinysip_config.h"
 
 /**@def AKA_AK_SIZE
- * a 48-bit anonymity key that is the output of either of the functions f5 and f5*. 
+ * a 48-bit anonymity key that is the output of either of the functions f5 and f5*.
  * Defined in 3GPP TS 35.206 subclause 2.3.
  */
 
@@ -97,7 +97,7 @@ typedef uint8_t AKA_IK_T[AKA_IK_SIZE + 1];
 typedef uint8_t AKA_K_T[AKA_K_SIZE + 1];
 
 /**@def AKA_MAC_A_SIZE
- * a 64-bit network authentication code that is the output of the function f1. 
+ * a 64-bit network authentication code that is the output of the function f1.
  * Defined in 3GPP TS 35.206 subclause 2.3.
  */
 #define AKA_MAC_A_SIZE 8
@@ -137,7 +137,7 @@ typedef uint8_t AKA_RAND_T[AKA_RAND_SIZE + 1];
  */
 #define AKA_RES_SIZE 8
 typedef uint8_t AKA_RES_T[AKA_RES_SIZE + 1];
-	
+
 /**@def AKA_SQN_SIZE
  * a 48-bit sequence number that is an input to either of the functions f1 and f1*.  (For f1* this input is more precisely called SQNMS.)
  * Defined in 3GPP TS 35.206 subclause 2.3.
@@ -175,7 +175,7 @@ void f1    ( uint8_t k[16], uint8_t rand[16], uint8_t sqn[6], uint8_t amf[2],
              uint8_t mac_a[8] );
 void f2345 ( uint8_t k[16], uint8_t rand[16],
              uint8_t res[8], uint8_t ck[16], uint8_t ik[16], uint8_t ak[6] );
-void f1star( uint8_t k[16], uint8_t rand[16], uint8_t sqn[6], uint8_t amf[2], 
+void f1star( uint8_t k[16], uint8_t rand[16], uint8_t sqn[6], uint8_t amf[2],
              uint8_t mac_s[8] );
 void f5star( uint8_t k[16], uint8_t rand[16],
              uint8_t ak[6] );
diff --git a/tinySIP/include/tinysip/authentication/tsip_rijndael.h b/tinySIP/include/tinysip/authentication/tsip_rijndael.h
index 18efe3a..acf6b6d 100755
--- a/tinySIP/include/tinysip/authentication/tsip_rijndael.h
+++ b/tinySIP/include/tinysip/authentication/tsip_rijndael.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.
 *
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog.h b/tinySIP/include/tinysip/dialogs/tsip_dialog.h
index e6280b9..e9e8c0c 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog.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.
 *
@@ -61,7 +61,7 @@ TSIP_BEGIN_DECLS
 
 // TX MUST be in seconds
 #define TSIP_DIALOG_TIMER_SCHEDULE(name, TX)								\
-	self->timer##TX.id = tsk_timer_mgr_global_schedule(self->timer##TX.timeout, TSK_TIMER_CALLBACK_F(tsip_dialog_##name##_timer_callback), self)	
+	self->timer##TX.id = tsk_timer_mgr_global_schedule(self->timer##TX.timeout, TSK_TIMER_CALLBACK_F(tsip_dialog_##name##_timer_callback), self)
 
 #define TSIP_DIALOG_SIGNAL(self, code, phrase)	\
 	tsip_event_signal(tsip_event_dialog, TSIP_DIALOG(self)->ss, code, phrase)
@@ -79,38 +79,35 @@ TSIP_BEGIN_DECLS
 
 typedef uint64_t tsip_dialog_id_t;
 
-typedef enum tsip_dialog_state_e
-{
-	tsip_initial,
-	tsip_early,
-	tsip_established,
-	tsip_terminated
+typedef enum tsip_dialog_state_e {
+    tsip_initial,
+    tsip_early,
+    tsip_established,
+    tsip_terminated
 }
 tsip_dialog_state_t;
 
-typedef enum tsip_dialog_type_e
-{
-	tsip_dialog_unknown,
-	tsip_dialog_INVITE,
-	tsip_dialog_MESSAGE,
-	tsip_dialog_INFO,
-	tsip_dialog_OPTIONS,
-	tsip_dialog_PUBLISH,
-	tsip_dialog_REGISTER,
-	tsip_dialog_SUBSCRIBE,
+typedef enum tsip_dialog_type_e {
+    tsip_dialog_unknown,
+    tsip_dialog_INVITE,
+    tsip_dialog_MESSAGE,
+    tsip_dialog_INFO,
+    tsip_dialog_OPTIONS,
+    tsip_dialog_PUBLISH,
+    tsip_dialog_REGISTER,
+    tsip_dialog_SUBSCRIBE,
 }
 tsip_dialog_type_t;
 
-typedef enum tsip_dialog_event_type_e
-{
-	tsip_dialog_i_msg,
-	tsip_dialog_o_msg,
-	tsip_dialog_transac_ok,
-	tsip_dialog_canceled,
-	tsip_dialog_terminated,
-	tsip_dialog_timedout,
-	tsip_dialog_error,
-	tsip_dialog_transport_error,
+typedef enum tsip_dialog_event_type_e {
+    tsip_dialog_i_msg,
+    tsip_dialog_o_msg,
+    tsip_dialog_transac_ok,
+    tsip_dialog_canceled,
+    tsip_dialog_terminated,
+    tsip_dialog_timedout,
+    tsip_dialog_error,
+    tsip_dialog_transport_error,
 }
 tsip_dialog_event_type_t;
 
@@ -119,53 +116,52 @@ typedef int (*tsip_dialog_event_callback_f)(const void *arg, tsip_dialog_event_t
 
 /*================================
 */
-typedef struct tsip_dialog_s
-{
-	TSK_DECLARE_OBJECT;
-	
-	tsip_dialog_type_t type;
-	tsip_dialog_id_t id;
-
-	tsk_fsm_t* fsm;
-	
-	tsip_ssession_t* ss;
-	tsip_action_t* curr_action;
-	
-	tsip_dialog_state_t state;
-	
-	tsk_bool_t initialized;
-	tsk_bool_t running;
-
-	tnet_fd_t connected_fd;
-
-	struct{
-		char* phrase;
-		short code;
-		tsip_message_t* message;
-	} last_error;
-	
-	char* tag_local;
-	tsip_uri_t* uri_local;
-	char* tag_remote;
-	tsip_uri_t* uri_remote;
-	
-	tsip_uri_t* uri_remote_target;
-	struct sockaddr_storage remote_addr; // Only valid for Dgram
-
-	uint32_t cseq_value;
-	char* cseq_method;
-	
-	int64_t expires; /* in milliseconds */
-	
-	char* callid;
-	
-	tsip_header_Record_Routes_L_t *record_routes;
-	
-	tsip_challenges_L_t *challenges;
-
-	tsip_dialog_event_callback_f callback;
-
-	TSK_DECLARE_SAFEOBJ;
+typedef struct tsip_dialog_s {
+    TSK_DECLARE_OBJECT;
+
+    tsip_dialog_type_t type;
+    tsip_dialog_id_t id;
+
+    tsk_fsm_t* fsm;
+
+    tsip_ssession_t* ss;
+    tsip_action_t* curr_action;
+
+    tsip_dialog_state_t state;
+
+    tsk_bool_t initialized;
+    tsk_bool_t running;
+
+    tnet_fd_t connected_fd;
+
+    struct {
+        char* phrase;
+        short code;
+        tsip_message_t* message;
+    } last_error;
+
+    char* tag_local;
+    tsip_uri_t* uri_local;
+    char* tag_remote;
+    tsip_uri_t* uri_remote;
+
+    tsip_uri_t* uri_remote_target;
+    struct sockaddr_storage remote_addr; // Only valid for Dgram
+
+    uint32_t cseq_value;
+    char* cseq_method;
+
+    int64_t expires; /* in milliseconds */
+
+    char* callid;
+
+    tsip_header_Record_Routes_L_t *record_routes;
+
+    tsip_challenges_L_t *challenges;
+
+    tsip_dialog_event_callback_f callback;
+
+    TSK_DECLARE_SAFEOBJ;
 }
 tsip_dialog_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_info.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_info.h
index 94fe6ad..1c54442 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_info.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_info.h
@@ -2,19 +2,19 @@
 * Copyright (C) 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,11 +40,10 @@ struct tsip_message_s;
 
 #define TSIP_DIALOG_INFO(self)							((tsip_dialog_info_t*)(self))
 
-typedef struct tsip_dialog_info
-{
-	TSIP_DECLARE_DIALOG;
-	/**< Last incoming message. */
-	struct tsip_message_s* last_iMessage;
+typedef struct tsip_dialog_info {
+    TSIP_DECLARE_DIALOG;
+    /**< Last incoming message. */
+    struct tsip_message_s* last_iMessage;
 }
 tsip_dialog_info_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.common.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.common.h
index 1496ca7..15494ad 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.common.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.common.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,75 +40,73 @@
 #define TSIP_DIALOG_INVITE_ICE_CONNCHECK_TIMEOUT	16000
 
 /* ======================== actions ======================== */
-typedef enum _fsm_action_e
-{
-	_fsm_action_accept = tsip_atype_accept,
-	_fsm_action_reject = tsip_atype_hangup,
-	_fsm_action_dtmf_send = tsip_atype_dtmf_send,
-	_fsm_action_msrp_send_msg = tsip_atype_lmessage,
-	_fsm_action_oINVITE = tsip_atype_invite,
-	_fsm_action_oCANCEL = tsip_atype_cancel,
-	_fsm_action_oHold = tsip_atype_hold,
-	_fsm_action_oResume = tsip_atype_resume,
-	_fsm_action_oECT = tsip_atype_ect,
-	_fsm_action_iECT_ACCEPT = tsip_atype_ect_accept,
-	_fsm_action_iECT_REJECT = tsip_atype_ect_reject,
-	_fsm_action_iECT_lNOTIFY = tsip_atype_ect_lnotify,
-	_fsm_action_oINFO = tsip_atype_info_send,
-	_fsm_action_oBYE = tsip_atype_hangup,
-	_fsm_action_oShutdown = tsip_atype_shutdown,
-	_fsm_action_transporterror = tsip_atype_transport_error,
-
-	_fsm_action_iINVITE = 0xFF,
-	_fsm_action_oUPDATE,
-	_fsm_action_iUPDATE,
-	_fsm_action_iCANCEL,
-	_fsm_action_iPRACK,
-	_fsm_action_oPRACK,
-	_fsm_action_iACK,
-	_fsm_action_oACK,
-	_fsm_action_iOPTIONS,
-	_fsm_action_oOPTIONS,
-	_fsm_action_iBYE,
-	_fsm_action_iREFER,
-	_fsm_action_iINFO,
-	_fsm_action_iNOTIFY,
-
-	_fsm_action_timer100rel,
-	_fsm_action_timerRefresh,
-	_fsm_action_timerRSVP,
-
-	_fsm_action_i1xx,
-	_fsm_action_i2xx,
-	_fsm_action_i300_to_i699,
-	_fsm_action_i401_i407,
-	_fsm_action_i422,
-
-	_fsm_action_shutdown_timedout, /* Any -> Terminated */
-	_fsm_action_error,
+typedef enum _fsm_action_e {
+    _fsm_action_accept = tsip_atype_accept,
+    _fsm_action_reject = tsip_atype_hangup,
+    _fsm_action_dtmf_send = tsip_atype_dtmf_send,
+    _fsm_action_msrp_send_msg = tsip_atype_lmessage,
+    _fsm_action_oINVITE = tsip_atype_invite,
+    _fsm_action_oCANCEL = tsip_atype_cancel,
+    _fsm_action_oHold = tsip_atype_hold,
+    _fsm_action_oResume = tsip_atype_resume,
+    _fsm_action_oECT = tsip_atype_ect,
+    _fsm_action_iECT_ACCEPT = tsip_atype_ect_accept,
+    _fsm_action_iECT_REJECT = tsip_atype_ect_reject,
+    _fsm_action_iECT_lNOTIFY = tsip_atype_ect_lnotify,
+    _fsm_action_oINFO = tsip_atype_info_send,
+    _fsm_action_oBYE = tsip_atype_hangup,
+    _fsm_action_oShutdown = tsip_atype_shutdown,
+    _fsm_action_transporterror = tsip_atype_transport_error,
+
+    _fsm_action_iINVITE = 0xFF,
+    _fsm_action_oUPDATE,
+    _fsm_action_iUPDATE,
+    _fsm_action_iCANCEL,
+    _fsm_action_iPRACK,
+    _fsm_action_oPRACK,
+    _fsm_action_iACK,
+    _fsm_action_oACK,
+    _fsm_action_iOPTIONS,
+    _fsm_action_oOPTIONS,
+    _fsm_action_iBYE,
+    _fsm_action_iREFER,
+    _fsm_action_iINFO,
+    _fsm_action_iNOTIFY,
+
+    _fsm_action_timer100rel,
+    _fsm_action_timerRefresh,
+    _fsm_action_timerRSVP,
+
+    _fsm_action_i1xx,
+    _fsm_action_i2xx,
+    _fsm_action_i300_to_i699,
+    _fsm_action_i401_i407,
+    _fsm_action_i422,
+
+    _fsm_action_shutdown_timedout, /* Any -> Terminated */
+    _fsm_action_error,
 }
 _fsm_action_t;
 
 /* ======================== states ======================== */
-typedef enum _fsm_state_e
-{
-	_fsm_state_Started,
-	_fsm_state_Outgoing,
-	_fsm_state_Incoming,
-	_fsm_state_Trying,
-	_fsm_state_Ringing,
-	_fsm_state_Cancelling,
-	_fsm_state_InProgress,
-
-	_fsm_state_Holding,
-	_fsm_state_Resuming,
-
-	_fsm_state_oECTing,
-	_fsm_state_iECTing,
-	_fsm_state_iECTreq,
-
-	_fsm_state_Connected,
-	_fsm_state_Terminated
+typedef enum _fsm_state_e {
+    _fsm_state_Started,
+    _fsm_state_Outgoing,
+    _fsm_state_Incoming,
+    _fsm_state_Trying,
+    _fsm_state_Ringing,
+    _fsm_state_Cancelling,
+    _fsm_state_InProgress,
+
+    _fsm_state_Holding,
+    _fsm_state_Resuming,
+
+    _fsm_state_oECTing,
+    _fsm_state_iECTing,
+    _fsm_state_iECTreq,
+
+    _fsm_state_Connected,
+    _fsm_state_Terminated
 }
 _fsm_state_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.h
index b3bbfea..0a90e4d 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_invite.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,80 +40,79 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_DIALOG_INVITE(self)							((tsip_dialog_invite_t*)(self))
 
-typedef struct tsip_dialog_invite
-{
-	TSIP_DECLARE_DIALOG;
-	
-	tsk_bool_t support_update; /**< Indicates whether the remote party support UPDATE */
-	tsk_bool_t is_client;
-	tsk_bool_t is_transf;
-	tsk_bool_t refersub;
-	tsk_bool_t use_rtcp;
-	tsk_bool_t use_rtcpmux;
+typedef struct tsip_dialog_invite {
+    TSIP_DECLARE_DIALOG;
+
+    tsk_bool_t support_update; /**< Indicates whether the remote party support UPDATE */
+    tsk_bool_t is_client;
+    tsk_bool_t is_transf;
+    tsk_bool_t refersub;
+    tsk_bool_t use_rtcp;
+    tsk_bool_t use_rtcpmux;
     tsk_bool_t is_initial_iack_pending; // we're waiting for the initial incoming ACK (for the 200 OK) to ensure the session
     tsk_bool_t is_cancelling; // whether we're cancelling the outgoing INVITE
-	uint32_t rseq;
-	uint32_t cseq_out_media_update; // CSeq for the last media update request (INVITE or UPDATE).
-	uint64_t last_out_fastupdate_time;
-	
-	tsip_timer_t timershutdown;
-	tsip_timer_t timer100rel;
-
-	tsip_response_t* last_o1xxrel;
-	tsip_request_t* last_iInvite;
-	tsip_request_t* last_oInvite;
-	tsip_request_t* last_iRefer;
-	tmedia_session_mgr_t* msession_mgr; /**< Media session Manager */
-	
-	struct tsip_ssession_s* ss_transf;
-
-	/* ICE */
-	struct{
-		tmedia_type_t media_type;
-		tsk_bool_t is_jingle;
-		tsk_bool_t start_smgr;
-		struct tnet_ice_ctx_s *ctx_audio;
-		struct tnet_ice_ctx_s *ctx_video;
-		tsk_fsm_action_id last_action_id;
-		tsip_action_t* last_action;
-		tsip_message_t* last_message;
-		int32_t last_sdp_ro_ver;
-	} ice;
-	
-	/* Session Timers */
-	struct{
-		tsip_timer_t timer;
-		char* refresher;
-		uint64_t minse;
-		tsk_bool_t is_refresher;
-	} stimers;
-	/* QoS (Preconditions) */
-	struct{
-		tsip_timer_t timer;
-		enum tmedia_qos_stype_e type;
-		enum tmedia_qos_strength_e strength;
-	} qos;
-	/* Hold/Resume */
-	struct{
-		unsigned remote:1;
-		unsigned local:1;
-	} hold;
-
-	struct{
-		unsigned _100rel:1;
-		unsigned precondition:1;
-		unsigned timer:1;
-		unsigned norefersub:1;
-		unsigned ice:1;
-	} supported;
-
-	struct{
-		unsigned _100rel:1;
-		unsigned precondition:1;
-		unsigned timer:1;
-		unsigned norefersub;
-		unsigned ice:1;
-	} required;
+    uint32_t rseq;
+    uint32_t cseq_out_media_update; // CSeq for the last media update request (INVITE or UPDATE).
+    uint64_t last_out_fastupdate_time;
+
+    tsip_timer_t timershutdown;
+    tsip_timer_t timer100rel;
+
+    tsip_response_t* last_o1xxrel;
+    tsip_request_t* last_iInvite;
+    tsip_request_t* last_oInvite;
+    tsip_request_t* last_iRefer;
+    tmedia_session_mgr_t* msession_mgr; /**< Media session Manager */
+
+    struct tsip_ssession_s* ss_transf;
+
+    /* ICE */
+    struct {
+        tmedia_type_t media_type;
+        tsk_bool_t is_jingle;
+        tsk_bool_t start_smgr;
+        struct tnet_ice_ctx_s *ctx_audio;
+        struct tnet_ice_ctx_s *ctx_video;
+        tsk_fsm_action_id last_action_id;
+        tsip_action_t* last_action;
+        tsip_message_t* last_message;
+        int32_t last_sdp_ro_ver;
+    } ice;
+
+    /* Session Timers */
+    struct {
+        tsip_timer_t timer;
+        char* refresher;
+        uint64_t minse;
+        tsk_bool_t is_refresher;
+    } stimers;
+    /* QoS (Preconditions) */
+    struct {
+        tsip_timer_t timer;
+        enum tmedia_qos_stype_e type;
+        enum tmedia_qos_strength_e strength;
+    } qos;
+    /* Hold/Resume */
+    struct {
+        unsigned remote:1;
+        unsigned local:1;
+    } hold;
+
+    struct {
+        unsigned _100rel:1;
+        unsigned precondition:1;
+        unsigned timer:1;
+        unsigned norefersub:1;
+        unsigned ice:1;
+    } supported;
+
+    struct {
+        unsigned _100rel:1;
+        unsigned precondition:1;
+        unsigned timer:1;
+        unsigned norefersub;
+        unsigned ice:1;
+    } required;
 }
 tsip_dialog_invite_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h
index 3539361..0a73a3b 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_layer.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_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.
 *
@@ -41,21 +41,20 @@
 
 TSIP_BEGIN_DECLS
 
-typedef struct tsip_dialog_layer_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_dialog_layer_s {
+    TSK_DECLARE_OBJECT;
 
-	const tsip_stack_t *stack;
+    const tsip_stack_t *stack;
 
-	tsip_dialogs_L_t *dialogs;
+    tsip_dialogs_L_t *dialogs;
 
-	struct{
-		tsk_bool_t inprogress;
-		tsk_bool_t phase2; /* whether unregistering? */
-		tsk_condwait_handle_t* condwait;
-	} shutdown;
+    struct {
+        tsk_bool_t inprogress;
+        tsk_bool_t phase2; /* whether unregistering? */
+        tsk_condwait_handle_t* condwait;
+    } shutdown;
 
-	TSK_DECLARE_SAFEOBJ;
+    TSK_DECLARE_SAFEOBJ;
 }
 tsip_dialog_layer_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h
index 904af54..77bc5cb 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_message.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_message.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,11 +40,10 @@ struct tsip_message_s;
 
 #define TSIP_DIALOG_MESSAGE(self)							((tsip_dialog_message_t*)(self))
 
-typedef struct tsip_dialog_message
-{
-	TSIP_DECLARE_DIALOG;
-	/**< Last incoming or outgoing message. */
-	struct tsip_message_s* request;
+typedef struct tsip_dialog_message {
+    TSIP_DECLARE_DIALOG;
+    /**< Last incoming or outgoing message. */
+    struct tsip_message_s* request;
 }
 tsip_dialog_message_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_options.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_options.h
index e092a32..db8837c 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_options.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_options.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.
 *
@@ -37,11 +37,10 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_DIALOG_OPTIONS(self)							((tsip_dialog_options_t*)(self))
 
-typedef struct tsip_dialog_options
-{
-	TSIP_DECLARE_DIALOG;
-	/**< Last incoming message. */
-	struct tsip_message_s* last_iMessage;
+typedef struct tsip_dialog_options {
+    TSIP_DECLARE_DIALOG;
+    /**< Last incoming message. */
+    struct tsip_message_s* last_iMessage;
 }
 tsip_dialog_options_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h
index b4ef37b..6919508 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_publish.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.
 *
@@ -37,15 +37,14 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_DIALOG_PUBLISH(self)							((tsip_dialog_publish_t*)(self))
 
-typedef struct tsip_dialog_publish
-{
-	TSIP_DECLARE_DIALOG;
-		
-	tsip_timer_t timerrefresh;
-	tsip_timer_t timershutdown;
+typedef struct tsip_dialog_publish {
+    TSIP_DECLARE_DIALOG;
+
+    tsip_timer_t timerrefresh;
+    tsip_timer_t timershutdown;
 
-	tsk_bool_t unpublishing;
-	char* etag;
+    tsk_bool_t unpublishing;
+    char* etag;
 }
 tsip_dialog_publish_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_register.common.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_register.common.h
index 94e4897..e99df2b 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_register.common.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_register.common.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 publishd 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.
 *
@@ -31,37 +31,35 @@
 
 
 /* ======================== actions ======================== */
-typedef enum _fsm_action_e
-{
-	_fsm_action_accept = tsip_atype_accept,
-	_fsm_action_reject = tsip_atype_hangup,
-	_fsm_action_hangup = tsip_atype_hangup,
-	_fsm_action_oREGISTER = tsip_atype_register,
-	_fsm_action_cancel = tsip_atype_cancel,
-	_fsm_action_shutdown = tsip_atype_shutdown,
-	_fsm_action_transporterror = tsip_atype_transport_error,
+typedef enum _fsm_action_e {
+    _fsm_action_accept = tsip_atype_accept,
+    _fsm_action_reject = tsip_atype_hangup,
+    _fsm_action_hangup = tsip_atype_hangup,
+    _fsm_action_oREGISTER = tsip_atype_register,
+    _fsm_action_cancel = tsip_atype_cancel,
+    _fsm_action_shutdown = tsip_atype_shutdown,
+    _fsm_action_transporterror = tsip_atype_transport_error,
 
-	_fsm_action_1xx = 0xFF,
-	_fsm_action_2xx,
-	_fsm_action_401_407_421_494,
-	_fsm_action_423,
-	_fsm_action_300_to_699,
+    _fsm_action_1xx = 0xFF,
+    _fsm_action_2xx,
+    _fsm_action_401_407_421_494,
+    _fsm_action_423,
+    _fsm_action_300_to_699,
 
-	_fsm_action_iREGISTER,
+    _fsm_action_iREGISTER,
 
-	_fsm_action_shutdown_timedout, /* Any -> Terminated */
-	_fsm_action_error,
+    _fsm_action_shutdown_timedout, /* Any -> Terminated */
+    _fsm_action_error,
 }
 _fsm_action_t;
 
 /* ======================== states ======================== */
-typedef enum _fsm_state_e
-{
-	_fsm_state_Started,
-	_fsm_state_InProgress, // Outgoing (Client)
-	_fsm_state_Incoming, // Incoming (Server)
-	_fsm_state_Connected,
-	_fsm_state_Terminated
+typedef enum _fsm_state_e {
+    _fsm_state_Started,
+    _fsm_state_InProgress, // Outgoing (Client)
+    _fsm_state_Incoming, // Incoming (Server)
+    _fsm_state_Connected,
+    _fsm_state_Terminated
 }
 _fsm_state_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h
index d2acf1a..bfb72ed 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_register.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_register.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,17 +38,16 @@ TSIP_BEGIN_DECLS
 #define TSIP_DIALOG_REGISTER(self)							((tsip_dialog_register_t*)(self))
 
 /**< SIP REGISTER dialog */
-typedef struct tsip_dialog_register
-{
-	TSIP_DECLARE_DIALOG;
+typedef struct tsip_dialog_register {
+    TSIP_DECLARE_DIALOG;
 
-	tsip_timer_t timerrefresh;
-	tsip_timer_t timershutdown;
+    tsip_timer_t timerrefresh;
+    tsip_timer_t timershutdown;
 
-	tsip_request_t* last_iRegister;
+    tsip_request_t* last_iRegister;
 
-	tsk_bool_t unregistering;
-	tsk_bool_t is_server;
+    tsk_bool_t unregistering;
+    tsk_bool_t is_server;
 }
 tsip_dialog_register_t;
 
diff --git a/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h b/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h
index c7db35b..4e66b33 100755
--- a/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.h
+++ b/tinySIP/include/tinysip/dialogs/tsip_dialog_subscribe.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.
 *
@@ -37,14 +37,13 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_DIALOG_SUBSCRIBE(self)							((tsip_dialog_subscribe_t*)(self))
 
-typedef struct tsip_dialog_subscribe
-{
-	TSIP_DECLARE_DIALOG;
-		
-	tsip_timer_t timerrefresh;
-	tsip_timer_t timershutdown;
+typedef struct tsip_dialog_subscribe {
+    TSIP_DECLARE_DIALOG;
+
+    tsip_timer_t timerrefresh;
+    tsip_timer_t timershutdown;
 
-	tsk_bool_t unsubscribing;
+    tsk_bool_t unsubscribing;
 }
 tsip_dialog_subscribe_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header.h b/tinySIP/include/tinysip/headers/tsip_header.h
index b611140..9237cf7 100755
--- a/tinySIP/include/tinysip/headers/tsip_header.h
+++ b/tinySIP/include/tinysip/headers/tsip_header.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.
 *
@@ -59,113 +59,111 @@ typedef char* (*tsip_header_get_special_param_value_f)(const struct tsip_header_
  *
  * @brief	List of all supported headers.
 **/
-typedef enum tsip_header_type_e
-{
-	tsip_htype_Accept,
-	tsip_htype_Accept_Contact,
-	tsip_htype_Accept_Encoding,
-	tsip_htype_Accept_Language,
-	tsip_htype_Accept_Resource_Priority,
-	tsip_htype_Alert_Info,
-	tsip_htype_Allow,
-	tsip_htype_Allow_Events,
-	tsip_htype_Authentication_Info,
-	tsip_htype_Authorization,
-	tsip_htype_Call_ID,
-	tsip_htype_Call_Info,
-	tsip_htype_Contact,
-	tsip_htype_Content_Disposition,
-	tsip_htype_Content_Encoding,
-	tsip_htype_Content_Language,
-	tsip_htype_Content_Length,
-	tsip_htype_Content_Type,
-	tsip_htype_CSeq,
-	tsip_htype_Date,
-	tsip_htype_Dummy,
-	tsip_htype_Error_Info,
-	tsip_htype_Event,
-	tsip_htype_Expires,
-	tsip_htype_From,
-	tsip_htype_History_Info,
-	tsip_htype_Identity,
-	tsip_htype_Identity_Info,
-	tsip_htype_In_Reply_To,
-	tsip_htype_Join,
-	tsip_htype_Max_Forwards,
-	tsip_htype_MIME_Version,
-	tsip_htype_Min_Expires,
-	tsip_htype_Min_SE,
-	tsip_htype_Organization,
-	tsip_htype_Path,
-	tsip_htype_Priority,
-	tsip_htype_Privacy,
-	tsip_htype_Proxy_Authenticate,
-	tsip_htype_Proxy_Authorization,
-	tsip_htype_Proxy_Require,
-	tsip_htype_RAck,
-	tsip_htype_Reason,
-	tsip_htype_Record_Route,
-	tsip_htype_Refer_Sub,
-	tsip_htype_Refer_To,
-	tsip_htype_Referred_By,
-	tsip_htype_Reject_Contact,
-	tsip_htype_Replaces,
-	tsip_htype_Reply_To,
-	tsip_htype_Request_Disposition,
-	tsip_htype_Require,
-	tsip_htype_Resource_Priority,
-	tsip_htype_Retry_After,
-	tsip_htype_Route,
-	tsip_htype_RSeq,
-	tsip_htype_Security_Client,
-	tsip_htype_Security_Server,
-	tsip_htype_Security_Verify,
-	tsip_htype_Server,
-	tsip_htype_Service_Route,
-	tsip_htype_Session_Expires,
-	tsip_htype_SIP_ETag,
-	tsip_htype_SIP_If_Match,
-	tsip_htype_Subject,
-	tsip_htype_Subscription_State,
-	tsip_htype_Supported,
-	tsip_htype_Target_Dialog,
-	tsip_htype_Timestamp,
-	tsip_htype_To,
-	tsip_htype_Unsupported,
-	tsip_htype_User_Agent,
-	tsip_htype_Via,
-	tsip_htype_Warning,
-	tsip_htype_WWW_Authenticate,
-	tsip_htype_P_Access_Network_Info,
-	tsip_htype_P_Answer_State,
-	tsip_htype_P_Asserted_Identity,
-	tsip_htype_P_Associated_URI,
-	tsip_htype_P_Called_Party_ID,
-	tsip_htype_P_Charging_Function_Addresses,
-	tsip_htype_P_Charging_Vector,
-	tsip_htype_P_DCS_Billing_Info,
-	tsip_htype_P_DCS_LAES,
-	tsip_htype_P_DCS_OSPS,
-	tsip_htype_P_DCS_Redirect,
-	tsip_htype_P_DCS_Trace_Party_ID,
-	tsip_htype_P_Early_Media,
-	tsip_htype_P_Media_Authorization,
-	tsip_htype_P_Preferred_Identity,
-	tsip_htype_P_Profile_Key,
-	tsip_htype_P_User_Database,
-	tsip_htype_P_Visited_Network_ID
+typedef enum tsip_header_type_e {
+    tsip_htype_Accept,
+    tsip_htype_Accept_Contact,
+    tsip_htype_Accept_Encoding,
+    tsip_htype_Accept_Language,
+    tsip_htype_Accept_Resource_Priority,
+    tsip_htype_Alert_Info,
+    tsip_htype_Allow,
+    tsip_htype_Allow_Events,
+    tsip_htype_Authentication_Info,
+    tsip_htype_Authorization,
+    tsip_htype_Call_ID,
+    tsip_htype_Call_Info,
+    tsip_htype_Contact,
+    tsip_htype_Content_Disposition,
+    tsip_htype_Content_Encoding,
+    tsip_htype_Content_Language,
+    tsip_htype_Content_Length,
+    tsip_htype_Content_Type,
+    tsip_htype_CSeq,
+    tsip_htype_Date,
+    tsip_htype_Dummy,
+    tsip_htype_Error_Info,
+    tsip_htype_Event,
+    tsip_htype_Expires,
+    tsip_htype_From,
+    tsip_htype_History_Info,
+    tsip_htype_Identity,
+    tsip_htype_Identity_Info,
+    tsip_htype_In_Reply_To,
+    tsip_htype_Join,
+    tsip_htype_Max_Forwards,
+    tsip_htype_MIME_Version,
+    tsip_htype_Min_Expires,
+    tsip_htype_Min_SE,
+    tsip_htype_Organization,
+    tsip_htype_Path,
+    tsip_htype_Priority,
+    tsip_htype_Privacy,
+    tsip_htype_Proxy_Authenticate,
+    tsip_htype_Proxy_Authorization,
+    tsip_htype_Proxy_Require,
+    tsip_htype_RAck,
+    tsip_htype_Reason,
+    tsip_htype_Record_Route,
+    tsip_htype_Refer_Sub,
+    tsip_htype_Refer_To,
+    tsip_htype_Referred_By,
+    tsip_htype_Reject_Contact,
+    tsip_htype_Replaces,
+    tsip_htype_Reply_To,
+    tsip_htype_Request_Disposition,
+    tsip_htype_Require,
+    tsip_htype_Resource_Priority,
+    tsip_htype_Retry_After,
+    tsip_htype_Route,
+    tsip_htype_RSeq,
+    tsip_htype_Security_Client,
+    tsip_htype_Security_Server,
+    tsip_htype_Security_Verify,
+    tsip_htype_Server,
+    tsip_htype_Service_Route,
+    tsip_htype_Session_Expires,
+    tsip_htype_SIP_ETag,
+    tsip_htype_SIP_If_Match,
+    tsip_htype_Subject,
+    tsip_htype_Subscription_State,
+    tsip_htype_Supported,
+    tsip_htype_Target_Dialog,
+    tsip_htype_Timestamp,
+    tsip_htype_To,
+    tsip_htype_Unsupported,
+    tsip_htype_User_Agent,
+    tsip_htype_Via,
+    tsip_htype_Warning,
+    tsip_htype_WWW_Authenticate,
+    tsip_htype_P_Access_Network_Info,
+    tsip_htype_P_Answer_State,
+    tsip_htype_P_Asserted_Identity,
+    tsip_htype_P_Associated_URI,
+    tsip_htype_P_Called_Party_ID,
+    tsip_htype_P_Charging_Function_Addresses,
+    tsip_htype_P_Charging_Vector,
+    tsip_htype_P_DCS_Billing_Info,
+    tsip_htype_P_DCS_LAES,
+    tsip_htype_P_DCS_OSPS,
+    tsip_htype_P_DCS_Redirect,
+    tsip_htype_P_DCS_Trace_Party_ID,
+    tsip_htype_P_Early_Media,
+    tsip_htype_P_Media_Authorization,
+    tsip_htype_P_Preferred_Identity,
+    tsip_htype_P_Profile_Key,
+    tsip_htype_P_User_Database,
+    tsip_htype_P_Visited_Network_ID
 }
 tsip_header_type_t;
 
 /*================================
 */
-typedef struct tsip_header_s
-{
-	TSK_DECLARE_OBJECT;
-	tsip_header_type_t type;
-	tsip_header_value_serialize_f serialize;
-	tsip_header_get_special_param_value_f get_special_param_value;
-	tsk_params_L_t *params;
+typedef struct tsip_header_s {
+    TSK_DECLARE_OBJECT;
+    tsip_header_type_t type;
+    tsip_header_value_serialize_f serialize;
+    tsip_header_get_special_param_value_f get_special_param_value;
+    tsk_params_L_t *params;
 }
 tsip_header_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h b/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h
index 19aaa1b..f053afe 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Accept_Contact.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.
 *
@@ -42,11 +42,10 @@ TSIP_BEGIN_DECLS
 /// @date	12/3/2009
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Accept_Contact_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Accept_Contact_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Accept_Contact_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h b/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h
index efff6cd..937718a 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Accept_Encoding.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.
 *
@@ -42,11 +42,10 @@ TSIP_BEGIN_DECLS
 /// @date	12/3/2009
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Accept_Encoding_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Accept_Encoding_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Accept_Encoding_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h b/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h
index fcb631b..db8843f 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Accept_Language.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.
 *
@@ -42,11 +42,10 @@ TSIP_BEGIN_DECLS
 /// @date	12/3/2009
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Accept_Language_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Accept_Language_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Accept_Language_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h b/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h
index 09143a5..d1464b8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Accept_Resource_Priority.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.
 *
@@ -42,11 +42,10 @@ TSIP_BEGIN_DECLS
 /// @date	12/3/2009
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Accept_Resource_Priority_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Accept_Resource_Priority_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Accept_Resource_Priority_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h b/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h
index 77a26be..dca2613 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Alert_Info.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Alert-Info' as per RFC 3261 subclause .
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Alert_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Alert_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Alert_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Allow.h b/tinySIP/include/tinysip/headers/tsip_header_Allow.h
index a43b9ba..f6a0832 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Allow.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Allow.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.
 *
@@ -43,13 +43,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Allow'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Allow_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Allow_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *methods;
+    tsk_strings_L_t *methods;
 }
 tsip_header_Allow_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h b/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h
index d97b6b3..6f7c942 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Allow_Events.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.
 *
@@ -41,13 +41,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Allow-Events'.
 ///
 /// @par ABNF : Allow-Events	=  	 ( "Allow-Events" / "u" ) HCOLON event-type *(COMMA event-type)
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Allow_Events_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Allow_Events_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *events;
+    tsk_strings_L_t *events;
 }
 tsip_header_Allow_Events_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h b/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h
index 0736dbc..02a7e08 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Authentication_Info.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.
 *
@@ -41,11 +41,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Authentication-Info'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Authentication_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Authentication_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Authentication_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Authorization.h b/tinySIP/include/tinysip/headers/tsip_header_Authorization.h
index 910fdc5..ad71883 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Authorization.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Authorization.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.
 *
@@ -55,32 +55,31 @@ TSIP_BEGIN_DECLS
 /// 								dresponse	= 	"response" EQUAL request-digest
 /// 								request-digest	= 	LDQUOT 32LHEX RDQUOT
 /// 								auth-request-uri = not-defined
-/// 								 
+///
 /// 								auth-param	= 	auth-param-name EQUAL ( token / quoted-string )
 /// 								auth-param-name	= 	token
-/// 								 
+///
 /// 								other-response	= 	auth-scheme LWS auth-param *(COMMA auth-param)
 /// 								auth-scheme	= 	token
 /// 								auts	= 	"auts" EQUAL auts-param
 /// 								auts-param	= 	LDQUOT auts-value RDQUOT
 /// 								auts-value	= 	[base64 encoding of AUTS]
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Authorization_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Authorization_s {
+    TSIP_DECLARE_HEADER;
 
-	char* scheme;
-	char* username;
-	char* realm;
-	char* nonce;
-	char* uri;
-	char* response;
-	char* algorithm;
-	char* cnonce;
-	char* opaque;
-	char* qop;
-	char* nc;
+    char* scheme;
+    char* username;
+    char* realm;
+    char* nonce;
+    char* uri;
+    char* response;
+    char* algorithm;
+    char* cnonce;
+    char* opaque;
+    char* qop;
+    char* nc;
 }
 tsip_header_Authorization_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_CSeq.h b/tinySIP/include/tinysip/headers/tsip_header_CSeq.h
index 98cd864..a225823 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_CSeq.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_CSeq.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.
 *
@@ -47,15 +47,14 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'CSeq'.
 ///
 /// @par ABNF: CSeq	= 	"CSeq" HCOLON 1*DIGIT LWS Method
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_CSeq_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_CSeq_s {
+    TSIP_DECLARE_HEADER;
 
-	char *method;
-	uint32_t seq;
-	tsip_request_type_t type;
+    char *method;
+    uint32_t seq;
+    tsip_request_type_t type;
 }
 tsip_header_CSeq_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h b/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h
index 41a7f73..a0830b3 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Call_ID.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Call_ID.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.
 *
@@ -44,14 +44,13 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Call-ID'.
 ///
 /// @par ABNF: Call-ID / i
-/// callid	=  	word  [ "@" word ] 
+/// callid	=  	word  [ "@" word ]
 /// Call-ID	= 	( "Call-ID" / "i" ) HCOLON callid
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Call_ID_s
-{	
-	TSIP_DECLARE_HEADER;
-	char *value;
+typedef struct tsip_header_Call_ID_s {
+    TSIP_DECLARE_HEADER;
+    char *value;
 }
 tsip_header_Call_ID_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h b/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h
index 72f0d1a..d15a00d 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Call_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Call_Info.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Call-Info'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Call_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Call_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Call_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Contact.h b/tinySIP/include/tinysip/headers/tsip_header_Contact.h
index 7fb200e..1d1900b 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Contact.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Contact.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.
 *
@@ -65,15 +65,14 @@ TSIP_BEGIN_DECLS
 /// c-p-instance	= 	"+sip.instance" EQUAL LDQUOT "<" instance-val ">" RDQUOT
 /// instance-val	= 	*uric
 /// contact-extension	= 	generic-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Contact_s
-{	
-	TSIP_DECLARE_HEADER;
-	
-	char *display_name;
-	tsip_uri_t *uri;
-	int64_t expires;
+typedef struct tsip_header_Contact_s {
+    TSIP_DECLARE_HEADER;
+
+    char *display_name;
+    tsip_uri_t *uri;
+    int64_t expires;
 }
 tsip_header_Contact_t;
 typedef tsk_list_t tsip_header_Contacts_L_t;
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h b/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h
index 3ec3cef..6395c4b 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Content_Disposition.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Content-Disposition'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Content_Disposition_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Content_Disposition_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Content_Disposition_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h b/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h
index 995abbb..d76828d 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Content_Encoding.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Content-Encoding'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Content_Encoding_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Content_Encoding_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Content_Encoding_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h b/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h
index 86899b1..85c3c66 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Content_Language.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Content_Language.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,11 +38,10 @@
 /// @brief	SIP header 'Content-Language'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Content_Language_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Content_Language_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Content_Language_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h b/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h
index 7f2ec61..9c4dca5 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Content_Length.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Content_Length.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.
 *
@@ -43,13 +43,12 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: Content-Length / l
 /// Content-Length	= 	( "Content-Length" / "l" ) HCOLON 1*DIGIT
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Content_Length_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Content_Length_s {
+    TSIP_DECLARE_HEADER;
 
-	uint32_t length;
+    uint32_t length;
 }
 tsip_header_Content_Length_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h b/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h
index 48c32b6..2557e08 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Content_Type.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Content_Type.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.
 *
@@ -55,13 +55,12 @@ TSIP_BEGIN_DECLS
 /// 				m-parameter	= 	m-attribute EQUAL m-value
 /// 				m-attribute	= 	token
 /// 				m-value	= 	token / quoted-string
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Content_Type_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Content_Type_s {
+    TSIP_DECLARE_HEADER;
 
-	char* type;
+    char* type;
 }
 tsip_header_Content_Type_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Date.h b/tinySIP/include/tinysip/headers/tsip_header_Date.h
index f16ee7a..a4a3063 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Date.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Date.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.
 *
@@ -48,21 +48,20 @@ TSIP_BEGIN_DECLS
 /// time	= 	2DIGIT ":" 2DIGIT ":" 2DIGIT
 /// wkday	= 	"Mon" / "Tue" / "Wed" / "Thu" / "Fri" / "Sat" / "Sun"
 /// month	= 	"Jan" / "Feb" / "Mar" / "Apr" / "May" / "Jun" / "Jul" / "Aug" / "Sep" / "Oct" / "Nov" / "Dec"
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Date_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Date_s {
+    TSIP_DECLARE_HEADER;
 
-	char *wkday;
-	char *month;
-	int8_t day;
-	int16_t year;
-	struct{
-		int8_t h;
-		int8_t m;
-		int8_t s;
-	} time;
+    char *wkday;
+    char *month;
+    int8_t day;
+    int16_t year;
+    struct {
+        int8_t h;
+        int8_t m;
+        int8_t s;
+    } time;
 }
 tsip_header_Date_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Dummy.h b/tinySIP/include/tinysip/headers/tsip_header_Dummy.h
index f1c5bb1..d54ba13 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Dummy.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Dummy.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.
 *
@@ -42,14 +42,13 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP Dummy header.
 ///
 /// @par ABNF : token SP* HCOLON SP*<: any*
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Dummy_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Dummy_s {
+    TSIP_DECLARE_HEADER;
 
-	char *name;
-	char *value;
+    char *name;
+    char *value;
 }
 tsip_header_Dummy_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h b/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h
index 53dc98f..55cd9ff 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Error_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Error_Info.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Error-Info'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Error_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Error_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Error_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Event.h b/tinySIP/include/tinysip/headers/tsip_header_Event.h
index 35eb8ea..97e6158 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Event.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Event.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.
 *
@@ -50,13 +50,12 @@ TSIP_BEGIN_DECLS
 ///	event-param	= 	generic-param / ( "id" EQUAL token ) / call-ident / from-tag / to-tag / with-sessd
 ///	call-ident	= 	"call-id" EQUAL ( token / DQUOTE callid DQUOTE )
 ///	with-sessd	= 	"include-session-description"
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Event_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Event_s {
+    TSIP_DECLARE_HEADER;
 
-	char *package;
+    char *package;
 }
 tsip_header_Event_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Expires.h b/tinySIP/include/tinysip/headers/tsip_header_Expires.h
index 2242b9f..ee9491d 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Expires.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Expires.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.
 *
@@ -45,13 +45,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Expires'.
 ///
 /// @par ABNF: Expires	= 	"Expires" HCOLON delta-seconds
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Expires_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Expires_s {
+    TSIP_DECLARE_HEADER;
 
-	int64_t delta_seconds;
+    int64_t delta_seconds;
 }
 tsip_header_Expires_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_From.h b/tinySIP/include/tinysip/headers/tsip_header_From.h
index a799efd..8144fcb 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_From.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_From.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.
 *
@@ -46,15 +46,14 @@ TSIP_BEGIN_DECLS
 /// from-spec	= 	( name-addr / addr-spec ) *( SEMI from-param )
 /// from-param	= 	tag-param / generic-param
 /// tag-param	= 	"tag" EQUAL token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_From_s
-{	
-	TSIP_DECLARE_HEADER;
-	
-	char *display_name;
-	tsip_uri_t *uri;
-	char *tag;
+typedef struct tsip_header_From_s {
+    TSIP_DECLARE_HEADER;
+
+    char *display_name;
+    tsip_uri_t *uri;
+    char *tag;
 }
 tsip_header_From_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_History_Info.h b/tinySIP/include/tinysip/headers/tsip_header_History_Info.h
index 6638f14..c900310 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_History_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_History_Info.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.
 *
@@ -42,11 +42,10 @@ TSIP_BEGIN_DECLS
 /// @date	12/3/2009
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_History_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_History_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_History_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Identity.h b/tinySIP/include/tinysip/headers/tsip_header_Identity.h
index 8382d39..6ecdf45 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Identity.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Identity.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Identity' .
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Identity_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Identity_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Identity_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h b/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h
index 1aa790b..fb57ad4 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Identity_Info.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Identity-Info'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Identity_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Identity_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Identity_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h b/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h
index 90477c6..b405d30 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_In_Reply_To.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'In-Reply-To'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_In_Reply_To_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_In_Reply_To_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_In_Reply_To_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Join.h b/tinySIP/include/tinysip/headers/tsip_header_Join.h
index ef4c042..25361f1 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Join.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Join.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Join'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Join_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Join_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Join_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h b/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h
index 439f98c..a756165 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_MIME_Version.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'MIME-Version'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_MIME_Version_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_MIME_Version_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_MIME_Version_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h b/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h
index 17d9856..606e4b4 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Max_Forwards.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.
 *
@@ -46,13 +46,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Max-Forwards'.
 ///
 /// @par ABNF: Max-Forwards = "Max-Forwards" HCOLON 1*DIGIT
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Max_Forwards_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Max_Forwards_s {
+    TSIP_DECLARE_HEADER;
 
-	int32_t value;
+    int32_t value;
 }
 tsip_header_Max_Forwards_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h b/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h
index 042a190..4f60359 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Min_Expires.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.
 *
@@ -45,13 +45,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Min-Expires' as per RFC 3261.
 ///
 /// @par ABNF: Min-Expires = "Min-Expires" HCOLON delta-seconds
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Min_Expires_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Min_Expires_s {
+    TSIP_DECLARE_HEADER;
 
-	int32_t value;
+    int32_t value;
 }
 tsip_header_Min_Expires_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h b/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h
index de05338..ee5a48e 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Min_SE.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Min_SE.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.
 *
@@ -44,14 +44,13 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Min-SE'.
 ///
 /// @par ABNF : Min-SE	= 	"Min-SE" HCOLON delta-seconds *(SEMI generic-param)
-/// 
-/// 	
+///
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Min_SE_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Min_SE_s {
+    TSIP_DECLARE_HEADER;
 
-	int64_t delta_seconds;
+    int64_t delta_seconds;
 }
 tsip_header_Min_SE_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Organization.h b/tinySIP/include/tinysip/headers/tsip_header_Organization.h
index 8351afb..96f58b8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Organization.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Organization.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Organization'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Organization_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Organization_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Organization_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h b/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h
index 9508424..09fa888 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Access_Network_Info.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.
 *
@@ -48,13 +48,12 @@ TSIP_BEGIN_DECLS
 /// extension-access-info	= 	gen-value
 /// cgi-3gpp	= 	"cgi-3gpp" EQUAL (token / quoted-string)
 /// utran-cell-id-3gpp	= 	"utran-cell-id-3gpp" EQUAL (token / quoted-string)
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Access_Network_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Access_Network_Info_s {
+    TSIP_DECLARE_HEADER;
 
-	char *value;
+    char *value;
 }
 tsip_header_P_Access_Network_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h b/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h
index e378ef7..78fdbc0 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Answer_State.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Answer-State'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Answer_State_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Answer_State_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Answer_State_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h b/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h
index 3e2118a..33f2daf 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Asserted_Identity.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.
 *
@@ -45,14 +45,13 @@ TSIP_BEGIN_DECLS
 /// @par ABNF: P-Asserted-Identity = PAssertedID
 /// PAssertedID	=  	"P-Asserted-Identity" HCOLON PAssertedID-value *(COMMA PAssertedID-value)
 /// PAssertedID-value	= 	name-addr / addr-spec
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Asserted_Identity_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Asserted_Identity_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_P_Asserted_Identity_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h b/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h
index 8c28f41..0e63ef8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Associated_URI.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.
 *
@@ -46,14 +46,13 @@ TSIP_BEGIN_DECLS
 /// @par ABNF: P-Associated-URI	= 	"P-Associated-URI" HCOLON p-aso-uri-spec *(COMMA p-aso-uri-spec)
 /// p-aso-uri-spec	= 	name-addr *( SEMI ai-param )
 /// ai-param	= 	generic-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Associated_URI_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Associated_URI_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_P_Associated_URI_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h b/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h
index 324b61a..a4485f3 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Called_Party_ID.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Called-Party-ID'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Called_Party_ID_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Called_Party_ID_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Called_Party_ID_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h b/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h
index 82e5e71..e5319c8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Function_Addresses.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.
 *
@@ -44,13 +44,12 @@ TSIP_BEGIN_DECLS
 /// charge-addr-params	= 	ccf / ecf / generic-param
 /// ccf	= 	"ccf" EQUAL gen-value
 /// ecf	= 	"ecf" EQUAL gen-value
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Charging_Function_Addresses_s
-{	
-	TSIP_DECLARE_HEADER;
-	char* ccf;
-	char* ecf;
+typedef struct tsip_header_P_Charging_Function_Addresses_s {
+    TSIP_DECLARE_HEADER;
+    char* ccf;
+    char* ecf;
 }
 tsip_header_P_Charging_Function_Addresses_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h b/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h
index 45ba24d..cdb69f4 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Charging_Vector.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Charging-Vector'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Charging_Vector_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Charging_Vector_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Charging_Vector_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h
index ca518b9..b195833 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Billing_Info.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-DCS-Billing-Info'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_DCS_Billing_Info_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_DCS_Billing_Info_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_DCS_Billing_Info_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h
index ed2ce31..37bfd21 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_LAES.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-DCS-_LAES'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_DCS_LAES_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_DCS_LAES_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_DCS_LAES_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h
index 1d98390..11f7e42 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_OSPS.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-DCS-OSPS'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_DCS_OSPS_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_DCS_OSPS_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_DCS_OSPS_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h
index 103e396..4873bfb 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Redirect.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-DCS-Redirect'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_DCS_Redirect_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_DCS_Redirect_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_DCS_Redirect_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h
index 3a11086..226b527 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_DCS_Trace_Party_ID.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-DCS-Trace-Party-ID'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_DCS_Trace_Party_ID_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_DCS_Trace_Party_ID_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_DCS_Trace_Party_ID_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h b/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h
index 54890f0..71e05d9 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Early_Media.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Early-Media'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Early_Media_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Early_Media_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Early_Media_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h b/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h
index c161c34..5024a3a 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Media_Authorization.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Media-Authorization'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Media_Authorization_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Media_Authorization_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Media_Authorization_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h b/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h
index 9272932..e89d60e 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Preferred_Identity.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.
 *
@@ -45,14 +45,13 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF:  PPreferredID = "P-Preferred-Identity" HCOLON PPreferredID-value *(COMMA PPreferredID-value)
 ///       PPreferredID-value = name-addr / addr-spec
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Preferred_Identity_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Preferred_Identity_s {
+    TSIP_DECLARE_HEADER;
 
-	tsip_uri_t *uri;
-	char *display_name;
+    tsip_uri_t *uri;
+    char *display_name;
 }
 tsip_header_P_Preferred_Identity_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h b/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h
index 0f33a2a..e024afe 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Profile_Key.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Profile-Key'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Profile_Key_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Profile_Key_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Profile_Key_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h b/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h
index 75915b5..c6154ad 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_User_Database.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-User-Database'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_User_Database_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_User_Database_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_User_Database_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h b/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h
index 121783f..6144da0 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_P_Visited_Network_ID.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'P-Visited-Network-ID'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_P_Visited_Network_ID_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_P_Visited_Network_ID_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_P_Visited_Network_ID_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Path.h b/tinySIP/include/tinysip/headers/tsip_header_Path.h
index d0fa6ed..f943b2a 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Path.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Path.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.
 *
@@ -46,14 +46,13 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF : Path	= 	"Path" HCOLON path-value *(COMMA path-value)
 ///							path-value	= 	name-addr *( SEMI rr-param )
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Path_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Path_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_Path_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Priority.h b/tinySIP/include/tinysip/headers/tsip_header_Priority.h
index eb1cbbf..bbcf2d9 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Priority.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Priority.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Priority'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Priority_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Priority_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Priority_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Privacy.h b/tinySIP/include/tinysip/headers/tsip_header_Privacy.h
index 421e18f..a054cbd 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Privacy.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Privacy.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.
 *
@@ -43,13 +43,12 @@ TSIP_BEGIN_DECLS
 /// @par ABNF: Privacy = Privacy-hdr
 /// Privacy-hdr	= 	"Privacy" HCOLON priv-value *(";" priv-value)
 /// priv-value	= 	"header" / "session" / "user" / "none" / "critical" / "id" / "history" / token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Privacy_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Privacy_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *values;
+    tsk_strings_L_t *values;
 }
 tsip_header_Privacy_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h
index 01c4681..be82015 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authenticate.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.
 *
@@ -51,20 +51,19 @@ TSIP_BEGIN_DECLS
 ///				stale	= 	"stale" EQUAL ( "true" / "false" )
 ///				qop-options	= 	"qop" EQUAL LDQUOT qop-value *("," qop-value) RDQUOT
 ///				qop-value	= 	"auth" / "auth-int" / token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Proxy_Authenticate_s
-{	
-	TSIP_DECLARE_HEADER;
-	
-	char* scheme;
-	char* realm;
-	char* domain;
-	char* nonce;
-	char* opaque;
-	tsk_bool_t stale;
-	char* algorithm;
-	char* qop;
+typedef struct tsip_header_Proxy_Authenticate_s {
+    TSIP_DECLARE_HEADER;
+
+    char* scheme;
+    char* realm;
+    char* domain;
+    char* nonce;
+    char* opaque;
+    tsk_bool_t stale;
+    char* algorithm;
+    char* qop;
 }
 tsip_header_Proxy_Authenticate_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h
index 6eb7136..5ed9366 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Authorization.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.
 *
@@ -55,32 +55,31 @@ TSIP_BEGIN_DECLS
 /// 								dresponse	= 	"response" EQUAL request-digest
 /// 								request-digest	= 	LDQUOT 32LHEX RDQUOT
 /// 								auth-request-uri = not-defined
-/// 								 
+///
 /// 								auth-param	= 	auth-param-name EQUAL ( token / quoted-string )
 /// 								auth-param-name	= 	token
-/// 								 
+///
 /// 								other-response	= 	auth-scheme LWS auth-param *(COMMA auth-param)
 /// 								auth-scheme	= 	token
 /// 								auts	= 	"auts" EQUAL auts-param
 /// 								auts-param	= 	LDQUOT auts-value RDQUOT
 /// 								auts-value	= [base64 encoding of AUTS]
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Proxy_Authorization_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Proxy_Authorization_s {
+    TSIP_DECLARE_HEADER;
 
-	char* scheme;
-	char* username;
-	char* realm;
-	char* nonce;
-	char* uri;
-	char* response;
-	char* algorithm;
-	char* cnonce;
-	char* opaque;
-	char* qop;
-	char* nc;
+    char* scheme;
+    char* username;
+    char* realm;
+    char* nonce;
+    char* uri;
+    char* response;
+    char* algorithm;
+    char* cnonce;
+    char* opaque;
+    char* qop;
+    char* nc;
 }
 tsip_header_Proxy_Authorization_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h
index 63f74e4..96cafe8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Proxy_Require.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.
 *
@@ -43,13 +43,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Proxy-Proxy_Require'.
 ///
 /// @par ABNF: Proxy_Require	= 	"Proxy_Require" HCOLON option-tag *(COMMA option-tag)
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Proxy_Require_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Proxy_Require_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *options;
+    tsk_strings_L_t *options;
 }
 tsip_header_Proxy_Require_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_RAck.h b/tinySIP/include/tinysip/headers/tsip_header_RAck.h
index 6a2bc13..55605e0 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_RAck.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_RAck.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.
 *
@@ -42,15 +42,14 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'RAck' as per RFC 3262.
 ///
 /// @par ABNF : "RAck" HCOLON response-num  LWS  CSeq-num  LWS  Method
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_RAck_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_RAck_s {
+    TSIP_DECLARE_HEADER;
 
-	uint32_t seq;
-	uint32_t cseq;
-	char* method;
+    uint32_t seq;
+    uint32_t cseq;
+    char* method;
 }
 tsip_header_RAck_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_RSeq.h b/tinySIP/include/tinysip/headers/tsip_header_RSeq.h
index 1b87ddd..6310dca 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_RSeq.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_RSeq.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.
 *
@@ -45,12 +45,11 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'RSeq' as per RFC 3262.
 ///
 /// @par ABNF: "RSeq" HCOLON response-num
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_RSeq_s
-{	
-	TSIP_DECLARE_HEADER;
-	uint32_t seq;
+typedef struct tsip_header_RSeq_s {
+    TSIP_DECLARE_HEADER;
+    uint32_t seq;
 }
 tsip_header_RSeq_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Reason.h b/tinySIP/include/tinysip/headers/tsip_header_Reason.h
index eb13b51..ba19369 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Reason.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Reason.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Reason'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Reason_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Reason_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Reason_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h b/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h
index 7e8e187..1eeada6 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Record_Route.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Record_Route.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.
 *
@@ -47,14 +47,13 @@ TSIP_BEGIN_DECLS
 /// @par ABNF : Record-Route	= 	"Record-Route" HCOLON rec-route *(COMMA rec-route)
 ///				rec-route	= 	name-addr *( SEMI rr-param )
 ///				rr-param	= 	generic-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Record_Route_s
-{	
-	TSIP_DECLARE_HEADER;
-	
-	char* display_name;
-	tsip_uri_t *uri;
+typedef struct tsip_header_Record_Route_s {
+    TSIP_DECLARE_HEADER;
+
+    char* display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_Record_Route_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h b/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h
index d436430..81db755 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Refer_Sub.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.
 *
@@ -44,13 +44,12 @@ TSIP_BEGIN_DECLS
 /// @par ABNF : Refer-Sub	= 	"Refer-Sub" HCOLON refer-sub-value *(SEMI exten)
 /// refer-sub-value	= 	"true" / "false"
 /// exten	= 	generic-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Refer_Sub_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Refer_Sub_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_bool_t sub;
+    tsk_bool_t sub;
 }
 tsip_header_Refer_Sub_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h b/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h
index f68ecd9..240a38b 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Refer_To.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Refer_To.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.
 *
@@ -45,14 +45,13 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: Refer-To	= 	( "Refer-To" / "r" ) HCOLON ( name-addr / addr-spec ) *(SEMI refer-param)
 /// refer-param	= 	generic-param / feature-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Refer_To_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Refer_To_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_Refer_To_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h b/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h
index 5870512..55c6e18 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Referred_By.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Referred_By.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.
 *
@@ -44,16 +44,15 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Referred-By'.
 ///
 /// @par ABNF: Referred-By	= 	( "Referred-By" / "b" ) HCOLON referrer-uri *( SEMI (referredby-id-param / generic-param) )
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Referred_By_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Referred_By_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 
-	char* cid;
+    char* cid;
 }
 tsip_header_Referred_By_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h b/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h
index 01bcf4f..4dbec22 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Reject_Contact.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Reject-Contact'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Reject_Contact_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Reject_Contact_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Reject_Contact_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Replaces.h b/tinySIP/include/tinysip/headers/tsip_header_Replaces.h
index 5889dd0..5c9a1cd 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Replaces.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Replaces.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Replaces'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Replaces_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Replaces_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Replaces_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h b/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h
index e5b97f1..3bb1601 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Reply_To.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Reply_To.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,11 +39,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Reply_To'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Reply_To_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Reply_To_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Reply_To_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h b/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h
index 50d8615..ceb48e6 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Request_Disposition.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Request-Disposition'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Request_Disposition_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Request_Disposition_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Request_Disposition_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Require.h b/tinySIP/include/tinysip/headers/tsip_header_Require.h
index 01de563..8c1768e 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Require.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Require.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.
 *
@@ -43,13 +43,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Require'.
 ///
 /// @par ABNF: Require	= 	"Require" HCOLON option-tag *(COMMA option-tag)
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Require_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Require_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *options;
+    tsk_strings_L_t *options;
 }
 tsip_header_Require_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h b/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h
index 24e83df..305466a 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Resource_Priority.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Resource-Priority'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Resource_Priority_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Resource_Priority_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Resource_Priority_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h b/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h
index 4761b5c..92b2266 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Retry_After.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Retry_After.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Retry-After'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Retry_After_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Retry_After_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Retry_After_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Route.h b/tinySIP/include/tinysip/headers/tsip_header_Route.h
index 28e3c80..3e3e246 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Route.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Route.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.
 *
@@ -46,14 +46,13 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF : Route	= 	"Route" HCOLON route-param *(COMMA route-param)
 ///							route-param	= 	name-addr *( SEMI rr-param )
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Route_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Route_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_Route_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h b/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h
index cf6ba6f..feee266 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_SIP_ETag.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.
 *
@@ -42,14 +42,13 @@ TSIP_BEGIN_DECLS
  * @struct	tsip_header_SIP_ETag_s
  *
  * 	SIP header 'SIP-ETag' as per RFC 3903.
- * 	@par ABNF 
+ * 	@par ABNF
  *	SIP-ETag	= 	"SIP-ETag" HCOLON entity-tag
- *	entity-tag = token 
+ *	entity-tag = token
 **/
-typedef struct tsip_header_SIP_ETag_s
-{	
-	TSIP_DECLARE_HEADER;
-	char *value;
+typedef struct tsip_header_SIP_ETag_s {
+    TSIP_DECLARE_HEADER;
+    char *value;
 }
 tsip_header_SIP_ETag_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h b/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h
index f918df4..25aee82 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_SIP_If_Match.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.
 *
@@ -43,14 +43,13 @@ TSIP_BEGIN_DECLS
  * @struct	tsip_header_SIP_If_Match_s
  *
  * 	SIP header 'SIP-If-Match' as per RFC 3903.
- * 	@par ABNF 
+ * 	@par ABNF
  *	SIP-If-Match	= 	"SIP-If-Match" HCOLON entity-tag
- *	entity-tag = token 
+ *	entity-tag = token
 **/
-typedef struct tsip_header_SIP_If_Match_s
-{	
-	TSIP_DECLARE_HEADER;
-	char *value;
+typedef struct tsip_header_SIP_If_Match_s {
+    TSIP_DECLARE_HEADER;
+    char *value;
 }
 tsip_header_SIP_If_Match_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h b/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h
index d453832..431901a 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Security_Client.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Security_Client.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.
 *
@@ -66,33 +66,32 @@ TSIP_BEGIN_DECLS
 /// port1              = "port1" EQUAL port
 /// port2              = "port2" EQUAL port
 /// port               = 1*DIGIT
-/// 
-/// 	
+///
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Security_Client_s
-{	
-	TSIP_DECLARE_HEADER;
-
-	//! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
-	char* mech;
-	//! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
-	char* alg;
-	//! protocol (e.g. "ah" / "esp")
-	char* prot;
-	//! mode (e.g. "trans" / "tun")
-	char* mod;
-	//! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
-	char* ealg;
-	//! client port
-	tnet_port_t port_c;
-	//! server port
-	tnet_port_t port_s;
-	//! client spi
-	uint32_t spi_c;
-	//! server spi
-	uint32_t spi_s;
-	//! preference
-	double q;
+typedef struct tsip_header_Security_Client_s {
+    TSIP_DECLARE_HEADER;
+
+    //! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
+    char* mech;
+    //! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
+    char* alg;
+    //! protocol (e.g. "ah" / "esp")
+    char* prot;
+    //! mode (e.g. "trans" / "tun")
+    char* mod;
+    //! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
+    char* ealg;
+    //! client port
+    tnet_port_t port_c;
+    //! server port
+    tnet_port_t port_s;
+    //! client spi
+    uint32_t spi_c;
+    //! server spi
+    uint32_t spi_s;
+    //! preference
+    double q;
 }
 tsip_header_Security_Client_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h b/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h
index eb66c43..8cd87ec 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Security_Server.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Security_Server.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.
 *
@@ -66,33 +66,32 @@ TSIP_BEGIN_DECLS
 /// port1              = "port1" EQUAL port
 /// port2              = "port2" EQUAL port
 /// port               = 1*DIGIT
-/// 
-/// 	
+///
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Security_Server_s
-{	
-	TSIP_DECLARE_HEADER;
-
-	//! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
-	char* mech;
-	//! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
-	char* alg;
-	//! protocol (e.g. "ah" / "esp")
-	char* prot;
-	//! mode (e.g. "trans" / "tun")
-	char* mod;
-	//! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
-	char* ealg;
-	//! client port
-	tnet_port_t port_c;
-	//! server port
-	tnet_port_t port_s;
-	//! client spi
-	uint32_t spi_c;
-	//! server spi
-	uint32_t spi_s;
-	//! preference
-	double q;
+typedef struct tsip_header_Security_Server_s {
+    TSIP_DECLARE_HEADER;
+
+    //! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
+    char* mech;
+    //! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
+    char* alg;
+    //! protocol (e.g. "ah" / "esp")
+    char* prot;
+    //! mode (e.g. "trans" / "tun")
+    char* mod;
+    //! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
+    char* ealg;
+    //! client port
+    tnet_port_t port_c;
+    //! server port
+    tnet_port_t port_s;
+    //! client spi
+    uint32_t spi_c;
+    //! server spi
+    uint32_t spi_s;
+    //! preference
+    double q;
 }
 tsip_header_Security_Server_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h b/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h
index a9e59aa..98cd971 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Security_Verify.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.
 *
@@ -65,33 +65,32 @@ TSIP_BEGIN_DECLS
 /// port1              = "port1" EQUAL port
 /// port2              = "port2" EQUAL port
 /// port               = 1*DIGIT
-/// 
-/// 	
+///
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Security_Verify_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Security_Verify_s {
+    TSIP_DECLARE_HEADER;
 
-	//! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
-	char* mech;
-	//! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
-	char* alg;
-	//! protocol (e.g. "ah" / "esp")
-	char* prot;
-	//! mode (e.g. "trans" / "tun")
-	char* mod;
-	//! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
-	char* ealg;
-	//! client port
-	tnet_port_t port_c;
-	//! server port
-	tnet_port_t port_s;
-	//! client spi
-	uint32_t spi_c;
-	//! server spi
-	uint32_t spi_s;
-	//! preference
-	double q;
+    //! sec-mechanism (e.g. "digest" / "tls" / "ipsec-3gpp")
+    char* mech;
+    //! algorithm (e.g. "hmac-md5-96" / "hmac-sha-1-96")
+    char* alg;
+    //! protocol (e.g. "ah" / "esp")
+    char* prot;
+    //! mode (e.g. "trans" / "tun")
+    char* mod;
+    //! encrypt-algorithm (e.g. "des-ede3-cbc" / "null")
+    char* ealg;
+    //! client port
+    tnet_port_t port_c;
+    //! server port
+    tnet_port_t port_s;
+    //! client spi
+    uint32_t spi_c;
+    //! server spi
+    uint32_t spi_s;
+    //! preference
+    double q;
 }
 tsip_header_Security_Verify_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Server.h b/tinySIP/include/tinysip/headers/tsip_header_Server.h
index 1bdb3e5..5c3f3b9 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Server.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Server.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.
 *
@@ -47,12 +47,11 @@ TSIP_BEGIN_DECLS
 /// server-val	= 	product / comment
 /// product	= 	token [SLASH product-version]
 /// product-version	= 	token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Server_s
-{	
-	TSIP_DECLARE_HEADER;
-	char* value;
+typedef struct tsip_header_Server_s {
+    TSIP_DECLARE_HEADER;
+    char* value;
 }
 tsip_header_Server_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h b/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h
index 307d644..328a9fd 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Service_Route.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Service_Route.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.
 *
@@ -45,14 +45,13 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: Service-Route	= 	"Service-Route" HCOLON sr-value *(COMMA sr-value)
 ///									sr-value	= 	name-addr *( SEMI rr-param )
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Service_Route_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Service_Route_s {
+    TSIP_DECLARE_HEADER;
 
-	char *display_name;
-	tsip_uri_t *uri;
+    char *display_name;
+    tsip_uri_t *uri;
 }
 tsip_header_Service_Route_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h b/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h
index 386d652..4b71d9b 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Session_Expires.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.
 *
@@ -45,15 +45,14 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: Session-Expires	=  	 ( "Session-Expires" / "x" ) HCOLON delta-seconds *( SEMI (se-params )
 /// se-params	= 	refresher-param / generic-param
-/// refresher-param	= 	"refresher" EQUAL ("uas" / "uac") 
-/// 	
+/// refresher-param	= 	"refresher" EQUAL ("uas" / "uac")
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Session_Expires_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Session_Expires_s {
+    TSIP_DECLARE_HEADER;
 
-	int64_t delta_seconds;
-	tsk_bool_t refresher_uas;
+    int64_t delta_seconds;
+    tsk_bool_t refresher_uas;
 }
 tsip_header_Session_Expires_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Subject.h b/tinySIP/include/tinysip/headers/tsip_header_Subject.h
index 69cbfec..ea195fa 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Subject.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Subject.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Subject'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Subject_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Subject_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Subject_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h b/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h
index 5e4f90c..716a98c 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Subscription_State.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.
 *
@@ -46,16 +46,15 @@ TSIP_BEGIN_DECLS
 /// subexp-params	= 	("reason" EQUAL event-reason-value) / ("expires" EQUAL delta-seconds) / ("retry-after" EQUAL delta-seconds) / generic-param
 /// event-reason-value	= 	"deactivated" / "probation" / "rejected" / "timeout" / "giveup" / "noresource" / event-reason-extension
 /// event-reason-extension 	= 	token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Subscription_State_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Subscription_State_s {
+    TSIP_DECLARE_HEADER;
 
-	char* state;
-	char* reason;
-	int32_t expires;
-	int32_t retry_after;
+    char* state;
+    char* reason;
+    int32_t expires;
+    int32_t retry_after;
 }
 tsip_header_Subscription_State_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Supported.h b/tinySIP/include/tinysip/headers/tsip_header_Supported.h
index 6b0ecd4..c1d8c4f 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Supported.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Supported.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.
 *
@@ -44,13 +44,12 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: Supported / k
 /// Supported	= 	( "Supported" / "k" ) HCOLON [option-tag *(COMMA option-tag)]
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Supported_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Supported_s {
+    TSIP_DECLARE_HEADER;
 
-	tsk_strings_L_t *options;
+    tsk_strings_L_t *options;
 }
 tsip_header_Supported_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h b/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h
index 185fdf9..d4c77b6 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Target_Dialog.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Target-Dialog'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Target_Dialog_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Target_Dialog_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Target_Dialog_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h b/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h
index 6492824..3b61b85 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Timestamp.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Timestamp.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Timestamp'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Timestamp_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Timestamp_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Timestamp_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_To.h b/tinySIP/include/tinysip/headers/tsip_header_To.h
index 92970f1..09a68ce 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_To.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_To.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.
 *
@@ -45,15 +45,14 @@ TSIP_BEGIN_DECLS
 ///
 /// @par ABNF: To	= 	To	= 	( "To" / "t" ) HCOLON ( name-addr / addr-spec ) *( SEMI to-param )
 /// to-param	= 	tag-param / generic-param
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_To_s
-{	
-	TSIP_DECLARE_HEADER;
-	
-	char *display_name;
-	tsip_uri_t *uri;
-	char *tag;
+typedef struct tsip_header_To_s {
+    TSIP_DECLARE_HEADER;
+
+    char *display_name;
+    tsip_uri_t *uri;
+    char *tag;
 }
 tsip_header_To_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h b/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h
index d58f8d4..57740e9 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Unsupported.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Unsupported.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,11 +40,10 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Unsupported'.
 ///
 /// @par ABNF
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Unsupported_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Unsupported_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Unsupported_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h b/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h
index a69c454..e8eaece 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_User_Agent.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_User_Agent.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.
 *
@@ -43,12 +43,11 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'User-Agent'.
 ///
 /// @par ABNF : User-Agent	= 	"User-Agent" HCOLON server-val *(LWS server-val)
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_User_Agent_s
-{	
-	TSIP_DECLARE_HEADER;
-	char *value;
+typedef struct tsip_header_User_Agent_s {
+    TSIP_DECLARE_HEADER;
+    char *value;
 }
 tsip_header_User_Agent_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Via.h b/tinySIP/include/tinysip/headers/tsip_header_Via.h
index dca22a7..5bd76d8 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Via.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Via.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.
 *
@@ -72,23 +72,22 @@ TSIP_BEGIN_DECLS
 /// @author	Mamadou
 /// @date	12/5/2009
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Via_s
-{
-	TSIP_DECLARE_HEADER;
-
-	char *branch;
-	char *host;
-	uint16_t port;
-	char *comp;
-	char *sigcomp_id;
-	char *received;
-	char *maddr;
-	char *proto_name;
-	char *proto_version;
-	char *transport;
-	
-	int32_t rport;
-	int32_t ttl;
+typedef struct tsip_header_Via_s {
+    TSIP_DECLARE_HEADER;
+
+    char *branch;
+    char *host;
+    uint16_t port;
+    char *comp;
+    char *sigcomp_id;
+    char *received;
+    char *maddr;
+    char *proto_name;
+    char *proto_version;
+    char *transport;
+
+    int32_t rport;
+    int32_t ttl;
 }
 tsip_header_Via_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h b/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h
index 5de99d9..0381b2d 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_WWW_Authenticate.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.
 *
@@ -52,20 +52,19 @@ TSIP_BEGIN_DECLS
 ///				stale	= 	"stale" EQUAL ( "true" / "false" )
 ///				qop-options	= 	"qop" EQUAL LDQUOT qop-value *("," qop-value) RDQUOT
 ///				qop-value	= 	"auth" / "auth-int" / token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_WWW_Authenticate_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_WWW_Authenticate_s {
+    TSIP_DECLARE_HEADER;
 
-	char* scheme;
-	char* realm;
-	char* domain;
-	char* nonce;
-	char* opaque;
-	tsk_bool_t stale;
-	char* algorithm;
-	char* qop;
+    char* scheme;
+    char* realm;
+    char* domain;
+    char* nonce;
+    char* opaque;
+    tsk_bool_t stale;
+    char* algorithm;
+    char* qop;
 }
 tsip_header_WWW_Authenticate_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_Warning.h b/tinySIP/include/tinysip/headers/tsip_header_Warning.h
index 6c16112..8c143ef 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_Warning.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_Warning.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.
 *
@@ -46,15 +46,14 @@ TSIP_BEGIN_DECLS
 /// warn-agent	= 	hostport / pseudonym
 /// warn-text	= 	quoted-string
 /// pseudonym	= 	token
-/// 	
+///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Warning_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Warning_s {
+    TSIP_DECLARE_HEADER;
 
-	int32_t code;
-	char* agent;
-	char* text;
+    int32_t code;
+    char* agent;
+    char* text;
 }
 tsip_header_Warning_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_header_accept.h b/tinySIP/include/tinysip/headers/tsip_header_accept.h
index 1742051..012b345 100755
--- a/tinySIP/include/tinysip/headers/tsip_header_accept.h
+++ b/tinySIP/include/tinysip/headers/tsip_header_accept.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.
 *
@@ -41,13 +41,12 @@ TSIP_BEGIN_DECLS
 /// @brief	SIP header 'Accept' as per RFC 3261 subclause 20.1.
 ///
 /// @par ABNF = Accept = "Accept" HCOLON [ accept-range *(COMMA accept-range) ] ; example: ;
-/// 	Accept: application/dialog-info+xml 
+/// 	Accept: application/dialog-info+xml
 ///		accept-range = media-range *(SEMI accept-param)
-/// 	media-range = ( "*'/*" / ( m-type SLASH "*" ) / ( m-type SLASH m-subtype ) )  *( SEMI m-parameter ) 
+/// 	media-range = ( "*'/*" / ( m-type SLASH "*" ) / ( m-type SLASH m-subtype ) )  *( SEMI m-parameter )
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_header_Accept_s
-{	
-	TSIP_DECLARE_HEADER;
+typedef struct tsip_header_Accept_s {
+    TSIP_DECLARE_HEADER;
 }
 tsip_header_Accept_t;
 
diff --git a/tinySIP/include/tinysip/headers/tsip_headers.h b/tinySIP/include/tinysip/headers/tsip_headers.h
index b520cc4..2b60546 100755
--- a/tinySIP/include/tinysip/headers/tsip_headers.h
+++ b/tinySIP/include/tinysip/headers/tsip_headers.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.
 *
@@ -47,7 +47,7 @@
 #include "tinysip/headers/tsip_header_Min_Expires.h"
 #include "tinysip/headers/tsip_header_Min_SE.h"
 #include "tinysip/headers/tsip_header_Path.h"
-#include "tinysip/headers/tsip_header_P_Access_Network_Info.h" 
+#include "tinysip/headers/tsip_header_P_Access_Network_Info.h"
 #include "tinysip/headers/tsip_header_P_Asserted_Identity.h"
 #include "tinysip/headers/tsip_header_P_Associated_URI.h"
 #include "tinysip/headers/tsip_header_P_Charging_Function_Addresses.h"
diff --git a/tinySIP/include/tinysip/parsers/tsip_parser_header.h b/tinySIP/include/tinysip/parsers/tsip_parser_header.h
index da673a4..1fb082b 100755
--- a/tinySIP/include/tinysip/parsers/tsip_parser_header.h
+++ b/tinySIP/include/tinysip/parsers/tsip_parser_header.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.
 *
diff --git a/tinySIP/include/tinysip/parsers/tsip_parser_message.h b/tinySIP/include/tinysip/parsers/tsip_parser_message.h
index bf1091d..eabaa91 100755
--- a/tinySIP/include/tinysip/parsers/tsip_parser_message.h
+++ b/tinySIP/include/tinysip/parsers/tsip_parser_message.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.
 *
diff --git a/tinySIP/include/tinysip/parsers/tsip_parser_uri.h b/tinySIP/include/tinysip/parsers/tsip_parser_uri.h
index 84537f5..39b4b39 100755
--- a/tinySIP/include/tinysip/parsers/tsip_parser_uri.h
+++ b/tinySIP/include/tinysip/parsers/tsip_parser_uri.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.
 *
diff --git a/tinySIP/include/tinysip/sigcomp/tsip_sigcomp.h b/tinySIP/include/tinysip/sigcomp/tsip_sigcomp.h
index 6ccb461..d20b480 100755
--- a/tinySIP/include/tinysip/sigcomp/tsip_sigcomp.h
+++ b/tinySIP/include/tinysip/sigcomp/tsip_sigcomp.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.
 *
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;
 
diff --git a/tinySIP/include/tinysip/transports/tsip_transport.h b/tinySIP/include/tinysip/transports/tsip_transport.h
index 44ffd16..d354ece 100755
--- a/tinySIP/include/tinysip/transports/tsip_transport.h
+++ b/tinySIP/include/tinysip/transports/tsip_transport.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.
 *
@@ -46,83 +46,80 @@ TSIP_BEGIN_DECLS
 #define TSIP_TRANSPORT(self)											((tsip_transport_t*)(self))
 
 enum {
-	TSIP_TRANSPORT_IDX_UDP,
-	TSIP_TRANSPORT_IDX_DTLS,
-	TSIP_TRANSPORT_IDX_TCP,
-	TSIP_TRANSPORT_IDX_TLS,
-	TSIP_TRANSPORT_IDX_WS,
-	TSIP_TRANSPORT_IDX_WSS,
-
-	TSIP_TRANSPORT_IDX_MAX
+    TSIP_TRANSPORT_IDX_UDP,
+    TSIP_TRANSPORT_IDX_DTLS,
+    TSIP_TRANSPORT_IDX_TCP,
+    TSIP_TRANSPORT_IDX_TLS,
+    TSIP_TRANSPORT_IDX_WS,
+    TSIP_TRANSPORT_IDX_WSS,
+
+    TSIP_TRANSPORT_IDX_MAX
 };
 
-typedef struct tsip_transport_idx_xs 
-{ 
-	int idx; 
-	const char* name;
-	enum tnet_socket_type_e type;
-} 
+typedef struct tsip_transport_idx_xs {
+    int idx;
+    const char* name;
+    enum tnet_socket_type_e type;
+}
 tsip_transport_idx_xt;
 
 const tsip_transport_idx_xt* tsip_transport_get_by_name(const char* name);
 int tsip_transport_get_idx_by_name(const char* name);
 enum tnet_socket_type_e tsip_transport_get_type_by_name(const char* name);
 
-typedef struct tsip_transport_stream_peer_s
-{
-	TSK_DECLARE_OBJECT;
-
-	tnet_fd_t local_fd;  // not owner: do not close
-	enum tnet_socket_type_e type;
-	tsk_bool_t connected;
-	uint64_t time_latest_activity; // in milliseconds
-	uint64_t time_added; // in milliseconds
-	tsk_bool_t got_valid_sip_msg; // whether we got at least one valid SIP message on this peer
-	
-	tsk_buffer_t *rcv_buff_stream;
-	tsk_buffer_t *snd_buff_stream;
-
-	// list of dialogs managed by this peer
-	tsk_strings_L_t *dialogs_cids;
-
-	// temp buffers used to send/recv websocket data before (un)masking
-	struct{
-		void* rcv_buffer;
-		uint64_t rcv_buffer_size;
-		void* snd_buffer;
-		uint64_t snd_buffer_size;
-		tsk_bool_t handshaking_done;
-	} ws;
-
-	tnet_ip_t remote_ip;
-	tnet_port_t remote_port;
+typedef struct tsip_transport_stream_peer_s {
+    TSK_DECLARE_OBJECT;
+
+    tnet_fd_t local_fd;  // not owner: do not close
+    enum tnet_socket_type_e type;
+    tsk_bool_t connected;
+    uint64_t time_latest_activity; // in milliseconds
+    uint64_t time_added; // in milliseconds
+    tsk_bool_t got_valid_sip_msg; // whether we got at least one valid SIP message on this peer
+
+    tsk_buffer_t *rcv_buff_stream;
+    tsk_buffer_t *snd_buff_stream;
+
+    // list of dialogs managed by this peer
+    tsk_strings_L_t *dialogs_cids;
+
+    // temp buffers used to send/recv websocket data before (un)masking
+    struct {
+        void* rcv_buffer;
+        uint64_t rcv_buffer_size;
+        void* snd_buffer;
+        uint64_t snd_buffer_size;
+        tsk_bool_t handshaking_done;
+    } ws;
+
+    tnet_ip_t remote_ip;
+    tnet_port_t remote_port;
 }
 tsip_transport_stream_peer_t;
 TINYSIP_GEXTERN const tsk_object_def_t *tsip_transport_stream_peer_def_t;
 typedef tsk_list_t tsip_transport_stream_peers_L_t;
 
-typedef struct tsip_transport_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_transport_s {
+    TSK_DECLARE_OBJECT;
 
-	tsk_bool_t initialized;
+    tsk_bool_t initialized;
 
-	int32_t idx;
+    int32_t idx;
 
-	const struct tsip_stack_s *stack;
+    const struct tsip_stack_s *stack;
 
-	tnet_socket_type_t type;
-	struct sockaddr_storage pcscf_addr;
-	tnet_fd_t connectedFD;
-	tnet_transport_handle_t *net_transport;
+    tnet_socket_type_t type;
+    struct sockaddr_storage pcscf_addr;
+    tnet_fd_t connectedFD;
+    tnet_transport_handle_t *net_transport;
 
-	const char *scheme;
-	const char *protocol;
-	const char *via_protocol;
-	const char *service; /**< NAPTR service name */
+    const char *scheme;
+    const char *protocol;
+    const char *via_protocol;
+    const char *service; /**< NAPTR service name */
 
-	tsip_transport_stream_peers_L_t* stream_peers;
-	int32_t stream_peers_count;
+    tsip_transport_stream_peers_L_t* stream_peers;
+    int32_t stream_peers_count;
 }
 tsip_transport_t;
 
diff --git a/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h b/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h
index d67c3ad..38382d5 100755
--- a/tinySIP/include/tinysip/transports/tsip_transport_ipsec.h
+++ b/tinySIP/include/tinysip/transports/tsip_transport_ipsec.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.
 *
@@ -42,31 +42,29 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_TRANSPORT_IPSEC(self)										((tsip_transport_ipsec_t*)(self))
 
-typedef struct tsip_ipsec_association_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_ipsec_association_s {
+    TSK_DECLARE_OBJECT;
 
-	const tsip_transport_t* transport;
+    const tsip_transport_t* transport;
 
-	tipsec_ctx_t* ctx;
-	
-	tnet_socket_t *socket_uc;
-	tnet_socket_t *socket_us;
+    tipsec_ctx_t* ctx;
 
-	tnet_ip_t ip_remote;
-	tnet_ip_t ip_local;
-	tnet_port_t port_local;
+    tnet_socket_t *socket_uc;
+    tnet_socket_t *socket_us;
+
+    tnet_ip_t ip_remote;
+    tnet_ip_t ip_local;
+    tnet_port_t port_local;
 }
 tsip_ipsec_association_t;
 
-typedef struct tsip_transport_ipsec_s
-{
-	TSIP_DECLARE_TRANSPORT;
-	
-	tsip_header_Security_Verifies_L_t* secVerifies;
+typedef struct tsip_transport_ipsec_s {
+    TSIP_DECLARE_TRANSPORT;
+
+    tsip_header_Security_Verifies_L_t* secVerifies;
 
-	tsip_ipsec_association_t* asso_active;
-	tsip_ipsec_association_t* asso_temporary;
+    tsip_ipsec_association_t* asso_active;
+    tsip_ipsec_association_t* asso_temporary;
 }
 tsip_transport_ipsec_t;
 
diff --git a/tinySIP/include/tinysip/transports/tsip_transport_layer.h b/tinySIP/include/tinysip/transports/tsip_transport_layer.h
index 35c4380..2b07c28 100755
--- a/tinySIP/include/tinysip/transports/tsip_transport_layer.h
+++ b/tinySIP/include/tinysip/transports/tsip_transport_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.
 *
@@ -38,14 +38,13 @@
 
 TSIP_BEGIN_DECLS
 
-typedef struct tsip_transport_layer_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_transport_layer_s {
+    TSK_DECLARE_OBJECT;
 
-	const tsip_stack_t *stack;
+    const tsip_stack_t *stack;
 
-	tsk_bool_t running;
-	tsip_transports_L_t *transports;
+    tsk_bool_t running;
+    tsip_transports_L_t *transports;
 }
 tsip_transport_layer_t;
 
diff --git a/tinySIP/include/tinysip/transports/tsip_transport_tls.h b/tinySIP/include/tinysip/transports/tsip_transport_tls.h
index 106a562..89b057b 100755
--- a/tinySIP/include/tinysip/transports/tsip_transport_tls.h
+++ b/tinySIP/include/tinysip/transports/tsip_transport_tls.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.
 *
diff --git a/tinySIP/include/tinysip/tsip_action.h b/tinySIP/include/tinysip/tsip_action.h
index 868421a..15f30a1 100755
--- a/tinySIP/include/tinysip/tsip_action.h
+++ b/tinySIP/include/tinysip/tsip_action.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.
 *
@@ -41,80 +41,78 @@
 
 TSIP_BEGIN_DECLS
 
-typedef uint64_t tsip_action_id_t;			
+typedef uint64_t tsip_action_id_t;
 #define TSIP_ACTION_INVALID_ID				0
 #define TSIP_ACTION_INVALID_HANDLE			tsk_null
 
 /** List of all supported actions */
-typedef enum tsip_action_type_e
-{
-	//! Used as configuration action
-	tsip_atype_config,
-	tsip_atype_dtmf_send,
-
-	/* === REGISTER == */
-	tsip_atype_register, /**< Sends SIP REGISTER request */
-	//! Unregister by sending SIP REGISTER request with expires value equals to zero
+typedef enum tsip_action_type_e {
+    //! Used as configuration action
+    tsip_atype_config,
+    tsip_atype_dtmf_send,
+
+    /* === REGISTER == */
+    tsip_atype_register, /**< Sends SIP REGISTER request */
+    //! Unregister by sending SIP REGISTER request with expires value equals to zero
 #define tsip_atype_unregister tsip_atype_hangup
-	
-	/* === SUBSCRIBE === */
-	tsip_atype_subscribe, /**< Sends SIP SUBSCRIBE request */
-	//! Unsubsribe by sending SIP SUBSCRIBE request with expires value equals to zero
+
+    /* === SUBSCRIBE === */
+    tsip_atype_subscribe, /**< Sends SIP SUBSCRIBE request */
+    //! Unsubsribe by sending SIP SUBSCRIBE request with expires value equals to zero
 #define tsip_atype_unsubscribe tsip_atype_hangup
 
-	/* === MESSAGE === */
-	tsip_atype_message_send, /**< Sends SIP MESSAGE request */
+    /* === MESSAGE === */
+    tsip_atype_message_send, /**< Sends SIP MESSAGE request */
 
-	/* === INFO === */
-	tsip_atype_info_send, /**< Sends SIP INFO request */
+    /* === INFO === */
+    tsip_atype_info_send, /**< Sends SIP INFO request */
 
-	/* === PUBLISH === */
-	tsip_atype_publish, /**< Sends SIP PUBLISH request */
-	//! Unpublish by sending SIP PUBLISH request with expires value equals to zero
+    /* === PUBLISH === */
+    tsip_atype_publish, /**< Sends SIP PUBLISH request */
+    //! Unpublish by sending SIP PUBLISH request with expires value equals to zero
 #define tsip_atype_unpublish tsip_atype_hangup
-	
-	/* === OPTIONS === */
-	tsip_atype_options_send, /**< Sends SIP OPTIONS request */
-
-	/* === INVITE === */
-	tsip_atype_invite, /**< Sends SIP INVITE/reINVITE request */
-	tsip_atype_hold, /**< Puts the session on hold state */
-	tsip_atype_resume, /**< Resumes a previously held session */
-	tsip_atype_ect, /**< Transfer the call */
-	tsip_atype_ect_accept, /**< Accept call transfer request */
-	tsip_atype_ect_reject, /**< Reject call transfer request */
-	tsip_atype_ect_lnotify, /**< Intra-Dialog notify. Never called by the end-user */
-	tsip_atype_lmessage, /**< Large message (MSRP). The session must be connected */
+
+    /* === OPTIONS === */
+    tsip_atype_options_send, /**< Sends SIP OPTIONS request */
+
+    /* === INVITE === */
+    tsip_atype_invite, /**< Sends SIP INVITE/reINVITE request */
+    tsip_atype_hold, /**< Puts the session on hold state */
+    tsip_atype_resume, /**< Resumes a previously held session */
+    tsip_atype_ect, /**< Transfer the call */
+    tsip_atype_ect_accept, /**< Accept call transfer request */
+    tsip_atype_ect_reject, /**< Reject call transfer request */
+    tsip_atype_ect_lnotify, /**< Intra-Dialog notify. Never called by the end-user */
+    tsip_atype_lmessage, /**< Large message (MSRP). The session must be connected */
 #define tsip_atype_bye tsip_atype_hangup
 
 
-	/* === common === */
-	//! Accept incoming call (INVITE) or message (SIP MESSAGE)
-	tsip_atype_accept,
-	//! Reject incoming call (INVITE) or message (SIP MESSAGE)
+    /* === common === */
+    //! Accept incoming call (INVITE) or message (SIP MESSAGE)
+    tsip_atype_accept,
+    //! Reject incoming call (INVITE) or message (SIP MESSAGE)
 #define tsip_atype_reject tsip_atype_hangup
-	//! Cancel an outgoing request
-	tsip_atype_cancel,
-	//! Hangup any SIP dialog (BYE, unREGISTER, unSUBSCRIBE ...). If the dialog is in early state, then it will be canceled.
-	tsip_atype_hangup,
-	//! Shutdown a SIP dialog. Should only be called by the stack.
-	tsip_atype_shutdown,
-	//! Signal transport error. Should only be called by the stack.
-	tsip_atype_transport_error,
+    //! Cancel an outgoing request
+    tsip_atype_cancel,
+    //! Hangup any SIP dialog (BYE, unREGISTER, unSUBSCRIBE ...). If the dialog is in early state, then it will be canceled.
+    tsip_atype_hangup,
+    //! Shutdown a SIP dialog. Should only be called by the stack.
+    tsip_atype_shutdown,
+    //! Signal transport error. Should only be called by the stack.
+    tsip_atype_transport_error,
 }
 tsip_action_type_t;
 
 /* internal enum used to pass parameters from the application layer to the stack */
-typedef enum tsip_action_param_type_e
-{
-	aptype_null = 0,
-	
-	aptype_header,
-	aptype_config,
-	aptype_payload,
-	aptype_resp_line,
-	aptype_media_type,
-	aptype_media,
+typedef enum tsip_action_param_type_e {
+    aptype_null = 0,
+
+    aptype_header,
+    aptype_config,
+    aptype_payload,
+    aptype_resp_line,
+    aptype_media_type,
+    aptype_media,
 }
 tsip_action_param_type_t;
 
@@ -127,32 +125,31 @@ tsip_action_param_type_t;
 #define TSIP_ACTION_SET_NULL()								aptype_null
 
 /* private action object. public api should use tsip_action_handle_t. */
-typedef struct tsip_action_s
-{
-	TSK_DECLARE_OBJECT;
-	
-	tsip_action_type_t type;
-	tsk_params_L_t *headers;
-	tsk_buffer_t* payload;
-
-	struct{
-		short code;
-		char* phrase;
-	} line_resp;
-
-	struct{
-		tmedia_type_t type;
-		tmedia_params_L_t *params;
-	} media;
-
-	struct{
-		int volume; // useless (manager will always use "10")
-		int event;
-	} dtmf;
-
-	struct{
-		char* to;
-	} ect;
+typedef struct tsip_action_s {
+    TSK_DECLARE_OBJECT;
+
+    tsip_action_type_t type;
+    tsk_params_L_t *headers;
+    tsk_buffer_t* payload;
+
+    struct {
+        short code;
+        char* phrase;
+    } line_resp;
+
+    struct {
+        tmedia_type_t type;
+        tmedia_params_L_t *params;
+    } media;
+
+    struct {
+        int volume; // useless (manager will always use "10")
+        int event;
+    } dtmf;
+
+    struct {
+        char* to;
+    } ect;
 }
 tsip_action_t;
 
diff --git a/tinySIP/include/tinysip/tsip_event.h b/tinySIP/include/tinysip/tsip_event.h
index 91e8f4e..1cb347e 100755
--- a/tinySIP/include/tinysip/tsip_event.h
+++ b/tinySIP/include/tinysip/tsip_event.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_EVENT(self)		((tsip_event_t*)(self))
 
-typedef enum tsip_event_type_e
-{	
-	tsip_event_invite,
-	tsip_event_message,
-	tsip_event_info,
-	tsip_event_options,
-	tsip_event_publish,
-	tsip_event_register,
-	tsip_event_subscribe,
-	
-	tsip_event_dialog,
-	tsip_event_stack,
+typedef enum tsip_event_type_e {
+    tsip_event_invite,
+    tsip_event_message,
+    tsip_event_info,
+    tsip_event_options,
+    tsip_event_publish,
+    tsip_event_register,
+    tsip_event_subscribe,
+
+    tsip_event_dialog,
+    tsip_event_stack,
 }
 tsip_event_type_t;
 
@@ -81,20 +80,19 @@ tsip_event_type_t;
 #define tsip_event_code_stack_disconnected			956
 
 
-typedef struct tsip_event_s
-{
-	TSK_DECLARE_OBJECT;
+typedef struct tsip_event_s {
+    TSK_DECLARE_OBJECT;
 
-	tsip_ssession_handle_t* ss;
+    tsip_ssession_handle_t* ss;
 
-	short code;
-	char *phrase;
+    short code;
+    char *phrase;
 
-	tsip_event_type_t type;
-	struct tsip_message_s *sipmessage;
+    tsip_event_type_t type;
+    struct tsip_message_s *sipmessage;
 
-	//! copy of stack user data (needed by sessionless events)
-	const void* userdata;
+    //! copy of stack user data (needed by sessionless events)
+    const void* userdata;
 }
 tsip_event_t;
 #define TSIP_DECLARE_EVENT	tsip_event_t __sipevent__
diff --git a/tinySIP/include/tinysip/tsip_message.h b/tinySIP/include/tinysip/tsip_message.h
index d0442ea..16ad164 100755
--- a/tinySIP/include/tinysip/tsip_message.h
+++ b/tinySIP/include/tinysip/tsip_message.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.
 *
@@ -57,8 +57,8 @@ TSIP_BEGIN_DECLS
 ///**
 // * @struct	tsip_request_line_t
 // *
-// * @brief	Defines SIP request header line. 
-// * ABNF: Request-Line  =  Method SP Request-URI SP SIP-Version CRLF 
+// * @brief	Defines SIP request header line.
+// * ABNF: Request-Line  =  Method SP Request-URI SP SIP-Version CRLF
 // * Ref: RFC 3261 subclause 7.1.
 // * @sa		tsip_status_line_t.
 // *
@@ -77,9 +77,9 @@ TSIP_BEGIN_DECLS
 ///**
 // * @struct	tsip_status_line_t
 // *
-// * @brief	Defines SIP response status line. 
-// * ABNF: Status-Line  =  SIP-Version SP Status-Code SP Reason-Phrase CRLF 
-// * Ref: RFC 3261 subclause 7.2. 
+// * @brief	Defines SIP response status line.
+// * ABNF: Status-Line  =  SIP-Version SP Status-Code SP Reason-Phrase CRLF
+// * Ref: RFC 3261 subclause 7.2.
 // * @sa		tsip_request_line_t.
 // *
 // * @author	Mamadou
@@ -96,60 +96,59 @@ TSIP_BEGIN_DECLS
  * @struct	tsip_message_t
  *
  * @brief	Represents a SIP message. A SIP message is either a request from a client to a server,
- * 			or a response from a server to a client. See RFC 3261 suc-bclause 7. 
+ * 			or a response from a server to a client. See RFC 3261 suc-bclause 7.
  *			You must call @ref tsip_message_create to create a sip message and TSK_OBJECT_SAFE_FREE to free the message.
  *
  * @author	Mamadou
  * @date	12/2/2009
 **/
-typedef struct tsip_message_s
-{
-	TSK_DECLARE_OBJECT;
-	
-	char *sip_version; /**< The SIP version. Only 'SIP/2.0' is supported. */
-	tsip_message_type_t type; /**< The type of this SIP message. */
-
-	/* Request Line */
-	union{
-		struct{
-			char *method; /**< SIP method name. e.g REGISTER, ACK or INVITE.*/
-			tsip_uri_t *uri;	/**< The Request-URI is a SIP or SIPS URI as described in Section 19.1 or a general URI (RFC 2396 [5]).  It indicates
+typedef struct tsip_message_s {
+    TSK_DECLARE_OBJECT;
+
+    char *sip_version; /**< The SIP version. Only 'SIP/2.0' is supported. */
+    tsip_message_type_t type; /**< The type of this SIP message. */
+
+    /* Request Line */
+    union {
+        struct {
+            char *method; /**< SIP method name. e.g REGISTER, ACK or INVITE.*/
+            tsip_uri_t *uri;	/**< The Request-URI is a SIP or SIPS URI as described in Section 19.1 or a general URI (RFC 2396 [5]).  It indicates
 				   the user or service to which this request is being addressed. The Request-URI MUST NOT contain unescaped spaces or control
 				   characters and MUST NOT be enclosed in "<>". */
-			tsip_request_type_t request_type;
-		} request;
-		struct{
-			short status_code; /**< 3-digit integer result code that indicates the outcome of an attempt to understand and satisfy a request. */
-			char *reason_phrase; /**< Textual description related to the status code. */
-		} response;
-	} line;
-	
-	
-	/*== MOST COMMON HEADERS. */
-	tsip_header_Via_t *firstVia; /**< First Via header. */
-	tsip_header_From_t *From;
-	tsip_header_To_t *To;
-	tsip_header_Contact_t *Contact;
-	tsip_header_Call_ID_t *Call_ID;
-	tsip_header_CSeq_t *CSeq;
-	tsip_header_Expires_t *Expires;
-
-	tsip_header_Content_Type_t *Content_Type;
-	tsip_header_Content_Length_t *Content_Length;
-	tsk_buffer_t *Content;
-
-	/*== OTHER HEADERS*/
-	tsip_headers_L_t *headers;
-
-	/*== to hack the message */
-	char* sigcomp_id;
-	tnet_fd_t local_fd;
-	struct sockaddr_storage remote_addr; // Only valid for Dgram
-	tsk_bool_t update;
-	enum tnet_socket_type_e src_net_type;
-	enum tnet_socket_type_e dst_net_type;
-	char* dst_address;
-	tnet_port_t dst_port;
+            tsip_request_type_t request_type;
+        } request;
+        struct {
+            short status_code; /**< 3-digit integer result code that indicates the outcome of an attempt to understand and satisfy a request. */
+            char *reason_phrase; /**< Textual description related to the status code. */
+        } response;
+    } line;
+
+
+    /*== MOST COMMON HEADERS. */
+    tsip_header_Via_t *firstVia; /**< First Via header. */
+    tsip_header_From_t *From;
+    tsip_header_To_t *To;
+    tsip_header_Contact_t *Contact;
+    tsip_header_Call_ID_t *Call_ID;
+    tsip_header_CSeq_t *CSeq;
+    tsip_header_Expires_t *Expires;
+
+    tsip_header_Content_Type_t *Content_Type;
+    tsip_header_Content_Length_t *Content_Length;
+    tsk_buffer_t *Content;
+
+    /*== OTHER HEADERS*/
+    tsip_headers_L_t *headers;
+
+    /*== to hack the message */
+    char* sigcomp_id;
+    tnet_fd_t local_fd;
+    struct sockaddr_storage remote_addr; // Only valid for Dgram
+    tsk_bool_t update;
+    enum tnet_socket_type_e src_net_type;
+    enum tnet_socket_type_e dst_net_type;
+    char* dst_address;
+    tnet_port_t dst_port;
 }
 tsip_message_t;
 
@@ -163,19 +162,19 @@ TINYSIP_API int tsip_message_add_content(tsip_message_t *self, const char* conte
 
 #if defined(__SYMBIAN32__) && 0
 static void TSIP_MESSAGE_ADD_HEADER(tsip_message_t *self, ...)
-	{
-		va_list ap;
-		tsip_header_t *header;
-		const tsk_object_def_t *objdef;
-		
-		va_start(ap, self);
-		objdef = va_arg(ap, const tsk_object_def_t*);
-		header = (tsip_header_t *)tsk_object_new_2(objdef, &ap);
-		va_end(ap);
-
-		tsip_message_add_header(self, header);
-		tsk_object_unref(header);
-	}
+{
+    va_list ap;
+    tsip_header_t *header;
+    const tsk_object_def_t *objdef;
+
+    va_start(ap, self);
+    objdef = va_arg(ap, const tsk_object_def_t*);
+    header = (tsip_header_t *)tsk_object_new_2(objdef, &ap);
+    va_end(ap);
+
+    tsip_message_add_header(self, header);
+    tsk_object_unref(header);
+}
 #else
 #define TSIP_MESSAGE_ADD_HEADER(self, objdef, ...)										\
 	{																					\
diff --git a/tinySIP/include/tinysip/tsip_message_common.h b/tinySIP/include/tinysip/tsip_message_common.h
index c04131c..b5a64bd 100755
--- a/tinySIP/include/tinysip/tsip_message_common.h
+++ b/tinySIP/include/tinysip/tsip_message_common.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.
 *
@@ -103,35 +103,33 @@ TSIP_BEGIN_DECLS
 #define TSIP_RESPONSE_IS_23456(self)		(TSIP_MESSAGE_IS_RESPONSE((self)) && 200<= TSIP_RESPONSE_CODE((self)) && TSIP_RESPONSE_CODE((self)) <= 699)
 #define TSIP_RESPONSE_IS_3456(self)			(TSIP_MESSAGE_IS_RESPONSE((self)) && 300<= TSIP_RESPONSE_CODE((self)) && TSIP_RESPONSE_CODE((self)) <= 699)
 
-/** Defines the message type (Request or Response). 
+/** Defines the message type (Request or Response).
 **/
-typedef enum tsip_message_type_e
-{
-	tsip_unknown,
-	tsip_request,
-	tsip_response
+typedef enum tsip_message_type_e {
+    tsip_unknown,
+    tsip_request,
+    tsip_response
 }
 tsip_message_type_t;
 
 // SWIG
-typedef enum tsip_request_type_e
-{
-	tsip_NONE = 0,
-
-	tsip_ACK,
-	tsip_BYE,
-	tsip_CANCEL,
-	tsip_INVITE,
-	tsip_OPTIONS,
-	tsip_REGISTER,
-	tsip_SUBSCRIBE,
-	tsip_NOTIFY,
-	tsip_REFER,
-	tsip_INFO,
-	tsip_UPDATE,
-	tsip_MESSAGE,
-	tsip_PUBLISH,
-	tsip_PRACK
+typedef enum tsip_request_type_e {
+    tsip_NONE = 0,
+
+    tsip_ACK,
+    tsip_BYE,
+    tsip_CANCEL,
+    tsip_INVITE,
+    tsip_OPTIONS,
+    tsip_REGISTER,
+    tsip_SUBSCRIBE,
+    tsip_NOTIFY,
+    tsip_REFER,
+    tsip_INFO,
+    tsip_UPDATE,
+    tsip_MESSAGE,
+    tsip_PUBLISH,
+    tsip_PRACK
 }
 tsip_request_type_t;
 
diff --git a/tinySIP/include/tinysip/tsip_ssession.h b/tinySIP/include/tinysip/tsip_ssession.h
index 9049a96..b144363 100755
--- a/tinySIP/include/tinysip/tsip_ssession.h
+++ b/tinySIP/include/tinysip/tsip_ssession.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.
 *
@@ -46,7 +46,7 @@ TSIP_BEGIN_DECLS
 struct tsip_message_s;
 struct tsip_action_s;
 
-typedef uint64_t tsip_ssession_id_t;			
+typedef uint64_t tsip_ssession_id_t;
 #define TSIP_SSESSION_INVALID_ID				0
 #define TSIP_SSESSION_INVALID_HANDLE			tsk_null
 
@@ -59,26 +59,25 @@ typedef uint64_t tsip_ssession_id_t;
 
 #define TSIP_SSESSION(self) ((tsip_ssession_t*)(self))
 
-typedef enum tsip_ssession_param_type_e
-{
-	sstype_null = 0,
-	
-	sstype_header,
-	sstype_caps,
-	sstype_userdata,
-	sstype_to_str,
-	sstype_from_str,
-	sstype_to_obj,
-	sstype_from_obj,
-	sstype_nocontact,
-	sstype_expires,
-	sstype_silent_hangup,
-	sstype_sigcomp_id,
-	sstype_auth_ha1,
-	sstype_auth_impi,
-	sstype_parent_id,
-	sstype_ws_src,
-	sstype_media
+typedef enum tsip_ssession_param_type_e {
+    sstype_null = 0,
+
+    sstype_header,
+    sstype_caps,
+    sstype_userdata,
+    sstype_to_str,
+    sstype_from_str,
+    sstype_to_obj,
+    sstype_from_obj,
+    sstype_nocontact,
+    sstype_expires,
+    sstype_silent_hangup,
+    sstype_sigcomp_id,
+    sstype_auth_ha1,
+    sstype_auth_impi,
+    sstype_parent_id,
+    sstype_ws_src,
+    sstype_media
 }
 tsip_ssession_param_type_t;
 
@@ -105,42 +104,41 @@ tsip_ssession_param_type_t;
 #define TSIP_SSESSION_SET_MEDIA(...)													sstype_media, ##__VA_ARGS__
 #define TSIP_SSESSION_SET_NULL()														sstype_null
 
-typedef enum tsip_msession_param_type_e
-{
-	mstype_null = 0,
+typedef enum tsip_msession_param_type_e {
+    mstype_null = 0,
 
-	mstype_set_profile,
-	mstype_set_srtp_mode,
-	mstype_set_avpf_mode,
+    mstype_set_profile,
+    mstype_set_srtp_mode,
+    mstype_set_avpf_mode,
 
-	mstype_set_100rel,
-	mstype_set_rtcp,
-	mstype_set_rtcpmux,
-	mstype_set_ice,
-	mstype_set_ice_stun,
-	mstype_set_ice_turn,
-	mstype_set_stun_server,
-	mstype_set_stun_cred,
+    mstype_set_100rel,
+    mstype_set_rtcp,
+    mstype_set_rtcpmux,
+    mstype_set_ice,
+    mstype_set_ice_stun,
+    mstype_set_ice_turn,
+    mstype_set_stun_server,
+    mstype_set_stun_cred,
 
-	mstype_set_video_fps,
-	mstype_set_video_bw_up,
-	mstype_set_video_bw_down,
-	mstype_set_video_prefsize,
+    mstype_set_video_fps,
+    mstype_set_video_bw_up,
+    mstype_set_video_bw_down,
+    mstype_set_video_prefsize,
 
-	mstype_set_qos,
-	mstype_unset_qos,
+    mstype_set_qos,
+    mstype_unset_qos,
 
-	mstype_set_timers,
-	mstype_unset_timers,
+    mstype_set_timers,
+    mstype_unset_timers,
 
-	mstype_set_codecs,
+    mstype_set_codecs,
 
-	mstype_set_bypass_encoding,
-	mstype_set_bypass_decoding,
+    mstype_set_bypass_encoding,
+    mstype_set_bypass_decoding,
 
-	mstype_set_rtp_ssrc,
+    mstype_set_rtp_ssrc,
 
-	mstype_set_msrp_cb
+    mstype_set_msrp_cb
 }
 tsip_msession_param_type_t;
 
@@ -175,100 +173,99 @@ tsip_msession_param_type_t;
 
 #define TSIP_MSESSION_SET_NULL()			mstype_null
 
-typedef struct tsip_ssession_s
-{
-	TSK_DECLARE_OBJECT;
-	
-	tsip_ssession_id_t id;
-	tsip_ssession_id_t id_parent; //for call transfer
-	unsigned owner:1;
-	
-	const struct tsip_stack_s* stack;
-	const void* userdata;
-
-	//=======
-	// SIP
-	//=======
-	tsk_params_L_t *caps;
-	tsk_params_L_t *headers;
-	
-	unsigned no_contact:1;
-	struct tsip_uri_s* from;
-	struct tsip_uri_s* to;
-	int64_t expires;
-	tsk_bool_t silent_hangup;
-	char* sigcomp_id;
-	char* auth_ha1;
-	char* auth_impi;
-
-	//=======
-	// WebSocket
-	//=======
-	struct{
-		// used when the stack is running in webrtc2sip mode to store the 'origin' (a.k.a 'src')
-		struct{
-			char* host;
-			tsk_istr_t port;
-			char* proto;
-		} src;
-	} ws;
-
-	//=======
-	// Media
-	//=======
-	struct{
-		tmedia_type_t type;
-		tmedia_profile_t profile;
-		tmedia_srtp_mode_t srtp_mode;
-		tmedia_mode_t avpf_mode;
-		tmedia_codec_id_t codecs;
-		tsk_bool_t bypass_encoding;
-		tsk_bool_t bypass_decoding;
-
-		/* Video */
-		int32_t video_fps;
-		int32_t video_bw_up;
-		int32_t video_bw_down;
-		tmedia_pref_video_size_t video_pref_size;
-
-		/* RTP*/
-		struct{
-			struct{
-				uint32_t audio;
-				uint32_t video;
-			}ssrc;
-		} rtp;
-
-		/* Session timers */
-		struct{
-			char* refresher;
-			unsigned timeout;
-		} timers;
-		/* QoS */
-		struct{
-			tmedia_qos_stype_t type;
-			tmedia_qos_strength_t strength;
-		} qos;
-		/* MSRP */
-		struct{
-			tmedia_session_msrp_cb_f callback;
-		} msrp;
-		/* STUN */
-		struct{
-			char* username;
-			char* password;
-			char* hostname;
-			uint16_t port;
-		} stun;
-
-		/* Features */
-		unsigned enable_100rel:1;
-		unsigned enable_ice:1;
-		unsigned enable_icestun:1;
-		unsigned enable_iceturn:1;
-		unsigned enable_rtcp:1;
-		unsigned enable_rtcpmux:1;
-	} media;
+typedef struct tsip_ssession_s {
+    TSK_DECLARE_OBJECT;
+
+    tsip_ssession_id_t id;
+    tsip_ssession_id_t id_parent; //for call transfer
+    unsigned owner:1;
+
+    const struct tsip_stack_s* stack;
+    const void* userdata;
+
+    //=======
+    // SIP
+    //=======
+    tsk_params_L_t *caps;
+    tsk_params_L_t *headers;
+
+    unsigned no_contact:1;
+    struct tsip_uri_s* from;
+    struct tsip_uri_s* to;
+    int64_t expires;
+    tsk_bool_t silent_hangup;
+    char* sigcomp_id;
+    char* auth_ha1;
+    char* auth_impi;
+
+    //=======
+    // WebSocket
+    //=======
+    struct {
+        // used when the stack is running in webrtc2sip mode to store the 'origin' (a.k.a 'src')
+        struct {
+            char* host;
+            tsk_istr_t port;
+            char* proto;
+        } src;
+    } ws;
+
+    //=======
+    // Media
+    //=======
+    struct {
+        tmedia_type_t type;
+        tmedia_profile_t profile;
+        tmedia_srtp_mode_t srtp_mode;
+        tmedia_mode_t avpf_mode;
+        tmedia_codec_id_t codecs;
+        tsk_bool_t bypass_encoding;
+        tsk_bool_t bypass_decoding;
+
+        /* Video */
+        int32_t video_fps;
+        int32_t video_bw_up;
+        int32_t video_bw_down;
+        tmedia_pref_video_size_t video_pref_size;
+
+        /* RTP*/
+        struct {
+            struct {
+                uint32_t audio;
+                uint32_t video;
+            } ssrc;
+        } rtp;
+
+        /* Session timers */
+        struct {
+            char* refresher;
+            unsigned timeout;
+        } timers;
+        /* QoS */
+        struct {
+            tmedia_qos_stype_t type;
+            tmedia_qos_strength_t strength;
+        } qos;
+        /* MSRP */
+        struct {
+            tmedia_session_msrp_cb_f callback;
+        } msrp;
+        /* STUN */
+        struct {
+            char* username;
+            char* password;
+            char* hostname;
+            uint16_t port;
+        } stun;
+
+        /* Features */
+        unsigned enable_100rel:1;
+        unsigned enable_ice:1;
+        unsigned enable_icestun:1;
+        unsigned enable_iceturn:1;
+        unsigned enable_rtcp:1;
+        unsigned enable_rtcpmux:1;
+    } media;
 }
 tsip_ssession_t;
 
diff --git a/tinySIP/include/tinysip/tsip_timers.h b/tinySIP/include/tinysip/tsip_timers.h
index 52fddc5..5d63b07 100755
--- a/tinySIP/include/tinysip/tsip_timers.h
+++ b/tinySIP/include/tinysip/tsip_timers.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.
 *
@@ -55,31 +55,29 @@ TSIP_BEGIN_DECLS
 //extern const char *timerL;
 //extern const char *timerM;
 
-typedef struct tsip_timer_s
-{
-	tsk_timer_id_t id;
-	uint64_t timeout;
+typedef struct tsip_timer_s {
+    tsk_timer_id_t id;
+    uint64_t timeout;
 }
 tsip_timer_t;
 
-typedef struct tsip_timers_s
-{
-	uint32_t T1;
-	uint32_t T2;
-	uint32_t T4;
-	uint32_t A;
-	uint32_t B;
-	uint32_t C;
-	uint32_t D;
-	uint32_t E;
-	uint32_t F;
-	uint32_t G;
-	uint32_t H;
-	uint32_t I;
-	uint32_t J;
-	uint32_t K;
-	uint32_t L;
-	uint32_t M;
+typedef struct tsip_timers_s {
+    uint32_t T1;
+    uint32_t T2;
+    uint32_t T4;
+    uint32_t A;
+    uint32_t B;
+    uint32_t C;
+    uint32_t D;
+    uint32_t E;
+    uint32_t F;
+    uint32_t G;
+    uint32_t H;
+    uint32_t I;
+    uint32_t J;
+    uint32_t K;
+    uint32_t L;
+    uint32_t M;
 }
 tsip_timers_t;
 
diff --git a/tinySIP/include/tinysip/tsip_uri.h b/tinySIP/include/tinysip/tsip_uri.h
index b0daf6b..f30414d 100755
--- a/tinySIP/include/tinysip/tsip_uri.h
+++ b/tinySIP/include/tinysip/tsip_uri.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,21 +40,19 @@ TSIP_BEGIN_DECLS
 
 #define TSIP_URI_IS_SECURE(uri)		((uri && uri->type==uri_sips) ? tsk_true : tsk_false)
 
-typedef enum tsip_uri_type_e
-{
-	uri_unknown,
-	uri_sip,
-	uri_sips,
-	uri_tel
+typedef enum tsip_uri_type_e {
+    uri_unknown,
+    uri_sip,
+    uri_sips,
+    uri_tel
 }
 tsip_uri_type_t;
 
-typedef enum tsip_host_type_e
-{
-	host_unknown,
-	host_hostname,
-	host_ipv4,
-	host_ipv6
+typedef enum tsip_host_type_e {
+    host_unknown,
+    host_hostname,
+    host_ipv4,
+    host_ipv6
 }
 tsip_host_type_t;
 
@@ -63,20 +61,19 @@ tsip_host_type_t;
 /// @brief	SIP/SIPS/TEL URI.
 ///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct tsip_uri_s
-{
-	TSK_DECLARE_OBJECT;
-
-	tsip_uri_type_t type;
-	char *scheme;
-	char *host; /**< Host name. Hostname or IPv4address or IPv6address. */
-	tsip_host_type_t host_type; /**< IPv4 or IPv6 or domain name. */
-	uint16_t port;
-	char *user_name;
-	char *password;
-	char *display_name;
-
-	tsk_params_L_t *params; /**< list of @ref tsk_param_t elements containing all parameters. */
+typedef struct tsip_uri_s {
+    TSK_DECLARE_OBJECT;
+
+    tsip_uri_type_t type;
+    char *scheme;
+    char *host; /**< Host name. Hostname or IPv4address or IPv6address. */
+    tsip_host_type_t host_type; /**< IPv4 or IPv6 or domain name. */
+    uint16_t port;
+    char *user_name;
+    char *password;
+    char *display_name;
+
+    tsk_params_L_t *params; /**< list of @ref tsk_param_t elements containing all parameters. */
 }
 tsip_uri_t;
 
diff --git a/tinySIP/include/tinysip_config.h b/tinySIP/include/tinysip_config.h
index 2f95cde..0c23c45 100755
--- a/tinySIP/include/tinysip_config.h
+++ b/tinySIP/include/tinysip_config.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.
 *
@@ -61,7 +61,7 @@
 #	define TSIP_BEGIN_DECLS extern "C" {
 #	define TSIP_END_DECLS }
 #else
-#	define TSIP_BEGIN_DECLS 
+#	define TSIP_BEGIN_DECLS
 #	define TSIP_END_DECLS
 #endif
 
@@ -90,7 +90,7 @@
 #endif
 
 #if HAVE_CONFIG_H
-	#include <config.h>
+#include <config.h>
 #endif
 
 #endif // TINYSIP_CONFIG_H
diff --git a/tinySIP/include/tsip.h b/tinySIP/include/tsip.h
index 0a1d79b..30eb50a 100755
--- a/tinySIP/include/tsip.h
+++ b/tinySIP/include/tsip.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.
 *
@@ -58,65 +58,63 @@ typedef uint8_t amf_t[2];
 typedef uint8_t operator_id_t[16];
 
 // @tinyWRAP
-typedef enum tsip_stack_mode_e
-{
-	tsip_stack_mode_ua,
-	tsip_stack_mode_p2p,
-	tsip_stack_mode_webrtc2sip,
-	tsip_stack_mode_mcu
+typedef enum tsip_stack_mode_e {
+    tsip_stack_mode_ua,
+    tsip_stack_mode_p2p,
+    tsip_stack_mode_webrtc2sip,
+    tsip_stack_mode_mcu
 }
 tsip_stack_mode_t;
 #define TSIP_STACK_MODE_IS_SERVER(stack) ((stack)->network.mode == tsip_stack_mode_webrtc2sip || (stack)->network.mode == tsip_stack_mode_mcu)
 #define TSIP_STACK_MODE_IS_CLIENT(stack) (!TSIP_STACK_MODE_IS_SERVER((stack)))
 
-typedef enum tsip_stack_param_type_e
-{
-	tsip_pname_null = 0,
-	
-	/* === Identity === */
-	tsip_pname_display_name,
-	tsip_pname_impu,
-	tsip_pname_preferred_id,
-	tsip_pname_impi,
-	tsip_pname_password,
-
-	/* === SigComp === */
-	tsip_pname_sigcomp,
-	tsip_pname_sigcomp_add_compartment,
-	tsip_pname_sigcomp_remove_compartment,
-
-	/* === Network === */
-	tsip_pname_realm,
-	tsip_pname_local_ip,
-	tsip_pname_local_port,
-	tsip_pname_aor,
-	tsip_pname_discovery_naptr,
-	tsip_pname_discovery_dhcp,
-	tsip_pname_proxy_cscf,
-	tsip_pname_dnsserver,
-	tsip_pname_max_fds,
-	tsip_pname_mode,
-
-	
-	/* === Security === */
-	tsip_pname_early_ims,
-	tsip_pname_secagree_ipsec,
-	tsip_pname_secagree_tls,
-	tsip_pname_amf,
-	tsip_pname_operator_id,
-	tsip_pname_tls_certs,
-	tsip_pname_ipsec_params,
-
-	/* === Dummy Headers === */
-	tsip_pname_header,
-
-	/* Nat Traversal */
-	tsip_pname_stun_enabled,
-	tsip_pname_stun_server,
-	tsip_pname_stun_cred,
-
-	/* === User Data === */
-	tsip_pname_userdata,
+typedef enum tsip_stack_param_type_e {
+    tsip_pname_null = 0,
+
+    /* === Identity === */
+    tsip_pname_display_name,
+    tsip_pname_impu,
+    tsip_pname_preferred_id,
+    tsip_pname_impi,
+    tsip_pname_password,
+
+    /* === SigComp === */
+    tsip_pname_sigcomp,
+    tsip_pname_sigcomp_add_compartment,
+    tsip_pname_sigcomp_remove_compartment,
+
+    /* === Network === */
+    tsip_pname_realm,
+    tsip_pname_local_ip,
+    tsip_pname_local_port,
+    tsip_pname_aor,
+    tsip_pname_discovery_naptr,
+    tsip_pname_discovery_dhcp,
+    tsip_pname_proxy_cscf,
+    tsip_pname_dnsserver,
+    tsip_pname_max_fds,
+    tsip_pname_mode,
+
+
+    /* === Security === */
+    tsip_pname_early_ims,
+    tsip_pname_secagree_ipsec,
+    tsip_pname_secagree_tls,
+    tsip_pname_amf,
+    tsip_pname_operator_id,
+    tsip_pname_tls_certs,
+    tsip_pname_ipsec_params,
+
+    /* === Dummy Headers === */
+    tsip_pname_header,
+
+    /* Nat Traversal */
+    tsip_pname_stun_enabled,
+    tsip_pname_stun_server,
+    tsip_pname_stun_cred,
+
+    /* === User Data === */
+    tsip_pname_userdata,
 }
 tsip_stack_param_type_t;
 
@@ -132,7 +130,7 @@ tsip_stack_param_type_t;
 * Sets the user's display name. Used in SIP 'From' and 'To' headers.
 * @param NAME_STR The user's display name.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_DISPLAY_NAME("john doe"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -142,7 +140,7 @@ tsip_stack_param_type_t;
 * Sets the user's IMPU (IMS Public Identity).
 * @param URI_STR A valid SIP/SIPS/tel URI string.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_IMPU("sip:johndoe@open-ims.test"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -152,7 +150,7 @@ tsip_stack_param_type_t;
 * Sets the user's Preferred Identity. Used to populate the P-Preferred-Identity header.
 * @param URI_STR A valid SIP/SIPS/tel URI string.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_PREFERRED_IDENTITY("sip:johndoe@open-ims.test"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -162,7 +160,7 @@ tsip_stack_param_type_t;
 * Sets the user's IMPI (IMS Private Identity).
 * @param IMPI_STR Any string.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_IMPI("johndoe@open-ims.test"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -172,7 +170,7 @@ tsip_stack_param_type_t;
 * Sets the user's password.
 * @param PASSORD_STR Any string.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_PASSWORD("mysecret"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -195,7 +193,7 @@ tsip_stack_param_type_t;
 * @param CPB_UINT Cycles Per Bit. Default value is 64.
 * @param PRES_DICT_BOOL Indicates whether to enable Presence dictionary (RFC 5112) or not. Default value is @a tsk_false.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_SIGCOMP(8192, 8192, 64, tsk_true),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -209,7 +207,7 @@ tsip_stack_param_type_t;
 * @sa @ref TSIP_STACK_UNSET_SIGCOMP_COMPARTMENT()
 *
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_NEW_SIGCOMP_COMPARTMENT("urn:uuid:0C67446E-F1A1-11D9-94D3-000A95A0E128"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -223,7 +221,7 @@ tsip_stack_param_type_t;
 * @sa @ref TSIP_STACK_SET_SIGCOMP_NEW_COMPARTMENT()
 *
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_UNSET_SIGCOMP_COMPARTMENT("urn:uuid:0C67446E-F1A1-11D9-94D3-000A95A0E128"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -238,7 +236,7 @@ tsip_stack_param_type_t;
 * Sets the domain name.
 * @param URI_STR A valid SIP/SIPS URI string.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_REALM("sip:open-ims.test"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -248,7 +246,7 @@ tsip_stack_param_type_t;
 * Sets the user's local IP address.
 * @param IP_STR IPv4/IPv6 IP address or FQDN.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_LOCAL_IP("fe80::"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -260,7 +258,7 @@ tsip_stack_param_type_t;
 * Sets the user's local Port to bind to.
 * @param PORT_UINT Port number. Should be between 0x0400 and 0xFFFF.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_LOCAL_PORT(5060),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -275,7 +273,7 @@ tsip_stack_param_type_t;
 * @param PORT_UINT Port number. Should be between 0x0400 and 0xFFFF.
 * Will be ignored if equals to zero.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_AOR("fe80::", 1234),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -289,7 +287,7 @@ tsip_stack_param_type_t;
 * is missing, then this option will be enabled by default.
 * @param ENABLED_BOOL @a tsk_true (1) or @a tsk_false (0).
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_DISCOVERY_NAPTR(tsk_true),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -302,7 +300,7 @@ tsip_stack_param_type_t;
 * to use will depend on the Proxy-CSCF address type.
 * @param ENABLED_BOOL @a tsk_true (1) or @a tsk_false (0).
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_DISCOVERY_DHCP(tsk_false),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -311,14 +309,14 @@ tsip_stack_param_type_t;
 */
 /**@ingroup tsip_stack_group
 * @def TSIP_STACK_SET_PROXY_CSCF
-* Configures the Proxy-CSCF. 
+* Configures the Proxy-CSCF.
 * @param FQDN_STR The IP address (v4/v6) or FQDN of the Proxy-CSCF.
 * @param PORT_UINT The port.
 * @param TRANSPORT_STR The transport type. Should be: @a "udp" or @a "tcp" or @a "tls" or @a "sctp". Default is @a "udp".
-* @param IP_VERSION_STR The IP version to use. Should be:  @a "ipv4" or @a "ipv6" or @a "ipv46". This parameter is useful when 
+* @param IP_VERSION_STR The IP version to use. Should be:  @a "ipv4" or @a "ipv6" or @a "ipv46". This parameter is useful when
 * @a FQDN_STR parameter is a domain name. default is @a "ipv4".
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_PROXY_CSCF("pcscf-doubango.org", 4060, "tcp", "ipv6"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -331,7 +329,7 @@ tsip_stack_param_type_t;
 * @param IP_STR The IP address or FQDN of the DNS server to add.
 * @code
  // Add two new DNS servers (IPv6 and IPv4)
-int ret = tsip_stack_set(stack, 
+int ret = tsip_stack_set(stack,
               TSIP_STACK_SET_DNS_SERVER("192.16.16.9"),
 			  TSIP_STACK_SET_DNS_SERVER("fe::"),
               TSIP_STACK_SET_NULL());
@@ -341,7 +339,7 @@ int ret = tsip_stack_set(stack,
 * @def TSIP_STACK_SET_MODE_SERVER
 * Configure the stack to be used as server. Cannot be changed later.
 * @code
-int ret = tsip_stack_set(stack, 
+int ret = tsip_stack_set(stack,
               TSIP_STACK_SET_MODE_SERVER(),
               TSIP_STACK_SET_NULL());
 * @endcode
@@ -363,20 +361,20 @@ int ret = tsip_stack_set(stack,
 /* === Security === */
 /**@ingroup tsip_stack_group
 * @def TSIP_STACK_SET_EARLY_IMS
-* Whether to enable 3GPP Early-IMS Security as per 3GPP TS 33.978. 
+* Whether to enable 3GPP Early-IMS Security as per 3GPP TS 33.978.
 * @param ENABLED_BOOL @a tsk_true (1) or @a tsk_false (0).
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_EARLY_IMS(tsk_false),
 *              TSIP_STACK_SET_NULL());
 * @endcode
 */
 /**@ingroup tsip_stack_group
 * @def TSIP_STACK_SET_SECAGREE_IPSEC
-* Whether to enable IPSec security agreement as per IETF RFC 3329. 
+* Whether to enable IPSec security agreement as per IETF RFC 3329.
 * @param ENABLED_BOOL @a tsk_true (1) or @a tsk_false (0).
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_SECAGREE_IPSEC(tsk_true),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -385,10 +383,10 @@ int ret = tsip_stack_set(stack,
 */
 /**@ingroup tsip_stack_group
 * @def TSIP_STACK_SET_SECAGREE_TLS
-* Whether to enable TLS security agreement as per IETF RFC 3329. 
+* Whether to enable TLS security agreement as per IETF RFC 3329.
 * @param ENABLED_BOOL @a tsk_true (1) or @a tsk_false (0).
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_SECAGREE_TLS(tsk_true),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -400,7 +398,7 @@ int ret = tsip_stack_set(stack,
 * Sets AMF (Authentication Management Field) value to use for IMS-AKA authentication.
 * @param AMF_UINT16 16-bit value.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_IMS_AKA_AMF(0x3FB6),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -413,7 +411,7 @@ int ret = tsip_stack_set(stack,
 * @param OPID_HEX_STR 128-bit value as hex-string. If the length of the value supplied by the user is less than 128 bits,
 * then it will be padded with zeros.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_IMS_AKA_OPERATOR_ID("0x5FABC9"), // Will be padded with zeros
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -428,7 +426,7 @@ int ret = tsip_stack_set(stack,
 * @param MODE_STR Mode. Should be: @a "tun" or @a "trans". Default is @a "trans".
 * @param PROTOCOL_STR Protocol. Should be @a "ah" or @a "esp" or @a "ah/esp". Default is @a "esp".
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_SECAGREE_IPSEC(tsk_true),
                TSIP_STACK_SET_IPSEC_PARAMS("hmac-md5-96", "des-ede3-cbc", "trans", "esp"),
 *              TSIP_STACK_SET_NULL());
@@ -443,7 +441,7 @@ int ret = tsip_stack_set(stack,
 * @param PUB_FILE_STR Public cert. file.
 * @param PRIV_FILE_STR Private cert. file.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_TLS_CERTS("C:\\tls\\ca.pki-crt.pem", "C:\\tls\\pub-crt.pem", "C:\\tls\\priv-key.pem"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -467,7 +465,7 @@ int ret = tsip_stack_set(stack,
 * @param NAME_STR The name of the header to add or update.
 * @param VALUE_STR The value of the header to add or update.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_HEADER("User-Agent", "IM-client/OMA1.0 doubango/v1.0.0"),
 *              TSIP_STACK_SET_HEADER("Allow", "INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER"),
 *              TSIP_STACK_SET_NULL());
@@ -480,7 +478,7 @@ int ret = tsip_stack_set(stack,
 * Removes a stack-level header.
 * @param NAME_STR The name of the header to remove.
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_UNSET_HEADER("User-Agent"),
 *              TSIP_STACK_UNSET_HEADER("Allow"),
 *              TSIP_STACK_UNSET_HEADER("My_Header"),
@@ -499,7 +497,7 @@ int ret = tsip_stack_set(stack,
 * @param IP_STR The IPv4/IPv6 address for FQDN of the STUN2/TURN address.
 * @param PORT_UINT The server port (default is 3478 for both TCP and UDP, and 5349 for TLS)
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_STUN_SERVER("numb.viagenie.ca", 3478),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -512,7 +510,7 @@ int ret = tsip_stack_set(stack,
 * @param USR_STR The login.
 * @param PASSORD_STR The password
 * @code
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_STUN_CRED("bob@open-ims.test", "mysecret"),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -530,7 +528,7 @@ int ret = tsip_stack_set(stack,
 * @param DATA_PTR Pointer to the user data.
 * @code
 * const void* context;
-* int ret = tsip_stack_set(stack, 
+* int ret = tsip_stack_set(stack,
 *              TSIP_STACK_SET_USERDATA(context),
 *              TSIP_STACK_SET_NULL());
 * @endcode
@@ -541,131 +539,130 @@ int ret = tsip_stack_set(stack,
 
 
 /* 3GPP IMS/LTE stack (for internal use). only tsip_stack_handle_t should be visible. */
-typedef struct tsip_stack_s
-{
-	TSK_DECLARE_RUNNABLE;
-	TSK_DECLARE_SAFEOBJ;
-	
-	tsk_timer_manager_handle_t* timer_mgr_global;
-	tsk_bool_t started;
-	tsip_stack_callback_f callback;
-
-	/* === Identity === */
-	struct{
-		char* display_name;
-		tsip_uri_t *impu;
-		tsip_uri_t *preferred;
-		char *impi;
-		char *password;
-	} identity;
-
-	/* === SigComp === */
-	struct{
-		tsip_sigcomp_handle_t* handle;
-
-		unsigned dms;
-		unsigned sms;
-		unsigned cpb;
-		tsk_bool_t sip_dict;
-		tsk_bool_t pres_dict;
-	} sigcomp;
-
-	/* === Network === */
-	struct{
-		tsip_stack_mode_t mode;
-
-		char *local_ip[TSIP_TRANSPORT_IDX_MAX];
-		tnet_port_t local_port[TSIP_TRANSPORT_IDX_MAX];
+typedef struct tsip_stack_s {
+    TSK_DECLARE_RUNNABLE;
+    TSK_DECLARE_SAFEOBJ;
+
+    tsk_timer_manager_handle_t* timer_mgr_global;
+    tsk_bool_t started;
+    tsip_stack_callback_f callback;
+
+    /* === Identity === */
+    struct {
+        char* display_name;
+        tsip_uri_t *impu;
+        tsip_uri_t *preferred;
+        char *impi;
+        char *password;
+    } identity;
+
+    /* === SigComp === */
+    struct {
+        tsip_sigcomp_handle_t* handle;
+
+        unsigned dms;
+        unsigned sms;
+        unsigned cpb;
+        tsk_bool_t sip_dict;
+        tsk_bool_t pres_dict;
+    } sigcomp;
+
+    /* === Network === */
+    struct {
+        tsip_stack_mode_t mode;
+
+        char *local_ip[TSIP_TRANSPORT_IDX_MAX];
+        tnet_port_t local_port[TSIP_TRANSPORT_IDX_MAX];
         tsk_bool_t local_ip_is_set_by_user[TSIP_TRANSPORT_IDX_MAX]; // whether the address (ip and port) is set by the user or retrieved
 
-		char *proxy_cscf[TSIP_TRANSPORT_IDX_MAX];
-		tnet_port_t proxy_cscf_port[TSIP_TRANSPORT_IDX_MAX];
-		tnet_socket_type_t proxy_cscf_type[TSIP_TRANSPORT_IDX_MAX];
-		tnet_socket_type_t transport_types[TSIP_TRANSPORT_IDX_MAX];
-		int32_t transport_idx_default;
-		
-		tsip_uri_t *realm;
-		
-		//! IP adddress and port to use as AOR (user-defined)
-		struct{
-			char* ip[TSIP_TRANSPORT_IDX_MAX];
-			tnet_port_t port[TSIP_TRANSPORT_IDX_MAX];
-		} aor;
-		
-		tsk_bool_t discovery_naptr;
-		tsk_bool_t discovery_dhcp;
-
-		tsk_size_t max_fds;
-	} network;
-
-	/* === Security === */
-	struct{
-		char* secagree_mech;
-		tsk_bool_t earlyIMS;
-		operator_id_t operator_id;
-		amf_t amf;
-		
-		/* IPSec */
-		struct{
-			char* alg;
-			char* ealg;
-			char* mode;
-			char* protocol;
-		} ipsec;
-		tsk_bool_t enable_secagree_ipsec;
-		
-		/* TLS */
-		struct {
-			char* ca;
-			char* pbk;
-			char* pvk;
-			tsk_bool_t verify;
-		}tls;
-		tsk_bool_t enable_secagree_tls;
-	} security;
-	
-	
-	
-	
-	
-	
-	
-	
-	tsip_uris_L_t* paths;
-	tsip_uris_L_t* service_routes;
-	tsip_uris_L_t* associated_uris;
-
-	/* DNS context */
-	tnet_dns_ctx_t *dns_ctx;
-
-	/* NAT Traversal context */
-	struct {
-		// STUN
-		struct{
-			char* ip;
-			tnet_port_t port;
-			char* login;
-			char* pwd;
-			tsk_bool_t enabled;
-		} stun;
-		struct tnet_nat_ctx_s* ctx;
-	} natt;
-
-	/* DHCP context */	
-
-	/* QoS */
-
-	/* Internals. */
-	//tsk_timer_manager_handle_t* timer_mgr;
-	tsip_timers_t timers;
-	tsip_ssessions_L_t *ssessions;
-	tsk_params_L_t *headers;
-	const void* userdata;
-
-	/* Layers */
-	struct tsip_dialog_layer_s *layer_dialog;
-	struct tsip_transac_layer_s *layer_transac;
-	struct tsip_transport_layer_s *layer_transport;
+        char *proxy_cscf[TSIP_TRANSPORT_IDX_MAX];
+        tnet_port_t proxy_cscf_port[TSIP_TRANSPORT_IDX_MAX];
+        tnet_socket_type_t proxy_cscf_type[TSIP_TRANSPORT_IDX_MAX];
+        tnet_socket_type_t transport_types[TSIP_TRANSPORT_IDX_MAX];
+        int32_t transport_idx_default;
+
+        tsip_uri_t *realm;
+
+        //! IP adddress and port to use as AOR (user-defined)
+        struct {
+            char* ip[TSIP_TRANSPORT_IDX_MAX];
+            tnet_port_t port[TSIP_TRANSPORT_IDX_MAX];
+        } aor;
+
+        tsk_bool_t discovery_naptr;
+        tsk_bool_t discovery_dhcp;
+
+        tsk_size_t max_fds;
+    } network;
+
+    /* === Security === */
+    struct {
+        char* secagree_mech;
+        tsk_bool_t earlyIMS;
+        operator_id_t operator_id;
+        amf_t amf;
+
+        /* IPSec */
+        struct {
+            char* alg;
+            char* ealg;
+            char* mode;
+            char* protocol;
+        } ipsec;
+        tsk_bool_t enable_secagree_ipsec;
+
+        /* TLS */
+        struct {
+            char* ca;
+            char* pbk;
+            char* pvk;
+            tsk_bool_t verify;
+        } tls;
+        tsk_bool_t enable_secagree_tls;
+    } security;
+
+
+
+
+
+
+
+
+    tsip_uris_L_t* paths;
+    tsip_uris_L_t* service_routes;
+    tsip_uris_L_t* associated_uris;
+
+    /* DNS context */
+    tnet_dns_ctx_t *dns_ctx;
+
+    /* NAT Traversal context */
+    struct {
+        // STUN
+        struct {
+            char* ip;
+            tnet_port_t port;
+            char* login;
+            char* pwd;
+            tsk_bool_t enabled;
+        } stun;
+        struct tnet_nat_ctx_s* ctx;
+    } natt;
+
+    /* DHCP context */
+
+    /* QoS */
+
+    /* Internals. */
+    //tsk_timer_manager_handle_t* timer_mgr;
+    tsip_timers_t timers;
+    tsip_ssessions_L_t *ssessions;
+    tsk_params_L_t *headers;
+    const void* userdata;
+
+    /* Layers */
+    struct tsip_dialog_layer_s *layer_dialog;
+    struct tsip_transac_layer_s *layer_transac;
+    struct tsip_transport_layer_s *layer_transport;
 }
 tsip_stack_t;