From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 May 2024 11:04:54 +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 1s5MBR-006znr-2x for lore@lore.pengutronix.de; Fri, 10 May 2024 11:04:54 +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 1s5MBR-0003ZB-8x; Fri, 10 May 2024 11:04:53 +0200 Received: from smtp73.iad3a.emailsrvr.com ([173.203.187.73]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s5MB5-0003XT-6g for ptxdist@pengutronix.de; Fri, 10 May 2024 11:04:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1715331870; bh=UoKXxjkbhGyfpaoy7oFSexaNvC04kdydGrzgdHyrtn0=; h=From:To:Subject:Date:From; b=OMg1k7qoDdaKyCyAeYfj9kMWzyqzR9cxx23nMgx1K1uaEkLUGGseFuyQjwmKgvEvT twqe6063tixnsfGSAV2FWZgEhaH6e7EC7dgpStAoIvC6FvC04AFh7n/erJfzgdEthv goQAbf3yTdhfANLVScWxUAOiHO8qjIFE+FcTSCfY= X-Auth-ID: abbotti@mev.co.uk Received: by smtp34.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id CC68724B81; Fri, 10 May 2024 05:04:29 -0400 (EDT) From: Ian Abbott To: ptxdist@pengutronix.de Date: Fri, 10 May 2024 09:58:48 +0100 Message-ID: <20240510090419.4399-3-abbotti@mev.co.uk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240510090419.4399-1-abbotti@mev.co.uk> References: <20240510090419.4399-1-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Classification-ID: 3c1b6e5d-a055-403d-8151-b847ef544b4b-3-1 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.5 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 2/2] 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 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 --- rules/mosquitto.in | 13 ++++++++++--- rules/mosquitto.make | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rules/mosquitto.in b/rules/mosquitto.in index 9b55f0847..3c751ede7 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 eedb5ca58..239f1fe3c 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 -- 2.43.0