boost up

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@416 a93c3328-9c30-0410-af19-c9cd2b2d52af

libs/freetdm/Makefile.in

@@ -29,7 +29,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-CFLAGS=@COMP_VENDOR_CFLAGS@
+CFLAGS=@COMP_VENDOR_CFLAGS@ @DEFS@
 SRC=src
 SOURCES=\
 $(SRC)/hashtable.c \
@@ -68,6 +68,7 @@ $(SRC)/isdn/5ESSStateTE.c \
 $(SRC)/isdn/Q932mes.c \
 $(SRC)/zap_zt.c \
 $(SRC)/zap_wanpipe.c \
+$(SRC)/ss7_boost_client.c \
 $(SRC)/zap_ss7_boost.c
 
 OBJS=\
@@ -107,6 +108,7 @@ $(SRC)/isdn/5ESSStateTE.o \
 $(SRC)/isdn/Q932mes.o \
 $(SRC)/zap_zt.o \
 $(SRC)/zap_wanpipe.o \
+$(SRC)/ss7_boost_client.o \
 $(SRC)/zap_ss7_boost.o
 
 HEADERS= $(SRC)/include/fsk.h \

libs/freetdm/configure.ac

@@ -44,6 +44,9 @@ sun)
     COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
     ;;
 esac
+
+AC_CHECK_HEADERS([netinet/sctp.h])
+
 #  Enable debugging
 AC_ARG_ENABLE(debug,
 [AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"])

libs/freetdm/mod_openzap/mod_openzap.c

@@ -33,6 +33,7 @@
 #include "openzap.h"
 #include "zap_analog.h"
 #include "zap_isdn.h"
+#include "zap_ss7_boost.h"
 
 #ifndef __FUNCTION__
 #define __FUNCTION__ __SWITCH_FUNC__
@@ -807,7 +808,8 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 	char name[128];
 	zap_status_t status;
 	int direction = ZAP_TOP_DOWN;
-	
+	zap_caller_data_t caller_data = {{ 0 }};
+
 	if (!outbound_profile) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
 		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
@@ -846,10 +848,14 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		chan_id = 0;
 	}
 
+	zap_set_string(caller_data.ani, dest);
+	zap_set_string(caller_data.cid_name, outbound_profile->caller_id_name);
+	zap_set_string(caller_data.cid_num, outbound_profile->caller_id_number);
+	
 	if (chan_id) {
 		status = zap_channel_open(span_id, chan_id, &zchan);
 	} else {
-		status = zap_channel_open_any(span_id, direction, &zchan);
+		status = zap_channel_open_any(span_id, direction, &caller_data, &zchan);
 	}
 	
 	if (status != ZAP_SUCCESS) {
@@ -875,9 +881,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 
 		snprintf(name, sizeof(name), "OPENZAP/%s", dest);
 		switch_channel_set_name(channel, name);
-		zap_set_string(zchan->caller_data.ani, dest);
-		zap_set_string(zchan->caller_data.cid_name, outbound_profile->caller_id_name);
-		zap_set_string(zchan->caller_data.cid_num, outbound_profile->caller_id_number);
+		zchan->caller_data = caller_data;
 		caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
 		switch_channel_set_caller_profile(channel, caller_profile);
 		tech_pvt->caller_profile = caller_profile;
@@ -1535,6 +1539,7 @@ static switch_status_t load_config(void)
 				
 			if (!id) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
+				continue;
 			}
 
 			span_id = atoi(id);
@@ -1561,6 +1566,70 @@ static switch_status_t load_config(void)
 		}
 	}
 
