Commit b9d7c690 authored by aymeric's avatar aymeric

rename macro to avoid conflict

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@69 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 7a7c9fb1
......@@ -116,8 +116,8 @@ typedef struct { unsigned char octet[16]; } UInt128;
#define ChangeRequest 0x0003
#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
#define UnknownAttribute 0x000A
......
......@@ -380,7 +380,7 @@ stunParseMessage( char* buf, unsigned int bufLen, StunMessage *msg, bool_t verbo
if (verbose) ortp_message("stun: ChangedAddress = %s\n", ipaddr(&msg->changedAddress.ipv4));
}
}
else if (atrType == Username)
else if (atrType == STUNUsername)
{
msg->hasUsername = TRUE;
if (stunParseAtrString( body, attrLen, &msg->username) == FALSE)
......@@ -394,7 +394,7 @@ stunParseMessage( char* buf, unsigned int bufLen, StunMessage *msg, bool_t verbo
ortp_message("stun: Username = %s\n", msg->username.value );
}
}
else if (atrType == Password)
else if (atrType == STUNPassword)
{
msg->hasPassword = TRUE;
if (stunParseAtrString( body, attrLen, &msg->password) == FALSE)
......@@ -677,12 +677,12 @@ stunEncodeMessage( const StunMessage *msg,
if (msg->hasUsername)
{
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)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment