From 925b9857173f5086c4afeed0a09fa29496b504ae Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 30 May 2013 20:52:37 +0200
Subject: [PATCH] store message lengths
---
main.c | 20 +++++++++++++-------
switch.h | 2 ++
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/main.c b/main.c
index b7461ad..fca2a37 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,7 @@ static const char *config_file = DEFAULT_CONFIG;
static struct blob_buf conf;
struct blob_attr **messages = NULL;
+int *message_len;
int n_messages = 0;
static struct avl_tree devices;
@@ -73,20 +74,20 @@ static int hexstr2bin(const char *hex, char *buffer, int len)
return 0;
}
-static bool convert_message(struct blob_attr *attr)
+static int convert_message(struct blob_attr *attr)
{
char *data;
int len;
- if (!attr)
- return true;
-
data = blobmsg_data(attr);
len = strlen(data);
if (len % 2)
- return false;
+ return -1;
+
+ if (hexstr2bin(data, data, len / 2))
+ return -1;
- return !hexstr2bin(data, data, len / 2);
+ return len / 2;
}
static int parse_config(void)
@@ -115,12 +116,17 @@ static int parse_config(void)
n_messages++;
messages = calloc(n_messages, sizeof(*messages));
+ message_len = calloc(n_messages, sizeof(*message_len));
n_messages = 0;
blobmsg_for_each_attr(cur, tb[CONF_MESSAGES], rem) {
- if (!convert_message(cur)) {
+ int len = convert_message(cur);
+
+ if (len < 0) {
fprintf(stderr, "Invalid data in message %d\n", n_messages);
return -1;
}
+
+ message_len[n_messages] = len;
messages[n_messages++] = cur;
}
diff --git a/switch.h b/switch.h
index ab09f11..1c964db 100644
--- a/switch.h
+++ b/switch.h
@@ -12,12 +12,14 @@ struct usbdev_data {
int interface;
int msg_endpoint;
int response_endpoint;
+ bool need_response;
char idstr[10];
char mfg[128], prod[128], serial[128];
};
extern struct blob_attr **messages;
+extern int *message_len;
extern int n_messages;
void handle_switch(struct usbdev_data *data);
--
2.25.1