i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Prepending l2cap header in a separate function to not play with c++ contexts

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36026 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2010-04-02 11:42:00 +00:00
parent 2e26da485a
commit 0feca7d685
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/l2cap/l2cap_lower.cpp
+28 -24
View File
@@ -101,6 +101,33 @@ struct bt_hci_module_info* btDevices = NULL;
static thread_id sConnectionThread; static thread_id sConnectionThread;
static void
AddL2capHeader(L2capFrame* frame)
{
NetBufferPrepend<l2cap_hdr_t> bufferHeader(frame->buffer);
status_t status = bufferHeader.Status();
if (status < B_OK) {
debugf("header could not be prepended! code=%d\n", frame->code);
return;
}
// fill
bufferHeader->length = htole16(frame->buffer->size - sizeof(l2cap_hdr_t));
switch (frame->type) {
case L2CAP_C_FRAME:
bufferHeader->dcid = L2CAP_SIGNAL_CID;
break;
case L2CAP_G_FRAME:
bufferHeader->dcid = L2CAP_CLT_CID;
break;
default:
bufferHeader->dcid = frame->channel->dcid;
break;
}
}
void void
purge_connection(HciConnection* conn) purge_connection(HciConnection* conn)
{ {
@@ -130,30 +157,7 @@ purge_connection(HciConnection* conn)
if (frame->buffer == NULL) if (frame->buffer == NULL)
panic("Malformed frame in ongoing queue"); panic("Malformed frame in ongoing queue");
{ AddL2capHeader(frame);
NetBufferPrepend<l2cap_hdr_t> bufferHeader(frame->buffer);
status_t status = bufferHeader.Status();
if (status < B_OK) {
debugf("header could not be prepended! code=%d\n", frame->code);
return;
}
// fill
bufferHeader->length = htole16(frame->buffer->size - sizeof(l2cap_hdr_t));
switch (frame->type) {
case L2CAP_C_FRAME:
bufferHeader->dcid = L2CAP_SIGNAL_CID;
break;
case L2CAP_G_FRAME:
bufferHeader->dcid = L2CAP_CLT_CID;
break;
default:
bufferHeader->dcid = frame->channel->dcid;
break;
}
}
if (btDevices == NULL) if (btDevices == NULL)
if (get_module(BT_HCI_MODULE_NAME, (module_info**)&btDevices) != B_OK) { if (get_module(BT_HCI_MODULE_NAME, (module_info**)&btDevices) != B_OK) {