Changeset 6055

Timestamp:

Aug 28, 2019 2:13:32 PM (5 years ago)

Author:

riza

Message:

Close #2222: Introduce a new compiler setting to allow to use cnonce for SIP authentication without hyphen character

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip/sip_auth_client.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -1191 +1191 @@
 #endif
 
+
+/**
+ * Specify whether the cnonce used for SIP authentication contain digits only.
+ * The "cnonce" value is setup using GUID generator, i.e:
+ * pj_create_unique_string(), and the GUID string may contain hyphen character
+ * ("-"). Some SIP servers do not like this GUID format, so this option will
+ * strip any hyphens from the GUID string.
+ *
+ * Default is 1 (cnonce will not contain any hyphen characters).
+ */
+#ifndef PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY
+#   define PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY    1
+#endif
+
 /*****************************************************************************
  *  SIP Event framework and presence settings.

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -397 +397 @@
         /* Create cnonce */
         pj_create_unique_string( cached_auth->pool, &cached_auth->cnonce );
+#if defined(PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY) && \
+    PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY!=0
+        if (pj_strchr(&cached_auth->cnonce, '-')) {
+            /* remove hyphen character. */
+            int w, r, len = pj_strlen(&cached_auth->cnonce);
+            char *s = cached_auth->cnonce.ptr;
+
+            w = r = 0;
+            for (; r < len; r++) {
+                if (s[r] != '-')
+                    s[w++] = s[r];
+            }
+            s[w] = '\0';
+            cached_auth->cnonce.slen = w;
+        }
+#endif
 
         /* Initialize nonce-count */