kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix typo

This commit is contained in:
Brian West 2013-04-02 13:37:04 -05:00
parent e334fd064f
commit 8839d61523
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/switch_rtp.c
View File

@ -178,6 +178,7 @@ typedef struct {
uint8_t ready; uint8_t ready;
uint8_t rready; uint8_t rready;
int missed_count; int missed_count;
int flips;
} switch_rtp_ice_t; } switch_rtp_ice_t;
struct switch_rtp; struct switch_rtp;
@ -726,7 +727,7 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice)
switch_snprintf(sw, sizeof(sw), "FreeSWITCH (%s)", SWITCH_VERSION_REVISION_HUMAN); switch_snprintf(sw, sizeof(sw), "FreeSWITCH (%s)", SWITCH_VERSION_REVISION_HUMAN);
switch_stun_packet_attribute_add_software(packet, sw, strlen(sw)); switch_stun_packet_attribute_add_software(packet, sw, strlen(sw));
if ((ice->type && ICE_CONTROLLED)) { if ((ice->type & ICE_CONTROLLED)) {
switch_stun_packet_attribute_add_controlled(packet); switch_stun_packet_attribute_add_controlled(packet);
} else { } else {
switch_stun_packet_attribute_add_controlling(packet); switch_stun_packet_attribute_add_controlling(packet);
@ -799,11 +800,26 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
} }
#if 0
if (ice->sending && (packet->header.type == SWITCH_STUN_BINDING_RESPONSE || packet->header.type == SWITCH_STUN_BINDING_ERROR_RESPONSE)) { if (packet->header.type == SWITCH_STUN_BINDING_ERROR_RESPONSE) {
ice->sending = 0;
if (ice->flips < 4) {
if ((ice->type & ICE_CONTROLLED)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "Changing role to CONTROLLING\n");
ice->type &= ~ICE_CONTROLLED;
ice->flips++;
} else {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "Changing role to CONTROLLED\n");
ice->type |= ICE_CONTROLLED;
ice->flips++;
}
packet->header.type = SWITCH_STUN_BINDING_RESPONSE;
}
} else {
ice->flips = 0;
} }
#endif
end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf)); end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf));