Merge "rtp_engine: rtcp_report_to_json can overflow the ssrc integer value"

[asterisk/asterisk.git] / main / global_datastores.c

diff --git a/main/global_datastores.c b/main/global_datastores.c
index 340e71d..521106d 100644 (file)
--- a/main/global_datastores.c
+++ b/main/global_datastores.c
@@ -23,56 +23,36 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
 #include "asterisk/global_datastores.h"
-#include "asterisk/linkedlists.h"
 
-static void dialed_interface_destroy(void *data)
+static void secure_call_store_destroy(void *data)
 {
-       struct ast_dialed_interface *di = NULL;
-       AST_LIST_HEAD(, ast_dialed_interface) *dialed_interface_list = data;
-       
-       if (!dialed_interface_list)
-               return;
+       struct ast_secure_call_store *store = data;
 
-       AST_LIST_LOCK(dialed_interface_list);
-       while ((di = AST_LIST_REMOVE_HEAD(dialed_interface_list, list)))
-               ast_free(di);
-       AST_LIST_UNLOCK(dialed_interface_list);
-
-       AST_LIST_HEAD_DESTROY(dialed_interface_list);
-       ast_free(dialed_interface_list);
+       ast_free(store);
 }
 
-static void *dialed_interface_duplicate(void *data)
+static void *secure_call_store_duplicate(void *data)
 {
-       struct ast_dialed_interface *di = NULL;
-       AST_LIST_HEAD(, ast_dialed_interface) *old_list;
-       AST_LIST_HEAD(, ast_dialed_interface) *new_list = NULL;
+       struct ast_secure_call_store *old = data;
+       struct ast_secure_call_store *new;
 
-       if(!(old_list = data))
+       if (!(new = ast_calloc(1, sizeof(*new)))) {
                return NULL;
-
-       if(!(new_list = ast_calloc(1, sizeof(*new_list))))
-               return NULL;
-
-       AST_LIST_HEAD_INIT(new_list);
-       AST_LIST_LOCK(old_list);
-       AST_LIST_TRAVERSE(old_list, di, list) {
-               struct ast_dialed_interface *di2 = ast_calloc(1, sizeof(*di2) + strlen(di->interface));
-               if(!di2) {
-                       AST_LIST_UNLOCK(old_list);
-                       return NULL;
-               }
-               strcpy(di2->interface, di->interface);
-               AST_LIST_INSERT_TAIL(new_list, di2, list);
        }
-       AST_LIST_UNLOCK(old_list);
+       new->signaling = old->signaling;
+       new->media = old->media;
 
-       return new_list;
+       return new;
 }
-
-const struct ast_datastore_info dialed_interface_info = {
-       .type ="dialed-interface",
-       .destroy = dialed_interface_destroy,
-       .duplicate = dialed_interface_duplicate,
+const struct ast_datastore_info secure_call_info = {
+       .type = "encrypt-call",
+       .destroy = secure_call_store_destroy,
+       .duplicate = secure_call_store_duplicate,
 };