On Fri, Aug 31, 2018 at 12:37:20AM +0200, Aleksander Morgado wrote:
> We need to advance the input buffer used to create messages when the
> data doesn't fit in a single RATP packet.
>
> Signed-off-by: Aleksander Morgado <aleksander@xxxxxxxxxxxxx>
> ---
Applied, thanks
Sascha
> include/ratp.h | 2 +-
> lib/ratp.c | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/ratp.h b/include/ratp.h
> index 6f4cf8a6f..d2a819235 100644
> --- a/include/ratp.h
> +++ b/include/ratp.h
> @@ -11,7 +11,7 @@ int ratp_establish(struct ratp *ratp, bool active, int timeout_ms);
> void ratp_close(struct ratp *ratp);
> int ratp_recv(struct ratp *ratp, void **data, size_t *len);
> int ratp_send(struct ratp *ratp, const void *data, size_t len);
> -int ratp_send_complete(struct ratp *ratp, const void *data, size_t len,
> +int ratp_send_complete(struct ratp *ratp, const uint8_t *data, size_t len,
> void (*complete)(void *ctx, int status), void *complete_ctx);
> int ratp_poll(struct ratp *ratp);
> bool ratp_closed(struct ratp *ratp);
> diff --git a/lib/ratp.c b/lib/ratp.c
> index 4c5c748b4..7801cae51 100644
> --- a/lib/ratp.c
> +++ b/lib/ratp.c
> @@ -1734,11 +1734,12 @@ void ratp_close(struct ratp *ratp)
> *
> * Return: 0 if successful, a negative error code otherwise.
> */
> -int ratp_send_complete(struct ratp *ratp, const void *data, size_t len,
> +int ratp_send_complete(struct ratp *ratp, const uint8_t *data, size_t len,
> void (*complete)(void *ctx, int status), void *complete_ctx)
> {
> struct ratp_internal *ri = ratp->internal;
> struct ratp_message *msg;
> + int sent = 0;
>
> if (!ri || ri->state != RATP_STATE_ESTABLISHED)
> return -ENETDOWN;
> @@ -1754,11 +1755,12 @@ int ratp_send_complete(struct ratp *ratp, const void *data, size_t len,
> msg = xzalloc(sizeof(*msg));
> msg->buf = xzalloc(sizeof(struct ratp_header) + now + 2);
> msg->len = now;
> - memcpy(msg->buf + sizeof(struct ratp_header), data, now);
> + memcpy(msg->buf + sizeof(struct ratp_header), data + sent, now);
>
> list_add_tail(&msg->list, &ri->sendmsg);
>
> len -= now;
> + sent += now;
> }
>
> msg->eor = 1;
> --
> 2.18.0
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
