From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Ian Abbott <abbotti@mev.co.uk>
Subject: Re: [ptxdist] [APPLIED] mosquitto: Add optional WebSocket support
Date: Fri, 31 May 2024 08:08:28 +0200 [thread overview]
Message-ID: <20240531060828.3598944-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20240513103808.21385-3-abbotti@mev.co.uk>
Thanks, applied as 8c23ffcc8a87bfb8f411f25eef65e332e8019ba4.
Michael
[sent from post-receive hook]
On Fri, 31 May 2024 08:08:28 +0200, Ian Abbott <abbotti@mev.co.uk> wrote:
> Add a configuration option to support WebSocket connections using the
> libwebsockets library. If Mosquitto is configured to use TLS, select
> TLS support in the libwebsockets package too.
>
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> Message-Id: <20240513103808.21385-3-abbotti@mev.co.uk>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/mosquitto.in b/rules/mosquitto.in
> index 9b55f084703d..3c751ede7efb 100644
> --- a/rules/mosquitto.in
> +++ b/rules/mosquitto.in
> @@ -4,9 +4,11 @@ menuconfig MOSQUITTO
> tristate
> prompt "mosquitto "
> select HOST_CMAKE
> - select OPENSSL if MOSQUITTO_TLS
> - select C_ARES if MOSQUITTO_SRV
> - select SYSTEMD if MOSQUITTO_SYSTEMD_UNIT
> + select OPENSSL if MOSQUITTO_TLS
> + select C_ARES if MOSQUITTO_SRV
> + select SYSTEMD if MOSQUITTO_SYSTEMD_UNIT
> + select LIBWEBSOCKETS if MOSQUITTO_WEBSOCKETS
> + select LIBWEBSOCKETS_TLS if MOSQUITTO_WEBSOCKETS && MOSQUITTO_TLS
> help
> Open source MQTT message broker, library, and client.
>
> @@ -35,6 +37,11 @@ config MOSQUITTO_SRV
> bool
> prompt "SRV lookup support"
>
> +config MOSQUITTO_WEBSOCKETS
> + bool
> + depends on MOSQUITTO_BROKER
> + prompt "Websockets support"
> +
> endif
>
> # vim: ft=kconfig noet tw=72
> diff --git a/rules/mosquitto.make b/rules/mosquitto.make
> index eedb5ca580e2..239f1fe3c34a 100644
> --- a/rules/mosquitto.make
> +++ b/rules/mosquitto.make
> @@ -60,7 +60,7 @@ MOSQUITTO_CONF_OPT := \
> -DWITH_TLS=$(call ptx/onoff, PTXCONF_MOSQUITTO_TLS) \
> -DWITH_TLS_PSK=$(call ptx/onoff, PTXCONF_MOSQUITTO_TLS) \
> -DWITH_UNIX_SOCKETS=ON \
> - -DWITH_WEBSOCKETS=OFF
> + -DWITH_WEBSOCKETS=$(call ptx/onoff, PTXCONF_MOSQUITTO_WEBSOCKETS)
>
> # ----------------------------------------------------------------------------
> # Install
prev parent reply other threads:[~2024-05-31 6:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 8:58 [ptxdist] [PATCH 0/2] Add WebSocket support to Mosquitto Ian Abbott
2024-05-10 8:58 ` [ptxdist] [PATCH 1/2] libwebsockets: new package Ian Abbott
2024-05-13 9:11 ` Michael Olbrich
2024-05-13 9:20 ` Ian Abbott
2024-05-10 8:58 ` [ptxdist] [PATCH 2/2] mosquitto: Add optional WebSocket support Ian Abbott
2024-05-13 10:36 ` [ptxdist] [PATCH v2 0/2] Add WebSocket support to Mosquitto Ian Abbott
2024-05-13 10:36 ` [ptxdist] [PATCH v2 1/2] libwebsockets: new package Ian Abbott
2024-05-31 6:08 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-05-13 10:36 ` [ptxdist] [PATCH v2 2/2] mosquitto: Add optional WebSocket support Ian Abbott
2024-05-31 6:08 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240531060828.3598944-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=abbotti@mev.co.uk \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox