mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-13 20:50:41 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1553 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
68d419869a
commit
ae806dc793
@ -577,11 +577,17 @@ static switch_status_t wanpipe_write_frame(switch_core_session_t *session, switc
|
|||||||
#endif
|
#endif
|
||||||
towrite = bytes >= globals.mtu ? globals.mtu : bytes;
|
towrite = bytes >= globals.mtu ? globals.mtu : bytes;
|
||||||
|
|
||||||
|
if (towrite < globals.mtu) {
|
||||||
|
int diff = globals.mtu - towrite;
|
||||||
|
memset(bp + towrite, 0, diff);
|
||||||
|
towrite = globals.mtu;
|
||||||
|
}
|
||||||
|
|
||||||
result = sangoma_sendmsg_socket(tech_pvt->socket,
|
result = sangoma_sendmsg_socket(tech_pvt->socket,
|
||||||
&tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), bp, towrite, 0);
|
&tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), bp, towrite, 0);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
|
||||||
"Bad Write frame len %u write %d bytes returned %d (%s)!\n", frame->datalen,
|
"Bad Write frame len %u write %d bytes returned %d (%s)!\n", towrite,
|
||||||
globals.mtu, result, strerror(errno));
|
globals.mtu, result, strerror(errno));
|
||||||
if (errno == EBUSY) {
|
if (errno == EBUSY) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -857,6 +857,10 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *
|
|||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (switch_channel_test_flag(channel, CF_ANSWERED)) {
|
||||||
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
if (switch_core_session_answer_channel(channel->session) == SWITCH_STATUS_SUCCESS) {
|
if (switch_core_session_answer_channel(channel->session) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_event_t *event;
|
switch_event_t *event;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user