Skinny: Check for socket to see if listener is alive

also, use tab to indent

src/mod/endpoints/mod_skinny/mod_skinny.h

@@ -45,51 +45,51 @@
 #define SKINNY_EVENT_CALL_STATE "skinny::call_state"
 
 struct skinny_globals {
-	int running;
-	switch_memory_pool_t *pool;
-	switch_mutex_t *mutex;
-	switch_hash_t *profile_hash;
-	switch_event_node_t *heartbeat_node;
-	switch_event_node_t *call_state_node;
+    int running;
+    switch_memory_pool_t *pool;
+    switch_mutex_t *mutex;
+    switch_hash_t *profile_hash;
+    switch_event_node_t *heartbeat_node;
+    switch_event_node_t *call_state_node;
 };
 typedef struct skinny_globals skinny_globals_t;
 
 skinny_globals_t globals;
 
 struct skinny_profile {
-	/* prefs */
-	char *name;
-	char *domain;
-	char *ip;
-	unsigned int port;
-	char *dialplan;
-	char *context;
-	uint32_t keep_alive;
-	char date_format[6];
-	int debug;
-	/* 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;
-	uint8_t listener_ready;
-	/* call id */
-	uint32_t next_call_id;
-	/* others */
-	switch_memory_pool_t *pool;
+    /* prefs */
+    char *name;
+    char *domain;
+    char *ip;
+    unsigned int port;
+    char *dialplan;
+    char *context;
+    uint32_t keep_alive;
+    char date_format[6];
+    int debug;
+    /* 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;
+    uint8_t listener_ready;
+    /* call id */
+    uint32_t next_call_id;
+    /* others */
+    switch_memory_pool_t *pool;
 };
 typedef struct skinny_profile skinny_profile_t;
 
@@ -99,26 +99,26 @@ typedef struct skinny_profile skinny_profile_t;
 /*****************************************************************************/
 
 typedef enum {
-	LFLAG_RUNNING = (1 << 0),
+    LFLAG_RUNNING = (1 << 0),
 } event_flag_t;
 
 #define SKINNY_MAX_LINES 42
 struct listener {
-	skinny_profile_t *profile;
-	char device_name[16];
-	uint32_t device_instance;
-
-	switch_socket_t *sock;
-	switch_memory_pool_t *pool;
-	switch_thread_rwlock_t *rwlock;
-	switch_sockaddr_t *sa;
-	char remote_ip[50];
-	switch_mutex_t *flag_mutex;
-	uint32_t flags;
-	switch_port_t remote_port;
-	uint32_t id;
-	time_t expire_time;
-	struct listener *next;
+    skinny_profile_t *profile;
+    char device_name[16];
+    uint32_t device_instance;
+
+    switch_socket_t *sock;
+    switch_memory_pool_t *pool;
+    switch_thread_rwlock_t *rwlock;
+    switch_sockaddr_t *sa;
+    char remote_ip[50];
+    switch_mutex_t *flag_mutex;
+    uint32_t flags;
+    switch_port_t remote_port;
+    uint32_t id;
+    time_t expire_time;
+    struct listener *next;
 };
 
 typedef struct listener listener_t;
@@ -129,54 +129,54 @@ typedef switch_status_t (*skinny_listener_callback_func_t) (listener_t *listener
 /* CHANNEL TYPES */
 /*****************************************************************************/
 typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_CODEC = (1 << 7),
-	
-	TFLAG_READING = (1 << 9),
-	TFLAG_WRITING = (1 << 10)
+    TFLAG_IO = (1 << 0),
+    TFLAG_INBOUND = (1 << 1),
+    TFLAG_OUTBOUND = (1 << 2),
+    TFLAG_DTMF = (1 << 3),
+    TFLAG_VOICE = (1 << 4),
+    TFLAG_HANGUP = (1 << 5),
+    TFLAG_LINEAR = (1 << 6),
+    TFLAG_CODEC = (1 << 7),
+
+    TFLAG_READING = (1 << 9),
+    TFLAG_WRITING = (1 << 10)
 } TFLAGS;
 
 typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
