Changeset 749:da9869fe1da8 in mediastreamer2

Timestamp:

Oct 27, 2009 1:00:32 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

use correct types

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@737 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2

Files:

• include/mediastreamer2/ice.h (modified) (1 diff)
• src/ice.c (modified) (6 diffs)

linphone/mediastreamer2/include/mediastreamer2/ice.h

@@ -77 +77 @@
 
     int rem_controlling;
-    UInt64 tiebreak_value;
+    uint64_t tiebreak_value;
 
 #define ICE_CL_RUNNING 0

linphone/mediastreamer2/src/ice.c

@@ -383 +383 @@
                         checklist->rem_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",
                         checklist->rem_ice_pwd);
-                password.sizeValue = (UInt16)strlen(password.value);
+                password.sizeValue = (uint16_t)strlen(password.value);
 
 
@@ -617 +617 @@
                         if (msg.hasFingerprint==TRUE)
                         {
-                                char *lenpos = (char *)mp->b_rptr + sizeof(UInt16);
-                                UInt16 newlen = htons(msg.msgHdr.msgLength-8); /* remove fingerprint size */
-                                memcpy(lenpos, &newlen, sizeof(UInt16));
+                                char *lenpos = (char *)mp->b_rptr + sizeof(uint16_t);
+                                uint16_t newlen = htons(msg.msgHdr.msgLength-8); /* remove fingerprint size */
+                                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);
                         }
@@ -637 +637 @@
                         if (msg.hasFingerprint==TRUE)
                         {
-                                char *lenpos = (char *)mp->b_rptr + sizeof(UInt16);
-                                UInt16 newlen = htons(msg.msgHdr.msgLength); /* add back fingerprint size */
-                                memcpy(lenpos, &newlen, sizeof(UInt16));
+                                char *lenpos = (char *)mp->b_rptr + sizeof(uint16_t);
+                                uint16_t newlen = htons(msg.msgHdr.msgLength); /* add back fingerprint size */
+                                memcpy(lenpos, &newlen, sizeof(uint16_t));
                         }
                 }
@@ -886 +886 @@
 
                 {
-                        UInt32 cookie = 0x2112A442;
+                        uint32_t cookie = 0x2112A442;
                         resp.hasXorMappedAddress = TRUE;
                         resp.xorMappedAddress.ipv4.port = remote_addr.port^(cookie>>16);
@@ -939 +939 @@
 
                 {
-                        UInt32 cookie = 0x2112A442;
-                        UInt16 cookie16 = 0x2112A442 >> 16;
+                        uint32_t cookie = 0x2112A442;
+                        uint16_t cookie16 = 0x2112A442 >> 16;
                         mappedAddr.port = resp.xorMappedAddress.ipv4.port^cookie16;
                         mappedAddr.addr = resp.xorMappedAddress.ipv4.addr^cookie;
@@ -1333 +1333 @@
         }
 
+#if !defined(_WIN32_WCE)
         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
 }