allow the device data to override the interface

[project/usbmode.git] / main.c

diff --git a/main.c b/main.c
index 5d135f2..cf58c17 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,11 +1,12 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <stdbool.h>
+#include <ctype.h>
 
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>
-#include <libusb.h>
+#include "switch.h"
 
 #define DEFAULT_CONFIG "/etc/usb-mode.json"
 
@@ -14,15 +15,6 @@ struct device {
        struct blob_attr *data;
 };
 
-struct usbdev_data {
-       struct libusb_device_descriptor desc;
-       libusb_device_handle *devh;
-       struct blob_attr *info;
-
-       char idstr[10];
-       char mfg[128], prod[128], serial[128];
-};
-
 static int verbose = 0;
 static const char *config_file = DEFAULT_CONFIG;
 static struct blob_buf conf;
@@ -36,6 +28,67 @@ static struct libusb_context *usb;
 static struct libusb_device **usbdevs;
 static int n_usbdevs;
 
+static int hex2num(char c)
+{
+       if (c >= '0' && c <= '9')
+               return c - '0';
+
+       c = toupper(c);
+       if (c >= 'A' && c <= 'F')
+               return c - 'A' + 10;
+
+       return -1;
+}
+
+static int hex2byte(const char *hex)
+{
+       int a, b;
+
+       a = hex2num(*hex++);
+       if (a < 0)
+               return -1;
+
+       b = hex2num(*hex++);
+       if (b < 0)
+               return -1;
+
+       return (a << 4) | b;
+}
+
+static int hexstr2bin(const char *hex, char *buffer, int len)
+{
+       const char *ipos = hex;
+       char *opos = buffer;
+       int i, a;
+
+       for (i = 0; i < len; i++) {
+               a = hex2byte(ipos);
+               if (a < 0)
+                       return -1;
+
+               *opos++ = a;
+               ipos += 2;
+       }
+
+       return 0;
+}
+
+static bool 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 !hexstr2bin(data, data, len / 2);
+}
+
 static int parse_config(void)
 {
        enum {
@@ -63,8 +116,13 @@ static int parse_config(void)
 
        messages = calloc(n_messages, sizeof(*messages));
        n_messages = 0;
-       blobmsg_for_each_attr(cur, tb[CONF_MESSAGES], rem)
+       blobmsg_for_each_attr(cur, tb[CONF_MESSAGES], rem) {
+               if (!convert_message(cur)) {
+                       fprintf(stderr, "Invalid data in message %d\n", n_messages);
+                       return -1;
+               }
                messages[n_messages++] = cur;
+       }
 
        blobmsg_for_each_attr(cur, tb[CONF_DEVICES], rem) {
            dev = calloc(1, sizeof(*dev));
@@ -129,6 +187,27 @@ find_dev_data(struct usbdev_data *data, struct device *dev)
        return NULL;
 }
 
+static void
+parse_interface_config(libusb_device *dev, struct usbdev_data *data)
+{
+       struct libusb_config_descriptor *config;
+       const struct libusb_interface *iface;
+
+       data->interface = -1;
+       if (libusb_get_config_descriptor(dev, 0, &config))
+               return;
+
+       data->config = config;
+       if (!config->bNumInterfaces)
+               return;
+
+       iface = &config->interface[0];
+       if (!iface->num_altsetting)
+               return;
+
+       data->interface = iface->altsetting[0].bInterfaceNumber;
+}
+
 static void iterate_devs(cmd_cb_t cb)
 {
        struct usbdev_data data;
@@ -163,9 +242,15 @@ static void iterate_devs(cmd_cb_t cb)
                        data.devh, data.desc.iSerialNumber,
                        (void *) data.serial, sizeof(data.serial));
 
+               parse_interface_config(usbdevs[i], &data);
+
                data.info = find_dev_data(&data, dev);
                if (data.info)
                        cb(&data);
+
+               if (data.config)
+                       libusb_free_config_descriptor(data.config);
+
                libusb_close(data.devh);
        }
 }
@@ -176,10 +261,6 @@ static void handle_list(struct usbdev_data *data)
                data->idstr, data->mfg, data->prod, data->serial);
 }
 
-static void handle_switch(struct usbdev_data *data)
-{
-}
-
 int main(int argc, char **argv)
 {
        cmd_cb_t cb = NULL;