X-Git-Url: http://git.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Ftrigger.c;h=97a06bb57d1a4bcf4769c4c81831d35b4456a3be;hp=6cd94d40809dd7c0985ffedf618c4e31b83c7456;hb=ef490722885a5c708c70dff656d094c7043ae081;hpb=bc0900b190015b3018adc652d91c4dfd6851aadd

diff --git a/service/trigger.c b/service/trigger.c
index 6cd94d4..97a06bb 100644
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -90,6 +90,7 @@ static void q_job_run(struct runqueue *q, struct runqueue_task *t)
 
 static void trigger_free(struct trigger *t)
 {
+	json_script_free(&t->jctx);
 	uloop_timeout_cancel(&t->delay);
 	free(t->data);
 	list_del(&t->list);
@@ -322,14 +323,22 @@ void trigger_init(void)
 	q.max_running_tasks = 1;
 }
 
-void trigger_event(char *type, struct blob_attr *data)
+static bool trigger_match(const char *event, const char *match)
+{
+	char *wildcard = strstr(match, ".*");
+	if (wildcard)
+		return !strncmp(event, match, wildcard - match);
+	return !strcmp(event, match);
+}
+
+void trigger_event(const char *type, struct blob_attr *data)
 {
 	struct trigger *t;
 
 	list_for_each_entry(t, &triggers, list) {
-		if (t->pending || t->remove)
+		if (t->remove)
 			continue;
-		if (!strcmp(t->type, type)) {
+		if (trigger_match(type, t->type)) {
 			if (t->timeout) {
 				free(t->data);
 				t->data = blob_memdup(data);