提交 89e62d8c authored 作者: Anthony Minessale's avatar Anthony Minessale

google part 1000

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2330 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 155420a7
...@@ -326,6 +326,8 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from, ...@@ -326,6 +326,8 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from,
} }
tag = iks_next_tag(tag); tag = iks_next_tag(tag);
} }
} else if (!strcasecmp(type, "transport-accept")) {
signal = LDL_SIGNAL_TRANSPORT_ACCEPT;
} else if (!strcasecmp(type, "transport-info")) { } else if (!strcasecmp(type, "transport-info")) {
char *tid = iks_find_attrib(xml, "id"); char *tid = iks_find_attrib(xml, "id");
signal = LDL_SIGNAL_CANDIDATES; signal = LDL_SIGNAL_CANDIDATES;
......
...@@ -123,7 +123,8 @@ typedef enum { ...@@ -123,7 +123,8 @@ typedef enum {
LDL_SIGNAL_ERROR, LDL_SIGNAL_ERROR,
LDL_SIGNAL_LOGIN_SUCCESS, LDL_SIGNAL_LOGIN_SUCCESS,
LDL_SIGNAL_LOGIN_FAILURE, LDL_SIGNAL_LOGIN_FAILURE,
LDL_SIGNAL_CONNECTED LDL_SIGNAL_CONNECTED,
LDL_SIGNAL_TRANSPORT_ACCEPT
} ldl_signal_t; } ldl_signal_t;
typedef enum { typedef enum {
......
...@@ -66,7 +66,8 @@ typedef enum { ...@@ -66,7 +66,8 @@ typedef enum {
TFLAG_AUTO = (1 << 17), TFLAG_AUTO = (1 << 17),
TFLAG_DTMF = (1 << 18), TFLAG_DTMF = (1 << 18),
TFLAG_TIMER = ( 1 << 19), TFLAG_TIMER = ( 1 << 19),
TFLAG_TERM = ( 1 << 20) TFLAG_TERM = ( 1 << 20),
TFLAG_TRANSPORT_ACCEPT = (1 << 21),
} TFLAGS; } TFLAGS;
typedef enum { typedef enum {
...@@ -542,6 +543,7 @@ static void *SWITCH_THREAD_FUNC negotiate_thread_run(switch_thread_t *thread, vo ...@@ -542,6 +543,7 @@ static void *SWITCH_THREAD_FUNC negotiate_thread_run(switch_thread_t *thread, vo
while(! (switch_test_flag(tech_pvt, TFLAG_CODEC_READY) && while(! (switch_test_flag(tech_pvt, TFLAG_CODEC_READY) &&
switch_test_flag(tech_pvt, TFLAG_RTP_READY) && switch_test_flag(tech_pvt, TFLAG_RTP_READY) &&
switch_test_flag(tech_pvt, TFLAG_ANSWER) && switch_test_flag(tech_pvt, TFLAG_ANSWER) &&
switch_test_flag(tech_pvt, TFLAG_TRANSPORT_ACCEPT) &&
switch_test_flag(tech_pvt, TFLAG_TRANSPORT))) { switch_test_flag(tech_pvt, TFLAG_TRANSPORT))) {
now = switch_time_now(); now = switch_time_now();
elapsed = (unsigned int)((now - started) / 1000); elapsed = (unsigned int)((now - started) / 1000);
...@@ -1608,6 +1610,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi ...@@ -1608,6 +1610,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
tech_pvt->local_port = switch_rtp_request_port(); tech_pvt->local_port = switch_rtp_request_port();
switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_set_flag_locked(tech_pvt, TFLAG_ANSWER);
tech_pvt->recip = switch_core_session_strdup(session, from); tech_pvt->recip = switch_core_session_strdup(session, from);
switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n");
terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
...@@ -1648,7 +1651,9 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi ...@@ -1648,7 +1651,9 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
} }
break; break;
case LDL_SIGNAL_TRANSPORT_ACCEPT:
switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT);
printf("\n**************************************\n");
break; break;
case LDL_SIGNAL_INITIATE: case LDL_SIGNAL_INITIATE:
if (signal) { if (signal) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论