File endian.patch of Package spice-vdagent

Overview Repositories Revisions Requests Users Attributes Meta

File endian.patch of Package spice-vdagent (Revision 82a8836c44a36282f14756d4149bad13)

Currently displaying revision 82a8836c44a36282f14756d4149bad13 , Show latest

commit 5960f3727702a16c9cf2f6bb31ab65cb104a2efe
Author: Michal Suchanek <msuchanek@suse.de>
Date:   Tue Nov 8 16:47:07 2016 +0100

Do endian swapping.

diff --git a/src/vdagentd/uinput.c b/src/vdagentd/uinput.c
index e2966c4..285706a 100644
--- a/src/vdagentd/uinput.c
+++ b/src/vdagentd/uinput.c
@@ -198,7 +198,7 @@ void vdagentd_uinput_do_mouse(struct vdagentd_uinput **uinputp,
         { .name = "up",     .mask =  VD_AGENT_UBUTTON_MASK, .btn = 1  },
         { .name = "down",   .mask =  VD_AGENT_DBUTTON_MASK, .btn = -1 },
     };
-    int i, down;
+    int i, down, x, y, buttons;
 
     if (*uinputp) {
         if (mouse->display_id >= uinput->screen_count) {
@@ -206,32 +206,37 @@ void vdagentd_uinput_do_mouse(struct vdagentd_uinput **uinputp,
                    mouse->display_id, uinput->screen_count);
             return;
         }
+	x = le32toh(mouse->x);
+	y = le32toh(mouse->y);
         if (uinput->debug)
             syslog(LOG_DEBUG, "mouse-event: mon %d %dx%d", mouse->display_id,
-                   mouse->x, mouse->y);
-        mouse->x += uinput->screen_info[mouse->display_id].x;
-        mouse->y += uinput->screen_info[mouse->display_id].y;
+                   x, y);
+        x += uinput->screen_info[mouse->display_id].x;
+        y += uinput->screen_info[mouse->display_id].y;
 #ifdef WITH_STATIC_UINPUT
-        mouse->x = mouse->x * 32767 / (uinput->width - 1);
-        mouse->y = mouse->y * 32767 / (uinput->height - 1);
+        x = x * 32767 / (uinput->width - 1);
+        y = y * 32767 / (uinput->height - 1);
 #endif
     }
 
