1 files changed, 1 insertions, 56 deletions

diff --git a/service/service.c b/service/service.c
index 2702dc3..90f4d7c 100644
--- a/service/service.c
+++ b/service/service.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -83,7 +84,6 @@ service_alloc(const char *name)
 	s->instances.keep_old = true;
 	s->name = new_name;
 	s->avl.key = s->name;
-	INIT_LIST_HEAD(&s->validators);
 
 	return s;
 }
@@ -93,7 +93,6 @@ enum {
 	SERVICE_SET_SCRIPT,
 	SERVICE_SET_INSTANCES,
 	SERVICE_SET_TRIGGER,
-	SERVICE_SET_VALIDATE,
 	__SERVICE_SET_MAX
 };
 
@@ -102,7 +101,6 @@ static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
 	[SERVICE_SET_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
 	[SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
 	[SERVICE_SET_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
-	[SERVICE_SET_VALIDATE] = { "validate", BLOBMSG_TYPE_ARRAY },
 };
 
 static int
@@ -117,8 +115,6 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
 		s->trigger = NULL;
 	}
 
-	service_validate_del(s);
-
 	if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
 		s->trigger = blob_memdup(tb[SERVICE_SET_TRIGGER]);
 		if (!s->trigger)
@@ -126,11 +122,6 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
 		trigger_add(s->trigger, s);
 	}
 
-	if (tb[SERVICE_SET_VALIDATE] && blobmsg_data_len(tb[SERVICE_SET_VALIDATE])) {
-		blobmsg_for_each_attr(cur, tb[SERVICE_SET_VALIDATE], rem)
-			service_validate_add(s, cur);
-	}
-
 	if (tb[SERVICE_SET_INSTANCES]) {
 		if (!add)
 			vlist_update(&s->instances);
@@ -155,7 +146,6 @@ service_delete(struct service *s)
 	trigger_del(s);
 	free(s->trigger);
 	free(s);
-	service_validate_del(s);
 }
 
 enum {
@@ -201,19 +191,6 @@ static const struct blobmsg_policy event_policy[__EVENT_MAX] = {
 };
 
 enum {
-	VALIDATE_PACKAGE,
-	VALIDATE_TYPE,
-	VALIDATE_SERVICE,
-	__VALIDATE_MAX
-};
-
-static const struct blobmsg_policy validate_policy[__VALIDATE_MAX] = {
-	[VALIDATE_PACKAGE] = { .name = "package", .type = BLOBMSG_TYPE_STRING },
-	[VALIDATE_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
-	[VALIDATE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
-};
-
-enum {
 	DATA_NAME,
 	DATA_INSTANCE,
 	DATA_TYPE,
@@ -282,8 +259,6 @@ service_dump(struct service *s, bool verbose)
 	}
 	if (verbose && s->trigger)
 		blobmsg_add_blob(&b, s->trigger);
-	if (verbose && !list_empty(&s->validators))
-		service_validate_dump(&b, s);
 	blobmsg_close_table(&b, c);
 }
 
@@ -399,34 +374,6 @@ service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
-service_handle_validate(struct ubus_context *ctx, struct ubus_object *obj,
-			struct ubus_request_data *req, const char *method,
-			struct blob_attr *msg)
-{
-	struct blob_attr *tb[__VALIDATE_MAX];
-	char *p = NULL, *t = NULL;
-
-	if (!msg)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blob_data(msg), blob_len(msg));
-	if (tb[VALIDATE_SERVICE]) {
-		return 0;
-	}
-	if (tb[VALIDATE_PACKAGE])
-		p = blobmsg_get_string(tb[VALIDATE_PACKAGE]);
-
-	if (tb[VALIDATE_TYPE])
-		t = blobmsg_get_string(tb[VALIDATE_TYPE]);
-
-	blob_buf_init(&b, 0);
-	service_validate_dump_all(&b, p, t);
-	ubus_send_reply(ctx, req, b.head);
-
-	return 0;
-}
-
-static int
 service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
 		 struct ubus_request_data *req, const char *method,
 		 struct blob_attr *msg)
@@ -493,7 +440,6 @@ static struct ubus_method main_object_methods[] = {
 	UBUS_METHOD("update_start", service_handle_update, service_attrs),
 	UBUS_METHOD("update_complete", service_handle_update, service_attrs),
 	UBUS_METHOD("event", service_handle_event, event_policy),
-	UBUS_METHOD("validate", service_handle_validate, validate_policy),
 	UBUS_METHOD("get_data", service_get_data, get_data_policy),
 };
 
@@ -557,6 +503,5 @@ void
 service_init(void)
 {
 	avl_init(&services, avl_strcmp, false, NULL);
-	service_validate_init();
 }