X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Ftrigger.c;h=97a06bb57d1a4bcf4769c4c81831d35b4456a3be;hp=b7bdbc5beb86c18205bb3bc3eb0d36f0c4f503b4;hb=dfd5816bcbef980b11c8a286f8f52a434651c528;hpb=c80009a5f56550483c1f1f0b4fdae9c040abd0ae

diff --git a/service/trigger.c b/service/trigger.c
index b7bdbc5..97a06bb 100644
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -88,13 +88,21 @@ static void q_job_run(struct runqueue *q, struct runqueue_task *t)
 	j->cmd->handler(j, j->exec, j->env);
 }
 
+static void trigger_free(struct trigger *t)
+{
+	json_script_free(&t->jctx);
+	uloop_timeout_cancel(&t->delay);
+	free(t->data);
+	list_del(&t->list);
+	free(t);
+}
+
 static void q_job_complete(struct runqueue *q, struct runqueue_task *p)
 {
 	struct job *j = container_of(p, struct job, proc.task);
 
 	if (j->trigger->remove) {
-		list_del(&j->trigger->list);
-		free(j->trigger);
+		trigger_free(j->trigger);
 	} else {
 		j->trigger->pending = 0;
 	}
@@ -219,6 +227,7 @@ static void trigger_delay_cb(struct uloop_timeout *tout)
 
 	json_script_run(&t->jctx, "foo", t->data);
 	free(t->data);
+	t->data = NULL;
 }
 
 static struct trigger* _trigger_add(char *type, struct blob_attr *rule, int timeout, void *id)
@@ -302,8 +311,8 @@ void trigger_del(void *id)
 			t->remove = 1;
 			continue;
 		}
-		list_del(&t->list);
-		free(t);
+
+		trigger_free(t);
 	}
 }
 
@@ -314,15 +323,24 @@ 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);
 				uloop_timeout_set(&t->delay, t->timeout);
 			} else {