X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fevent.c;h=ec5537a0f4da301a751ea12413db0bf24269f460;hp=6434b40d39cd944c90cd93ab8681617b3b721ba6;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/discover/event.c b/discover/event.c
index 6434b40..ec5537a 100644
--- a/discover/event.c
+++ b/discover/event.c
@@ -29,14 +29,14 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
 	headerlen = strnlen(buf, len);
 
 	if (!headerlen) {
-		pb_log("%s: bad header, no data\n", __func__);
+		pb_log_fn("bad header, no data\n");
 		return -1;
 	}
 
 	/* we should see an <action>@<device>\0 at the head of the buffer */
 	sep = strchr(buf, '@');
 	if (!sep) {
-		pb_log("%s: bad header: %s\n", __func__, buf);
+		pb_log_fn("bad header: %s\n", buf);
 		return -1;
 	}
 
@@ -47,17 +47,23 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
 		*action = EVENT_ACTION_ADD;
 	else if (streq(buf, "remove"))
 		*action = EVENT_ACTION_REMOVE;
-	else if (streq(buf, "conf"))
-		*action = EVENT_ACTION_CONF;
+	else if (streq(buf, "url"))
+		*action = EVENT_ACTION_URL;
 	else if (streq(buf, "dhcp"))
 		*action = EVENT_ACTION_DHCP;
+	else if (streq(buf, "boot"))
+		*action = EVENT_ACTION_BOOT;
+	else if (streq(buf, "sync"))
+		*action = EVENT_ACTION_SYNC;
+	else if (streq(buf, "plugin"))
+		*action = EVENT_ACTION_PLUGIN;
 	else {
-		pb_log("%s: unknown action: %s\n", __func__, buf);
+		pb_log_fn("unknown action: %s\n", buf);
 		return -1;
 	}
 
 	if (!*(sep + 1)) {
-		pb_log("%s: bad device: %s\n", __func__, buf);
+		pb_log_fn("bad device: %s\n", buf);
 		return -1;
 	}
 
@@ -74,7 +80,7 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
 static void event_parse_params(struct event *event, const char *buf, int len)
 {
 	int param_len, name_len, value_len;
-	struct param *param;
+	struct event_param *param;
 	char *sep;
 
 	for (; len > 0; len -= param_len + 1, buf += param_len + 1) {
@@ -89,7 +95,7 @@ static void event_parse_params(struct event *event, const char *buf, int len)
 
 		/* update the params array */
 		event->params = talloc_realloc(event, event->params,
-					struct param, ++event->n_params);
+					struct event_param, ++event->n_params);
 		param = &event->params[event->n_params - 1];
 
 		sep = memchr(buf, '=', param_len);
@@ -144,7 +150,7 @@ const char *event_get_param(const struct event *event, const char *name)
 
 void event_set_param(struct event *event, const char *name, const char *value)
 {
-	struct param *param;
+	struct event_param *param;
 	int i;
 
 	/* if it's already present, replace the value of the old param */
@@ -159,7 +165,7 @@ void event_set_param(struct event *event, const char *name, const char *value)
 
 	/* not found - create a new param */
 	event->params = talloc_realloc(event, event->params,
-				struct param, ++event->n_params);
+				struct event_param, ++event->n_params);
 	param = &event->params[event->n_params - 1];
 
 	param->name = talloc_strdup(event, name);