[FFmpeg-devel] avformat/amqp: parse vhost in uri

From: Andriy Gelman <andriy.gelman@gmail.com>

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
---
 doc/protocols.texi    |  7 ++++---
 libavformat/libamqp.c | 31 ++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

On Sat, 19 Dec 2020, Andriy Gelman wrote:

> From: Andriy Gelman <andriy.gelman@gmail.com>
>
> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> ---
> doc/protocols.texi    |  7 ++++---
> libavformat/libamqp.c | 31 ++++++++++++++++++++++++++-----
> 2 files changed, 30 insertions(+), 8 deletions(-)

LGTM, thanks.

Regards,
Marton

>
> diff --git a/doc/protocols.texi b/doc/protocols.texi
> index b4efa14509..de377a9546 100644
> --- a/doc/protocols.texi
> +++ b/doc/protocols.texi
> @@ -63,16 +63,17 @@ After starting the broker, an FFmpeg client may stream data to the broker using
> the command:
> 
> @example
> -ffmpeg -re -i input -f mpegts amqp://[[user]:[password]@@]hostname[:port]
> +ffmpeg -re -i input -f mpegts amqp://[[user]:[password]@@]hostname[:port][/vhost]
> @end example
> 
> Where hostname and port (default is 5672) is the address of the broker. The
> client may also set a user/password for authentication. The default for both
> -fields is "guest".
> +fields is "guest". Name of virtual host on broker can be set with vhost. The
> +default value is "/".
> 
> Muliple subscribers may stream from the broker using the command:
> @example
> -ffplay amqp://[[user]:[password]@@]hostname[:port]
> +ffplay amqp://[[user]:[password]@@]hostname[:port][/vhost]
> @end example
> 
> In RabbitMQ all data published to the broker flows through a specific exchange,
> diff --git a/libavformat/libamqp.c b/libavformat/libamqp.c
> index 81df724a6d..c3b9c484ea 100644
> --- a/libavformat/libamqp.c
> +++ b/libavformat/libamqp.c
> @@ -62,10 +62,10 @@ static const AVOption options[] = {
> static int amqp_proto_open(URLContext *h, const char *uri, int flags)
> {
>     int ret, server_msg;
> -    char hostname[STR_LEN], credentials[STR_LEN];
> +    char hostname[STR_LEN], credentials[STR_LEN], path[STR_LEN];
>     int port;
> -    const char *user, *password = NULL;
> -    const char *user_decoded, *password_decoded;
> +    const char *user, *password = NULL, *vhost;
> +    const char *user_decoded, *password_decoded, *vhost_decoded;
>     char *p;
>     amqp_rpc_reply_t broker_reply;
>     struct timeval tval = { 0 };
> @@ -76,7 +76,7 @@ static int amqp_proto_open(URLContext *h, const char *uri, int flags)
>     h->max_packet_size = s->pkt_size;
>
>     av_url_split(NULL, 0, credentials, sizeof(credentials),
> -                 hostname, sizeof(hostname), &port, NULL, 0, uri);
> +                 hostname, sizeof(hostname), &port, path, sizeof(path), uri);
>
>     if (port < 0)
>         port = 5672;
> @@ -109,8 +109,27 @@ static int amqp_proto_open(URLContext *h, const char *uri, int flags)
>         return AVERROR(ENOMEM);
>     }
> 
> +    /* skip query for now */
> +    p = strchr(path, '?');
> +    if (p)
> +        *p = '\0';
> +
> +    vhost = path;
> +    if (*vhost == '\0')
> +        vhost = "/";
> +    else
> +        vhost++; /* skip leading '/' */
> +
> +    vhost_decoded = ff_urldecode(vhost, 0);
> +    if (!vhost_decoded) {
> +        av_freep(&user_decoded);
> +        av_freep(&password_decoded);
> +        return AVERROR(ENOMEM);
> +    }
> +
>     s->conn = amqp_new_connection();
>     if (!s->conn) {
> +        av_freep(&vhost_decoded);
>         av_freep(&user_decoded);
>         av_freep(&password_decoded);
>         av_log(h, AV_LOG_ERROR, "Error creating connection\n");
> @@ -136,7 +155,7 @@ static int amqp_proto_open(URLContext *h, const char *uri, int flags)
>         goto destroy_connection;
>     }
> 
> -    broker_reply = amqp_login(s->conn, "/", 0, s->pkt_size, 0,
> +    broker_reply = amqp_login(s->conn, vhost_decoded, 0, s->pkt_size, 0,
>                               AMQP_SASL_METHOD_PLAIN, user_decoded, password_decoded);
>
>     if (broker_reply.reply_type != AMQP_RESPONSE_NORMAL) {
> @@ -195,6 +214,7 @@ static int amqp_proto_open(URLContext *h, const char *uri, int flags)
>         }
>     }
> 
> +    av_freep(&vhost_decoded);
>     av_freep(&user_decoded);
>     av_freep(&password_decoded);
>     return 0;
> @@ -206,6 +226,7 @@ close_connection:
> destroy_connection:
>     amqp_destroy_connection(s->conn);
> 
> +    av_freep(&vhost_decoded);
>     av_freep(&user_decoded);
>     av_freep(&password_decoded);
>     return AVERROR_EXTERNAL;
> -- 
> 2.29.2
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

On Sun, 20. Dec 23:11, Marton Balint wrote:
> 
> 
> On Sat, 19 Dec 2020, Andriy Gelman wrote:
> 
> > From: Andriy Gelman <andriy.gelman@gmail.com>
> > 
> > Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> > ---
> > doc/protocols.texi    |  7 ++++---
> > libavformat/libamqp.c | 31 ++++++++++++++++++++++++++-----
> > 2 files changed, 30 insertions(+), 8 deletions(-)
> 
> LGTM, thanks.

Thanks, will apply.