+    GFLAG_MY_CODEC_PREFS = (1 << 0)
 } GFLAGS;
 
 struct private_object {
-	unsigned int flags;
-	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 */
-	uint32_t call_id;
-	uint32_t party_id;
-
-	skinny_profile_t *profile;
-
-	/* codec */
-	char *iananame;	
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_codec_implementation_t read_impl;
-	switch_codec_implementation_t write_impl;
-	unsigned long rm_rate;
-	uint32_t codec_ms;
-	char *rm_encoding;
-	char *rm_fmtp;
-	switch_payload_t agreed_pt;
-	/* RTP */
-	switch_rtp_t *rtp_session;
-	char *local_sdp_audio_ip;
-	switch_port_t local_sdp_audio_port;
-	char *remote_sdp_audio_ip;
-	switch_port_t remote_sdp_audio_port;
+    unsigned int flags;
+    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 */
+    uint32_t call_id;
+    uint32_t party_id;
+
+    skinny_profile_t *profile;
+
+    /* codec */
+    char *iananame;	
+    switch_codec_t read_codec;
+    switch_codec_t write_codec;
+    switch_codec_implementation_t read_impl;
+    switch_codec_implementation_t write_impl;
+    unsigned long rm_rate;
+    uint32_t codec_ms;
+    char *rm_encoding;
+    char *rm_fmtp;
+    switch_payload_t agreed_pt;
+    /* RTP */
+    switch_rtp_t *rtp_session;
+    char *local_sdp_audio_ip;
+    switch_port_t local_sdp_audio_port;
+    char *remote_sdp_audio_ip;
+    switch_port_t remote_sdp_audio_port;
 };
 
 typedef struct private_object private_t;
@@ -197,7 +197,7 @@ switch_status_t dump_device(skinny_profile_t *profile, const char *device_name,
 /*****************************************************************************/
 void 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 */
@@ -222,8 +222,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,53 +36,53 @@
 /* SKINNY TABLES */
 /*****************************************************************************/
 struct skinny_table {
-	const char *name;
-	uint32_t id;
+    const char *name;
+    uint32_t id;
 };
 
 #define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
 const char *func(uint32_t id) \
 { \
-	const char *str = DEFAULT_STR; \
-	\
-	for (uint8_t 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; \
+    \
+    for (uint8_t 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 id = DEFAULT_ID;\
-	\
-	if (*str > 47 && *str < 58) {\
-		id = atoi(str);\
-	} else {\
-		for (uint8_t 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 = DEFAULT_ID;\
+    \
+    if (*str > 47 && *str < 58) {\
+	    id = atoi(str);\
+    } else {\
+	    for (uint8_t 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;\
-	for (uint8_t 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;\
+    for (uint8_t 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;\
+    }
+
 
 struct skinny_table SKINNY_MESSAGE_TYPES[56];
 const char *skinny_message_type2str(uint32_t id);
@@ -90,20 +90,20 @@ uint32_t skinny_str2message_type(const char *str);
 #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_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
 };
 struct skinny_table SKINNY_RING_TYPES[5];
 const char *skinny_ring_type2str(uint32_t id);
@@ -111,8 +111,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,
 };
 struct skinny_table SKINNY_RING_MODES[3];
 const char *skinny_ring_mode2str(uint32_t id);
@@ -121,11 +121,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,
 };
 struct skinny_table SKINNY_LAMP_MODES[6];
 const char *skinny_lamp_mode2str(uint32_t id);
@@ -133,8 +133,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,
 };
 struct skinny_table SKINNY_SPEAKER_MODES[3];
 const char *skinny_speaker_mode2str(uint32_t id);
@@ -142,20 +142,20 @@ 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_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_LINE = 0x09,
+    SKINNY_BUTTON_VOICEMAIL = 0x0F,
+    SKINNY_BUTTON_PRIVACY = 0x13,
+    SKINNY_BUTTON_SERVICE_URL = 0x14,
+    SKINNY_BUTTON_UNDEFINED = 0xFF,
 };
 struct skinny_table SKINNY_BUTTONS[9];
 const char *skinny_button2str(uint32_t id);
@@ -163,39 +163,39 @@ 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,
 };
 
 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_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,
 };
 struct skinny_table SKINNY_KEY_SETS[11];
 const char *skinny_soft_key_set2str(uint32_t id);
@@ -204,20 +204,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
 };
 struct skinny_table SKINNY_CALL_STATES[15];
 const char *skinny_call_state2str(uint32_t id);