From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 31 May 2024 08:09:01 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sCvRl-000EoS-1y for lore@lore.pengutronix.de; Fri, 31 May 2024 08:09:01 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sCvRk-0005pP-Ov; Fri, 31 May 2024 08:09:00 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sCvRE-0005Rx-PJ; Fri, 31 May 2024 08:08:28 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sCvRE-003h3z-Ch; Fri, 31 May 2024 08:08:28 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sCvRE-00F6Ff-18; Fri, 31 May 2024 08:08:28 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 31 May 2024 08:08:28 +0200 Message-Id: <20240531060828.3598944-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240513103808.21385-3-abbotti@mev.co.uk> References: <20240513103808.21385-3-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] mosquitto: Add optional WebSocket support X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ian Abbott Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 8c23ffcc8a87bfb8f411f25eef65e332e8019ba4. Michael [sent from post-receive hook] On Fri, 31 May 2024 08:08:28 +0200, Ian Abbott 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 > Message-Id: <20240513103808.21385-3-abbotti@mev.co.uk> > Signed-off-by: Michael Olbrich > > 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