mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-05-18 21:48:27 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3448 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
5869b86676
commit
fd16c8f245
@ -465,7 +465,8 @@ typedef enum {
|
|||||||
CF_CONTROLLED = (1 << 12),
|
CF_CONTROLLED = (1 << 12),
|
||||||
CF_NOMEDIA = (1 << 13),
|
CF_NOMEDIA = (1 << 13),
|
||||||
CF_SUSPEND = (1 << 14),
|
CF_SUSPEND = (1 << 14),
|
||||||
CF_EVENT_PARSE = (1 << 15)
|
CF_EVENT_PARSE = (1 << 15),
|
||||||
|
CF_NO_EARLY = (1 << 16)
|
||||||
} switch_channel_flag_t;
|
} switch_channel_flag_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -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
|
LDFLAGS +=-lg729
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
CFLAGS += -DG729_PASSTHROUGH
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
|
all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
|
||||||
|
|
||||||
|
@ -2548,6 +2548,12 @@ static void sip_i_state(int status,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (r_sdp) {
|
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)) {
|
if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) {
|
||||||
switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
|
switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
|
||||||
switch_channel_set_flag(channel, CF_EARLY_MEDIA);
|
switch_channel_set_flag(channel, CF_EARLY_MEDIA);
|
||||||
|
@ -2436,7 +2436,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
|
|||||||
peer_sessions[i] = NULL;
|
peer_sessions[i] = NULL;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
//switch_channel_set_flag(peer_channels[i], CF_NO_EARLY);
|
||||||
switch_core_session_read_lock(peer_sessions[i]);
|
switch_core_session_read_lock(peer_sessions[i]);
|
||||||
pool = NULL;
|
pool = NULL;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user