Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

conf/dialplan/default.xml

@@ -274,7 +274,15 @@
 
     <extension name="Local_Extension_Skinny">
       <condition field="destination_number" expression="^(11[01][0-9])$">
+	<action application="set" data="dialed_extension=$1"/>
+	<action application="export" data="dialed_extension=$1"/>
+	<action application="set" data="call_timeout=30"/>
+	<action application="set" data="hangup_after_bridge=true"/>
+	<action application="set" data="continue_on_fail=true"/>
         <action application="bridge" data="skinny/internal/${destination_number}"/>
+	<action application="answer"/>
+	<action application="sleep" data="1000"/>
+	<action application="bridge" data="loopback/app=voicemail:default ${domain_name} ${dialed_extension}"/>
       </condition>
     </extension>
 

conf/dialplan/skinny-patterns.xml

@@ -5,7 +5,7 @@
     This context is used for skinny to match dialed number
 
     The special applications:
-    - skinny-route tells skinny to route the call
+    - skinny-process tells skinny to process the call (route, set call forwarding, ...)
     - skinny-drop tells skinny to drop the call
     - skinny-wait tells skinny to wait 'data' seconds for more numbers before drop
 -->

conf/dialplan/skinny-patterns/20-Demo.xml

 <include>
   <extension name="Demo">
     <condition field="destination_number" expression="^(9[0-9]{3})$">
-      <action application="skinny-route"/>
+      <action application="skinny-process"/>
     </condition>
   </extension>
 </include>

conf/dialplan/skinny-patterns/20-Local_extension.xml

 <include>
   <extension name="Local_Extension">
     <condition field="destination_number" expression="^(10[01][0-9])$">
-      <action application="skinny-route"/>
+      <action application="skinny-process"/>
     </condition>
   </extension>
   <extension name="Local_Extension_Skinny">
     <condition field="destination_number" expression="^(11[01][0-9])$">
-      <action application="skinny-route"/>
+      <action application="skinny-process"/>
     </condition>
   </extension>
 </include>

conf/dialplan/skinny-patterns/90-External.xml

 <include>
   <extension name="External">
     <condition field="destination_number" expression="^(0[0-9]{10,})$">
-      <action application="skinny-route"/>
+      <action application="skinny-process"/>
     </condition>
   </extension>
 </include>

src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c

@@ -272,6 +272,7 @@ static int sangoma_create_rtp(void *usr_priv, sngtc_codec_request_leg_t *codec_r
 	}
 	
 	rtp_port = (switch_port_t)(long)*rtp_fd;
+	*rtp_fd = NULL;
 
 	codec_req_leg->host_udp_port = rtp_port;
 
