freetdm: completion of compilation with initial reworked API

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

@@ -120,14 +120,6 @@
 extern "C" {
 #endif
 
-#define FTDM_MAX_CHANNELS_PHYSICAL_SPAN 32
-#define FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN 32
-#define FTDM_MAX_CHANNELS_SPAN FTDM_MAX_CHANNELS_PHYSICAL_SPAN * FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN
-#define FTDM_MAX_SPANS_INTERFACE 128
-
-#define FTDM_MAX_CHANNELS_GROUP 1024
-#define FTDM_MAX_GROUPS_INTERFACE FTDM_MAX_SPANS_INTERFACE
-
 #define GOTO_STATUS(label,st) status = st; goto label ;
 
 #define ftdm_copy_string(x,y,z) strncpy(x, y, z - 1) 
@@ -542,7 +534,6 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_set_state(ftdm_channel_t *ftdmchan, ftdm_
 
 FT_DECLARE(ftdm_status_t) ftdm_span_load_tones(ftdm_span_t *span, const char *mapname);
 FT_DECLARE(ftdm_time_t) ftdm_current_time_in_ms(void);
-FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan);
 
 FT_DECLARE(ftdm_status_t) ftdm_channel_use(ftdm_channel_t *ftdmchan);
 
@@ -639,6 +630,9 @@ FIO_CODEC_FUNCTION(fio_alaw2ulaw);
 
 #define ftdm_array_len(array) sizeof(array)/sizeof(array[0])
 
+#define ftdm_channel_lock(chan) ftdm_mutex_lock(chan->mutex)
+#define ftdm_channel_unlock(chan) ftdm_mutex_unlock(chan->mutex)
+
 static __inline__ void ftdm_abort(void)
 {
 #ifdef __cplusplus

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

@@ -151,19 +151,6 @@ typedef enum {
 #define OOB_STRINGS "DTMF", "ONHOOK", "OFFHOOK", "WINK", "FLASH", "RING_START", "RING_STOP", "ALARM_TRAP", "ALARM_CLEAR", "NOOP", "CAS_BITS_CHANGE", "INVALID"
 FTDM_STR2ENUM_P(ftdm_str2ftdm_oob_event, ftdm_oob_event2str, ftdm_oob_event_t)
 
-typedef enum {
-	FTDM_ALARM_NONE = 0,
-	FTDM_ALARM_RECOVER = (1 << 0),
-	FTDM_ALARM_LOOPBACK = (1 << 2),
-	FTDM_ALARM_YELLOW = (1 << 3),
-	FTDM_ALARM_RED = (1 << 4),
-	FTDM_ALARM_BLUE = (1 << 5),
-	FTDM_ALARM_NOTOPEN = ( 1 << 6),
-	FTDM_ALARM_AIS = ( 1 << 7),
-	FTDM_ALARM_RAI = ( 1 << 8),
-	FTDM_ALARM_GENERAL = ( 1 << 30)
-} ftdm_alarm_flag_t;
-
 typedef enum {
 	FTDM_SIGTYPE_NONE,
 	FTDM_SIGTYPE_ISDN,
@@ -174,10 +161,6 @@ typedef enum {
 	FTDM_SIGTYPE_R2
 } ftdm_signal_type_t;
 
-typedef enum {
-	FTDM_TONE_DTMF = (1 << 0)
-} ftdm_tone_type_t;
-
 typedef enum {
 	FTDM_SPAN_CONFIGURED = (1 << 0),
 	FTDM_SPAN_READY = (1 << 1),
@@ -368,70 +351,6 @@ typedef struct ftdm_fsk_modulator ftdm_fsk_modulator_t;
 typedef ftdm_status_t (*ftdm_span_start_t)(ftdm_span_t *span);
 typedef ftdm_status_t (*ftdm_span_stop_t)(ftdm_span_t *span);
 
-typedef enum {
-	FTDM_CAUSE_NONE = 0,
-	FTDM_CAUSE_UNALLOCATED = 1,
-	FTDM_CAUSE_NO_ROUTE_TRANSIT_NET = 2,
-	FTDM_CAUSE_NO_ROUTE_DESTINATION = 3,
-	FTDM_CAUSE_CHANNEL_UNACCEPTABLE = 6,
-	FTDM_CAUSE_CALL_AWARDED_DELIVERED = 7,
-	FTDM_CAUSE_NORMAL_CLEARING = 16,
-	FTDM_CAUSE_USER_BUSY = 17,
-	FTDM_CAUSE_NO_USER_RESPONSE = 18,
-	FTDM_CAUSE_NO_ANSWER = 19,
-	FTDM_CAUSE_SUBSCRIBER_ABSENT = 20,
-	FTDM_CAUSE_CALL_REJECTED = 21,
-	FTDM_CAUSE_NUMBER_CHANGED = 22,
-	FTDM_CAUSE_REDIRECTION_TO_NEW_DESTINATION = 23,
-	FTDM_CAUSE_EXCHANGE_ROUTING_ERROR = 25,
-	FTDM_CAUSE_DESTINATION_OUT_OF_ORDER = 27,
-	FTDM_CAUSE_INVALID_NUMBER_FORMAT = 28,
-	FTDM_CAUSE_FACILITY_REJECTED = 29,
-	FTDM_CAUSE_RESPONSE_TO_STATUS_ENQUIRY = 30,
-	FTDM_CAUSE_NORMAL_UNSPECIFIED = 31,
-	FTDM_CAUSE_NORMAL_CIRCUIT_CONGESTION = 34,
-	FTDM_CAUSE_NETWORK_OUT_OF_ORDER = 38,
-	FTDM_CAUSE_NORMAL_TEMPORARY_FAILURE = 41,
-	FTDM_CAUSE_SWITCH_CONGESTION = 42,
-	FTDM_CAUSE_ACCESS_INFO_DISCARDED = 43,
-	FTDM_CAUSE_REQUESTED_CHAN_UNAVAIL = 44,
-	FTDM_CAUSE_PRE_EMPTED = 45,
-	FTDM_CAUSE_FACILITY_NOT_SUBSCRIBED = 50,
-	FTDM_CAUSE_OUTGOING_CALL_BARRED = 52,
-	FTDM_CAUSE_INCOMING_CALL_BARRED = 54,
-	FTDM_CAUSE_BEARERCAPABILITY_NOTAUTH = 57,
-	FTDM_CAUSE_BEARERCAPABILITY_NOTAVAIL = 58,
-	FTDM_CAUSE_SERVICE_UNAVAILABLE = 63,
-	FTDM_CAUSE_BEARERCAPABILITY_NOTIMPL = 65,
-	FTDM_CAUSE_CHAN_NOT_IMPLEMENTED = 66,
-	FTDM_CAUSE_FACILITY_NOT_IMPLEMENTED = 69,
-	FTDM_CAUSE_SERVICE_NOT_IMPLEMENTED = 79,
-	FTDM_CAUSE_INVALID_CALL_REFERENCE = 81,
-	FTDM_CAUSE_INCOMPATIBLE_DESTINATION = 88,
-	FTDM_CAUSE_INVALID_MSG_UNSPECIFIED = 95,
-	FTDM_CAUSE_MANDATORY_IE_MISSING = 96,
-	FTDM_CAUSE_MESSAGE_TYPE_NONEXIST = 97,
-	FTDM_CAUSE_WRONG_MESSAGE = 98,
-	FTDM_CAUSE_IE_NONEXIST = 99,
-	FTDM_CAUSE_INVALID_IE_CONTENTS = 100,
-	FTDM_CAUSE_WRONG_CALL_STATE = 101,
-	FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE = 102,
-	FTDM_CAUSE_MANDATORY_IE_LENGTH_ERROR = 103,
-	FTDM_CAUSE_PROTOCOL_ERROR = 111,
-	FTDM_CAUSE_INTERWORKING = 127,
-	FTDM_CAUSE_SUCCESS = 142,
-	FTDM_CAUSE_ORIGINATOR_CANCEL = 487,
-	FTDM_CAUSE_CRASH = 500,
-	FTDM_CAUSE_SYSTEM_SHUTDOWN = 501,
-	FTDM_CAUSE_LOSE_RACE = 502,
-	FTDM_CAUSE_MANAGER_REQUEST = 503,
-	FTDM_CAUSE_BLIND_TRANSFER = 600,
-	FTDM_CAUSE_ATTENDED_TRANSFER = 601,
-	FTDM_CAUSE_ALLOTTED_TIMEOUT = 602,
-	FTDM_CAUSE_USER_CHALLENGE = 603,
-	FTDM_CAUSE_MEDIA_TIMEOUT = 604
-} ftdm_call_cause_t;
-
 #ifdef __cplusplus
 }
 #endif

libs/freetdm/src/testanalog.c

@@ -18,7 +18,7 @@ static void *test_call(ftdm_thread_t *me, void *obj)
 	ftdm_channel_call_answer(chan);
 	ftdm_channel_command(chan, FTDM_COMMAND_SEND_DTMF, number);
 
-	while (ftdm_channel_call_active(chan)) {
+	while (ftdm_channel_call_check_answered(chan)) {
 		ftdm_wait_flag_t flags = FTDM_READ;
 		
 		if (ftdm_channel_wait(chan, &flags, -1) == FTDM_FAIL) {
@@ -35,7 +35,7 @@ static void *test_call(ftdm_thread_t *me, void *obj)
 		}
 	}
 	
-	if (ftdm_channel_call_active(chan)) {
+	if (ftdm_channel_call_check_answered(chan)) {
 		ftdm_channel_call_indicate(chan, FTDM_CHANNEL_INDICATE_BUSY);
 	}