update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3448 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index e553d546056c46378410696d3614f85e005b4f3f..0e56c0c13d67e390cf67330f7c0512393393fae5 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -465,7 +465,8 @@ typedef enum {
        CF_CONTROLLED   = (1 << 12),
        CF_NOMEDIA              = (1 << 13),
        CF_SUSPEND              = (1 << 14),
-       CF_EVENT_PARSE  = (1 << 15)
+       CF_EVENT_PARSE  = (1 << 15),
+       CF_NO_EARLY     = (1 << 16)
 } switch_channel_flag_t;
 
 

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index ad8c52540cab678831d89b57a03a0f5d56441aee..0b47c5591566dcc4e01d62eff2d9ecdc54eb956f 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,13 +1,9 @@
-ifeq ($(shell ls $(BASE)/libs/libg729),$(BASE)/libs/libg729)
 
-CFLAGS += -I$(PREFIX)/include/g729
-LDFLAGS +=-lg729
 
-else
+CFLAGS += -I$(PREFIX)/include/libg729
+LDFLAGS +=-lg729
 
-CFLAGS += -DG729_PASSTHROUGH
 
-endif
 
 all:   $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index a6a053e83a09ea0f880f691714a2259a31e87436..c3f78b07d713751eae459a0956151e5c6e6a4004 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -2548,6 +2548,12 @@ static void sip_i_state(int status,
                                }
                        }
                        if (r_sdp) {
+                               if (switch_channel_test_flag(channel, CF_NO_EARLY)) {
+                                       //ignore 183 but how do we say we dont want it and not end the call
+                                       //nua_respond(nh, SIP_403_FORBIDDEN, TAG_END());
+                                       return;
+                               }
+
                                if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) {
                                        switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
                                        switch_channel_set_flag(channel, CF_EARLY_MEDIA);

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 2c40593f4de7794b20c56a54b586fb0ec8f1ff92..7f01da6293c2d9d3ad4695e9155a845596fdbaf1 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -2436,7 +2436,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                peer_sessions[i] = NULL;
                                continue;
                        }
-
+                       //switch_channel_set_flag(peer_channels[i], CF_NO_EARLY);
                        switch_core_session_read_lock(peer_sessions[i]);
                        pool = NULL;