monitor: Fix misaligment errors

This fixes the following errors:

monitor/packet.c:11968:27: runtime error: member access within
misaligned address 0x565448026d55 for type
'const struct monitor_l2cap_hdr', which requires 2 byte alignment
monitor/packet.c:11968:4: runtime error: member access within
misaligned address 0x565448026d55 for type
'const struct monitor_l2cap_hdr', which requires 2 byte alignment

diff --git a/monitor/packet.c b/monitor/packet.c
index 99f8e6f..b694fea 100755 (executable)
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -11951,7 +11951,7 @@ void packet_system_note(struct timeval *tv, struct ucred *cred,
 struct monitor_l2cap_hdr {
        uint16_t cid;
        uint16_t psm;
-};
+} __attribute__((packed));
 
 static void packet_decode(struct timeval *tv, struct ucred *cred, char dir,
                                uint16_t index, const char *color,
@@ -11970,7 +11970,8 @@ static void packet_decode(struct timeval *tv, struct ucred *cred, char dir,
                                NULL);
 
        /* Discard last byte since it just a filler */
-       l2cap_frame(index, dir == '>', 0, hdr->cid, hdr->psm,
+       l2cap_frame(index, dir == '>', 0,
+                       le16_to_cpu(hdr->cid), le16_to_cpu(hdr->psm),
                        data + sizeof(*hdr), size - (sizeof(*hdr) + 1));
 }