Fix correct authentication behavior for artificial endpoint.
authorMark Michelson <mmichelson@digium.com>
Tue, 10 Dec 2013 15:15:13 +0000 (15:15 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 10 Dec 2013 15:15:13 +0000 (15:15 +0000)
When switching to using a vector for authentication, I initialized
the vector for the artificial endpoint to be of size 1. However, this
does not result in AST_VECTOR_SIZE() returning 1 since there isn't
actually anything in the vector.

Rather than trifle with the vector by putting unnecessary elements in,
I simply changed the callback in res_pjsip_authenticator_digest.c to
explicitly report that the artificial endpoint requires authentication.

Thanks to Joshua Colp for pointing this out.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403605 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_pjsip_authenticator_digest.c

index 4a84a40..e0f633f 100644 (file)
@@ -41,7 +41,9 @@ AO2_GLOBAL_OBJ_STATIC(entity_id);
  */
 static int digest_requires_authentication(struct ast_sip_endpoint *endpoint, pjsip_rx_data *rdata)
 {
  */
 static int digest_requires_authentication(struct ast_sip_endpoint *endpoint, pjsip_rx_data *rdata)
 {
-       return AST_VECTOR_SIZE(&endpoint->inbound_auths) > 0;
+       RAII_VAR(struct ast_sip_endpoint *, artificial, ast_sip_get_artificial_endpoint(), ao2_cleanup);
+
+       return endpoint == artificial || AST_VECTOR_SIZE(&endpoint->inbound_auths) > 0;
 }
 
 static void auth_store_cleanup(void *data)
 }
 
 static void auth_store_cleanup(void *data)