Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

libs/freetdm/mod_freetdm/Makefile.in

@@ -4,6 +4,7 @@ BASE=../../..
 FT_DIR=..
 VERBOSE=1
 FTLA=$(FT_DIR)/libfreetdm.la
+LOCAL_OBJS=tdm.o
 LOCAL_CFLAGS=-I$(FT_DIR)/src/include -I$(FT_DIR)/src/isdn/include $(FT_CFLAGS)
 LOCAL_LDFLAGS=-L$(FT_DIR) -lfreetdm 
 include $(BASE)/build/modmake.rules

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -873,7 +873,7 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 	if (!tech_pvt->ftdmchan) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no ftdmchan set in channel %s!\n", name);
 		return SWITCH_STATUS_FALSE;
-	} 
+	}
 
 	span_id = ftdm_channel_get_span_id(tech_pvt->ftdmchan);
 	chan_id = ftdm_channel_get_id(tech_pvt->ftdmchan);
@@ -906,7 +906,7 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 	ftdm_channel_wait(tech_pvt->ftdmchan, &wflags, ftdm_channel_get_io_interval(tech_pvt->ftdmchan) * 10);
 	
 	if (!(wflags & FTDM_WRITE)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Dropping frame! (write note ready) in channel %s device %d:%d!\n", name, span_id, chan_id);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Dropping frame! (write not ready) in channel %s device %d:%d!\n", name, span_id, chan_id);
 		return SWITCH_STATUS_SUCCESS;
 	}
 

libs/freetdm/mod_freetdm/tdm.c

