Hi Szymon,
On 13 May 2015 at 17:14, Szymon Janc <szymon.janc@xxxxxxxxx> wrote:
> Hi Grzegorz,
>
> On Tuesday 12 of May 2015 12:23:31 Grzegorz Kolodziejczyk wrote:
>> Support for extension headers is mandatory functionality. This patch
>> add support to it and leave responsibility for processing extension
>> header and sending setup success response to kernel.
>>
>> This patch is necessary to pass PTS bnep test TC_CTRL_BV_19_C.
>> ---
>> android/pan.c | 7 +++-
>> profiles/network/bnep.c | 102
>> ++++++++++++++++++++++++++++++++++++++++------ profiles/network/server.c |
>> 7 +++-
>> tools/bneptest.c | 2 +-
>> 4 files changed, 101 insertions(+), 17 deletions(-)
>>
>> diff --git a/android/pan.c b/android/pan.c
>> index 6c9815b..0bb576e 100644
>> --- a/android/pan.c
>> +++ b/android/pan.c
>> @@ -471,8 +471,11 @@ static gboolean nap_setup_cb(GIOChannel *chan,
>> GIOCondition cond,
>>
>> sk = g_io_channel_unix_get_fd(chan);
>>
>> - /* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */
>> - n = read(sk, packet, sizeof(packet));
>> + /*
>> + * BNEP_SETUP_CONNECTION_REQUEST_MSG should be read and left in case
>> + * of kernel setup connection msg handling.
>> + */
>> + n = recv(sk, packet, sizeof(packet), MSG_PEEK);
>> if (n < 0) {
>> error("read(): %s(%d)", strerror(errno), errno);
>> goto failed;
>> diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c
>> index e325b72..9e8afdc 100644
>> --- a/profiles/network/bnep.c
>> +++ b/profiles/network/bnep.c
>> @@ -124,6 +124,7 @@ static int bnep_connadd(int sk, uint16_t role, char
>> *dev)
>>
>> req.sock = sk;
>> req.role = role;
>> + req.flags = (1 << BNEP_SETUP_RESPONSE);
>> if (ioctl(ctl, BNEPCONNADD, &req) < 0) {
>> int err = -errno;
>> error("bnep: Failed to add device %s: %s(%d)",
>> @@ -135,6 +136,18 @@ static int bnep_connadd(int sk, uint16_t role, char
>> *dev) return 0;
>> }
>>
>> +static uint32_t bnep_getsuppfeat(void)
>> +{
>> + uint32_t feat;
>> +
>> + if (ioctl(ctl, BNEPGETSUPPFEAT, &feat) < 0)
>> + feat = 0;
>> +
>> + DBG("supported features: 0x%x", feat);
>> +
>> + return feat;
>> +}
>> +
>> static int bnep_if_up(const char *devname)
>> {
>> struct ifreq ifr;
>> @@ -530,7 +543,9 @@ static uint16_t bnep_setup_decode(int sk, struct
>> bnep_setup_conn_req *req, uint8_t *dest, *source;
>> uint32_t val;
>>
>> - if (req->type != BNEP_CONTROL || req->ctrl != BNEP_SETUP_CONN_REQ)
>> + if (((req->type != BNEP_CONTROL) &&
>> + (req->type != (BNEP_CONTROL | BNEP_EXT_HEADER))) ||
>> + req->ctrl != BNEP_SETUP_CONN_REQ)
>> return BNEP_CONN_NOT_ALLOWED;
>>
>> dest = req->service;
>> @@ -587,10 +602,55 @@ static uint16_t bnep_setup_decode(int sk, struct
>> bnep_setup_conn_req *req, return BNEP_CONN_INVALID_DST;
>> }
>>
>> +static int bnep_server_add_legacy(int sk, uint16_t dst, char *bridge,
>> + char *iface, const bdaddr_t *addr,
>> + uint8_t *setup_data, int len)
>> +{
>> + int err, n;
>> + uint16_t rsp;
>> +
>> + n = read(sk, setup_data, len);
>> + if (n != len) {
>> + err = -1;
>
> Make this -EIO
>
Ok, it's better.
>> + rsp = BNEP_CONN_NOT_ALLOWED;
>> + goto reply;
>> + }
>> +
>> + err = bnep_connadd(sk, dst, iface);
>> + if (err < 0) {
>> + rsp = BNEP_CONN_NOT_ALLOWED;
>> + goto reply;
>> + }
>> +
>> + err = bnep_add_to_bridge(iface, bridge);
>> + if (err < 0) {
>> + bnep_conndel(addr);
>> + rsp = BNEP_CONN_NOT_ALLOWED;
>> + goto reply;
>> + }
>> +
>> + err = bnep_if_up(iface);
>> + if (err < 0) {
>> + bnep_del_from_bridge(iface, bridge);
>> + bnep_conndel(addr);
>> + rsp = BNEP_CONN_NOT_ALLOWED;
>> + }
>> +
>> +reply:
>> + if (bnep_send_ctrl_rsp(sk, BNEP_SETUP_CONN_RSP, rsp) < 0) {
>> + err = -errno;
>> + error("bnep: send ctrl rsp error: %s (%d)", strerror(-err),
>> + -err);
>> + }
>> +
>> + return err;
>> +}
>> +
>> int bnep_server_add(int sk, char *bridge, char *iface, const bdaddr_t
>> *addr, uint8_t *setup_data, int len)
>> {
>> int err;
>> + uint32_t feat;
>> uint16_t rsp, dst;
>> struct bnep_setup_conn_req *req = (void *) setup_data;
>>
>> @@ -614,31 +674,49 @@ int bnep_server_add(int sk, char *bridge, char *iface,
>> const bdaddr_t *addr, err = -rsp;
>> error("bnep: error while decoding setup connection request: %d",
>> rsp);
>> - goto reply;
>> + goto failed;
>> }
>>
>> + feat = bnep_getsuppfeat();
>> +
>> + /*
>> + * Take out setup data if kernel doesn't support handling it, especially
>> + * setup request. If kernel would have set session flags, they should
>> + * be checked and handled respectively.
>> + */
>> + if (!feat || !(feat & (1 << BNEP_SETUP_RESPONSE)))
>> + return bnep_server_add_legacy(sk, dst, bridge, iface, addr,
>> + setup_data, len);
>> +
>> err = bnep_connadd(sk, dst, iface);
>> if (err < 0) {
>> rsp = BNEP_CONN_NOT_ALLOWED;
>> - goto reply;
>> + goto failed;
>> }
>>
>> err = bnep_add_to_bridge(iface, bridge);
>> - if (err < 0) {
>> - bnep_conndel(addr);
>> - rsp = BNEP_CONN_NOT_ALLOWED;
>> - goto reply;
>> - }
>> + if (err < 0)
>> + goto del_conn;
>>
>> err = bnep_if_up(iface);
>> if (err < 0)
>> - rsp = BNEP_CONN_NOT_ALLOWED;
>> + goto del_from_bridge;
>>
>> -reply:
>> + return 0;
>> +
>> +del_from_bridge:
>
> I'd prefer to have failed_* in those labels eg failed_bridge, failed_conn
> etc
>
Ok,
>> + bnep_del_from_bridge(iface, bridge);
>> +
>> +del_conn:
>> + bnep_conndel(addr);
>> +
>> + return err;
>> +
>> +failed:
>> if (bnep_send_ctrl_rsp(sk, BNEP_SETUP_CONN_RSP, rsp) < 0) {
>> err = -errno;
>> - error("bnep: send ctrl rsp error: %s (%d)", strerror(errno),
>> - errno);
>> + error("bnep: send ctrl rsp error: %s (%d)", strerror(-err),
>> + -err);
>> }
>>
>> return err;
>> diff --git a/profiles/network/server.c b/profiles/network/server.c
>> index 32aafc3..1bff9f8 100644
>> --- a/profiles/network/server.c
>> +++ b/profiles/network/server.c
>> @@ -327,8 +327,11 @@ static gboolean bnep_setup(GIOChannel *chan,
>>
>> sk = g_io_channel_unix_get_fd(chan);
>>
>> - /* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */
>> - n = read(sk, packet, sizeof(packet));
>> + /*
>> + * BNEP_SETUP_CONNECTION_REQUEST_MSG should be read and left in case
>> + * of kernel setup connection msg handling.
>> + */
>> + n = recv(sk, packet, sizeof(packet), MSG_PEEK);
>> if (n < 0) {
>> error("read(): %s(%d)", strerror(errno), errno);
>> return FALSE;
>> diff --git a/tools/bneptest.c b/tools/bneptest.c
>> index 98ee9b1..a7d5815 100644
>> --- a/tools/bneptest.c
>> +++ b/tools/bneptest.c
>> @@ -327,7 +327,7 @@ static gboolean setup_bnep_cb(GIOChannel *chan,
>> GIOCondition cond, sk = g_io_channel_unix_get_fd(chan);
>>
>> /* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */
>> - n = read(sk, packet, sizeof(packet));
>> + n = recv(sk, packet, sizeof(packet), MSG_PEEK);
>> if (n < 0) {
>> error("read(): %s(%d)", strerror(errno), errno);
>> return FALSE;
>
> --
> BR
> Szymon Janc
BR,
Grzegorz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
