Bluetooth: Avoid using macro GPOINTER_TO_UINT()

Fix warnings and try to inform user about unknown values in
"Decode As".

Also use define instead of magic number for Unknown L2CAP CIDs.

Change-Id: Ie6f26a9e3330b84cef14bbf8861ffbdbdb789225
Reviewed-on: https://code.wireshark.org/review/1880
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h
index 4208e7beab..5de3436dfb 100644
--- a/epan/dissectors/packet-btl2cap.h
+++ b/epan/dissectors/packet-btl2cap.h
@@ -49,13 +49,15 @@
 #define BTL2CAP_FIXED_CID_AMP_TEST  0x003F
 #define BTL2CAP_FIXED_CID_LAST      0x003F
 
+#define BTL2CAP_UNKNOWN_CID 0xFFFFFFFF
+
 typedef struct _btl2cap_data_t {
     guint32   interface_id;
     guint32   adapter_id;
     guint16   chandle;  /* only low 12 bits used */
     guint16   cid;
-    gint32    local_cid;
-    gint32    remote_cid;
+    guint32   local_cid;
+    guint32   remote_cid;
     guint32  *disconnect_in_frame;
     gboolean  is_local_psm; /* otherwise it is PSM in remote device */
     guint16   psm;