+	if ((spans = switch_xml_child(cfg, "boost_spans"))) {
+		for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
+			char *id = (char *) switch_xml_attr_soft(myspan, "id");
+			char *context = "default";
+			char *dialplan = "XML";
+			uint32_t span_id = 0;
+			zap_span_t *span = NULL;
+			char *tonegroup = NULL;
+			char *local_ip = NULL;
+			int local_port = 0;
+			char *remote_ip = NULL;
+			int remote_port = 0;
+
+			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
+				char *var = (char *) switch_xml_attr_soft(param, "name");
+				char *val = (char *) switch_xml_attr_soft(param, "value");
+
+				if (!strcasecmp(var, "tonegroup")) {
+					tonegroup = val;
+				} else if (!strcasecmp(var, "local-ip")) {
+					local_ip = val;
+				} else if (!strcasecmp(var, "local-port")) {
+					local_port = atoi(val);
+				} else if (!strcasecmp(var, "remote-ip")) {
+					remote_ip = val;
+				} else if (!strcasecmp(var, "remote-port")) {
+					remote_port = atoi(val);
+				} else if (!strcasecmp(var, "context")) {
+					context = val;
+				} else if (!strcasecmp(var, "dialplan")) {
+					dialplan = val;
+				} 
+			}
+				
+			if (!(id && local_ip && local_port && remote_ip && remote_port) ) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param\n");
+				continue;
+			}
+
+			span_id = atoi(id);
+			
+			if (!tonegroup) {
+				tonegroup = "us";
+			}
+			
+			if (zap_span_find(span_id, &span) != ZAP_SUCCESS) {
+				zap_log(ZAP_LOG_ERROR, "Error finding OpenZAP span %d\n", span_id);
+				continue;
+			}
+
+			if (zap_ss7_boost_configure_span(span, local_ip, local_port, remote_ip, remote_port, on_isdn_signal) != ZAP_SUCCESS) {
+				zap_log(ZAP_LOG_ERROR, "Error starting OpenZAP span %d error: %s\n", span_id, span->last_error);
+				continue;
+			}
+
+			SPAN_CONFIG[span->span_id].span = span;
+			switch_copy_string(SPAN_CONFIG[span->span_id].context, context, sizeof(SPAN_CONFIG[span->span_id].context));
+			switch_copy_string(SPAN_CONFIG[span->span_id].dialplan, dialplan, sizeof(SPAN_CONFIG[span->span_id].dialplan));
+
+			zap_ss7_boost_start(span);
+		}
+	}
+
+
 
 	switch_xml_free(xml);
 

libs/freetdm/src/include/openzap.h

@@ -150,7 +150,9 @@
 #define assert(_Expression)     ((void)(_Expression))
 #endif
 
-#define ZAP_MAX_CHANNELS_SPAN 513
+#define ZAP_MAX_CHANNELS_PHYSICAL_SPAN 32
+#define ZAP_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN 16
+#define ZAP_MAX_CHANNELS_SPAN ZAP_MAX_CHANNELS_PHYSICAL_SPAN * ZAP_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN
 #define ZAP_MAX_SPANS_INTERFACE 33
 
 #define GOTO_STATUS(label,st) status = st; goto label ;
@@ -506,7 +508,7 @@ zap_status_t zap_span_set_event_callback(zap_span_t *span, zio_event_cb_t event_
 zap_status_t zap_channel_set_event_callback(zap_channel_t *zchan, zio_event_cb_t event_callback);
 zap_status_t zap_channel_open(uint32_t span_id, uint32_t chan_id, zap_channel_t **zchan);
 zap_status_t zap_channel_open_chan(zap_channel_t *zchan);
-zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, zap_channel_t **zchan);
+zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, const zap_caller_data_t *caller_data, zap_channel_t **zchan);
 zap_status_t zap_channel_close(zap_channel_t **zchan);
 zap_status_t zap_channel_done(zap_channel_t *zchan);
 zap_status_t zap_channel_use(zap_channel_t *zchan);

libs/freetdm/src/include/ss7_boost_client.h

@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef SS7BC_USE_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 #include <netinet/sctp.h>
 #endif
 #include <arpa/inet.h>
@@ -77,13 +77,13 @@
 typedef  t_sigboost ss7bc_event_t;
 typedef uint32_t ss7bc_event_id_t;
 
