Changeset 66:ceb29224b3ad in mediastreamer2

Timestamp:

Oct 5, 2008 4:35:36 PM (5 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

rename macro to avoid conflict

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

Location:

linphone/oRTP

Files:

• include/ortp/stun.h (modified) (1 diff)
• src/stun.c (modified) (3 diffs)

linphone/oRTP/include/ortp/stun.h

@@ -117 +117 @@
 #define SourceAddress     0x0004
 #define ChangedAddress    0x0005
-#define Username          0x0006
-#define Password          0x0007
+#define STUNUsername      0x0006 /* Username is too common: rename to avoid conflict */
+#define STUNPassword      0x0007 /* Password is too common: rename to avoid conflict */
 #define MessageIntegrity  0x0008
 #define ErrorCode         0x0009

linphone/oRTP/src/stun.c

@@ -381 +381 @@
             }
       }
-      else if (atrType == Username)
+      else if (atrType == STUNUsername)
       {
             msg->hasUsername = TRUE;
@@ -395 +395 @@
             }                                   
       }
-      else if (atrType == Password)
+      else if (atrType == STUNPassword)
       {
             msg->hasPassword = TRUE;
@@ -678 +678 @@
    {
       if (verbose) ortp_message("stun: Encoding Username: %s\n", msg->username.value );
-      ptr = encodeAtrString(ptr, Username, &msg->username);
+      ptr = encodeAtrString(ptr, STUNUsername, &msg->username);
    }
    if (msg->hasPassword)
    {
       if (verbose) ortp_message("stun: Encoding Password: %s\n", msg->password.value );
-      ptr = encodeAtrString(ptr, Password, &msg->password);
+      ptr = encodeAtrString(ptr, STUNPassword, &msg->password);
    }
    if (msg->hasErrorCode)