pjsip_cli: Create pjsip show channel and contact, and general cli code cleanup.

Created the 'pjsip show channel' and 'pjsip show contact' commands.
Refactored out the hated ast_hashtab.  Replaced with ao2_container.
Cleaned up function naming.  Internal only, no public name changes.
Cleaned up whitespace and brace formatting in cli code.
Changed some NULL checking from "if"s to ast_asserts.
Fixed some register/unregister ordering to reduce deadlock potential.
Fixed ast_sip_location_add_contact where the 'name' buffer was too short.
Fixed some self-assignment issues in res_pjsip_outbound_registration.

(closes issue ASTERISK-23276)
Review: http://reviewboard.asterisk.org/r/3283/
........

Merged revisions 410287 from http://svn.asterisk.org/svn/asterisk/branches/12


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

1 files changed, 12 insertions, 2 deletions

diff --git a/include/asterisk/sorcery.h b/include/asterisk/sorcery.h
index 98e8ee012..026fb4074 100644
--- a/include/asterisk/sorcery.h
+++ b/include/asterisk/sorcery.h
@@ -924,9 +924,19 @@ const char *ast_sorcery_object_get_extended(const void *object, const char *name
 int ast_sorcery_object_set_extended(const void *object, const char *name, const char *value);
 
 /*!
- * \brief Sorcery object comparator based on id.
+ * \brief ao2 object comparator based on sorcery id.
  */
-int ast_sorcery_object_id_compare(const void *obj_left, const void *obj_right, int flags);
+int ast_sorcery_object_id_compare(void *obj, void *arg, int flags);
+
+/*!
+ * \brief ao2 object sorter based on sorcery id.
+ */
+int ast_sorcery_object_id_sort(const void *obj, const void *arg, int flags);
+
+/*!
+ * \brief ao2 object hasher based on sorcery id.
+ */
+int ast_sorcery_object_id_hash(const void *obj, int flags);
 
 /*!
  * \brief Get the sorcery object type given a type name.