Merge remote branch 'fsorig/master' into releases.3.5

Conflicts:
	build/modules.conf.in
	libs/freetdm/mod_freetdm/mod_freetdm.c

libs/freetdm/src/include/freetdm.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Anthony Minessale II
+ * Copyright (c) 2007-2012, Anthony Minessale II
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,9 @@
 /*! \brief Max number of groups */
 #define FTDM_MAX_GROUPS_INTERFACE FTDM_MAX_SPANS_INTERFACE
 
+/*! \brief Max number of key=value pairs to be sent as signaling stack parameters */
+#define FTDM_MAX_SIG_PARAMETERS 30
+
 #define FTDM_INVALID_INT_PARM 0xFF
 
 /*! \brief Thread/Mutex OS abstraction API. */
@@ -343,6 +346,11 @@ typedef struct {
 	uint8_t plan;
 } ftdm_number_t;
 
+typedef struct {
+	char from[FTDM_MAX_NUMBER_STR_SZ];  	
+	char body[FTDM_MAX_NAME_STR_SZ];
+} ftdm_sms_data_t;
+
 /*! \brief Caller information */
 typedef struct ftdm_caller_data {
 	char cid_date[8]; /*!< Caller ID date */
@@ -454,12 +462,13 @@ typedef enum {
 	FTDM_SIGEVENT_INDICATION_COMPLETED, /*!< Last requested indication was completed */
 	FTDM_SIGEVENT_DIALING, /*!< Outgoing call just started */
 	FTDM_SIGEVENT_TRANSFER_COMPLETED, /*!< Transfer request is completed */
+	FTDM_SIGEVENT_SMS,
 	FTDM_SIGEVENT_INVALID, /*!<Invalid */
 } ftdm_signal_event_t;
 #define SIGNAL_STRINGS "START", "STOP", "RELEASED", "UP", "FLASH", "PROCEED", "RINGING", "PROGRESS", \
 		"PROGRESS_MEDIA", "ALARM_TRAP", "ALARM_CLEAR", \
 		"COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGSTATUS_CHANGED", "FACILITY", \
-		"TRACE", "TRACE_RAW", "INDICATION_COMPLETED", "DIALING", "TRANSFER_COMPLETED", "INVALID"
+		"TRACE", "TRACE_RAW", "INDICATION_COMPLETED", "DIALING", "TRANSFER_COMPLETED", "SMS", "INVALID"
 /*! \brief Move from string to ftdm_signal_event_t and viceversa */
 FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)
 
@@ -473,9 +482,10 @@ typedef enum {
 	FTDM_TRUNK_FXO,
 	FTDM_TRUNK_FXS,
 	FTDM_TRUNK_EM,
+	FTDM_TRUNK_GSM,
 	FTDM_TRUNK_NONE
 } ftdm_trunk_type_t;
-#define TRUNK_STRINGS "E1", "T1", "J1", "BRI", "BRI_PTMP", "FXO", "FXS", "EM", "NONE"
+#define TRUNK_STRINGS "E1", "T1", "J1", "BRI", "BRI_PTMP", "FXO", "FXS", "EM", "GSM", "NONE"
 
 /*! \brief Move from string to ftdm_trunk_type_t and viceversa */
 FTDM_STR2ENUM_P(ftdm_str2ftdm_trunk_type, ftdm_trunk_type2str, ftdm_trunk_type_t)
@@ -623,14 +633,6 @@ typedef enum {
 	FTDM_CRASH_ON_ASSERT
 } ftdm_crash_policy_t;
 
-/*! \brief I/O waiting flags */
-typedef enum {
-	FTDM_NO_FLAGS = 0,
-	FTDM_READ =  (1 << 0),
-	FTDM_WRITE = (1 << 1),
-	FTDM_EVENTS = (1 << 2)
-} ftdm_wait_flag_t;
-
 /*! \brief Signaling configuration parameter for the stacks (variable=value pair) */
 typedef struct ftdm_conf_parameter {
 	const char *var;

libs/freetdm/src/include/ftdm_declare.h

@@ -203,6 +203,14 @@ typedef enum {
 	FTDM_TRUE
 } ftdm_bool_t;
 
+/*! \brief I/O waiting flags */
+typedef enum {
+	FTDM_NO_FLAGS = 0,
+	FTDM_READ =  (1 << 0),
+	FTDM_WRITE = (1 << 1),
+	FTDM_EVENTS = (1 << 2)
+} ftdm_wait_flag_t;
+
 /*! 
  * \brief FreeTDM channel.
  *        This is the basic data structure used to place calls and I/O operations

libs/freetdm/src/include/ftdm_threadmutex.h

@@ -52,11 +52,12 @@ FT_DECLARE(ftdm_status_t) _ftdm_mutex_trylock(const char *file, int line, const
 #define ftdm_mutex_unlock(_x) _ftdm_mutex_unlock(__FILE__, __LINE__, __FUNCTION__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_unlock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
-FT_DECLARE(ftdm_status_t) ftdm_interrupt_create(ftdm_interrupt_t **cond, ftdm_socket_t device);
+FT_DECLARE(ftdm_status_t) ftdm_interrupt_create(ftdm_interrupt_t **cond, ftdm_socket_t device, ftdm_wait_flag_t device_flags);
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_destroy(ftdm_interrupt_t **cond);
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_signal(ftdm_interrupt_t *cond);
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_wait(ftdm_interrupt_t *cond, int ms);
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_multiple_wait(ftdm_interrupt_t *interrupts[], ftdm_size_t size, int ms);
+FT_DECLARE(ftdm_wait_flag_t) ftdm_interrupt_device_ready(ftdm_interrupt_t *interrupt);
 
 #ifdef __cplusplus
 }

libs/freetdm/src/include/private/ftdm_buffer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Anthony Minessale II
+ * Copyright (c) 2007-2012, Anthony Minessale II
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

libs/freetdm/src/include/private/ftdm_config.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Anthony Minessale II
+ * Copyright (c) 2007-2012, Anthony Minessale II
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

libs/freetdm/src/include/private/ftdm_types.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Anthony Minessale II
+ * Copyright (c) 2007-2012, Anthony Minessale II
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -163,7 +163,8 @@ typedef enum {
 	FTDM_SIGTYPE_SANGOMABOOST,
 	FTDM_SIGTYPE_M3UA,
 	FTDM_SIGTYPE_R2,
-	FTDM_SIGTYPE_SS7
+	FTDM_SIGTYPE_SS7,
+	FTDM_SIGTYPE_GSM
 } ftdm_signal_type_t;
 
 typedef enum {

libs/freetdm/src/include/private/libteletone.h

@@ -1,6 +1,6 @@
 /* 
  * libteletone
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
+ * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
  *
  * Version: MPL 1.1
  *

libs/freetdm/src/include/private/libteletone_detect.h

@@ -1,6 +1,6 @@
 /* 
  * libteletone
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
+ * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
  *
  * Version: MPL 1.1
  *

libs/freetdm/src/include/private/libteletone_generate.h

@@ -1,6 +1,6 @@
 /* 
  * libteletone
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
+ * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
  *
  * Version: MPL 1.1
  *