Changeset 5237 for pjproject/trunk

Timestamp:

Jan 27, 2016 5:42:20 AM (9 years ago)

Author:

riza

Message:

Misc (Re #1882): When server sends blank realm on the Authentication challanges, the stack doesn't include the realm param.
And hence, the server will reject the request. This patch will include the blank realm on the next request.
Thanks to Keith Hanaway for the report.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/print_util.h (modified) (2 diffs)
• src/pjsip/sip_auth_msg.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/print_util.h

@@ -106 +106 @@
 #define copy_advance_pair       copy_advance_pair_check
 
+/*
+ * Append str1 and quoted str2 and copy to buf. 
+ * No string is copied if str2 is empty.
+ */
 #define copy_advance_pair_quote_cond(buf,str1,len1,str2,quotebegin,quoteend) \
         do {    \
@@ -113 +117 @@
             copy_advance_pair(buf,str1,len1,str2); \
         } while (0)
+
+/*
+ * Append str1 and quoted str2 and copy to buf. 
+ * In case str2 is empty, str1 will be appended with empty quote.
+ */
+#define copy_advance_pair_quote_cond_always(buf,str1,len1,str2,quotebegin, \
+                                            quoteend)\
+    do {        \
+       if (!str2.slen) \
+         copy_advance_pair_quote(buf,str1,len1,str2,quotebegin,quoteend); \
+       else \
+         copy_advance_pair_quote_cond(buf,str1,len1,str2,quotebegin,quoteend);\
+    } while (0)
 
 /*

pjproject/trunk/pjsip/src/pjsip/sip_auth_msg.c

@@ -72 +72 @@
     
     copy_advance_pair_quote_cond(buf, "username=", 9, cred->username, '"', '"');
-    copy_advance_pair_quote_cond(buf, ", realm=", 8, cred->realm, '"', '"');
+    copy_advance_pair_quote_cond_always(buf, ", realm=", 8, cred->realm, '"', 
+                                        '"');
     copy_advance_pair_quote(buf, ", nonce=", 8, cred->nonce, '"', '"');
     copy_advance_pair_quote_cond(buf, ", uri=", 6, cred->uri, '"', '"');