-typedef struct smg_ip_cfg
+typedef struct ss7bc_ip_cfg
 {
 	char local_ip[25];
 	int local_port;
 	char remote_ip[25];
 	int remote_port;
-}smg_ip_cfg_t;
+}ss7bc_ip_cfg_t;
 
 struct ss7bc_connection {
 	zap_socket_t socket;
@@ -99,7 +99,7 @@ struct ss7bc_connection {
 	unsigned int rxseq;
 	unsigned int txwindow;
 	unsigned int rxseq_reset;
-	smg_ip_cfg_t cfg;
+	ss7bc_ip_cfg_t cfg;
 };
 
 typedef enum {
@@ -111,7 +111,7 @@ typedef struct ss7bc_connection ss7bc_connection_t;
 /* disable nagle's algorythm */
 static inline void sctp_no_nagle(int socket)
 {
-#ifdef SS7BC_USE_SCTP
+#ifdef HAVE_NETINET_SCTP_H
     int flag = 1;
     setsockopt(socket, IPPROTO_SCTP, SCTP_NODELAY, (char *) &flag, sizeof(int));
 #endif
@@ -123,8 +123,9 @@ ss7bc_event_t *ss7bc_connection_read(ss7bc_connection_t *mcon, int iteration);
 ss7bc_event_t *ss7bc_connection_readp(ss7bc_connection_t *mcon, int iteration);
 int ss7bc_connection_write(ss7bc_connection_t *mcon, ss7bc_event_t *event);
 void ss7bc_event_init(ss7bc_event_t *event, ss7bc_event_id_t event_id, int chan, int span);
-void ss7bc_call_init(ss7bc_event_t *event, char *calling, char *called, int setup_id);
-char *ss7bc_event_id_name(uint32_t event_id);
+void ss7bc_call_init(ss7bc_event_t *event, const char *calling, const char *called, int setup_id);
+const char *ss7bc_event_id_name(uint32_t event_id);
+int ss7bc_exec_command(ss7bc_connection_t *mcon, int span, int chan, int id, int cmd, int cause);
 
 #endif
 

libs/freetdm/src/include/zap_ss7_boost.h

@@ -33,21 +33,19 @@
 
 #ifndef ZAP_SS7_BOOST_H
 #define ZAP_SS7_BOOST_H
+#include "ss7_boost_client.h"
 #include "openzap.h"
 
 typedef enum {
 	ZAP_SS7_BOOST_RUNNING = (1 << 0)
-} zap_isdn_flag_t;
+} zap_ss7_boost_flag_t;
 
-struct zap_ss7_boost_data {
-	const char *local_ip;
-	int local_port;
-	const char *remote_ip;
-	int remote_port;
+typedef struct zap_ss7_boost_data {
+	ss7bc_connection_t mcon;
+	ss7bc_connection_t pcon;
 	zio_signal_cb_t signal_cb;
 	uint32_t flags;
-};
-typedef struct zap_ss7_boost_data zap_ss7_boost_data_t;
+} zap_ss7_boost_data_t;
 
 zap_status_t zap_ss7_boost_start(zap_span_t *span);
 zap_status_t zap_ss7_boost_init(void);

libs/freetdm/src/include/zap_types.h

@@ -336,8 +336,9 @@ typedef struct zap_channel zap_channel_t;
 typedef struct zap_event zap_event_t;
 typedef struct zap_sigmsg zap_sigmsg_t;
 typedef struct zap_span zap_span_t;
+typedef struct zap_caller_data zap_caller_data_t;
 
-#define ZIO_CHANNEL_REQUEST_ARGS (zap_span_t *span, zap_direction_t direction, zap_channel_t **zchan)
+#define ZIO_CHANNEL_REQUEST_ARGS (zap_span_t *span, zap_direction_t direction, const zap_caller_data_t *caller_data, zap_channel_t **zchan)
 #define ZIO_CHANNEL_OUTGOING_CALL_ARGS (zap_channel_t *zchan)
 #define ZIO_SPAN_POLL_EVENT_ARGS (zap_span_t *span, uint32_t ms)
 #define ZIO_SPAN_NEXT_EVENT_ARGS (zap_span_t *span, zap_event_t **event)

libs/freetdm/src/ss7_boost_client.c

@@ -43,7 +43,7 @@ extern int gethostbyname_r (__const char *__restrict __name,
 
 struct ss7bc_map {
 	uint32_t event_id;
-	char *name;
+	const char *name;
 };
 
 static struct ss7bc_map ss7bc_table[] = {
@@ -72,7 +72,7 @@ static int create_conn_socket(ss7bc_connection_t *mcon, char *local_ip, int loca
 
 	memset(&mcon->remote_hp, 0, sizeof(mcon->remote_hp));
 	memset(&mcon->local_hp, 0, sizeof(mcon->local_hp));
-#ifdef SS7BC_USE_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 	mcon->socket = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
 #else
 	mcon->socket = socket(AF_INET, SOCK_DGRAM, 0);
@@ -96,7 +96,7 @@ static int create_conn_socket(ss7bc_connection_t *mcon, char *local_ip, int loca
 			memcpy((char *) &mcon->local_addr.sin_addr.s_addr, mcon->local_hp.h_addr_list[0], mcon->local_hp.h_length);
 			mcon->local_addr.sin_port = htons(local_port);
 
-#ifdef SS7BC_USE_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 			setsockopt(mcon->socket, IPPROTO_SCTP, SCTP_NODELAY, 
 					   (char *)&flag, sizeof(int));
 #endif
@@ -107,7 +107,7 @@ static int create_conn_socket(ss7bc_connection_t *mcon, char *local_ip, int loca
 				close(mcon->socket);
 				mcon->socket = -1;
 			} else {
-#ifdef SS7BC_USE_SCTP
+#ifdef HAVE_NETINET_SCTP_H
 				rc=listen(mcon->socket,100);
 				if (rc) {
 					close(mcon->socket);
@@ -123,9 +123,11 @@ static int create_conn_socket(ss7bc_connection_t *mcon, char *local_ip, int loca
 
 int ss7bc_connection_close(ss7bc_connection_t *mcon)
 {
-	close(mcon->socket);
-	mcon->socket = -1;
+	if (mcon->socket > -1) {
+		close(mcon->socket);
+	}
 	memset(mcon, 0, sizeof(*mcon));
+	mcon->socket = -1;
 
 	return 0;
 }
@@ -136,6 +138,41 @@ int ss7bc_connection_open(ss7bc_connection_t *mcon, char *local_ip, int local_po
 	return mcon->socket;
 }
 
+
+int ss7bc_exec_command(ss7bc_connection_t *mcon, int span, int chan, int id, int cmd, int cause)
+{
+    ss7bc_event_t oevent;
+    int retry = 5;
+
+    ss7bc_event_init(&oevent, cmd, chan, span);
+    oevent.release_cause = cause;
+
+    if (id >= 0) {
+        oevent.call_setup_id = id;
+    }
+ isup_exec_cmd_retry:
+    if (ss7bc_connection_write(mcon, &oevent) <= 0){
+
+        --retry;
+        if (retry <= 0) {
+            zap_log(ZAP_LOG_WARNING,
+					   "Critical System Error: Failed to tx on ISUP socket: %s\n",
+					   strerror(errno));
+            return -1;
+        } else {
+            zap_log(ZAP_LOG_WARNING,
+					   "System Warning: Failed to tx on ISUP socket: %s :retry %i\n",
+					   strerror(errno),retry);
+        }
+
+        goto isup_exec_cmd_retry;
+    }
+
+    return 0;
+}
+
+
+
 ss7bc_event_t *ss7bc_connection_read(ss7bc_connection_t *mcon, int iteration)
 {
 	unsigned int fromlen = sizeof(struct sockaddr_in);
@@ -360,7 +397,7 @@ int ss7bc_connection_write(ss7bc_connection_t *mcon, ss7bc_event_t *event)
 	return err;
 }
 
-void ss7bc_call_init(ss7bc_event_t *event, char *calling, char *called, int setup_id)
+void ss7bc_call_init(ss7bc_event_t *event, const char *calling, const char *called, int setup_id)
 {
 	memset(event, 0, sizeof(ss7bc_event_t));
 	event->event_id = SIGBOOST_EVENT_CALL_START;
@@ -387,10 +424,10 @@ void ss7bc_event_init(ss7bc_event_t *event, ss7bc_event_id_t event_id, int chan,
 	event->span = span;
 }
 
-char *ss7bc_event_id_name(uint32_t event_id)
+const char *ss7bc_event_id_name(uint32_t event_id)
 {
 	unsigned int x;
-	char *ret = NULL;
+	const char *ret = NULL;
 
 	for (x = 0 ; x < sizeof(ss7bc_table)/sizeof(struct ss7bc_map); x++) {
 		if (ss7bc_table[x].event_id == event_id) {

libs/freetdm/src/zap_io.c

@@ -37,6 +37,7 @@
 #endif
 #include "openzap.h"
 #include "zap_isdn.h"
+#include "zap_ss7_boost.h"
 #include <stdarg.h>
 #ifdef WIN32
 #include <io.h>
@@ -342,7 +343,7 @@ zap_status_t zap_span_close_all(void)
 		span = &globals.spans[i];
 		if (zap_test_flag(span, ZAP_SPAN_CONFIGURED)) {
 			for(j = 0; j < span->chan_count; j++) {
-				zap_channel_destroy(&span->channels[i]);
+				zap_channel_destroy(&span->channels[j]);
 			}
 		} 
 	}
@@ -679,7 +680,7 @@ zap_status_t zap_channel_set_state(zap_channel_t *zchan, zap_channel_state_t sta
 	return ok ? ZAP_SUCCESS : ZAP_FAIL;
 }
 
-zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, zap_channel_t **zchan)
+zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, const zap_caller_data_t *caller_data, zap_channel_t **zchan)
 {
 	zap_status_t status = ZAP_FAIL;
 	zap_channel_t *check;
@@ -690,7 +691,7 @@ zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, z
 	zap_mutex_lock(globals.mutex);
 
 	if (span_id && globals.spans[span_id].channel_request) {
-		status = globals.spans[span_id].channel_request(&globals.spans[span_id], direction, zchan);
+		status = globals.spans[span_id].channel_request(&globals.spans[span_id], direction, caller_data, zchan);
 		goto done;
 	}
 
@@ -1949,6 +1950,7 @@ zap_status_t zap_global_init(void)
 
 	time_init();
 	zap_isdn_init();
+	zap_ss7_boost_init();
 	
 	memset(&interfaces, 0, sizeof(interfaces));
 	globals.interface_hash = create_hashtable(16, zap_hash_hashfromstring, zap_hash_equalkeys);

libs/freetdm/src/zap_wanpipe.c

@@ -358,13 +358,14 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
 		sockfd = tdmv_api_open_span_chan(spanno, x);
 		
 		if (sockfd != WP_INVALID_SOCKET && zap_span_add_channel(span, sockfd, type, &chan) == ZAP_SUCCESS) {
+			wanpipe_tdm_api_t tdm_api;
 			zap_log(ZAP_LOG_INFO, "configuring device s%dc%d as OpenZAP device %d:%d fd:%d\n", spanno, x, chan->span_id, chan->chan_id, sockfd);
 			chan->physical_span_id = spanno;
 			chan->physical_chan_id = x;
 			chan->rate = 8000;
 
 			if (type == ZAP_CHAN_TYPE_FXS || type == ZAP_CHAN_TYPE_FXO) {
-				wanpipe_tdm_api_t tdm_api;
+				
 
 #if 1
 				if (type == ZAP_CHAN_TYPE_FXO) {
@@ -390,8 +391,9 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
 				tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_mode = WP_TDMAPI_EVENT_ENABLE;
 				wp_tdm_cmd_exec(chan, &tdm_api);
 
+			}
 
-
+			if (type == ZAP_CHAN_TYPE_FXS || type == ZAP_CHAN_TYPE_FXO || type == ZAP_CHAN_TYPE_B) {
 				tdm_api.wp_tdm_cmd.cmd = SIOC_WP_TDM_GET_HW_CODING;
 				wp_tdm_cmd_exec(chan, &tdm_api);
 				if (tdm_api.wp_tdm_cmd.hw_tdm_coding) {
@@ -400,6 +402,7 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
 					chan->native_codec = chan->effective_codec = ZAP_CODEC_ULAW;
 				}
 			}
+			
 			if (!zap_strlen_zero(name)) {
 				zap_copy_string(chan->chan_name, name, sizeof(chan->chan_name));
 			}