| commit | f787350730f0993e89273dd971b6a52cb2fedba7 | [log] [tgz] |
|---|---|---|
| author | Jack He <siyuanh@google.com> | Fri Apr 20 22:06:11 2018 -0700 |
| committer | Jack He <siyuanh@google.com> | Tue Apr 24 19:22:13 2018 -0700 |
| tree | 87c0639c5c2ec0ea5755ef1fc10116cfedc5f391 | |
| parent | 3dfb5f8ab621e9822f99ab25956e7822eab2b26c [diff] |
RFCOMM: Improve logging and readability
Debug Improvements:
* Add more error logging in the following methods:
- rfc_mx_sm_state_idle for L2CA_ConnectReq failure
- rfc_mx_sm_state_configure for RFC_EVENT_TIMEOUT
- rfc_mx_conf_cnf for L2CAP configuration failures
- RFCOMM_RemoveServer
Readability Improvements:
* Refactored logic in the following methods to be more readable
- L2CA_ErtmConnectReq
- RFCOMM_CreateConnection
- port_open_continue
- PORT_StartCnf
- port_allocate_port
- rfc_send_buf_uih
- bta_ag_get_other_idle_scb
* Rename RFCOMM_ParNegReq to RFCOMM_ParameterNegotiationRequest
* Rename RFCOMM_ParNegRsp to RFCOMM_ParameterNegotiationResponse
* Rename RFCOMM_PortNegReq to RFCOMM_PortParameterNegotiationRequest
* Rename RFCOMM_PortNegRsp to RFCOMM_PortParameterNegotiationResponse
Rename using IDE:
* Rename tRFCOMM_CB.last_port to tRFCOMM_CB.last_port_index
* Rename tPORT.inx to tPORT.handle as inx is ready the port handle
indexed from 1
* Rename tRFC_MCB.port_inx to tRFC_MCB.port_handles
NPE Prevention:
* Add error checking in rfc_save_lcid_mcb to avoid accessing beyond
array boundary
Bug: 77224743
Test: StackRfcommTest, connect and disconnect to multiple devices
with PBAP, MAP, PAN, PTS HFP tests
testplans/details/158641/3975
Change-Id: I8de89dfc0cee48fed6ad4e1d4a8cdcde2f960aab
Just build AOSP - Fluoride is there by default.
Instructions for Ubuntu, tested on 14.04 with Clang 3.5.0 and 16.10 with Clang 3.8.0
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/packages/modules/Bluetooth/system
Install dependencies (require sudo access):
cd ~/fluoride/bt build/install_deps.sh
Then fetch third party dependencies:
cd ~/fluoride/bt mkdir third_party cd third_party git clone https://github.com/google/googletest.git git clone https://android.googlesource.com/platform/external/aac git clone https://android.googlesource.com/platform/external/libchrome git clone https://android.googlesource.com/platform/external/libldac git clone https://android.googlesource.com/platform/external/modp_b64 git clone https://android.googlesource.com/platform/external/tinyxml2
And third party dependencies of third party dependencies:
cd fluoride/bt/third_party/libchrome/base/third_party mkdir valgrind cd valgrind curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/valgrind.h?format=TEXT | base64 -d > valgrind.h curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/memcheck.h?format=TEXT | base64 -d > memcheck.h
NOTE: If packages/modules/Bluetooth/system is checked out under AOSP, then create symbolic links instead of downloading sources
cd packages/modules/Bluetooth/system mkdir third_party cd third_party ln -s ../../../external/aac aac ln -s ../../../external/libchrome libchrome ln -s ../../../external/libldac libldac ln -s ../../../external/modp_b64 modp_b64 ln -s ../../../external/tinyxml2 tinyxml2 ln -s ../../../external/googletest googletest
cd ~/fluoride/bt gn gen out/Default
cd ~/fluoride/bt ninja -C out/Default all
This will build all targets (the shared library, executables, tests, etc) and put them in out/Default. To build an individual target, replace "all" with the target of your choice, e.g. ninja -C out/Default net_test_osi.
cd ~/fluoride/bt/out/Default LD_LIBRARY_PATH=./ ./bluetoothtbd -create-ipc-socket=fluoride
Follows the Chromium project Eclipse Setup Instructions until "Optional: Building inside Eclipse" section (don't do that section, we will set it up differently)
Generate Eclipse settings:
cd packages/modules/Bluetooth/system gn gen --ide=eclipse out/Default
In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under packages/modules/Bluetooth/system/out/Default
Right click on the project. Go to Preferences->C/C++ Build->Builder Settings. Uncheck "Use default build command", but instead using "ninja -C out/Default"
Goto Behaviour tab, change clean command to "-t clean"