From f04315d9210f22e5d7317f1cfb3c076fb93b3c08 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Sun, 19 Feb 2012 09:58:03 +0100

Subject: [PATCH 123/140] usb-redir: Let the usb-host know about our device

 filtering

libusbredirparser-0.3.4 adds 2 new packets which allows us to notify

the usb-host:

-about the usb device filter we have (if any), so that it knows not the even

 try to redirect certain devices

-when we reject a device based on filtering (in case it tries anyways)

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 configure   |    2 +-

 usb-redir.c |   20 ++++++++++++++++++++

 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/configure b/configure

index c7e37df..a4848a4 100755

--- a/configure

+++ b/configure

@@ -2541,7 +2541,7 @@ fi

 # check for usbredirparser for usb network redirection support

 if test "$usb_redir" != "no" ; then

-    if $pkg_config --atleast-version=0.3.3 libusbredirparser >/dev/null 2>&1 ; then

+    if $pkg_config --atleast-version=0.3.4 libusbredirparser >/dev/null 2>&1 ; then

         usb_redir="yes"

         usb_redir_cflags=$($pkg_config --cflags libusbredirparser 2>/dev/null)

         usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)

diff --git a/usb-redir.c b/usb-redir.c

index fe3b0a3..d10d8de 100644

--- a/usb-redir.c

+++ b/usb-redir.c

@@ -106,6 +106,7 @@ struct AsyncURB {

     QTAILQ_ENTRY(AsyncURB)next;

 };

+static void usbredir_hello(void *priv, struct usb_redir_hello_header *h);

 static void usbredir_device_connect(void *priv,

     struct usb_redir_device_connect_header *device_connect);

 static void usbredir_device_disconnect(void *priv);

@@ -812,6 +813,7 @@ static void usbredir_open_close_bh(void *opaque)

         dev->parser->log_func = usbredir_log;

         dev->parser->read_func = usbredir_read;

         dev->parser->write_func = usbredir_write;

+        dev->parser->hello_func = usbredir_hello;

         dev->parser->device_connect_func = usbredir_device_connect;

         dev->parser->device_disconnect_func = usbredir_device_disconnect;

         dev->parser->interface_info_func = usbredir_interface_info;

@@ -830,6 +832,7 @@ static void usbredir_open_close_bh(void *opaque)

         dev->read_buf_size = 0;

         usbredirparser_caps_set_cap(caps, usb_redir_cap_connect_device_version);

+        usbredirparser_caps_set_cap(caps, usb_redir_cap_filter);

         usbredirparser_init(dev->parser, VERSION, caps, USB_REDIR_CAPS_SIZE, 0);

         usbredirparser_do_write(dev->parser);

     }

@@ -1018,6 +1021,10 @@ static int usbredir_check_filter(USBRedirDevice *dev)

 error:

     usbredir_device_disconnect(dev);

+    if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter)) {

+        usbredirparser_send_filter_reject(dev->parser);

+        usbredirparser_do_write(dev->parser);

+    }

     return -1;

 }

@@ -1043,6 +1050,19 @@ static int usbredir_handle_status(USBRedirDevice *dev,

     }

 }

+static void usbredir_hello(void *priv, struct usb_redir_hello_header *h)

+{

+    USBRedirDevice *dev = priv;

+

+    /* Try to send the filter info now that we've the usb-host's caps */

+    if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter) &&

+            dev->filter_rules) {

+        usbredirparser_send_filter_filter(dev->parser, dev->filter_rules,

+                                          dev->filter_rules_count);

+        usbredirparser_do_write(dev->parser);

+    }

+}

+

 static void usbredir_device_connect(void *priv,

     struct usb_redir_device_connect_header *device_connect)

 {

-- 

1.7.9.3