[Freeswitch-svn] [commit] r3448 - in freeswitch/trunk/src: . include mod/codecs/mod_g729 mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Thu Nov 23 14:42:21 2006
New Revision: 3448

Modified:
   freeswitch/trunk/src/include/switch_types.h
   freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/switch_ivr.c

Log:
update

Modified: freeswitch/trunk/src/include/switch_types.h
==============================================================================
--- freeswitch/trunk/src/include/switch_types.h	(original)
+++ freeswitch/trunk/src/include/switch_types.h	Thu Nov 23 14:42:21 2006
@@ -465,7 +465,8 @@
 	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;
 
 

Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile	Thu Nov 23 14:42:21 2006
@@ -1,13 +1,9 @@
-ifeq ($(shell ls $(BASE)/libs/libg729),$(BASE)/libs/libg729)
 
-CFLAGS += -I$(PREFIX)/include/g729
+
+CFLAGS += -I$(PREFIX)/include/libg729
 LDFLAGS +=-lg729
 
-else
 
-CFLAGS += -DG729_PASSTHROUGH
-
-endif
 
 all:	$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Thu Nov 23 14:42:21 2006
@@ -2548,6 +2548,12 @@
 				}
 			}
 			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);

Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c	(original)
+++ freeswitch/trunk/src/switch_ivr.c	Thu Nov 23 14:42:21 2006
@@ -2436,7 +2436,7 @@
 				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;