mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-04 19:31:56 +00:00
Merge commit from fork
This commit is contained in:
+26
-3
@@ -239,7 +239,13 @@ SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t *buf, ui
|
||||
case SWITCH_STUN_ATTR_DESTINATION_ADDRESS:
|
||||
case SWITCH_STUN_ATTR_PRIORITY:
|
||||
{
|
||||
switch_stun_ip_t *ip = (switch_stun_ip_t *) attr->value;
|
||||
switch_stun_ip_t *ip;
|
||||
|
||||
if (bytes_left < sizeof(switch_stun_ip_t)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ip = (switch_stun_ip_t *) attr->value;
|
||||
ip->port = ntohs(ip->port);
|
||||
}
|
||||
break;
|
||||
@@ -247,6 +253,11 @@ SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t *buf, ui
|
||||
{
|
||||
switch_stun_ip_t *ip;
|
||||
uint32_t addr_length = 0;
|
||||
|
||||
if (bytes_left < sizeof(switch_stun_ip_t)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ip = (switch_stun_ip_t *) attr->value;
|
||||
|
||||
switch (ip->family) {
|
||||
@@ -277,7 +288,13 @@ SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t *buf, ui
|
||||
case SWITCH_STUN_ATTR_BANDWIDTH:
|
||||
case SWITCH_STUN_ATTR_OPTIONS:
|
||||
{
|
||||
uint32_t *val = (uint32_t *) attr->value;
|
||||
uint32_t *val;
|
||||
|
||||
if (bytes_left < sizeof(uint32_t)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
val = (uint32_t *)attr->value;
|
||||
|
||||
if (attr->length != sizeof(uint32_t)) {
|
||||
/* Invalid */
|
||||
@@ -289,7 +306,13 @@ SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t *buf, ui
|
||||
break;
|
||||
case SWITCH_STUN_ATTR_ERROR_CODE: /* ErrorCode */
|
||||
{
|
||||
uint32_t *u = (uint32_t *) attr->value;
|
||||
uint32_t *u;
|
||||
|
||||
if (bytes_left < sizeof(uint32_t)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
u = (uint32_t *)attr->value;
|
||||
*u = htonl(*u);
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user