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

- Add handling of some events taking part on the pairing process

Browse Source 
- Rename event structures to be consistent with another remaining ones
- Fix typos
by Mika & Oliver




git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26476 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2008-07-17 20:44:09 +00:00
parent 0a95b2a34b
commit 41da6509b2
2 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/bluetooth/LocalDeviceImpl.cpp
+53 -20
View File
@@ -65,24 +65,25 @@ void
LocalDeviceImpl::HandleEvent(struct hci_event_header* event) LocalDeviceImpl::HandleEvent(struct hci_event_header* event)
{ {
printf("### Event comming: len = %d\n", event->elen); printf("### Incoming event: len = %d\n", event->elen);
for (int16 index = 0 ; index < event->elen + 2; index++ ) { for (int16 index = 0 ; index < event->elen + 2; index++ ) {
printf("%x:",((uint8*)event)[index]); printf("%x:",((uint8*)event)[index]);
} }
printf("### \n"); printf("### \n");
// Events here might have not been initated by us // Events here might have not been initated by us
// TODO: ML mark as handled pass a reply by parameter and reply in common
switch (event->ecode) { switch (event->ecode) {
case HCI_EVENT_HARDWARE_ERROR: case HCI_EVENT_HARDWARE_ERROR:
//HardwareError(event); //HardwareError(event);
return; return;
case HCI_EVENT_CONN_REQUEST: case HCI_EVENT_CONN_REQUEST:
ConnectionRequest((struct hci_ev_conn_request*)(event+1), NULL); // incoming request
break; break;
case HCI_EVENT_CONN_COMPLETE: case HCI_EVENT_CONN_COMPLETE:
ConnectionComplete((struct hci_ev_conn_complete*)(event+1), NULL); // should belong to a request? ConnectionComplete((struct hci_ev_conn_complete*)(event+1), NULL); // should belong to a request?
// can be sporadic or initiated by us¿?...
break; break;
case HCI_EVENT_PIN_CODE_REQ: case HCI_EVENT_PIN_CODE_REQ:
@@ -132,14 +133,14 @@ printf("### \n");
break; break;
case HCI_EVENT_DISCONNECTION_COMPLETE: case HCI_EVENT_DISCONNECTION_COMPLETE:
DisconnectionComplete((struct hci_ev_disconnection_complete_reply*)(event+1), request);
break; break;
case HCI_EVENT_AUTH_COMPLETE: case HCI_EVENT_AUTH_COMPLETE:
break; break;
case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE: case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE:
RemoteNameRequestComplete((struct hci_remote_name_request_complete_reply*)(event+1), request); RemoteNameRequestComplete((struct hci_ev_remote_name_request_complete_reply*)(event+1), request);
break; break;
case HCI_EVENT_ENCRYPT_CHANGE: case HCI_EVENT_ENCRYPT_CHANGE:
@@ -172,6 +173,7 @@ printf("### \n");
break; break;
case HCI_EVENT_ROLE_CHANGE: case HCI_EVENT_ROLE_CHANGE:
RoleChange((struct hci_ev_role_change*)(event+1), request, eventIndexLocation);
break; break;
case HCI_EVENT_NUM_COMP_PKTS: case HCI_EVENT_NUM_COMP_PKTS:
@@ -187,6 +189,7 @@ printf("### \n");
break; break;
case HCI_EVENT_LINK_KEY_NOTIFY: case HCI_EVENT_LINK_KEY_NOTIFY:
LinkKeyNotify((struct hci_ev_link_key_notify*)(event+1), request, eventIndexLocation);
break; break;
case HCI_EVENT_LOOPBACK_COMMAND: case HCI_EVENT_LOOPBACK_COMMAND:
@@ -232,7 +235,7 @@ printf("### \n");
void void
LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* request, int32 index) { LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* request, int32 index) {
int16 opcodeExpected; int16 opcodeExpected;
BMessage reply; BMessage reply;
@@ -240,8 +243,6 @@ LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* re
Output::Instance()->Post("\n", BLACKBOARD_LD_OFFSET + GetID()); Output::Instance()->Post("\n", BLACKBOARD_LD_OFFSET + GetID());
// Handle command complete information // Handle command complete information
// FIX ME! the expected code might me in another
// index as is relative to the event not the request
request->FindInt16("opcodeExpected", index, &opcodeExpected); request->FindInt16("opcodeExpected", index, &opcodeExpected);
@@ -262,15 +263,15 @@ LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* re
printf("Sending reply ... %ld\n",request->SendReply(&reply)); printf("Sending reply ... %ld\n",request->SendReply(&reply));
reply.PrintToStream(); reply.PrintToStream();
Output::Instance()->Post("Positive reply for getAdress\n", BLACKBOARD_KIT); Output::Instance()->Post("Positive reply for getAddress\n", BLACKBOARD_KIT);
} else { } else {
reply.AddInt8("status", readbdaddr->status); reply.AddInt8("status", readbdaddr->status);
request->SendReply(&reply); request->SendReply(&reply);
Output::Instance()->Post("Negative reply for getAdress\n", BLACKBOARD_KIT); Output::Instance()->Post("Negative reply for getAddress\n", BLACKBOARD_KIT);
} }
// This request is not genna be used anymore // This request is not gonna be used anymore
ClearWantedEvent(request); ClearWantedEvent(request);
} }
break; break;
@@ -295,7 +296,7 @@ LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* re
printf("Sending reply ... %ld\n",request->SendReply(&reply)); printf("Sending reply ... %ld\n",request->SendReply(&reply));
reply.PrintToStream(); reply.PrintToStream();
// This request is not genna be used anymore // This request is not gonna be used anymore
ClearWantedEvent(request); ClearWantedEvent(request);
} }
break; break;
@@ -319,7 +320,7 @@ LocalDeviceImpl::CommandComplete(struct hci_ev_cmd_complete* event, BMessage* re
printf("Sending reply ... %ld\n",request->SendReply(&reply)); printf("Sending reply ... %ld\n",request->SendReply(&reply));
reply.PrintToStream(); reply.PrintToStream();
// This request is not genna be used anymore // This request is not gonna be used anymore
ClearWantedEvent(request); ClearWantedEvent(request);
} }
break; break;
@@ -388,7 +389,7 @@ LocalDeviceImpl::InquiryResult(uint8* numberOfResponses, BMessage* request)
BMessage reply(BT_MSG_INQUIRY_DEVICE); BMessage reply(BT_MSG_INQUIRY_DEVICE);
reply.AddData("info", B_ANY_TYPE, numberOfResponses+1 // skiping here the number of responses reply.AddData("info", B_ANY_TYPE, numberOfResponses+1 // skipping here the number of responses
, (*numberOfResponses) * sizeof(struct inquiry_info) ); , (*numberOfResponses) * sizeof(struct inquiry_info) );
printf("%s: Sending reply ... %ld\n",__FUNCTION__, request->SendReply(&reply)); printf("%s: Sending reply ... %ld\n",__FUNCTION__, request->SendReply(&reply));
@@ -412,7 +413,7 @@ LocalDeviceImpl::InquiryComplete(uint8* status, BMessage* request)
void void
LocalDeviceImpl::RemoteNameRequestComplete(struct hci_remote_name_request_complete_reply* remotename, BMessage* request) LocalDeviceImpl::RemoteNameRequestComplete(struct hci_ev_remote_name_request_complete_reply* remotename, BMessage* request)
{ {
BMessage reply; BMessage reply;
@@ -432,19 +433,36 @@ LocalDeviceImpl::RemoteNameRequestComplete(struct hci_remote_name_request_comple
printf("Sending reply ... %ld\n", request->SendReply(&reply)); printf("Sending reply ... %ld\n", request->SendReply(&reply));
reply.PrintToStream(); reply.PrintToStream();
// This request is not genna be used anymore // This request is not gonna be used anymore
// Although there are many middle events that should be tracked todo: ticket 2377
ClearWantedEvent(request); ClearWantedEvent(request);
} }
void
LocalDeviceImpl::ConnectionRequest(struct hci_ev_conn_request* event, BMessage* request)
{
}
void void
LocalDeviceImpl::ConnectionComplete(struct hci_ev_conn_complete* event, BMessage* request) LocalDeviceImpl::ConnectionComplete(struct hci_ev_conn_complete* event, BMessage* request)
{ {
ConnectionIncoming* iConnection = new ConnectionIncoming(NULL); ConnectionIncoming* iConnection = new ConnectionIncoming(NULL);
iConnection->Show(); iConnection->Show();
// TODO: Connection is valid create needed instances here or in KL
ClearWantedEvent(request);
}
void
LocalDeviceImpl::DisconnectionComplete(struct hci_ev_disconnection_complete_reply* event, BMessage * request)
{
Output::Instance()->Post("Disconnected\n", BLACKBOARD_KIT);
} }
@@ -456,6 +474,21 @@ LocalDeviceImpl::PinCodeRequest(struct hci_ev_pin_code_req* event, BMessage* req
} }
void
LocalDeviceImpl::RoleChange(hci_ev_role_change *event, BMessage* request, int32 index)
{
}
void
LocalDeviceImpl::LinkKeyNotify(hci_ev_link_key_notify *event, BMessage* request, int32 index)
{
}
#if 0 #if 0
#pragma mark - Request Methods - #pragma mark - Request Methods -
#endif #endif
@@ -464,9 +497,9 @@ LocalDeviceImpl::PinCodeRequest(struct hci_ev_pin_code_req* event, BMessage* req
status_t status_t
LocalDeviceImpl::GetAddress(bdaddr_t* bdaddr, BMessage* request) LocalDeviceImpl::GetAddress(bdaddr_t* bdaddr, BMessage* request)
{ {
ssize_t size; ssize_t ssize;
if (fProperties->FindData("bdaddr", B_ANY_TYPE, 0, (const void **)bdaddr, &size) == B_OK) { if (fProperties->FindData("bdaddr", B_ANY_TYPE, 0, (const void **)bdaddr, &ssize) == B_OK) {
(Output::Instance()->Post("BDADDR already present in server\n", BLACKBOARD_EVENTS)); (Output::Instance()->Post("BDADDR already present in server\n", BLACKBOARD_EVENTS));
/* We have this info, returning back */ /* We have this info, returning back */
src/servers/bluetooth/LocalDeviceImpl.h
+9 -2
View File
@@ -43,11 +43,18 @@ public:
// Inquiry // Inquiry
void InquiryResult(uint8* numberOfResponses, BMessage* request); void InquiryResult(uint8* numberOfResponses, BMessage* request);
void InquiryComplete(uint8* status, BMessage* request); void InquiryComplete(uint8* status, BMessage* request);
void RemoteNameRequestComplete(struct hci_remote_name_request_complete_reply* remotename, BMessage* request); void RemoteNameRequestComplete(struct hci_ev_remote_name_request_complete_reply* remotename, BMessage* request);
// Connection // Connection
void ConnectionComplete(struct hci_ev_conn_complete* event, BMessage* request); void ConnectionComplete(struct hci_ev_conn_complete* event, BMessage* request);
void PinCodeRequest(struct hci_ev_pin_code_req* event, BMessage* request); void ConnectionRequest(struct hci_ev_conn_request* event, BMessage* request);
void DisconnectionComplete(struct hci_ev_disconnection_complete_reply* event, BMessage *request);
// Pairing
void PinCodeRequest(struct hci_ev_pin_code_req* event, BMessage* request);
void RoleChange(struct hci_ev_role_change* event, BMessage* request, int32 index);
void LinkKeyNotify(struct hci_ev_link_key_notify* event, BMessage* request, int32 index);
}; };
#endif #endif