[Spice-devel] [PATCH 1/7] Introduce reds_stream_async_read() helper
Marc-André Lureau
marcandre.lureau at gmail.com
Tue Mar 25 03:58:40 PDT 2014
On Mon, Mar 17, 2014 at 2:20 PM, Christophe Fergeau <cfergeau at redhat.com>wrote:
> This will allow to make RedsStream::async_read private
> ---
> server/reds_stream.c | 77
> +++++++++++++++++++++++-----------------------------
> server/reds_stream.h | 2 ++
> 2 files changed, 36 insertions(+), 43 deletions(-)
>
> diff --git a/server/reds_stream.c b/server/reds_stream.c
> index 873b953..57eb1d1 100644
> --- a/server/reds_stream.c
> +++ b/server/reds_stream.c
> @@ -310,8 +310,6 @@ RedsStream *reds_stream_new(int socket)
> stream->priv->write = stream_write_cb;
> stream->priv->writev = stream_writev_cb;
>
> - stream->priv->async_read.stream = stream;
> -
> return stream;
> }
>
> @@ -396,11 +394,10 @@ void async_read_set_error_handler(AsyncRead *async,
>
> static inline void async_read_clear_handlers(AsyncRead *obj)
> {
> - if (!obj->stream->watch) {
> - return;
> + if (obj->stream->watch) {
> + reds_stream_remove_watch(obj->stream);
> }
> -
> - reds_stream_remove_watch(obj->stream);
> + obj->stream = NULL;
> }
>
> void async_read_handler(int fd, int event, void *data)
> @@ -449,6 +446,23 @@ void async_read_handler(int fd, int event, void *data)
> }
> }
>
> +void reds_stream_async_read(RedsStream *stream,
> + uint8_t *data, size_t size,
> + AsyncReadDone read_done_cb,
> + void *opaque)
> +{
> + AsyncRead *obj = &stream->priv->async_read;
> +
>
s/obj/ async or op ?
> + g_assert(!obj->stream);
>
Safer spice_return_if_fail() ?
+ obj->stream = stream;
> + obj->now = data;
> + obj->end = obj->now + size;
> + obj->done = read_done_cb;
> + obj->opaque = opaque;
> + async_read_handler(0, 0, obj);
> +
> +}
> +
> #if HAVE_SASL
> bool reds_stream_write_u8(RedsStream *s, uint8_t n)
> {
> @@ -638,7 +652,6 @@ RedsSaslError reds_sasl_handle_auth_step(RedsStream
> *stream, AsyncReadDone read_
> char *clientdata = NULL;
> RedsSASL *sasl = &stream->priv->sasl;
> uint32_t datalen = sasl->len;
> - AsyncRead *obj = &stream->priv->async_read;
>
> /* NB, distinction of NULL vs "" is *critical* in SASL */
> if (datalen) {
> @@ -683,10 +696,8 @@ RedsSaslError reds_sasl_handle_auth_step(RedsStream
> *stream, AsyncReadDone read_
> if (err == SASL_CONTINUE) {
> spice_info("%s", "Authentication must continue (step)");
> /* Wait for step length */
> - obj->now = (uint8_t *)&sasl->len;
> - obj->end = obj->now + sizeof(uint32_t);
> - obj->done = read_cb;
> - async_read_handler(0, 0, &stream->priv->async_read);
> + reds_stream_async_read(stream, (uint8_t *)&sasl->len,
> sizeof(uint32_t),
> + read_cb, opaque);
> return REDS_SASL_ERROR_CONTINUE;
> } else {
> int ssf;
> @@ -718,7 +729,6 @@ authreject:
>
> RedsSaslError reds_sasl_handle_auth_steplen(RedsStream *stream,
> AsyncReadDone read_cb, void *opaque)
> {
> - AsyncRead *obj = &stream->priv->async_read;
> RedsSASL *sasl = &stream->priv->sasl;
>
> spice_info("Got steplen %d", sasl->len);
> @@ -735,11 +745,8 @@ RedsSaslError
> reds_sasl_handle_auth_steplen(RedsStream *stream, AsyncReadDone re
> * treatment */
> return REDS_SASL_ERROR_OK;
> } else {
> - sasl->data = spice_realloc(sasl->data, sasl->len);
> - obj->now = (uint8_t *)sasl->data;
> - obj->end = obj->now + sasl->len;
> - obj->done = read_cb;
> - async_read_handler(0, 0, obj);
> + reds_stream_async_read(stream, (uint8_t *)sasl->data, sasl->len,
> + read_cb, opaque);
> return REDS_SASL_ERROR_OK;
> }
> }
> @@ -761,7 +768,6 @@ RedsSaslError reds_sasl_handle_auth_steplen(RedsStream
> *stream, AsyncReadDone re
>
> RedsSaslError reds_sasl_handle_auth_start(RedsStream *stream,
> AsyncReadDone read_cb, void *opaque)
> {
> - AsyncRead *obj = &stream->priv->async_read;
> const char *serverout;
> unsigned int serveroutlen;
> int err;
> @@ -813,10 +819,8 @@ RedsSaslError reds_sasl_handle_auth_start(RedsStream
> *stream, AsyncReadDone read
> if (err == SASL_CONTINUE) {
> spice_info("%s", "Authentication must continue (start)");
> /* Wait for step length */
> - obj->now = (uint8_t *)&sasl->len;
> - obj->end = obj->now + sizeof(uint32_t);
> - obj->done = read_cb;
> - async_read_handler(0, 0, &stream->priv->async_read);
> + reds_stream_async_read(stream, (uint8_t *)&sasl->len,
> sizeof(uint32_t),
> + read_cb, opaque);
> return REDS_SASL_ERROR_CONTINUE;
> } else {
> int ssf;
> @@ -847,7 +851,6 @@ authreject:
>
> RedsSaslError reds_sasl_handle_auth_startlen(RedsStream *stream,
> AsyncReadDone read_cb, void *opaque)
> {
> - AsyncRead *obj = &stream->priv->async_read;
> RedsSASL *sasl = &stream->priv->sasl;
>
> spice_info("Got client start len %d", sasl->len);
> @@ -861,17 +864,14 @@ RedsSaslError
> reds_sasl_handle_auth_startlen(RedsStream *stream, AsyncReadDone r
> }
>
> sasl->data = spice_realloc(sasl->data, sasl->len);
> - obj->now = (uint8_t *)sasl->data;
> - obj->end = obj->now + sasl->len;
> - obj->done = read_cb;
> - async_read_handler(0, 0, obj);
> + reds_stream_async_read(stream, (uint8_t *)sasl->data, sasl->len,
> + read_cb, opaque);
>
> return REDS_SASL_ERROR_OK;
> }
>
> bool reds_sasl_handle_auth_mechname(RedsStream *stream, AsyncReadDone
> read_cb, void *opaque)
> {
> - AsyncRead *obj = &stream->priv->async_read;
> RedsSASL *sasl = &stream->priv->sasl;
>
> sasl->mechname[sasl->len] = '\0';
> @@ -903,17 +903,14 @@ bool reds_sasl_handle_auth_mechname(RedsStream
> *stream, AsyncReadDone read_cb, v
>
> spice_info("Validated mechname '%s'", sasl->mechname);
>
> - obj->now = (uint8_t *)&sasl->len;
> - obj->end = obj->now + sizeof(uint32_t);
> - obj->done = read_cb;
> - async_read_handler(0, 0, &stream->priv->async_read);
> + reds_stream_async_read(stream, (uint8_t *)&sasl->len,
> sizeof(uint32_t),
> + read_cb, opaque);
>
> return TRUE;
> }
>
> bool reds_sasl_handle_auth_mechlen(RedsStream *stream, AsyncReadDone
> read_cb, void *opaque)
> {
> - AsyncRead *obj = &stream->priv->async_read;
> RedsSASL *sasl = &stream->priv->sasl;
>
> if (sasl->len < 1 || sasl->len > 100) {
> @@ -924,10 +921,8 @@ bool reds_sasl_handle_auth_mechlen(RedsStream
> *stream, AsyncReadDone read_cb, vo
> sasl->mechname = spice_malloc(sasl->len + 1);
>
> spice_info("Wait for client mechname");
> - obj->now = (uint8_t *)sasl->mechname;
> - obj->end = obj->now + sasl->len;
> - obj->done = read_cb;
> - async_read_handler(0, 0, &stream->priv->async_read);
> + reds_stream_async_read(stream, (uint8_t *)sasl->mechname, sasl->len,
> + read_cb, opaque);
>
> return TRUE;
> }
> @@ -939,7 +934,6 @@ bool reds_sasl_start_auth(RedsStream *stream,
> AsyncReadDone read_cb, void *opaqu
> int err;
> char *localAddr, *remoteAddr;
> int mechlistlen;
> - AsyncRead *obj = &stream->priv->async_read;
> RedsSASL *sasl = &stream->priv->sasl;
>
> if (!(localAddr = reds_stream_get_local_address(stream))) {
> @@ -1036,11 +1030,8 @@ bool reds_sasl_start_auth(RedsStream *stream,
> AsyncReadDone read_cb, void *opaqu
> }
>
> spice_info("Wait for client mechname length");
> - obj->now = (uint8_t *)&sasl->len;
> - obj->end = obj->now + sizeof(uint32_t);
> - obj->done = read_cb;
> - obj->opaque = opaque;
> - async_read_handler(0, 0, obj);
> + reds_stream_async_read(stream, (uint8_t *)&sasl->len,
> sizeof(uint32_t),
> + read_cb, opaque);
>
> return TRUE;
>
> diff --git a/server/reds_stream.h b/server/reds_stream.h
> index ae3403a..866679a 100644
> --- a/server/reds_stream.h
> +++ b/server/reds_stream.h
> @@ -65,6 +65,8 @@ typedef enum {
>
> /* any thread */
> ssize_t reds_stream_read(RedsStream *s, void *buf, size_t nbyte);
> +void reds_stream_async_read(RedsStream *stream, uint8_t *data, size_t
> size,
> + AsyncReadDone read_done_cb, void *opaque);
> ssize_t reds_stream_write(RedsStream *s, const void *buf, size_t nbyte);
> ssize_t reds_stream_writev(RedsStream *s, const struct iovec *iov, int
> iovcnt);
> bool reds_stream_write_all(RedsStream *stream, const void *in_buf, size_t
> n);
> --
> 1.8.5.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>
--
Marc-André Lureau
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20140325/5f73df1f/attachment.html>
More information about the Spice-devel
mailing list