fix

Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>

Author: yaroslavborbat

src/cli/pkg/usbredir/usbredir.go

@@ -4,6 +4,10 @@ import "C"
 
 /*
 #cgo pkg-config: libusbredirhost libusbredirparser-0.5 libusb-1.0 glib-2.0 gio-2.0
+
+#define G_LOG_DOMAIN "usbredirect"
+#define G_LOG_USE_STRUCTURED
+
 #include <usbredirhost.h>
 #include <usbredirparser.h>
 #include <usbredirproto.h>
@@ -62,16 +66,33 @@ typedef struct {
 
 static bool
 by_bus(device *device) {
-	return device != NULL && device.bus > && device.device_number > 0;
+	return device != NULL && device->bus > 0 && device->device_number > 0;
+}
+
+static bool
+validate_device_from_config(usbredir_config *config)
+{
+    bool by_bus_flag = config->device.bus > 0 && config->device.device_number > 0;
+    if (by_bus_flag) {
+        return config->device.bus > 0 && config->device.device_number > 0;
+    }
+
+    if (config->device.vendor <= 0 || config->device.vendor > 0xffff ||
+        config->device.product < 0 || config->device.product > 0xffff) {
+        return false;
+    }
+
+    return true;
 }
+
 static bool
 is_valid_config(usbredir_config *config) {
-    if (!config || !config->addr) {
+    if (!config || !config->net_settings.addr) {
         return false;
     }
 
     if (!validate_device_from_config(config)) {
-        return fail;
+        return false;
     }
 
     return true;
@@ -81,7 +102,7 @@ static redirect *
 new_redirect(usbredir_config *config)
 {
 	redirect *self = NULL;
-	if !is_valid_config(config) {
+	if (!is_valid_config(config)) {
 		return self;
 	}
 
@@ -95,21 +116,6 @@ new_redirect(usbredir_config *config)
 	return self;
 }
 
-static bool
-validate_device_from_config(usbredir_config *config)
-{
-    if (config->by_bus) {
-        return config->bus > 0 && config->device_number > 0;
-    }
-
-    if (config->vendor <= 0 || config->vendor > 0xffff ||
-        config->product < 0 || config->product > 0xffff) {
-        return false;
-    }
-
-    return true;
-}
-
 static gpointer
 thread_handle_libusb_events(gpointer user_data)
 {
@@ -395,7 +401,7 @@ can_claim_usb_device(libusb_device *dev, libusb_device_handle **handle)
     for (i = 0; i < config->bNumInterfaces; i++) {
         int interface_num = config->interface[i].altsetting[0].bInterfaceNumber;
 #if LIBUSBX_API_VERSION < 0x01000102
-        ret = libusb_detach_kernel_driver(handle, interface_num);
+        ret = libusb_detach_kernel_driver(*handle, interface_num);
         if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND
             && ret != LIBUSB_ERROR_NOT_SUPPORTED) {
             g_error("failed to detach driver from interface %d: %s",
@@ -596,7 +602,7 @@ int usbredir_run(usbredir_config *config)
         socket_service = g_socket_service_new();
         GInetAddress *iaddr = g_inet_address_new_from_string(self->net_settings.addr);
         if (iaddr == NULL) {
-            g_warning("Failed to parse IP: %s", self->addr);
+            g_warning("Failed to parse IP: %s", self->net_settings.addr);
             goto end;
         }
 
@@ -617,7 +623,7 @@ int usbredir_run(usbredir_config *config)
 
         g_signal_connect(socket_service,
                 "incoming", G_CALLBACK(connection_incoming_cb),
-                state);
+                self);
     }
 
 	self->main_loop = g_main_loop_new(NULL, FALSE);
@@ -702,7 +708,7 @@ func Run(ctx context.Context, config Config) error {
 		},
 		verbosity: C.int(config.Verbosity),
 	}
-	defer C.free(unsafe.Pointer(cConfig.addr))
+	defer C.free(unsafe.Pointer(cConfig.net_settings.addr))
 
 	done := make(chan error, 1)
 	go func() {