Skip to content

F
freeswitch
提交 631e689e authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

merge 1 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4876 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 2bc59bff
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 208 行增加 和 191 行删除
libs/libdingaling/src/libdingaling.c
浏览文件 @ 631e689e
...@@ -731,6 +731,8 @@ static int on_presence(void *user_data, ikspak *pak) ...@@ -731,6 +731,8 @@ static int on_presence(void *user_data, ikspak *pak)
struct ldl_buffer *buffer; struct ldl_buffer *buffer;
ldl_signal_t dl_signal = LDL_SIGNAL_PRESENCE_IN; ldl_signal_t dl_signal = LDL_SIGNAL_PRESENCE_IN;
if (type && *type) { if (type && *type) {
if (!strcasecmp(type, "unavailable")) { if (!strcasecmp(type, "unavailable")) {
dl_signal = LDL_SIGNAL_PRESENCE_OUT; dl_signal = LDL_SIGNAL_PRESENCE_OUT;
...@@ -754,6 +756,7 @@ static int on_presence(void *user_data, ikspak *pak) ...@@ -754,6 +756,7 @@ static int on_presence(void *user_data, ikspak *pak)
*resource++ = '\0'; *resource++ = '\0';
} }
if (!apr_hash_get(handle->sub_hash, from, APR_HASH_KEY_STRING)) { if (!apr_hash_get(handle->sub_hash, from, APR_HASH_KEY_STRING)) {
iks *msg; iks *msg;
apr_hash_set(handle->sub_hash, apr_pstrdup(handle->pool, from), APR_HASH_KEY_STRING, &marker); apr_hash_set(handle->sub_hash, apr_pstrdup(handle->pool, from), APR_HASH_KEY_STRING, &marker);
...@@ -766,6 +769,8 @@ static int on_presence(void *user_data, ikspak *pak) ...@@ -766,6 +769,8 @@ static int on_presence(void *user_data, ikspak *pak)
apr_cpystrn(buffer->buf, from, buffer->len); apr_cpystrn(buffer->buf, from, buffer->len);
fflush(stderr); fflush(stderr);
buffer->hit = 1; buffer->hit = 1;
} else {
printf("DAMMIT Lookup %s\n", from);
} }
if (handle->session_callback) { if (handle->session_callback) {
...@@ -1953,42 +1958,33 @@ char *ldl_handle_probe(ldl_handle_t *handle, char *id, char *from, char *buf, un ...@@ -1953,42 +1958,33 @@ char *ldl_handle_probe(ldl_handle_t *handle, char *id, char *from, char *buf, un
iks *pres, *msg; iks *pres, *msg;
char *lid = NULL, *low_id = NULL; char *lid = NULL, *low_id = NULL;
struct ldl_buffer buffer; struct ldl_buffer buffer;
apr_time_t started; time_t started;
unsigned int elapsed; unsigned int elapsed;
char *notice = "Call Me!"; char *notice = "Call Me!";
int again = 0; int next = 0;
buffer.buf = buf; buffer.buf = buf;
buffer.len = len; buffer.len = len;
buffer.hit = 0; buffer.hit = 0;
pres = iks_new("presence");
iks_insert_attrib(pres, "type", "probe");
iks_insert_attrib(pres, "from", from);
iks_insert_attrib(pres, "to", id);
apr_hash_set(handle->probe_hash, id, APR_HASH_KEY_STRING, &buffer); apr_hash_set(handle->probe_hash, id, APR_HASH_KEY_STRING, &buffer);
msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice);
iks_insert_attrib(msg, "from", from); iks_insert_attrib(msg, "from", from);
apr_queue_push(handle->queue, msg); apr_queue_push(handle->queue, msg);
msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, notice);
iks_insert_attrib(msg, "from", from);
apr_queue_push(handle->queue, msg);
apr_queue_push(handle->queue, pres);
//schedule_packet(handle, next_id(), pres, LDL_RETRY);
started = apr_time_now(); started = time(NULL);
for(;;) { for(;;) {
elapsed = (unsigned int)((apr_time_now() - started) / 1000); elapsed = time(NULL) - started;
if (elapsed > 5000 && ! again) { if (elapsed == next) {
msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); pres = iks_new("presence");
iks_insert_attrib(msg, "from", from); iks_insert_attrib(pres, "type", "probe");
apr_queue_push(handle->queue, msg); iks_insert_attrib(pres, "from", from);
again++; iks_insert_attrib(pres, "to", id);
apr_queue_push(handle->queue, pres);
next += 5;
} }
if (elapsed > 10000) { if (elapsed >= 17) {
break; break;
} }
if (buffer.hit) { if (buffer.hit) {
......
src/mod/endpoints/mod_dingaling/mod_dingaling.c
浏览文件 @ 631e689e
...@@ -849,9 +849,8 @@ static int activate_rtp(struct private_object *tech_pvt) ...@@ -849,9 +849,8 @@ static int activate_rtp(struct private_object *tech_pvt)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip,
tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port);
flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG;
//flags = SWITCH_RTP_FLAG_AUTOADJ;
if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) {
flags |= SWITCH_RTP_FLAG_USE_TIMER; flags |= SWITCH_RTP_FLAG_USE_TIMER;
...@@ -874,7 +873,11 @@ static int activate_rtp(struct private_object *tech_pvt) ...@@ -874,7 +873,11 @@ static int activate_rtp(struct private_object *tech_pvt)
uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1;
switch_rtp_activate_ice(tech_pvt->rtp_session, tech_pvt->remote_user, tech_pvt->local_user); switch_rtp_activate_ice(tech_pvt->rtp_session, tech_pvt->remote_user, tech_pvt->local_user);
if ((vad_in && inb) || (vad_out && !inb)) { if ((vad_in && inb) || (vad_out && !inb)) {
switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING); if (switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VAD ERROR %s\n", err);
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
return 0;
}
switch_set_flag_locked(tech_pvt, TFLAG_VAD); switch_set_flag_locked(tech_pvt, TFLAG_VAD);
} }
switch_rtp_set_cng_pt(tech_pvt->rtp_session, 13); switch_rtp_set_cng_pt(tech_pvt->rtp_session, 13);
...@@ -1065,7 +1068,8 @@ static switch_status_t negotiate_media(switch_core_session_t *session) ...@@ -1065,7 +1068,8 @@ static switch_status_t negotiate_media(switch_core_session_t *session)
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_TRANSPORT_ACCEPT) switch_test_flag(tech_pvt, TFLAG_ANSWER) && switch_test_flag(tech_pvt, TFLAG_TRANSPORT_ACCEPT) &&
tech_pvt->remote_ip && tech_pvt->remote_port
&& 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);
...@@ -1329,89 +1333,101 @@ static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *d ...@@ -1329,89 +1333,101 @@ static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *d
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id)
{ {
struct private_object *tech_pvt = NULL; struct private_object *tech_pvt = NULL;
uint32_t bytes = 0;
switch_size_t samples = 0, frames = 0, ms = 0;
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
switch_payload_t payload = 0; int payload = 0;
switch_status_t status;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
assert(channel != NULL); assert(channel != NULL);
tech_pvt = switch_core_session_get_private(session); tech_pvt = (struct private_object *) switch_core_session_get_private(session);
assert(tech_pvt != NULL); assert(tech_pvt != NULL);
while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) {
if (!tech_pvt->rtp_session) { if (switch_channel_ready(channel)) {
return SWITCH_STATUS_FALSE; switch_yield(10000);
} } else {
return SWITCH_STATUS_GENERR;
if (switch_test_flag(tech_pvt, TFLAG_BYE)) { }
//terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING);
return SWITCH_STATUS_FALSE;
} }
tech_pvt->read_frame.datalen = 0; tech_pvt->read_frame.datalen = 0;
switch_set_flag_locked(tech_pvt, TFLAG_READING); switch_set_flag_locked(tech_pvt, TFLAG_READING);
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; #if 0
samples = tech_pvt->read_codec.implementation->samples_per_frame; if (tech_pvt->last_read) {
ms = tech_pvt->read_codec.implementation->microseconds_per_frame; elapsed = (unsigned int) ((switch_time_now() - tech_pvt->last_read) / 1000);
tech_pvt->read_frame.datalen = 0; if (elapsed > 60000) {
return SWITCH_STATUS_TIMEOUT;
}
}
#endif
while (!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO) if (switch_test_flag(tech_pvt, TFLAG_IO)) {
&& tech_pvt->read_frame.datalen == 0) { switch_status_t status;
tech_pvt->read_frame.flags = 0;
status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame);
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { assert(tech_pvt->rtp_session != NULL);
return SWITCH_STATUS_FALSE; tech_pvt->read_frame.datalen = 0;
}
payload = tech_pvt->read_frame.payload;
if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) {
char dtmf[128];
switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf));
switch_channel_queue_dtmf(channel, dtmf);
switch_set_flag_locked(tech_pvt, TFLAG_DTMF);
}
if (switch_test_flag(tech_pvt, TFLAG_DTMF)) { while (switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) {
switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); tech_pvt->read_frame.flags = SFF_NONE;
return SWITCH_STATUS_BREAK;
}
if (switch_test_flag(&tech_pvt->read_frame, SFF_CNG)) { status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame);
tech_pvt->read_frame.datalen = tech_pvt->last_read ? tech_pvt->last_read : tech_pvt->read_codec.implementation->encoded_bytes_per_frame; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
} return SWITCH_STATUS_FALSE;
}
if (tech_pvt->read_frame.datalen > 0) {
if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) {
if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame && bytes) { payload = tech_pvt->read_frame.payload;
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
frames = (tech_pvt->read_frame.datalen / bytes); #if 0
} else { elapsed = (unsigned int) ((switch_time_now() - started) / 1000);
frames = 1;
if (timeout > -1) {
if (elapsed >= (unsigned int) timeout) {
return SWITCH_STATUS_BREAK;
} }
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame;
tech_pvt->timestamp_recv += (int32_t) samples;
tech_pvt->read_frame.samples = (int) samples;
tech_pvt->last_read = tech_pvt->read_frame.datalen;
} }
break;
}
switch_yield(1000); elapsed = (unsigned int) ((switch_time_now() - last_act) / 1000);
} if (elapsed >= hard_timeout) {
return SWITCH_STATUS_BREAK;
}
#endif
if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) {
char dtmf[128];
switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf));
switch_channel_queue_dtmf(channel, dtmf);
}
if (tech_pvt->read_frame.datalen > 0) {
size_t bytes = 0;
int frames = 1;
if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) {
if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) {
frames = (tech_pvt->read_frame.datalen / bytes);
}
tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame);
}
break;
}
}
}
switch_clear_flag_locked(tech_pvt, TFLAG_READING); switch_clear_flag_locked(tech_pvt, TFLAG_READING);
if (tech_pvt->read_frame.datalen == 0) {
*frame = NULL;
return SWITCH_STATUS_GENERR;
}
*frame = &tech_pvt->read_frame; *frame = &tech_pvt->read_frame;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -1422,45 +1438,46 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc ...@@ -1422,45 +1438,46 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
int bytes = 0, samples = 0, frames = 0; int bytes = 0, samples = 0, frames = 0;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
assert(channel != NULL); assert(channel != NULL);
tech_pvt = switch_core_session_get_private(session); tech_pvt = (struct private_object *) switch_core_session_get_private(session);
assert(tech_pvt != NULL); assert(tech_pvt != NULL);
if (!tech_pvt->rtp_session) { while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) {
return SWITCH_STATUS_FALSE; if (switch_channel_ready(channel)) {
switch_yield(10000);
} else {
return SWITCH_STATUS_GENERR;
}
} }
if (!switch_test_flag(tech_pvt, TFLAG_RTP_READY)) { if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_test_flag(tech_pvt, TFLAG_BYE)) {
return SWITCH_STATUS_FALSE;
}
switch_set_flag_locked(tech_pvt, TFLAG_WRITING); switch_set_flag_locked(tech_pvt, TFLAG_WRITING);
if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { if (!switch_test_flag(frame, SFF_CNG)) {
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) {
frames = ((int) frame->datalen / bytes); bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
} else { frames = ((int) frame->datalen / bytes);
frames = 1; } else
} frames = 1;
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
tech_pvt->timestamp_send += samples;
if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, 0) < 0) {
terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING);
return SWITCH_STATUS_FALSE;
} }
#if 0
printf("%s %s->%s send %d bytes %d samples in %d frames ts=%d\n",
switch_channel_get_name(channel),
tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, tech_pvt->timestamp_send);
#endif
tech_pvt->timestamp_send += samples;
//switch_rtp_write_frame(tech_pvt->rtp_session, frame, tech_pvt->timestamp_send);
switch_rtp_write_frame(tech_pvt->rtp_session, frame, 0);
switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); switch_clear_flag_locked(tech_pvt, TFLAG_WRITING);
return status; return status;
} }
......
src/switch_rtp.c
浏览文件 @ 631e689e
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论