mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-27 13:16:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

use correct types

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@737 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
aymeric 2009-10-27 12:00:32 +00:00
parent 01641b81a5
commit 32a1edae6b
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone/mediastreamer2/include/mediastreamer2/ice.h
View file

@ -76,7 +76,7 @@ struct IceCheckList {
char rem_ice_pwd[256]; char rem_ice_pwd[256];
int rem_controlling; int rem_controlling;
UInt64 tiebreak_value; uint64_t tiebreak_value;
#define ICE_CL_RUNNING 0 #define ICE_CL_RUNNING 0
#define ICE_CL_COMPLETED 1 #define ICE_CL_COMPLETED 1

26
linphone/mediastreamer2/src/ice.c
View file

@ -382,12 +382,12 @@ static int ice_sound_send_stun_request(RtpSession *session, struct IceCheckList
snprintf(username.value, sizeof(username.value), "%s:%s", snprintf(username.value, sizeof(username.value), "%s:%s",
checklist->rem_ice_ufrag, checklist->rem_ice_ufrag,
checklist->loc_ice_ufrag); checklist->loc_ice_ufrag);
username.sizeValue = (UInt16)strlen(username.value); username.sizeValue = (uint16_t)strlen(username.value);
snprintf(password.value, sizeof(password.value), "%s", snprintf(password.value, sizeof(password.value), "%s",
checklist->rem_ice_pwd); checklist->rem_ice_pwd);
password.sizeValue = (UInt16)strlen(password.value); password.sizeValue = (uint16_t)strlen(password.value);
res = stunParseServerName(cand_pair->remote_candidate.conn_addr, res = stunParseServerName(cand_pair->remote_candidate.conn_addr,
@ -616,9 +616,9 @@ static int ice_process_stun_message(RtpSession *session, struct IceCheckList *ch
/* remove length of fingerprint if present */ /* remove length of fingerprint if present */
if (msg.hasFingerprint==TRUE) if (msg.hasFingerprint==TRUE)
{ {
char *lenpos = (char *)mp->b_rptr + sizeof(UInt16); char *lenpos = (char *)mp->b_rptr + sizeof(uint16_t);
UInt16 newlen = htons(msg.msgHdr.msgLength-8); /* remove fingerprint size */ uint16_t newlen = htons(msg.msgHdr.msgLength-8); /* remove fingerprint size */
memcpy(lenpos, &newlen, sizeof(UInt16)); memcpy(lenpos, &newlen, sizeof(uint16_t));
stunCalculateIntegrity_shortterm(hmac, (char*)mp->b_rptr, mp->b_wptr-mp->b_rptr-24-8, checklist->loc_ice_pwd); stunCalculateIntegrity_shortterm(hmac, (char*)mp->b_rptr, mp->b_wptr-mp->b_rptr-24-8, checklist->loc_ice_pwd);
} }
else else
@ -636,9 +636,9 @@ static int ice_process_stun_message(RtpSession *session, struct IceCheckList *ch
} }
if (msg.hasFingerprint==TRUE) if (msg.hasFingerprint==TRUE)
{ {
char *lenpos = (char *)mp->b_rptr + sizeof(UInt16); char *lenpos = (char *)mp->b_rptr + sizeof(uint16_t);
UInt16 newlen = htons(msg.msgHdr.msgLength); /* add back fingerprint size */ uint16_t newlen = htons(msg.msgHdr.msgLength); /* add back fingerprint size */
memcpy(lenpos, &newlen, sizeof(UInt16)); memcpy(lenpos, &newlen, sizeof(uint16_t));
} }
} }
@ -885,7 +885,7 @@ static int ice_process_stun_message(RtpSession *session, struct IceCheckList *ch
} }
{ {
UInt32 cookie = 0x2112A442; uint32_t cookie = 0x2112A442;
resp.hasXorMappedAddress = TRUE; resp.hasXorMappedAddress = TRUE;
resp.xorMappedAddress.ipv4.port = remote_addr.port^(cookie>>16); resp.xorMappedAddress.ipv4.port = remote_addr.port^(cookie>>16);
resp.xorMappedAddress.ipv4.addr = remote_addr.addr^cookie; resp.xorMappedAddress.ipv4.addr = remote_addr.addr^cookie;
@ -938,8 +938,8 @@ static int ice_process_stun_message(RtpSession *session, struct IceCheckList *ch
} }
{ {
UInt32 cookie = 0x2112A442; uint32_t cookie = 0x2112A442;
UInt16 cookie16 = 0x2112A442 >> 16; uint16_t cookie16 = 0x2112A442 >> 16;
mappedAddr.port = resp.xorMappedAddress.ipv4.port^cookie16; mappedAddr.port = resp.xorMappedAddress.ipv4.port^cookie16;
mappedAddr.addr = resp.xorMappedAddress.ipv4.addr^cookie; mappedAddr.addr = resp.xorMappedAddress.ipv4.addr^cookie;
} }
@ -1332,7 +1332,11 @@ static void ice_process(MSFilter * f)
} }
} }
#if !defined(_WIN32_WCE)
ice_sound_send_stun_request(d->session, d->check_lists, f->ticker->time); ice_sound_send_stun_request(d->session, d->check_lists, f->ticker->time);
#else
ice_sound_send_stun_request(d->session, d->check_lists, f->ticker->time));
#endif
} }
static MSFilterMethod ice_methods[] = { static MSFilterMethod ice_methods[] = {