diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:42:41 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:42:41 +0000 |
| commit | f8f86993ac844ccaa9e28367ce3c5d74a4d77cee (patch) | |
| tree | 093994b2ca0bbcc6c57ba895c37374a999a6ce9a /include | |
| parent | b15e6188d96ecb23acbd80882143361b658fffe5 (diff) | |
Merged revisions 215955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r215955 | dvossel | 2009-09-03 11:31:54 -0500 (Thu, 03 Sep 2009) | 6 lines
Merge code associated with AST-2009-006
(closes issue #12912)
Reported by: rathaus
Tested by: tilghman, russell, dvossel, dbrooks
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@216007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/acl.h | 3 | ||||
| -rw-r--r-- | include/asterisk/astobj2.h | 9 |
2 files changed, 12 insertions, 0 deletions
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 0b0bf84b1..a9bd61d2f 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -674,6 +674,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), }; /*! |