@@ -0,0 +1,413 @@
+/* 
+* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+* Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
+*
+* Version: MPL 1.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+*
+* The Initial Developer of the Original Code is
+* Anthony Minessale II <anthm@freeswitch.org>
+* Portions created by the Initial Developer are Copyright (C)
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+* 
+* Mathieu Rene <mrene@avgs.ca>
+*
+* tdm.c -- FreeTDM Controllable Channel Module
+*
+*/
+
+#include <switch.h>
+#include "freetdm.h"
+
+void ctdm_init(switch_loadable_module_interface_t *module_interface);
+
+/* Parameters */
+
+#define kSPAN_ID "span"
+#define kCHAN_ID "chan"
+
+static struct {
+    switch_memory_pool_t *pool;
+    switch_endpoint_interface_t *endpoint_interface;
+} ctdm;
+
+typedef struct {
+    int span_id;
+    int chan_id;
+    ftdm_channel_t *ftdm_channel;
+    switch_core_session_t *session;
+    switch_codec_t read_codec, write_codec;
+    switch_frame_t read_frame;
+} ctdm_private_t;
+
+static switch_status_t channel_on_init(switch_core_session_t *session);
+static switch_status_t channel_on_destroy(switch_core_session_t *session);
+static 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);
+static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
+static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
+static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg);
+static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf);
+
+switch_state_handler_table_t ctdm_state_handlers = {
+	.on_init = channel_on_init,
+	.on_destroy = channel_on_destroy
+};
+
+switch_io_routines_t ctdm_io_routines = {
+    .send_dtmf = channel_send_dtmf,
+	.outgoing_channel = channel_outgoing_channel,
+	.read_frame = channel_read_frame,
+	.write_frame = channel_write_frame,
+	.receive_message = channel_receive_message
+};
+
+void ctdm_init(switch_loadable_module_interface_t *module_interface)
+{
+    switch_endpoint_interface_t *endpoint_interface;
+    ctdm.pool = module_interface->pool;
+    endpoint_interface = switch_loadable_module_create_interface(module_interface, SWITCH_ENDPOINT_INTERFACE);
+    endpoint_interface->interface_name = "tdm";
+    endpoint_interface->io_routines = &ctdm_io_routines;
+    endpoint_interface->state_handler = &ctdm_state_handlers;
+    ctdm.endpoint_interface = endpoint_interface;
+    
+}
+
+static 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)
+{
+    const char  *szspanid = switch_event_get_header(var_event, kSPAN_ID),
+                *szchanid = switch_event_get_header(var_event, kCHAN_ID);
+    int chan_id;
+    int span_id;
+    
+    ftdm_span_t *span;
+    ftdm_channel_t *chan;
+    switch_channel_t *channel;
+    char name[128];
+    const char *dname;
+    ftdm_codec_t codec;
+    uint32_t interval;
+    
+    ctdm_private_t *tech_pvt;
+    
+    if (zstr(szchanid) || zstr(szspanid)) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Both "kSPAN_ID" and "kCHAN_ID" have to be set.\n");
+        goto fail;
+    }
+    
+    chan_id = atoi(szchanid);
+    span_id = atoi(szspanid);
+    
+    
+    if (!(*new_session = switch_core_session_request(ctdm.endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, 0, pool))) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't request session.\n");
+        goto fail;
+    }
+    
+    channel = switch_core_session_get_channel(*new_session);
+    
+    if (ftdm_channel_open(span_id, chan_id, &chan) != FTDM_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't open span or channel.\n"); 
+        goto fail;
+    }
+    
+    span = ftdm_channel_get_span(chan);
+    
+    tech_pvt = switch_core_session_alloc(*new_session, sizeof *tech_pvt);
+    tech_pvt->chan_id = chan_id;
+    tech_pvt->span_id = span_id;
+    tech_pvt->ftdm_channel = chan;
+    tech_pvt->session = *new_session;
+    switch_core_session_set_private(*new_session, tech_pvt);
+    
+    snprintf(name, sizeof(name), "tdm/%d:%d", span_id, chan_id);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connect outbound channel %s\n", name);
+	switch_channel_set_name(channel, name);
+    
+    switch_channel_set_state(channel, CS_INIT);
+    
+	if (FTDM_SUCCESS != ftdm_channel_command(chan, FTDM_COMMAND_GET_CODEC, &codec)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to retrieve channel codec.\n");
+		return SWITCH_STATUS_GENERR;
+	}
+    
+    if (FTDM_SUCCESS != ftdm_channel_command(chan, FTDM_COMMAND_GET_INTERVAL, &interval)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to retrieve channel interval.\n");
+		return SWITCH_STATUS_GENERR;
+	}
+    
+	switch(codec) {
+        case FTDM_CODEC_ULAW:
+		{
+			dname = "PCMU";
+		}
+            break;
+        case FTDM_CODEC_ALAW:
+		{
+			dname = "PCMA";
+		}
+            break;
+        case FTDM_CODEC_SLIN:
+		{
+			dname = "L16";
+		}
+            break;
+        default:
+		{
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid codec value retrieved from channel, codec value: %d\n", codec);
+			goto fail;
+		}
+	}
+
+    
+	if (switch_core_codec_init(&tech_pvt->read_codec,
+							   dname,
+							   NULL,
+							   8000,
+							   interval,
+							   1,
+							   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+							   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
+        goto fail;
+	} else {
+		if (switch_core_codec_init(&tech_pvt->write_codec,
+								   dname,
+								   NULL,
+								   8000,
+								   interval,
+								   1,
+								   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+								   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
+			switch_core_codec_destroy(&tech_pvt->read_codec);
+            goto fail;
+		}
+	}
+    
+    if (switch_core_session_set_read_codec(*new_session, &tech_pvt->read_codec) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set read codec?\n");
+        goto fail;
+    }
+    
+    if (switch_core_session_set_write_codec(*new_session, &tech_pvt->write_codec) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set write codec?\n");        
+    }
+    
+    if (switch_core_session_thread_launch(*new_session) != SWITCH_STATUS_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't start session thread.\n"); 
+        goto fail;
+    }
+    
+    return SWITCH_CAUSE_SUCCESS;
+
+fail:
+    
+    if (tech_pvt) {
+        if (tech_pvt->ftdm_channel) {
+            ftdm_channel_close(&tech_pvt->ftdm_channel);
+        }
+        
+        if (tech_pvt->read_codec.implementation) {
+			switch_core_codec_destroy(&tech_pvt->read_codec);
+		}
+		
+		if (tech_pvt->write_codec.implementation) {
+			switch_core_codec_destroy(&tech_pvt->write_codec);
+		}
+    }
+    
+    if (*new_session) {
+        switch_core_session_destroy(new_session);
+    }
+    return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+}
+
+static switch_status_t channel_on_init(switch_core_session_t *session)
+{
+    return SWITCH_STATUS_SUCCESS;   
+}
+
+static switch_status_t channel_on_destroy(switch_core_session_t *session)
+{
+    ctdm_private_t *tech_pvt = switch_core_session_get_private(session);
+    
+ 	if ((tech_pvt = switch_core_session_get_private(session))) {
+        
+		if (tech_pvt->read_codec.implementation) {
+			switch_core_codec_destroy(&tech_pvt->read_codec);
+		}
+		
+		if (tech_pvt->write_codec.implementation) {
+			switch_core_codec_destroy(&tech_pvt->write_codec);
+		}
+	}
+    
+    ftdm_channel_close(&tech_pvt->ftdm_channel);
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
+{
+    ftdm_wait_flag_t wflags = FTDM_READ;
+    ftdm_status_t status;
+    ctdm_private_t *tech_pvt;
+    const char *name;
+    switch_channel_t *channel;
+    int chunk;
+    uint32_t span_id, chan_id;
+    ftdm_size_t len;
+    char dtmf[128] = "";
+    
+    channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+	
+	tech_pvt = switch_core_session_get_private(session);
+	assert(tech_pvt != NULL);
+    
+	name = switch_channel_get_name(channel);
+
+top:
+    wflags = FTDM_READ;
+    chunk = ftdm_channel_get_io_interval(tech_pvt->ftdm_channel) * 2;
+    status = ftdm_channel_wait(tech_pvt->ftdm_channel, &wflags, chunk);
+    
+    
+	span_id = ftdm_channel_get_span_id(tech_pvt->ftdm_channel);
+	chan_id = ftdm_channel_get_id(tech_pvt->ftdm_channel);
+
+    if (status == FTDM_FAIL) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from channel %s device %d:%d!\n", name, span_id, chan_id);
+        goto fail;
+    }
+
+    if (status == FTDM_TIMEOUT) {
+        goto top;
+    }
+
+    if (!(wflags & FTDM_READ)) {
+        goto top;
+    }
+
+    len = tech_pvt->read_frame.buflen;
+    if (ftdm_channel_read(tech_pvt->ftdm_channel, tech_pvt->read_frame.data, &len) != FTDM_SUCCESS) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to read from channel %s device %d:%d!\n", name, span_id, chan_id);
+    }
+
+    *frame = &tech_pvt->read_frame;
+    tech_pvt->read_frame.datalen = (uint32_t)len;
+    tech_pvt->read_frame.samples = tech_pvt->read_frame.datalen;
+
+    if (ftdm_channel_get_codec(tech_pvt->ftdm_channel) == FTDM_CODEC_SLIN) {
+        tech_pvt->read_frame.samples /= 2;
+    }
+
+    while (ftdm_channel_dequeue_dtmf(tech_pvt->ftdm_channel, dtmf, sizeof(dtmf))) {
+        switch_dtmf_t _dtmf = { 0, switch_core_default_dtmf_duration(0) };
+        char *p;
+        for (p = dtmf; p && *p; p++) {
+            if (is_dtmf(*p)) {
+                _dtmf.digit = *p;
+                ftdm_log(FTDM_LOG_DEBUG, "Queuing DTMF [%c] in channel %s device %d:%d\n", *p, name, span_id, chan_id);
+                switch_channel_queue_dtmf(channel, &_dtmf);
+            }
+        }
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+
+fail:
+    return SWITCH_STATUS_GENERR;
+}
+
+static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
+{
+    ftdm_wait_flag_t wflags = FTDM_WRITE;
+    ctdm_private_t *tech_pvt;
+    const char *name;
+    switch_channel_t *channel;
+    uint32_t span_id, chan_id;
+    ftdm_size_t len;
+    unsigned char data[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0};
+    
+    channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+	
+	tech_pvt = switch_core_session_get_private(session);
+	assert(tech_pvt != NULL);
+    
+	span_id = ftdm_channel_get_span_id(tech_pvt->ftdm_channel);
+	chan_id = ftdm_channel_get_id(tech_pvt->ftdm_channel);
+    
+	name = switch_channel_get_name(channel);   
+    
+    if (switch_test_flag(frame, SFF_CNG)) {
+		frame->data = data;
+		frame->buflen = sizeof(data);
+		if ((frame->datalen = tech_pvt->write_codec.implementation->encoded_bytes_per_packet) > frame->buflen) {
+			goto fail;
+		}
+		memset(data, 255, frame->datalen);
+	}
+    
+    wflags = FTDM_WRITE;	
+	ftdm_channel_wait(tech_pvt->ftdm_channel, &wflags, ftdm_channel_get_io_interval(tech_pvt->ftdm_channel) * 10);
+	
+	if (!(wflags & FTDM_WRITE)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Dropping frame! (write not ready) in channel %s device %d:%d!\n", name, span_id, chan_id);
+		return SWITCH_STATUS_SUCCESS;
+	}
+    
+	len = frame->datalen;
+	if (ftdm_channel_write(tech_pvt->ftdm_channel, frame->data, frame->buflen, &len) != FTDM_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Failed to write to channel %s device %d:%d!\n", name, span_id, chan_id);
+	}
+    
+    return SWITCH_STATUS_SUCCESS;
+
+fail:
+    return SWITCH_STATUS_GENERR;
+}
+
+static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
+{
+	ctdm_private_t *tech_pvt = NULL;
+	char tmp[2] = "";
+    
+	tech_pvt = switch_core_session_get_private(session);
+	assert(tech_pvt != NULL);
+        
+	tmp[0] = dtmf->digit;
+	ftdm_channel_command(tech_pvt->ftdm_channel, FTDM_COMMAND_SEND_DTMF, tmp);
+    
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
+{
+    return SWITCH_STATUS_SUCCESS;
+}
+

libs/freetdm/src/ftdm_io.c

@@ -171,7 +171,7 @@ static void stop_chan_io_dump(ftdm_io_dump_t *dump)
 		return;
 	}
 	ftdm_safe_free(dump->buffer);
-	memset(dump, 0, sizeof(dump));
+	memset(dump, 0, sizeof(*dump));
 }
 
 static ftdm_status_t start_chan_io_dump(ftdm_channel_t *chan, ftdm_io_dump_t *dump, ftdm_size_t size)

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c

