Strip down the old event system

This removes unused code, event types, IE pltypes, and event IE types
where possible and makes several functions private that were once
public. This includes a renumbering of the remaining event and IE types
which breaks binary compatibility with previous versions. The last
remaining consumers of the old event system (or parts thereof) are
main/security_events.c, res/res_security_log.c, tests/test_cel.c,
tests/test_event.c, main/cel.c, and the CEL backends.

Review: https://reviewboard.asterisk.org/r/2703/
(closes issue ASTERISK-22139)


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

7 files changed, 1 insertions, 22 deletions

diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index 67605c2f7..4b854759d 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
-#include "asterisk/event.h"
 #include "asterisk/utils.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/features.h"
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index f952ff23a..dac191090 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
-#include "asterisk/event.h"
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/res/parking/parking_ui.c b/res/parking/parking_ui.c
index 2f54e8637..55b2d5b45 100644
--- a/res/parking/parking_ui.c
+++ b/res/parking/parking_ui.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
-#include "asterisk/event.h"
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 0e373e5e7..0e41cdf77 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -70,7 +70,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astobj.h"
 #include "asterisk/astdb.h"
 #include "asterisk/manager.h"
-#include "asterisk/event.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/message.h"
 
@@ -3335,7 +3334,6 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
 	int oldmsgs, newmsgs;
 	iks *item, *item_content;
 	struct ast_eid pubsub_eid;
-	struct ast_event *event;
 	unsigned int cachable = AST_DEVSTATE_CACHABLE;
 
 	item = iks_find(iks_find(iks_find(pak->x, "event"), "items"), "item");
@@ -3374,12 +3372,6 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
 		return IKS_FILTER_EAT;
 	}
 
-	if (cachable == AST_DEVSTATE_CACHABLE) {
-		ast_event_queue_and_cache(event);
-	} else {
-		ast_event_queue(event);
-	}
-
 	return IKS_FILTER_EAT;
 }
 
diff --git a/res/res_parking.c b/res/res_parking.c
index c7156fbe0..3cd10a1dd 100644
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -184,7 +184,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "parking/res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
-#include "asterisk/event.h"
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/res/res_security_log.c b/res/res_security_log.c
index 1a4f379a1..9e87acf12 100644
--- a/res/res_security_log.c
+++ b/res/res_security_log.c
@@ -105,8 +105,7 @@ static void security_event_stasis_cb(struct ast_json *json)
 		return;
 	}
 
-	ast_str_set(&str, 0, "%s=\"%s\"",
-			ast_event_get_ie_type_name(AST_EVENT_IE_SECURITY_EVENT),
+	ast_str_set(&str, 0, "SecurityEvent=\"%s\"",
 			ast_security_event_get_name(event_type));
 
 	append_json(&str, json,
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 3be8aa458..1a3ccd3a6 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -59,7 +59,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/message.h"
 #include "asterisk/manager.h"
-#include "asterisk/event.h"
 #include "asterisk/cli.h"
 #include "asterisk/config_options.h"
 
@@ -1455,7 +1454,6 @@ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
 	int oldmsgs, newmsgs;
 	iks *item, *item_content;
 	struct ast_eid pubsub_eid;
-	struct ast_event *event;
 	unsigned int cachable = AST_DEVSTATE_CACHABLE;
 	item = iks_find(iks_find(iks_find(pak->x, "event"), "items"), "item");
 	if (!item) {
@@ -1493,12 +1491,6 @@ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
 		return IKS_FILTER_EAT;
 	}
 
-	if (cachable == AST_DEVSTATE_CACHABLE) {
-		ast_event_queue_and_cache(event);
-	} else {
-		ast_event_queue(event);
-	}
-
 	return IKS_FILTER_EAT;
 }