X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fevent.c;h=ec5537a0f4da301a751ea12413db0bf24269f460;hp=cced6588d8b88aed85683668c93a9a19ddcc0178;hb=6fe83028cc8de0954e81bede58115c18ec29b040;hpb=9933fe75fd5f7f6a281a67deb3a8d919f5617f89

diff --git a/discover/event.c b/discover/event.c
index cced658..ec5537a 100644
--- a/discover/event.c
+++ b/discover/event.c
@@ -2,7 +2,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <string.h>
 
 #include <log/log.h>
@@ -22,40 +21,54 @@
 static int event_parse_ad_header(char *buf, int len, enum event_action *action,
 	char **device)
 {
+	int headerlen;
 	char *sep;
 
 	*action = 0;
 	*device = NULL;
+	headerlen = strnlen(buf, len);
+
+	if (!headerlen) {
+		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;
 	}
 
 	/* terminate the action string */
 	*sep = '\0';
-	len -= sep - buf + 1;
 
 	if (streq(buf, "add"))
 		*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;
 	}
 
 	*device = sep + 1;
-	return 0;
+	return headerlen;
 }
 
 /**
@@ -67,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) {
@@ -82,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);
@@ -102,26 +115,24 @@ static void event_parse_params(struct event *event, const char *buf, int len)
 
 int event_parse_ad_message(struct event *event, char *buf, int len)
 {
-	int result;
-	char *device;
 	enum event_action action;
-	int device_len;
+	int headerlen;
+	char *device;
 
-	result = event_parse_ad_header(buf, len, &action, &device);
+	headerlen = event_parse_ad_header(buf, len, &action, &device);
 
-	if (result)
+	if (headerlen <= 0)
 		return -1;
 
-	device_len = strlen(device);
-
 	/* now we have an action and a device, we can construct the event */
 	event->action = action;
-	event->device = talloc_strndup(event, device, device_len);
+	event->device = talloc_strdup(event, device);
 	event->n_params = 0;
 	event->params = NULL;
 
-	len -= device_len + 1;
-	event_parse_params(event, device + device_len + 1, len);
+	len -= headerlen + 1;
+	buf += headerlen + 1;
+	event_parse_params(event, buf, len);
 
 	return 0;
 }
@@ -139,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 */
@@ -154,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);