Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

[Core] switch_rtp: update username to allow size specified in STUN RFC 5389

Browse Source
This commit is contained in:
LarryHemenway 2020-03-03 16:37:14 -06:00 committed by GitHub
parent 695ba877aa
commit 6190fa6242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/switch_rtp.c
View File

@ -82,6 +82,11 @@ static const switch_payload_t INVALID_PT = 255;
#define rtp_session_name(_rtp_session) _rtp_session->session ? switch_core_session_get_name(_rtp_session->session) : "-"
#define STUN_USERNAME_MAX_SIZE 513 /* From RFC5389: "It MUST contain a UTF-8 [RFC3629] encoded sequence of less than 513 bytes" */
#define SDP_UFRAG_MAX_SIZE 256 /* From draft-ietf-mmusic-ice-sip-sdp-24: "the ice-ufrag attribute MUST NOT be longer than 32
* characters when sending, but an implementation MUST accept up to 256
* characters when receiving." */
static switch_port_t START_PORT = RTP_START_PORT;
static switch_port_t END_PORT = RTP_END_PORT;
static switch_mutex_t *port_lock = NULL;
@ -907,8 +912,8 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
switch_stun_packet_t *packet;
switch_stun_packet_attribute_t *attr;
void *end_buf;
char username[34] = { 0 };
unsigned char buf[512] = { 0 };
char username[STUN_USERNAME_MAX_SIZE] = { 0 };
unsigned char buf[1500] = { 0 };
switch_size_t cpylen = len;
int xlen = 0;
int ok = 1;
@ -4838,9 +4843,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_sessio
const char *password, const char *rpassword, ice_proto_t proto,
switch_core_media_ice_type_t type, ice_t *ice_params)
{
char ice_user[80];
char user_ice[80];
char luser_ice[80];
char ice_user[STUN_USERNAME_MAX_SIZE];
char user_ice[STUN_USERNAME_MAX_SIZE];
char luser_ice[SDP_UFRAG_MAX_SIZE];
switch_rtp_ice_t *ice;
char *host = NULL;
switch_port_t port = 0;