From d09f9fd00a08c9e143ea68003ecf87dfe970a8a9 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Thu, 3 Sep 2009 16:31:54 +0000 Subject: Merge code associated with AST-2009-006 (closes issue #12912) Reported by: rathaus Tested by: tilghman, russell, dvossel, dbrooks git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@215955 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/acl.h | 3 +++ include/asterisk/astobj2.h | 9 +++++++++ 2 files changed, 12 insertions(+) (limited to 'include') diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index 79b787d70..28ad09265 100644 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -55,6 +55,9 @@ struct ast_ha { /*! \brief Free host access list */ void ast_free_ha(struct ast_ha *ha); +/*! \brief Copy ha structure */ +void ast_copy_ha(const struct ast_ha *from, struct ast_ha *to); + /*! \brief Append ACL entry to host access list. */ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha *path, int *error); diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 953482f19..71b86c909 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -673,6 +673,15 @@ enum search_flags { * The search function is unaffected (i.e. use the one passed as * argument, or match_by_addr if none specified). */ OBJ_POINTER = (1 << 3), + /*! + * \brief Continue if a match is not found in the hashed out bucket + * + * This flag is to be used in combination with OBJ_POINTER. This tells + * the ao2_callback() core to keep searching through the rest of the + * buckets if a match is not found in the starting bucket defined by + * the hash value on the argument. + */ + OBJ_CONTINUE = (1 << 4), }; /*! -- cgit v1.2.3