@@ -124,6 +124,7 @@ static ftdm_status_t handle_show_sctp_profile(ftdm_stream_handle_t *stream, char
 static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream);
 static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char* m2ua_profile_name);
 static ftdm_status_t handle_show_m2ua_peer_status(ftdm_stream_handle_t *stream, char* m2ua_profile_name);
+static ftdm_status_t handle_show_m2ua_cluster_status(ftdm_stream_handle_t *stream, char* m2ua_profile_name);
 static ftdm_status_t handle_show_nif_profiles(ftdm_stream_handle_t *stream);
 static ftdm_status_t handle_show_nif_profile(ftdm_stream_handle_t *stream, char* profile_name);
 int get_assoc_resp_buf(char* buf,SbMgmt* cfm);
@@ -427,10 +428,17 @@ ftdm_status_t ftdm_sngss7_handle_cli_cmd(ftdm_stream_handle_t *stream, const cha
 					{
 						char* profile_name = argv[++c];
 						c++;
+						/***************************************************************/
 						if(!strcasecmp(argv[c],"peerstatus")){
+						/***************************************************************/
 							handle_show_m2ua_peer_status(stream, profile_name);
-						}
-						else{
+						/***************************************************************/
+						}else if(!strcasecmp(argv[c],"clusterstatus")){
+						/***************************************************************/
+							handle_show_m2ua_cluster_status(stream, profile_name);
+						/***************************************************************/
+						} else{
+						/***************************************************************/
 							stream->write_function(stream, "Unknown \"show m2ua \" command..\n");
 							goto handle_cli_error_argc;
 						}
@@ -933,6 +941,7 @@ static ftdm_status_t handle_print_usage(ftdm_stream_handle_t *stream)
 	stream->write_function(stream, "ftdm ss7 xmlshow m2ua \n");
 	stream->write_function(stream, "ftdm ss7 xmlshow m2ua <m2ua_interface_name>\n");
 	stream->write_function(stream, "ftdm ss7 xmlshow m2ua <m2ua_interface_name> peerstatus\n");
+	stream->write_function(stream, "ftdm ss7 xmlshow m2ua <m2ua_interface_name> clusterstatus\n");
 	stream->write_function(stream, "ftdm ss7 xmlshow nif \n");
 	stream->write_function(stream, "ftdm ss7 xmlshow nif <nif_interface_name>\n");
 	stream->write_function(stream, "\n");
@@ -3113,7 +3122,7 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 	len = len + sprintf(buf + len, "<m2ua_profiles>\n");
 
 	if(ftmod_m2ua_ssta_req(STMWGEN, 0x00, &cfm)) {
-		stream->write_function(stream," Request to Trillium M2UA layer failed \n");
+		stream->write_function(stream," Request to  layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<m2ua_gen>\n");
@@ -3142,7 +3151,7 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 			 len = len + sprintf(buf + len, "<name> %s </name>\n", g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].name);
 
 			 if(ftmod_m2ua_ssta_req(STMWDLSAP,x,&cfm)) {
-				 stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				 stream->write_function(stream," Request to M2UA  layer failed \n");
 				 return FTDM_FAIL;
 			 } else {
 				 len = len + sprintf(buf + len, "<m2ua_dlsap>\n");
@@ -3156,7 +3165,7 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 
 			 memset((U8 *)&cfm, 0, sizeof(MwMgmt));
 			 if(ftmod_m2ua_ssta_req(STMWCLUSTER,g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].clusterId,&cfm)) {
-				 stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				 stream->write_function(stream," Request to  M2UA layer failed \n");
 				 return FTDM_FAIL;
 			 } else {
 				 len = len + sprintf(buf + len, "<m2ua_cluster>\n");
@@ -3187,18 +3196,14 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 					 if(LMW_PEER_DOWN != rsp.t.ssta.s.clusterSta.peerSt[idx].peerState){
 
 						 if(ftmod_m2ua_ssta_req(STMWPEER, peer_id, &cfm)) {
-							 stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+							 stream->write_function(stream," Request to M2UA  layer failed \n");
 							 return FTDM_FAIL;
 						 } else {
 							 len = len + sprintf(buf + len, "<m2ua_peer>\n");
 							 len = len + sprintf(buf + len, "<name> %s </name>\n",g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua_peer[peer_id].name);
 							 len = len + sprintf(buf + len," <state> %s </state>\n", PRNT_M2UA_PEER_STATE(cfm.t.ssta.s.peerSta.state));
 							 len = len + sprintf(buf + len, " <retry_count> %d </retry_count>\n",cfm.t.ssta.s.peerSta.retryCount);
-#ifdef BIT_64							 
-							 len = len + sprintf(buf + len, " <assoc_id> %d </assoc_id>\n", (int64_t) cfm.t.ssta.s.peerSta.assocSta.spAssocId);
-#else
-							 len = len + sprintf(buf + len, " <assoc_id> %lld </assoc_id>\n", (int64_t) cfm.t.ssta.s.peerSta.assocSta.spAssocId);
-#endif
+							 len = len + sprintf(buf + len, " <assoc_id> %d </assoc_id>\n", (int)cfm.t.ssta.s.peerSta.assocSta.spAssocId);
 							 len = len + sprintf(buf + len, " <connected_status> %s </connected_status>\n",(cfm.t.ssta.s.peerSta.assocSta.connected)?"CONNECTED":"NOT CONNECTED");
 							 len = len + sprintf(buf + len, " <flow_cntrl_progress> %d </flow_cntrl_progress>\n",cfm.t.ssta.s.peerSta.assocSta.flcInProg);
 							 len = len + sprintf(buf + len, " <flow_cntrl_level> %d </flow_cntrl_level>\n",cfm.t.ssta.s.peerSta.assocSta.flcLevel);
@@ -3218,17 +3223,13 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 
 			 memset((U8 *)&cfm, 0, sizeof(MwMgmt));
 			 if(ftmod_m2ua_ssta_req(STMWSCTSAP,x,&cfm)) {
-				 stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				 stream->write_function(stream," Request to M2UA layer failed \n");
 				 return FTDM_FAIL;
 			 } else {
 				 len = len + sprintf(buf + len, "<m2ua_sctp_sap>\n");
 				 len = len + sprintf(buf + len," <state> %s </state>\n", PRNT_M2UA_SAP_STATE(cfm.t.ssta.s.sctSapSta.state));
 				 len = len + sprintf(buf + len," <end_point_open_state> %s </end_point_open_state>\n", (cfm.t.ssta.s.sctSapSta.endpOpen)?"END_POINT_OPENED_SUCCESSFULLY":"END_POINT_NOT_OPEN");
-#ifdef BIT_64							 
-				 len = len + sprintf(buf + len," <end_point_id> %d </end_point_id>\n", (int64_t) cfm.t.ssta.s.sctSapSta.spEndpId);
-#else
-				 len = len + sprintf(buf + len," <end_point_id> %lld </end_point_id>\n", (int64_t) cfm.t.ssta.s.sctSapSta.spEndpId);
-#endif
+				 len = len + sprintf(buf + len," <end_point_id> %d </end_point_id>\n", (int) cfm.t.ssta.s.sctSapSta.spEndpId);
 				 len = len + sprintf(buf + len," <nmb_of_retry_attemp> %d </nmb_of_retry_attemp>\n", cfm.t.ssta.s.sctSapSta.nmbPrimRetry);
 				 len = len + sprintf(buf + len, "</m2ua_sctp_sap>\n");
 			 }
@@ -3241,7 +3242,7 @@ static ftdm_status_t handle_show_m2ua_profiles(ftdm_stream_handle_t *stream)
 	len = len + sprintf(buf + len, "</m2ua_profiles>\n");
 	stream->write_function(stream,"\n%s\n",buf); 
 
-	return FTDM_FAIL;
+	return FTDM_SUCCESS;
 
 }
 
@@ -3294,7 +3295,7 @@ static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char
 	len = len + sprintf(buf + len, "<name> %s </name>\n", m2ua_profile_name);
 
 	if(ftmod_m2ua_ssta_req(STMWDLSAP,x,&cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to M2UA layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<m2ua_dlsap>\n");
@@ -3307,7 +3308,7 @@ static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char
 	}
 
 	if(ftmod_m2ua_ssta_req(STMWCLUSTER, g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].clusterId, &cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to M2UA layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<m2ua_cluster>\n");
@@ -3333,7 +3334,7 @@ static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char
 		memset((U8 *)&cfm, 0, sizeof(MwMgmt));
 
 		if(ftmod_m2ua_ssta_req(STMWPEER, rsp.t.ssta.s.clusterSta.peerSt[idx].peerId, &cfm)) {
-			stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+			stream->write_function(stream," Request to M2UA layer failed \n");
 			return FTDM_FAIL;
 		} else {
 			len = len + sprintf(buf + len, "<m2ua_peer>\n");
@@ -3356,7 +3357,7 @@ static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char
 	}
 
 	if(ftmod_m2ua_ssta_req(STMWSCTSAP,x,&cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to M2UA layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<m2ua_sctp_sap>\n");
@@ -3375,7 +3376,7 @@ static ftdm_status_t handle_show_m2ua_profile(ftdm_stream_handle_t *stream, char
 
 	stream->write_function(stream,"\n%s\n",buf); 
 
-	return FTDM_FAIL;
+	return FTDM_SUCCESS;
 
 }
 
@@ -3401,7 +3402,7 @@ static ftdm_status_t handle_show_sctp_profiles(ftdm_stream_handle_t *stream)
 	len = len + sprintf(buf + len, "<sctp_profiles>\n");
 
 	if(ftmod_sctp_ssta_req(STSBGEN, 0x00, &cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to  SCTP layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<sctp_gen>\n");
@@ -3421,7 +3422,7 @@ static ftdm_status_t handle_show_sctp_profiles(ftdm_stream_handle_t *stream)
 
 #ifdef LSB12
 	if(ftmod_sctp_ssta_req(STSBTMR, 0x00, &cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to  SCTP layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<sctp_timers>\n");
@@ -3453,7 +3454,7 @@ static ftdm_status_t handle_show_sctp_profiles(ftdm_stream_handle_t *stream)
 			len = len + sprintf(buf + len, "<sctp_profile>\n");
 
 			if(ftmod_sctp_ssta_req(STSBSCTSAP,x,&cfm)) {
-				stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				stream->write_function(stream," Request to  SCTP layer failed \n");
 				return FTDM_FAIL;
 			} else {
 				len = len + sprintf(buf + len, "<sctp_sap>\n");
@@ -3463,7 +3464,7 @@ static ftdm_status_t handle_show_sctp_profiles(ftdm_stream_handle_t *stream)
 			}
 
 			if(ftmod_sctp_ssta_req(STSBTSAP,x,&cfm)) {
-				stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				stream->write_function(stream," Request to  SCTP layer failed \n");
 				return FTDM_FAIL;
 			} else {
 				len = len + sprintf(buf + len, "<sctp_transport_sap>\n");
@@ -3478,7 +3479,7 @@ static ftdm_status_t handle_show_sctp_profiles(ftdm_stream_handle_t *stream)
 					len = len + sprintf(buf + len, " <status> SCT_ASSOC_STATE_CLOSED </status>\n");
 					len = len + sprintf(buf + len, "</sctp_association>\n");
 				}else{
-					stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+					stream->write_function(stream," Request to  SCTP layer failed \n");
 					return FTDM_FAIL;
 				}
 			} else {
@@ -3647,7 +3648,7 @@ static ftdm_status_t handle_show_sctp_profile(ftdm_stream_handle_t *stream, char
 	len = len + sprintf(buf + len, "<sctp_profile>\n");
 
 	if(ftmod_sctp_ssta_req(STSBSCTSAP,x,&cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to  SCTP layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<sctp_sap>\n");
@@ -3657,7 +3658,7 @@ static ftdm_status_t handle_show_sctp_profile(ftdm_stream_handle_t *stream, char
 	}
 
 	if(ftmod_sctp_ssta_req(STSBTSAP,x,&cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to  SCTP layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<sctp_transport_sap>\n");
@@ -3673,7 +3674,7 @@ static ftdm_status_t handle_show_sctp_profile(ftdm_stream_handle_t *stream, char
 			len = len + sprintf(buf + len, " <status> SCT_ASSOC_STATE_CLOSED </status>\n");
 			len = len + sprintf(buf + len, "</sctp_association>\n");
 		}else{
-			stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+			stream->write_function(stream," Request to  SCTP layer failed \n");
 			return FTDM_FAIL;
 		}
 	} else {
@@ -3713,7 +3714,7 @@ static ftdm_status_t handle_show_nif_profiles(ftdm_stream_handle_t *stream)
 	len = len + sprintf(buf + len, "<nif_profiles>\n");
 
 	if(ftmod_nif_ssta_req(STNWGEN, 0x00, &cfm)) {
-		stream->write_function(stream," Request to Trillium NIF layer failed \n");
+		stream->write_function(stream," Request to  NIF layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<nif_gen>\n");
@@ -3736,7 +3737,7 @@ static ftdm_status_t handle_show_nif_profiles(ftdm_stream_handle_t *stream)
 			len = len + sprintf(buf + len, "<nif_profile>\n");
 
 			if(ftmod_nif_ssta_req(STNWDLSAP,x,&cfm)) {
-				stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				stream->write_function(stream," Request to NIF layer failed \n");
 				return FTDM_FAIL;
 			} else {
 				len = len + sprintf(buf + len, "<nif_dlsap>\n");
@@ -3758,7 +3759,7 @@ static ftdm_status_t handle_show_nif_profiles(ftdm_stream_handle_t *stream)
 	len = len + sprintf(buf + len, "</nif_profiles>\n");
 	stream->write_function(stream,"\n%s\n",buf); 
 
-	return FTDM_FAIL;
+	return FTDM_SUCCESS;
 }
 
 /******************************************************************************
@@ -3805,7 +3806,7 @@ static ftdm_status_t handle_show_nif_profile(ftdm_stream_handle_t *stream, char*
 	len = len + sprintf(buf + len, "<nif_profile>\n");
 
 	if(ftmod_nif_ssta_req(STNWDLSAP,x,&cfm)) {
-		stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+		stream->write_function(stream," Request to NIF layer failed \n");
 		return FTDM_FAIL;
 	} else {
 		len = len + sprintf(buf + len, "<nif_dlsap>\n");
@@ -3823,7 +3824,7 @@ static ftdm_status_t handle_show_nif_profile(ftdm_stream_handle_t *stream, char*
 
 	stream->write_function(stream,"\n%s\n",buf); 
 
-	return FTDM_FAIL;
+	return FTDM_SUCCESS;
 }
 
 /******************************************************************************/
@@ -3883,7 +3884,7 @@ static ftdm_status_t handle_show_m2ua_peer_status(ftdm_stream_handle_t *stream,
 		peer = &g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua_peer[peer_id];
 
 		if(ftmod_m2ua_ssta_req(STMWPEER, peer_id, &cfm)) {
-			stream->write_function(stream," Request to Trillium M2UA layer failed \n");
+			stream->write_function(stream," Request to  M2UA layer failed \n");
 			return FTDM_FAIL;
 		} else {
 			len = len + sprintf(buf + len, "<m2ua_peer>\n");
@@ -3902,7 +3903,7 @@ static ftdm_status_t handle_show_m2ua_peer_status(ftdm_stream_handle_t *stream,
 				len = len + sprintf(buf + len, " <status> SCT_ASSOC_STATE_CLOSED </status>\n");
 				len = len + sprintf(buf + len, "</sctp_association>\n");
 			}else{
-				stream->write_function(stream," Request to Trillium SCTP layer failed \n");
+				stream->write_function(stream," Request to SCTP layer failed \n");
 				return FTDM_FAIL;
 			}
 		} else {
@@ -3914,7 +3915,82 @@ static ftdm_status_t handle_show_m2ua_peer_status(ftdm_stream_handle_t *stream,
 
 	stream->write_function(stream,"\n%s\n",buf); 
 
-	return FTDM_FAIL;
+	return FTDM_SUCCESS;
+}
+
+/******************************************************************************
+* Fun:  handle_show_m2ua_cluster_status()
+* Desc: display requested m2ua profile cluster information
+* Ret:  FTDM_SUCCESS | FTDM_FAIL
+* Note: 
+* author: Kapil Gupta
+*******************************************************************************/
+
+static ftdm_status_t handle_show_m2ua_cluster_status(ftdm_stream_handle_t *stream, char* m2ua_profile_name) 
+{
+	char*  xmlhdr = (char*)"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>";
+	char  buf[4096];
+	int x = 0x00;
+	int found = 0x00;
+	int len = 0x00;
+	int idx = 0x00;
+	MwMgmt cfm;
+	SbMgmt sctp_cfm;
+	sng_m2ua_cluster_cfg_t*     clust = NULL; 
+	sng_m2ua_cfg_t*             m2ua  = NULL;
+
+	memset((U8 *)&cfm, 0, sizeof(MwMgmt));
+	memset((U8 *)&sctp_cfm, 0, sizeof(SbMgmt));
+	memset(&buf[0], 0, sizeof(buf));
+
+	len = len + sprintf(buf + len, "%s\n", xmlhdr);
+
+	/*iterate through all the m2ua links and get required profile */
+	x = 1;
+	while(x<MW_MAX_NUM_OF_INTF){
+		if((g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].id !=0) &&
+				((g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].flags & SNGSS7_ACTIVE))) {
+
+			if(!strcasecmp(m2ua_profile_name, g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].name)){
+				found = 0x01;
+				break;
+			}
+		}
+		x++;
+	}
+
+	if(!found){
+		stream->write_function(stream,"Requested M2UA profile[%s] not configured\n", m2ua_profile_name);
+		return FTDM_FAIL;
+	}
+
+	m2ua  = &g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x];
+	clust = &g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua_clus[m2ua->clusterId];
+
+	if(ftmod_m2ua_ssta_req(STMWCLUSTER,g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua[x].clusterId,&cfm)) {
+		stream->write_function(stream," Request to M2UA layer failed \n");
+		return FTDM_FAIL;
+	} else {
+		len = len + sprintf(buf + len, "<m2ua_cluster>\n");
+		len = len + sprintf(buf + len, "<name> %s </name>\n",clust->name);
+		len = len + sprintf(buf + len," <state> %s </state>\n", PRNT_M2UA_CLUSTER_STATE(cfm.t.ssta.s.clusterSta.state));
+		len = len + sprintf(buf + len, "<num_of_peers> %d </num_of_peers>\n",cfm.t.ssta.s.clusterSta.nmbPeer);
+		for(idx = 0; idx < cfm.t.ssta.s.clusterSta.nmbPeer; idx++)
+		{
+			len = len + sprintf(buf + len, "<m2ua_cluster_peer>\n");
+			len = len + sprintf(buf + len, " <peer_name> %s </peer_name>\n", g_ftdm_sngss7_data.cfg.g_m2ua_cfg.m2ua_peer[cfm.t.ssta.s.clusterSta.peerSt[idx].peerId].name);
+			len = len + sprintf(buf + len, " <peer_id> %d </peer_id>\n", cfm.t.ssta.s.clusterSta.peerSt[idx].peerId);
+			len = len + sprintf(buf + len, " <peer_state> %s </peer_state>\n",  PRNT_M2UA_PEER_STATE(cfm.t.ssta.s.clusterSta.peerSt[idx].peerState));
+			len = len + sprintf(buf + len, "</m2ua_cluster_peer>\n");
+		}
+		len = len + sprintf(buf + len, "<num_active_peer> %d </num_active_peer>\n",cfm.t.ssta.s.clusterSta.nmbActPeer);
+
+		len = len + sprintf(buf + len, "</m2ua_cluster>\n");
+	}
+
+	stream->write_function(stream,"\n%s\n",buf); 
+
+	return FTDM_SUCCESS;
 }
 
 /******************************************************************************/

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_m2ua.c

@@ -793,10 +793,10 @@ static int ftmod_m2ua_peer_config(int id)
 			ftdm_log (FTDM_LOG_INFO, " ftmod_m2ua_sctsap_config: M2UA SCTSAP for M2UA Intf Id[%d] config SUCCESS \n", id);
 		}
 		if(ftmod_m2ua_peer_config1(id, peer_id)){
-			ftdm_log (FTDM_LOG_ERROR, " ftmod_m2ua_peer_config1: M2UA Peer configuration for M2UA Intf Id[%d] config FAILED \n", id);
+			ftdm_log (FTDM_LOG_ERROR, " ftmod_m2ua_peer_config1: M2UA Peer[%d] configuration for M2UA Intf Id[%d] config FAILED \n", peer_id, id);
 			return 0x01;
 		}else{
-			ftdm_log (FTDM_LOG_INFO, " ftmod_m2ua_peer_config1: M2UA Peer configuration for M2UA Intf Id[%d] config SUCCESS \n", id);
+			ftdm_log (FTDM_LOG_INFO, " ftmod_m2ua_peer_config1: M2UA Peer[%d] configuration for M2UA Intf Id[%d] config SUCCESS \n", peer_id, id);
 		}
 
 		clust->sct_sap_id = id;
@@ -813,13 +813,28 @@ static int ftmod_m2ua_peer_config(int id)
 static int ftmod_m2ua_sctsap_config(int sct_sap_id, int sctp_id)
 {
    int    i;
+   int    ret;
    Pst    pst; 
    MwMgmt cfg;
+   MwMgmt cfm;
    sng_sctp_link_t *sctp = &g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[sctp_id];
 
+
+
    memset((U8 *)&cfg, 0, sizeof(MwMgmt));
+   memset((U8 *)&cfm, 0, sizeof(MwMgmt));
    memset((U8 *)&pst, 0, sizeof(Pst));
 
+   /* check is sct_sap is already configured */
+   if(!ftmod_m2ua_ssta_req(STMWSCTSAP, sct_sap_id, &cfm )){
+	   ftdm_log (FTDM_LOG_INFO, " ftmod_m2ua_sctsap_config: SCT SAP [%s] is already configured \n", sctp->name);
+	   return 0x00;
+   }
+
+   if(LCM_REASON_INVALID_SAP == cfm.cfm.reason){
+	   ftdm_log (FTDM_LOG_INFO, " ftmod_m2ua_sctsap_config: SCT SAP [%s] is not configured..configuring now \n", sctp->name);
+   }
+
    smPstInit(&pst);
 
    pst.dstEnt = ENTMW;
@@ -880,8 +895,11 @@ static int ftmod_m2ua_sctsap_config(int sct_sap_id, int sctp_id)
    cfg.t.cfg.s.sctSapCfg.reConfig.mem.region    = S_REG;
    cfg.t.cfg.s.sctSapCfg.reConfig.mem.pool      = S_POOL;
 
-     return (sng_cfg_m2ua (&pst, &cfg));
+     if (0 == (ret = sng_cfg_m2ua (&pst, &cfg))){
+		sctp->flags |= SNGSS7_CONFIGURED;
+     }
 
+     return ret;
 }
 
 /****************************************************************************************************/