@@ -307,6 +308,9 @@ static int sangoma_destroy_rtp(void *usr_priv, void *fd)
 {
 	switch_memory_pool_t *sesspool;
 	switch_rtp_t *rtp = fd;
+	if (!rtp) {
+		return 0;
+	}
 	sesspool = switch_rtp_get_private(rtp);
 	switch_rtp_destroy(&rtp);
 	switch_core_destroy_memory_pool(&sesspool);

src/mod/endpoints/mod_skinny/mod_skinny.h

@@ -48,66 +48,66 @@
 #define SKINNY_EVENT_DEVICE_TO_USER "skinny::device_to_user"
 
 struct skinny_globals {
-    int running;
-    switch_memory_pool_t *pool;
-    switch_mutex_t *mutex;
-    switch_hash_t *profile_hash;
-    switch_event_node_t *user_to_device_node;
-    switch_event_node_t *call_state_node;
-    switch_event_node_t *message_waiting_node;
-    switch_event_node_t *trap_node;
-    int auto_restart;
+	int running;
+	switch_memory_pool_t *pool;
+	switch_mutex_t *mutex;
+	switch_hash_t *profile_hash;
+	switch_event_node_t *user_to_device_node;
+	switch_event_node_t *call_state_node;
+	switch_event_node_t *message_waiting_node;
+	switch_event_node_t *trap_node;
+	int auto_restart;
 };
 typedef struct skinny_globals skinny_globals_t;
 
 extern skinny_globals_t globals;
 
 typedef enum {
-    PFLAG_LISTENER_READY = (1 << 0),
-    PFLAG_SHOULD_RESPAWN = (1 << 1),
-    PFLAG_RESPAWN = (1 << 2),
+	PFLAG_LISTENER_READY = (1 << 0),
+	PFLAG_SHOULD_RESPAWN = (1 << 1),
+	PFLAG_RESPAWN = (1 << 2),
 } profile_flag_t;
 
 struct skinny_profile {
-    /* prefs */
-    char *name;
-    char *domain;
-    char *ip;
-    unsigned int port;
-    char *dialplan;
-    char *context;
-    char *patterns_dialplan;
-    char *patterns_context;
-    uint32_t keep_alive;
-    char date_format[6];
-    int debug;
+	/* prefs */
+	char *name;
+	char *domain;
+	char *ip;
+	unsigned int port;
+	char *dialplan;
+	char *context;
+	char *patterns_dialplan;
+	char *patterns_context;
+	uint32_t keep_alive;
+	char date_format[6];
+	int debug;
 	int auto_restart;
-    switch_hash_t *soft_key_set_sets_hash;
-    switch_hash_t *device_type_params_hash;
-    /* db */
-    char *dbname;
-    char *odbc_dsn;
-    char *odbc_user;
-    char *odbc_pass;
-    switch_odbc_handle_t *master_odbc;
-    switch_mutex_t *sql_mutex;	
-    /* stats */
-    uint32_t ib_calls;
-    uint32_t ob_calls;
-    uint32_t ib_failed_calls;
-    uint32_t ob_failed_calls;	
-    /* listener */
-    int listener_threads;
-    switch_mutex_t *listener_mutex;	
-    switch_socket_t *sock;
-    switch_mutex_t *sock_mutex;
-    struct listener *listeners;
-    int flags;
-    switch_mutex_t *flag_mutex;
-    /* call id */
-    uint32_t next_call_id;
-    /* others */
-    switch_memory_pool_t *pool;
+	switch_hash_t *soft_key_set_sets_hash;
+	switch_hash_t *device_type_params_hash;
+	/* db */
+	char *dbname;
+	char *odbc_dsn;
+	char *odbc_user;
+	char *odbc_pass;
+	switch_odbc_handle_t *master_odbc;
+	switch_mutex_t *sql_mutex;	
+	/* stats */
+	uint32_t ib_calls;
+	uint32_t ob_calls;
+	uint32_t ib_failed_calls;
+	uint32_t ob_failed_calls;	
+	/* listener */
+	int listener_threads;
+	switch_mutex_t *listener_mutex;	
+	switch_socket_t *sock;
+	switch_mutex_t *sock_mutex;
+	struct listener *listeners;
+	int flags;
+	switch_mutex_t *flag_mutex;
+	/* call id */
+	uint32_t next_call_id;
+	/* others */
+	switch_memory_pool_t *pool;
 };
 typedef struct skinny_profile skinny_profile_t;
 
@@ -117,7 +117,7 @@ struct skinny_device_type_params {
 typedef struct skinny_device_type_params skinny_device_type_params_t;
 
 typedef enum {
-	SKINNY_ACTION_ROUTE,
+	SKINNY_ACTION_PROCESS,
 	SKINNY_ACTION_DROP,
 	SKINNY_ACTION_WAIT
 } skinny_action_t;
@@ -127,7 +127,7 @@ typedef enum {
 /*****************************************************************************/
 
 typedef enum {
-    LFLAG_RUNNING = (1 << 0),
+	LFLAG_RUNNING = (1 << 0),
 } listener_flag_t;
 
 #define SKINNY_MAX_LINES 42
@@ -161,25 +161,25 @@ typedef switch_status_t (*skinny_listener_callback_func_t) (listener_t *listener
 /* CHANNEL TYPES */
 /*****************************************************************************/
 typedef enum {
-    TFLAG_FORCE_ROUTE = (1 << 0),
-    TFLAG_EARLY_MEDIA = (1 << 1),
-    TFLAG_IO = (1 << 2),
-    TFLAG_READING = (1 << 3),
-    TFLAG_WRITING = (1 << 4)
+	TFLAG_FORCE_ROUTE = (1 << 0),
+	TFLAG_EARLY_MEDIA = (1 << 1),
+	TFLAG_IO = (1 << 2),
+	TFLAG_READING = (1 << 3),
+	TFLAG_WRITING = (1 << 4)
 } TFLAGS;
 
 typedef enum {
-    GFLAG_MY_CODEC_PREFS = (1 << 0)
+	GFLAG_MY_CODEC_PREFS = (1 << 0)
 } GFLAGS;
 
 struct private_object {
 	unsigned int flags;
+	switch_mutex_t *flag_mutex;
 	switch_frame_t read_frame;
 	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
 	switch_core_session_t *session;
 	switch_caller_profile_t *caller_profile;
 	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
 
 	/* identification */
 	skinny_profile_t *profile;
@@ -236,7 +236,7 @@ void profile_walk_listeners(skinny_profile_t *profile, skinny_listener_callback_
 switch_cache_db_handle_t *skinny_get_db_handle(skinny_profile_t *profile);
 switch_status_t skinny_execute_sql(skinny_profile_t *profile, char *sql, switch_mutex_t *mutex);
 switch_bool_t skinny_execute_sql_callback(skinny_profile_t *profile,
-										      switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
+		switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
 
 /*****************************************************************************/
 /* LISTENER FUNCTIONS */
@@ -261,8 +261,8 @@ switch_status_t channel_on_routing(switch_core_session_t *session);
 switch_status_t channel_on_exchange_media(switch_core_session_t *session);
 switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-												    switch_caller_profile_t *outbound_profile,
-												    switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
+		switch_caller_profile_t *outbound_profile,
+		switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
 switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);

src/mod/endpoints/mod_skinny/skinny_tables.h

@@ -36,55 +36,55 @@
 /* SKINNY TABLES */
 /*****************************************************************************/
 struct skinny_table {
-    uint32_t id;
-    const char *name;
+	uint32_t id;
+	const char *name;
 };
 
 #define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
-const char *func(uint32_t id) \
+	const char *func(uint32_t id) \
 { \
-    const char *str = DEFAULT_STR; \
-    uint8_t x; \
-    \
-    for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-	    if (TABLE[x].id == id) {\
-		    str = TABLE[x].name;\
-		    break;\
-	    }\
-    }\
-    \
-    return str;\
+	const char *str = DEFAULT_STR; \
+	uint8_t x; \
+	\
+	for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+		if (TABLE[x].id == id) {\
+			str = TABLE[x].name;\
+			break;\
+		}\
+	}\
+	\
+	return str;\
 }
 
 #define SKINNY_DECLARE_STR2ID(func, TABLE, DEFAULT_ID) \
-uint32_t func(const char *str)\
+	uint32_t func(const char *str)\
 {\
-    uint32_t id = (uint32_t) DEFAULT_ID;\
-    \
-    if (*str > 47 && *str < 58) {\
-	    id = atoi(str);\
-    } else {\
-	    uint8_t x;\
-	    for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
-		    if (!strcasecmp(TABLE[x].name, str)) {\
-			    id = TABLE[x].id;\
-			    break;\
-		    }\
-	    }\
-    }\
-    return id;\
+	uint32_t id = (uint32_t) DEFAULT_ID;\
+	\
+	if (*str > 47 && *str < 58) {\
+		id = atoi(str);\
+	} else {\
+		uint8_t x;\
+		for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
+			if (!strcasecmp(TABLE[x].name, str)) {\
+				id = TABLE[x].id;\
+				break;\
+			}\
+		}\
+	}\
+	return id;\
 }
 
 #define SKINNY_DECLARE_PUSH_MATCH(TABLE) \
-    switch_console_callback_match_t *my_matches = NULL;\
-    uint8_t x;\
-    for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-	    switch_console_push_match(&my_matches, TABLE[x].name);\
-    }\
-    if (my_matches) {\
-	    *matches = my_matches;\
-	    status = SWITCH_STATUS_SUCCESS;\
-    }
+	switch_console_callback_match_t *my_matches = NULL;\
+uint8_t x;\
+for (x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+	switch_console_push_match(&my_matches, TABLE[x].name);\
+}\
+if (my_matches) {\
+	*matches = my_matches;\
+	status = SWITCH_STATUS_SUCCESS;\
+}
 
 
 extern struct skinny_table SKINNY_MESSAGE_TYPES[72];
@@ -98,20 +98,20 @@ uint32_t skinny_str2device_type(const char *str);
 #define SKINNY_PUSH_DEVICE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_DEVICE_TYPES)
 
 enum skinny_tone {
-    SKINNY_TONE_SILENCE = 0x00,
-    SKINNY_TONE_DIALTONE = 0x21,
-    SKINNY_TONE_BUSYTONE = 0x23,
-    SKINNY_TONE_ALERT = 0x24,
-    SKINNY_TONE_REORDER = 0x25,
-    SKINNY_TONE_CALLWAITTONE = 0x2D,
-    SKINNY_TONE_NOTONE = 0x7F,
+	SKINNY_TONE_SILENCE = 0x00,
+	SKINNY_TONE_DIALTONE = 0x21,
+	SKINNY_TONE_BUSYTONE = 0x23,
+	SKINNY_TONE_ALERT = 0x24,
+	SKINNY_TONE_REORDER = 0x25,
+	SKINNY_TONE_CALLWAITTONE = 0x2D,
+	SKINNY_TONE_NOTONE = 0x7F,
 };
 
 enum skinny_ring_type {
-    SKINNY_RING_OFF = 1,
-    SKINNY_RING_INSIDE = 2,
-    SKINNY_RING_OUTSIDE = 3,
-    SKINNY_RING_FEATURE = 4
+	SKINNY_RING_OFF = 1,
+	SKINNY_RING_INSIDE = 2,
+	SKINNY_RING_OUTSIDE = 3,
+	SKINNY_RING_FEATURE = 4
 };
 extern struct skinny_table SKINNY_RING_TYPES[5];
 const char *skinny_ring_type2str(uint32_t id);
@@ -119,8 +119,8 @@ uint32_t skinny_str2ring_type(const char *str);
 #define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)
 
 enum skinny_ring_mode {
-    SKINNY_RING_FOREVER = 1,
-    SKINNY_RING_ONCE = 2,
+	SKINNY_RING_FOREVER = 1,
+	SKINNY_RING_ONCE = 2,
 };
 extern struct skinny_table SKINNY_RING_MODES[3];
 const char *skinny_ring_mode2str(uint32_t id);
@@ -129,11 +129,11 @@ uint32_t skinny_str2ring_mode(const char *str);
 
 
 enum skinny_lamp_mode {
-    SKINNY_LAMP_OFF = 1,
-    SKINNY_LAMP_ON = 2,
-    SKINNY_LAMP_WINK = 3,
-    SKINNY_LAMP_FLASH = 4,
-    SKINNY_LAMP_BLINK = 5,
+	SKINNY_LAMP_OFF = 1,
+	SKINNY_LAMP_ON = 2,
+	SKINNY_LAMP_WINK = 3,
+	SKINNY_LAMP_FLASH = 4,
+	SKINNY_LAMP_BLINK = 5,
 };
 extern struct skinny_table SKINNY_LAMP_MODES[6];
 const char *skinny_lamp_mode2str(uint32_t id);
@@ -141,8 +141,8 @@ uint32_t skinny_str2lamp_mode(const char *str);
 #define SKINNY_PUSH_LAMP_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_LAMP_MODES)
 
 enum skinny_speaker_mode {
-    SKINNY_SPEAKER_ON = 1,
-    SKINNY_SPEAKER_OFF = 2,
+	SKINNY_SPEAKER_ON = 1,
+	SKINNY_SPEAKER_OFF = 2,
 };
 extern struct skinny_table SKINNY_SPEAKER_MODES[3];
 const char *skinny_speaker_mode2str(uint32_t id);
@@ -150,22 +150,22 @@ uint32_t skinny_str2speaker_mode(const char *str);
 #define SKINNY_PUSH_SPEAKER_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_SPEAKER_MODES)
 
 enum skinny_call_type {
-    SKINNY_INBOUND_CALL = 1,
-    SKINNY_OUTBOUND_CALL = 2,
-    SKINNY_FORWARD_CALL = 3,
+	SKINNY_INBOUND_CALL = 1,
+	SKINNY_OUTBOUND_CALL = 2,
+	SKINNY_FORWARD_CALL = 3,
 };
 
 enum skinny_button_definition {
-    SKINNY_BUTTON_UNKNOWN = 0x00,
-    SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
-    SKINNY_BUTTON_SPEED_DIAL = 0x02,
-    SKINNY_BUTTON_HOLD = 0x03,
-    SKINNY_BUTTON_TRANSFER = 0x04,
-    SKINNY_BUTTON_LINE = 0x09,
-    SKINNY_BUTTON_VOICEMAIL = 0x0F,
-    SKINNY_BUTTON_PRIVACY = 0x13,
-    SKINNY_BUTTON_SERVICE_URL = 0x14,
-    SKINNY_BUTTON_UNDEFINED = 0xFF,
+	SKINNY_BUTTON_UNKNOWN = 0x00,
+	SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
+	SKINNY_BUTTON_SPEED_DIAL = 0x02,
+	SKINNY_BUTTON_HOLD = 0x03,
+	SKINNY_BUTTON_TRANSFER = 0x04,
+	SKINNY_BUTTON_LINE = 0x09,
+	SKINNY_BUTTON_VOICEMAIL = 0x0F,
+	SKINNY_BUTTON_PRIVACY = 0x13,
+	SKINNY_BUTTON_SERVICE_URL = 0x14,
+	SKINNY_BUTTON_UNDEFINED = 0xFF,
 };
 extern struct skinny_table SKINNY_BUTTONS[11];
 const char *skinny_button2str(uint32_t id);
@@ -173,26 +173,26 @@ uint32_t skinny_str2button(const char *str);
 #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
 
 enum skinny_soft_key_event {
-    SOFTKEY_REDIAL = 0x01,
-    SOFTKEY_NEWCALL = 0x02,
-    SOFTKEY_HOLD = 0x03,
-    SOFTKEY_TRANSFER = 0x04,
-    SOFTKEY_CFWDALL = 0x05,
-    SOFTKEY_CFWDBUSY = 0x06,
-    SOFTKEY_CFWDNOANSWER = 0x07,
-    SOFTKEY_BACKSPACE = 0x08,
-    SOFTKEY_ENDCALL = 0x09,
-    SOFTKEY_RESUME = 0x0A,
-    SOFTKEY_ANSWER = 0x0B,
-    SOFTKEY_INFO = 0x0C,
-    SOFTKEY_CONFRM = 0x0D,
-    SOFTKEY_PARK = 0x0E,
-    SOFTKEY_JOIN = 0x0F,
-    SOFTKEY_MEETMECONFRM = 0x10,
-    SOFTKEY_CALLPICKUP = 0x11,
-    SOFTKEY_GRPCALLPICKUP = 0x12,
-    SOFTKEY_DND = 0x13,
-    SOFTKEY_IDIVERT = 0x14,
+	SOFTKEY_REDIAL = 0x01,
+	SOFTKEY_NEWCALL = 0x02,
+	SOFTKEY_HOLD = 0x03,
+	SOFTKEY_TRANSFER = 0x04,
+	SOFTKEY_CFWDALL = 0x05,
+	SOFTKEY_CFWDBUSY = 0x06,
+	SOFTKEY_CFWDNOANSWER = 0x07,
+	SOFTKEY_BACKSPACE = 0x08,
+	SOFTKEY_ENDCALL = 0x09,
+	SOFTKEY_RESUME = 0x0A,
+	SOFTKEY_ANSWER = 0x0B,
+	SOFTKEY_INFO = 0x0C,
+	SOFTKEY_CONFRM = 0x0D,
+	SOFTKEY_PARK = 0x0E,
+	SOFTKEY_JOIN = 0x0F,
+	SOFTKEY_MEETMECONFRM = 0x10,
+	SOFTKEY_CALLPICKUP = 0x11,
+	SOFTKEY_GRPCALLPICKUP = 0x12,
+	SOFTKEY_DND = 0x13,
+	SOFTKEY_IDIVERT = 0x14,
 };
 extern struct skinny_table SKINNY_SOFT_KEY_EVENTS[21];
 const char *skinny_soft_key_event2str(uint32_t id);
@@ -200,17 +200,17 @@ uint32_t skinny_str2soft_key_event(const char *str);
 #define SKINNY_PUSH_SOFT_KEY_EVENTS SKINNY_DECLARE_PUSH_MATCH(SOFT_KEY_EVENTS)
 
 enum skinny_key_set {
-    SKINNY_KEY_SET_ON_HOOK = 0,
-    SKINNY_KEY_SET_CONNECTED = 1,
-    SKINNY_KEY_SET_ON_HOLD = 2,
-    SKINNY_KEY_SET_RING_IN = 3,
-    SKINNY_KEY_SET_OFF_HOOK = 4,
-    SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
-    SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
-    SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
-    SKINNY_KEY_SET_RING_OUT = 8,
-    SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
-    SKINNY_KEY_SET_IN_USE_HINT = 10,
+	SKINNY_KEY_SET_ON_HOOK = 0,
+	SKINNY_KEY_SET_CONNECTED = 1,
+	SKINNY_KEY_SET_ON_HOLD = 2,
+	SKINNY_KEY_SET_RING_IN = 3,
+	SKINNY_KEY_SET_OFF_HOOK = 4,
+	SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
+	SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
+	SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
+	SKINNY_KEY_SET_RING_OUT = 8,
+	SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
+	SKINNY_KEY_SET_IN_USE_HINT = 10,
 };
 extern struct skinny_table SKINNY_KEY_SETS[12];
 const char *skinny_soft_key_set2str(uint32_t id);
@@ -219,20 +219,20 @@ uint32_t skinny_str2soft_key_set(const char *str);
 
 
 enum skinny_call_state {
-    SKINNY_OFF_HOOK = 1,
-    SKINNY_ON_HOOK = 2,
-    SKINNY_RING_OUT = 3,
-    SKINNY_RING_IN = 4,
-    SKINNY_CONNECTED = 5,
-    SKINNY_BUSY = 6,
-    SKINNY_LINE_IN_USE = 7,
-    SKINNY_HOLD = 8,
-    SKINNY_CALL_WAITING = 9,
-    SKINNY_CALL_TRANSFER = 10,
-    SKINNY_CALL_PARK = 11,
-    SKINNY_PROCEED = 12,
-    SKINNY_IN_USE_REMOTELY = 13,
-    SKINNY_INVALID_NUMBER = 14
+	SKINNY_OFF_HOOK = 1,
+	SKINNY_ON_HOOK = 2,
+	SKINNY_RING_OUT = 3,
+	SKINNY_RING_IN = 4,
+	SKINNY_CONNECTED = 5,
+	SKINNY_BUSY = 6,
+	SKINNY_LINE_IN_USE = 7,
+	SKINNY_HOLD = 8,
+	SKINNY_CALL_WAITING = 9,
+	SKINNY_CALL_TRANSFER = 10,
+	SKINNY_CALL_PARK = 11,
+	SKINNY_PROCEED = 12,
+	SKINNY_IN_USE_REMOTELY = 13,
+	SKINNY_INVALID_NUMBER = 14
 };
 extern struct skinny_table SKINNY_CALL_STATES[15];
 const char *skinny_call_state2str(uint32_t id);
@@ -240,8 +240,8 @@ uint32_t skinny_str2call_state(const char *str);
 #define SKINNY_PUSH_CALL_STATES SKINNY_DECLARE_PUSH_MATCH(SKINNY_CALL_STATES)
 
 enum skinny_device_reset_types {
-  SKINNY_DEVICE_RESET = 1,
-  SKINNY_DEVICE_RESTART = 2
+	SKINNY_DEVICE_RESET = 1,
+	SKINNY_DEVICE_RESTART = 2
 };
 extern struct skinny_table SKINNY_DEVICE_RESET_TYPES[3];
 const char *skinny_device_reset_type2str(uint32_t id);