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.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@695 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
72b6104702
commit
d6388acc29
|
@ -78,5 +78,8 @@
|
|||
# endif
|
||||
|
||||
# define PJSUA_MAX_CALLS 512
|
||||
# define PJSIP_AUTH_HEADER_CACHING 1
|
||||
# define PJSIP_AUTH_AUTO_SEND_NEXT 1
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -715,8 +715,8 @@ static pj_status_t parse_args(int argc, char *argv[],
|
|||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,9 +117,7 @@ typedef struct pjsip_cached_auth
|
|||
pj_uint32_t nc; /**< Nonce count. */
|
||||
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
|
||||
each method. */
|
||||
|
|
|
@ -289,7 +289,7 @@
|
|||
* Default: 1
|
||||
*/
|
||||
#if !defined(PJSIP_AUTH_HEADER_CACHING)
|
||||
# define PJSIP_AUTH_HEADER_CACHING 1
|
||||
# define PJSIP_AUTH_HEADER_CACHING 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@ -310,7 +310,7 @@
|
|||
* Default: 1
|
||||
*/
|
||||
#if !defined(PJSIP_AUTH_AUTO_SEND_NEXT)
|
||||
# define PJSIP_AUTH_AUTO_SEND_NEXT 1
|
||||
# define PJSIP_AUTH_AUTO_SEND_NEXT 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue