Diff between dfca2fff13f6c7d583e82ca3c3c5541ce0ed4d37 and ef276c54785525b7669d7d0439f80eeb20c03fab

Changed Files

File Additions Deletions Status
emulator/bthost.c +1 -1 modified
monitor/bt.h +1 -1 modified
monitor/l2cap.c +3 -3 modified

Full Patch

diff --git a/emulator/bthost.c b/emulator/bthost.c
index 5d713b9..8c1d1f9 100644
--- a/emulator/bthost.c
+++ b/emulator/bthost.c
@@ -436,7 +436,7 @@ static bool l2cap_config_req(struct bthost *bthost, uint16_t handle,
 		return false;
 
 	memset(&rsp, 0, sizeof(rsp));
-	rsp.dcid  = req->dcid;
+	rsp.scid  = req->dcid;
 	rsp.flags = req->flags;
 
 	send_l2cap_sig(bthost, handle, BT_L2CAP_PDU_CONFIG_RSP, ident, &rsp,
diff --git a/monitor/bt.h b/monitor/bt.h
index 06d2a1c..7bd439f 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -1496,7 +1496,7 @@ struct bt_l2cap_pdu_config_req {
 
 #define BT_L2CAP_PDU_CONFIG_RSP		0x05
 struct bt_l2cap_pdu_config_rsp {
-	uint16_t dcid;
+	uint16_t scid;
 	uint16_t flags;
 	uint16_t result;
 } __attribute__ ((packed));
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index f28c76b..6aa8523 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -828,7 +828,7 @@ static void sig_conn_rsp(const struct l2cap_frame *frame)
 
 static void sig_config_req(const struct l2cap_frame *frame)
 {
-	const struct bt_l2cap_pdu_config_rsp *pdu = frame->data;
+	const struct bt_l2cap_pdu_config_req *pdu = frame->data;
 
 	print_cid("Destination", pdu->dcid);
 	print_config_flags(pdu->flags);
@@ -839,10 +839,10 @@ static void sig_config_rsp(const struct l2cap_frame *frame)
 {
 	const struct bt_l2cap_pdu_config_rsp *pdu = frame->data;
 
-	print_cid("Destination", pdu->dcid);
+	print_cid("Source", pdu->scid);
 	print_config_flags(pdu->flags);
 	print_config_result(pdu->result);
-	print_config_options(frame, 6, btohs(pdu->dcid), true);
+	print_config_options(frame, 6, btohs(pdu->scid), true);
 }
 
 static void sig_disconn_req(const struct l2cap_frame *frame)