Changeset 695

Timestamp:

Sep 9, 2006 1:23:09 PM (18 years ago)

Author:

bennylp

Message:

Fix compilation error when PJSIP_AUTH_HEADER_CACHING and PJSIP_AUTH_AUTO_SEND_NEXT is disabled, and set the default for both to disabled. Also fixed the error message in pjsua when invalid arguments are specified.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsip/sip_auth.h (modified) (1 diff)
• pjsip/include/pjsip/sip_config.h (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -79 +79 @@
 
 #   define PJSUA_MAX_CALLS              512
+#   define PJSIP_AUTH_HEADER_CACHING    1
+#   define PJSIP_AUTH_AUTO_SEND_NEXT    1
+
 #endif
 

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -716 +716 @@
         default:
             PJ_LOG(1,(THIS_FILE, 
-                      "Argument \"--%s\" is not valid. Use --help to see help",
-                      long_options[option_index].name));
+                      "Argument \"%s\" is not valid. Use --help to see help",
+                      argv[pj_optind-1]));
             return -1;
         }

pjproject/trunk/pjsip/include/pjsip/sip_auth.h

@@ -118 +118 @@
     pj_str_t                     cnonce;    /**< Cnonce value.              */
 #endif
-#if PJSIP_AUTH_AUTO_SEND_NEXT
     pjsip_www_authenticate_hdr  *last_chal; /**< Last challenge seen.       */
-#endif
 #if PJSIP_AUTH_HEADER_CACHING
     pjsip_cached_auth_hdr        cached_hdr;/**< List of cached header for

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

@@ -290 +290 @@
  */
 #if !defined(PJSIP_AUTH_HEADER_CACHING)
-#   define PJSIP_AUTH_HEADER_CACHING        1
+#   define PJSIP_AUTH_HEADER_CACHING        0
 #endif
 
@@ -311 +311 @@
  */
 #if !defined(PJSIP_AUTH_AUTO_SEND_NEXT)
-#   define PJSIP_AUTH_AUTO_SEND_NEXT        1
+#   define PJSIP_AUTH_AUTO_SEND_NEXT        0
 #endif