Changeset 303:909202cb5aeb in mediastreamer2

Timestamp:

Mar 7, 2009 12:22:14 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

add fingerprint support

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

File:

• linphone/mediastreamer2/src/ice.c (modified) (5 diffs)

linphone/mediastreamer2/src/ice.c

@@ -352 +352 @@
                                                         stunBuildReqSimple( &req, NULL, FALSE, FALSE, 1);
                                                         req.msgHdr.msgType = (STUN_METHOD_BINDING|STUN_INDICATION);
+                                                        req.hasFingerprint = TRUE;
                                                         len = stunEncodeMessage( &req, buf, len, NULL);
                                                         sendMessage( media_socket, buf, len, stunServerAddr.addr, stunServerAddr.port );
@@ -447 +448 @@
         strcpy(response->errorCode.reason, msg);
         response->errorCode.sizeReason = strlen(msg);
+        response->hasFingerprint = TRUE;
 }
 
@@ -586 +588 @@
                 */
                 char hmac[20];
-                stunCalculateIntegrity_shortterm(hmac, (char*)mp->b_rptr, mp->b_wptr-mp->b_rptr-24, checklist->loc_ice_pwd);
+                /* remove length of fingerprint if present */
+                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));
+                        stunCalculateIntegrity_shortterm(hmac, (char*)mp->b_rptr, mp->b_wptr-mp->b_rptr-24-8, checklist->loc_ice_pwd);
+                }
+                else
+                        stunCalculateIntegrity_shortterm(hmac, (char*)mp->b_rptr, mp->b_wptr-mp->b_rptr-24, checklist->loc_ice_pwd);
                 if (memcmp(msg.messageIntegrity.hash, hmac, 20)!=0)
                 {
@@ -597 +608 @@
                                 sendMessage( rtp_socket, buf, len, remote_addr.addr, remote_addr.port);
                         return -1;
+                }
+                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));
                 }
 
@@ -869 +886 @@
                 memcpy( resp.softwareName.value, serverName, sizeof(serverName));
                 resp.softwareName.sizeValue = sizeof(serverName);
+
+                resp.hasFingerprint = TRUE;
 
                 {