Hi Marcel,
On Friday 07 of March 2014 19:37:00 Marcel Holtmann wrote:
> Hi Szymon,
>
> > Those commands are passed to Framework without parsing.
> > ---
> > android/handsfree.c | 64
> > ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54
> > insertions(+), 10 deletions(-)
> >
> > diff --git a/android/handsfree.c b/android/handsfree.c
> > index c49a35b..e104c4a 100644
> > --- a/android/handsfree.c
> > +++ b/android/handsfree.c
> > @@ -161,19 +161,35 @@ static void device_cleanup(void)
> >
> > memset(&device, 0, sizeof(device));
> >
> > }
> >
> > -static void at_command_handler(const char *command, void *user_data)
> > +static void disconnect_watch(void *user_data)
> > {
> > - hfp_gw_send_result(device.gw, HFP_RESULT_ERROR);
> > + DBG("");
> >
> > - if (device.state != HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED)
> > - hfp_gw_disconnect(device.gw);
> > + device_cleanup();
> > }
> >
> > -static void disconnect_watch(void *user_data)
> > +static void at_cmd_unknown(const char *command, void *user_data)
> > {
> > - DBG("");
> > + uint8_t buf[IPC_MTU];
> > + struct hal_ev_handsfree_unknown_at *ev = (void *) buf;
> >
> > - device_cleanup();
> > + if (device.state != HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED) {
> > + hfp_gw_send_result(device.gw, HFP_RESULT_ERROR);
> > + hfp_gw_disconnect(device.gw);
> > + return;
> > + }
> > +
> > + /* copy while string including terminating NULL */
> > + ev->len = strlen(command) + 1;
> > + memcpy(ev->buf, command, ev->len);
> > +
> > + if (ev->len > IPC_MTU - sizeof(*ev)) {
> > + hfp_gw_send_result(device.gw, HFP_RESULT_ERROR);
> > + return;
> > + }
> > +
> > + ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > + HAL_EV_HANDSFREE_UNKNOWN_AT, sizeof(*ev) + ev->len, ev);
> > }
> >
> > static void at_cmd_vgs_vgm(struct hfp_gw_result *result,
> > @@ -674,7 +690,7 @@ static void connect_cb(GIOChannel *chan, GError *err,
> > gpointer user_data)>
> > g_io_channel_set_close_on_unref(chan, FALSE);
> >
> > hfp_gw_set_close_on_unref(device.gw, true);
> >
> > - hfp_gw_set_command_handler(device.gw, at_command_handler, NULL, NULL);
> > + hfp_gw_set_command_handler(device.gw, at_cmd_unknown, NULL, NULL);
> >
> > hfp_gw_set_disconnect_handler(device.gw, disconnect_watch, NULL,
NULL);
> >
> > @@ -1147,19 +1163,47 @@ static void handle_cind(const void *buf, uint16_t
> > len)
> >
> > static void handle_formatted_at_resp(const void *buf, uint16_t len)
> > {
> > + const struct hal_cmd_handsfree_formatted_at_response *cmd = buf;
> > + char *at;
> > +
> >
> > DBG("");
> >
> > + if (len != sizeof(*cmd) + cmd->len) {
> > + error("Invalid formatted AT response command, terminating");
> > + raise(SIGTERM);
> > + return;
> > + }
> > +
> > + DBG("");
> > +
> > + at = g_malloc0(cmd->len + 1);
> > +
> > + memcpy(at, cmd->buf, cmd->len);
> > +
> > + hfp_gw_send_info(device.gw, "%s", at);
> > +
> > + g_free(at);
> > +
>
> is Android really passing AT commands around without \0 terminating them.
> That OS is really just plain silly.
This is due to how we currently send strings overs IPC. There is string type
in our IPC doc, but not in hal-msg.h. I'll fix that.
>
> Anyway, using strndupa seems more appropriate here.
>
> I also wonder why not just using (.., “%.*s”, cmd->len, cmd->buf) here.
I'll use that.
> Regards
>
> Marcel
--
BR
Szymon Janc
--
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