-    if (*uinputp && uinput->last.x != mouse->x) {
+    if (*uinputp && uinput->last.x != x) {
         if (uinput->debug)
-            syslog(LOG_DEBUG, "mouse: abs-x %d", mouse->x);
-        uinput_send_event(uinputp, EV_ABS, ABS_X, mouse->x);
+            syslog(LOG_DEBUG, "mouse: abs-x %d", x);
+        uinput_send_event(uinputp, EV_ABS, ABS_X, x);
     }
-    if (*uinputp && uinput->last.y != mouse->y) {
+    if (*uinputp && uinput->last.y != y) {
         if (uinput->debug)
-            syslog(LOG_DEBUG, "mouse: abs-y %d", mouse->y);
-        uinput_send_event(uinputp, EV_ABS, ABS_Y, mouse->y);
+            syslog(LOG_DEBUG, "mouse: abs-y %d", y);
+        uinput_send_event(uinputp, EV_ABS, ABS_Y, y);
     }
+
+    buttons = le32toh(mouse->buttons);
+
     for (i = 0; i < sizeof(btns)/sizeof(btns[0]) && *uinputp; i++) {
         if ((uinput->last.buttons & btns[i].mask) ==
-                (mouse->buttons & btns[i].mask))
+                (buttons & btns[i].mask))
             continue;
-        down = !!(mouse->buttons & btns[i].mask);
+        down = !!(buttons & btns[i].mask);
         if (uinput->debug)
             syslog(LOG_DEBUG, "mouse: btn-%s %s",
                     btns[i].name, down ? "down" : "up");
@@ -239,9 +244,9 @@ void vdagentd_uinput_do_mouse(struct vdagentd_uinput **uinputp,
     }
     for (i = 0; i < sizeof(wheel)/sizeof(wheel[0]) && *uinputp; i++) {
         if ((uinput->last.buttons & wheel[i].mask) ==
-                (mouse->buttons & wheel[i].mask))
+                (buttons & wheel[i].mask))
             continue;
-        if (mouse->buttons & wheel[i].mask) {
+        if (buttons & wheel[i].mask) {
             if (uinput->debug)
                 syslog(LOG_DEBUG, "mouse: wheel-%s", wheel[i].name);
             uinput_send_event(uinputp, EV_REL, REL_WHEEL, wheel[i].btn);
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
index 18e82a7..ec162d8 100644
--- a/src/vdagentd/vdagentd.c
+++ b/src/vdagentd/vdagentd.c
@@ -151,8 +151,8 @@ static void do_client_monitors(struct vdagent_virtio_port *vport, int port_nr,
                     (uint8_t *)mon_config, size);
 
     /* Acknowledge reception of monitors config to spice server / client */
-    reply.type  = VD_AGENT_MONITORS_CONFIG;
-    reply.error = VD_AGENT_SUCCESS;
+    reply.type  = htole32(VD_AGENT_MONITORS_CONFIG);
+    reply.error = htole32(VD_AGENT_SUCCESS);
     vdagent_virtio_port_write(vport, port_nr, VD_AGENT_REPLY, 0,
                               (uint8_t *)&reply, sizeof(reply));
 }
@@ -174,7 +174,7 @@ static void do_client_capabilities(struct vdagent_virtio_port *vport,
     VDAgentMessage *message_header,
     VDAgentAnnounceCapabilities *caps)
 {
-    int new_size = VD_AGENT_CAPS_SIZE_FROM_MSG_SIZE(message_header->size);
+    int i, new_size = VD_AGENT_CAPS_SIZE_FROM_MSG_SIZE(message_header->size);
 
     if (capabilities_size != new_size) {
         capabilities_size = new_size;
@@ -186,7 +186,8 @@ static void do_client_capabilities(struct vdagent_virtio_port *vport,
             return;
         }
     }
-    memcpy(capabilities, caps->caps, capabilities_size * sizeof(uint32_t));
+    for (i = 0; i < capabilities_size; i++) {
+        capabilities[i] = caps->caps[i];
     if (caps->request) {
         /* Report the previous client has disconneced. */
         do_client_disconnect();
@@ -225,7 +226,7 @@ static void do_client_clipboard(struct vdagent_virtio_port *vport,
     case VD_AGENT_CLIPBOARD_REQUEST: {
         VDAgentClipboardRequest *req = (VDAgentClipboardRequest *)data;
         msg_type = VDAGENTD_CLIPBOARD_REQUEST;
-        data_type = req->type;
+        data_type = le32toh(req->type);
         data = NULL;
         size = 0;
         break;
@@ -233,7 +234,7 @@ static void do_client_clipboard(struct vdagent_virtio_port *vport,
     case VD_AGENT_CLIPBOARD: {
         VDAgentClipboard *clipboard = (VDAgentClipboard *)data;
         msg_type = VDAGENTD_CLIPBOARD_DATA;
-        data_type = clipboard->type;
+        data_type = le32toh(clipboard->type);
         size = size - sizeof(VDAgentClipboard);
         data = clipboard->data;
         break;
@@ -255,8 +256,8 @@ static void send_file_xfer_status(struct vdagent_virtio_port *vport,
                                   const char *msg, uint32_t id, uint32_t xfer_status)
 {
     VDAgentFileXferStatusMessage status = {
-        .id = id,
-        .result = xfer_status,
+        .id = htole32(id),
+        .result = htole32(xfer_status),
     };
     syslog(LOG_WARNING, msg, id);
     if (vport)
@@ -275,6 +276,7 @@ static void do_client_file_xfer(struct vdagent_virtio_port *vport,
     switch (message_header->type) {
     case VD_AGENT_FILE_XFER_START: {
         VDAgentFileXferStartMessage *s = (VDAgentFileXferStartMessage *)data;
+        s->id = le32toh(s->id);
         if (!active_session_conn) {
             send_file_xfer_status(vport,
                "Could not find an agent connnection belonging to the "
@@ -295,12 +297,16 @@ static void do_client_file_xfer(struct vdagent_virtio_port *vport,
     }
     case VD_AGENT_FILE_XFER_STATUS: {
         VDAgentFileXferStatusMessage *s = (VDAgentFileXferStatusMessage *)data;
+        s->id = le32toh(s->id);
+        s->result = le64toh(s->result);
         msg_type = VDAGENTD_FILE_XFER_STATUS;
         id = s->id;
         break;
     }
     case VD_AGENT_FILE_XFER_DATA: {
         VDAgentFileXferDataMessage *d = (VDAgentFileXferDataMessage *)data;
+        s->id = le32toh(s->id);
+        s->size = le64toh(s->size);
         msg_type = VDAGENTD_FILE_XFER_DATA;
         id = d->id;
         break;
diff --git a/src/vdagentd/virtio-port.c b/src/vdagentd/virtio-port.c
index cedda4d..09bdfd5 100644
--- a/src/vdagentd/virtio-port.c
+++ b/src/vdagentd/virtio-port.c
@@ -216,16 +216,16 @@ int vdagent_virtio_port_write_start(
         return -1;
     }
 
-    chunk_header.port = port_nr;
-    chunk_header.size = sizeof(message_header) + data_size;
+    chunk_header.port = htole32(port_nr);
+    chunk_header.size = htole32(sizeof(message_header) + data_size);
     memcpy(new_wbuf->buf + new_wbuf->write_pos, &chunk_header,
            sizeof(chunk_header));
     new_wbuf->write_pos += sizeof(chunk_header);
 
-    message_header.protocol = VD_AGENT_PROTOCOL;
-    message_header.type = message_type;
-    message_header.opaque = message_opaque;
-    message_header.size = data_size;
+    message_header.protocol = htole32(VD_AGENT_PROTOCOL);
+    message_header.type = htole32(message_type);
+    message_header.opaque = htole64(message_opaque);
+    message_header.size = htole32(ata_size);
     memcpy(new_wbuf->buf + new_wbuf->write_pos, &message_header,
            sizeof(message_header));
     new_wbuf->write_pos += sizeof(message_header);
@@ -309,13 +309,20 @@ static void vdagent_virtio_port_do_chunk(struct vdagent_virtio_port **vportp)
         memcpy((uint8_t *)&port->message_header + port->message_header_read,
                vport->chunk_data, read);
         port->message_header_read += read;
-        if (port->message_header_read == sizeof(port->message_header) &&
-                port->message_header.size) {
-            port->message_data = malloc(port->message_header.size);
-            if (!port->message_data) {
-                syslog(LOG_ERR, "out of memory, disconnecting virtio");
-                vdagent_virtio_port_destroy(vportp);
-                return;
+        if (port->message_header_read == sizeof(port->message_header)) {
+
+            port->message_header.protocol = le32toh(message_header.protocol);
+            port->message_header.type = le32toh(message_header.type);
+            port->message_header.opaque = le64toh(message_header.opaque);
+            port->message_header.size = le32toh(message_header.size);
+
+            if (port->message_header.size) {
+                port->message_data = malloc(port->message_header.size);
+                if (!port->message_data) {
+                    syslog(LOG_ERR, "out of memory, disconnecting virtio");
+                    vdagent_virtio_port_destroy(vportp);
+                    return;
+                }
             }
         }
         pos = read;
@@ -420,6 +427,8 @@ static void vdagent_virtio_port_do_read(struct vdagent_virtio_port **vportp)
     if (vport->chunk_header_read < sizeof(vport->chunk_header)) {
         vport->chunk_header_read += n;
         if (vport->chunk_header_read == sizeof(vport->chunk_header)) {
+            chunk_header.size = le32toh(chunk_header.size);
+            chunk_header.port = le32toh(chunk_header.port);
             if (vport->chunk_header.size > VD_AGENT_MAX_DATA_SIZE) {
                 syslog(LOG_ERR, "chunk size %u too large",
                        vport->chunk_header.size);

Places

File endian.patch of Package spice-vdagent (Revision 82a8836c44a36282f14756d4149bad13)

Places