Bluetooth: L2CAP: Another fix for CIDs

Example: if there is Connection Request than field with CID always
is called SCID. If we Sent this packet, it is okay, but if we Receive
it, then it is not SCID for us, but DCID. If we receive
Connection Request (DCID) and than we want to make disconnection,
so we send Disconnection Request with DCID that is SCID in
Connection Request... etc.

I try to clarify this, so rename stored SCID to Local CID
and DCID  to Remote CID.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h
index 27340cefeb..4208e7beab 100644
--- a/epan/dissectors/packet-btl2cap.h
+++ b/epan/dissectors/packet-btl2cap.h
@@ -54,13 +54,11 @@ typedef struct _btl2cap_data_t {
     guint32   adapter_id;
     guint16   chandle;  /* only low 12 bits used */
     guint16   cid;
-    gint32    scid;
-    gint32    dcid;
+    gint32    local_cid;
+    gint32    remote_cid;
     guint32  *disconnect_in_frame;
     gboolean  is_local_psm; /* otherwise it is PSM in remote device */
     guint16   psm;
-    guint32   first_scid_frame;
-    guint32   first_dcid_frame;
     guint32   remote_bd_addr_oui;
     guint32   remote_bd_addr_id;
 } btl2cap_data_t;