From 0c438ebcf56e633aff8a77106dfcc1324b04d542 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Tue, 17 Oct 2023 17:21:32 -0400
Subject: [PATCH] build: require 4.3 in carveout

---
 src/websock/WebsockUtil.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/websock/WebsockUtil.cpp b/src/websock/WebsockUtil.cpp
index 324d9f79..7ba1dc22 100644
--- a/src/websock/WebsockUtil.cpp
+++ b/src/websock/WebsockUtil.cpp
@@ -13,6 +13,8 @@ namespace xo {
 
             /* ubuntu build (available via github actions) has older version of libwebsockets.
              * typically building (e.g. via nix) with libwebsockets 4.3.2
+             *
+             * see lws_config.h for version numbers vars
              */
 
             switch (x) {
@@ -48,7 +50,7 @@ namespace xo {
                 CASE(LWS_CALLBACK_RECEIVE_CLIENT_HTTP);
                 CASE(LWS_CALLBACK_COMPLETED_CLIENT_HTTP);
                 CASE(LWS_CALLBACK_CLIENT_HTTP_WRITEABLE);
-#if LWS_LIBRARY_VERSION_MAJOR >= 4
+#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
                 CASE(LWS_CALLBACK_CLIENT_HTTP_REDIRECT);
 #endif
                 CASE(LWS_CALLBACK_CLIENT_HTTP_BIND_PROTOCOL);
@@ -118,7 +120,7 @@ namespace xo {
                 CASE(LWS_CALLBACK_TIMER);
                 CASE(LWS_CALLBACK_EVENT_WAIT_CANCELLED);
                 CASE(LWS_CALLBACK_CHILD_CLOSING);
-#if LWS_LIBRARY_VERSION_MAJOR >= 4
+#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
                 CASE(LWS_CALLBACK_CONNECTING);
 #endif
                 CASE(LWS_CALLBACK_VHOST_CERT_AGING);
@@ -134,7 +136,7 @@ namespace xo {
                 CASE(LWS_CALLBACK_MQTT_CLIENT_CLOSED);
                 CASE(LWS_CALLBACK_MQTT_ACK);
                 CASE(LWS_CALLBACK_MQTT_RESEND);
-#if LWS_LIBRARY_VERSION_MAJOR >= 4
+#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
                 CASE(LWS_CALLBACK_MQTT_UNSUBSCRIBE_TIMEOUT);
                 CASE(LWS_CALLBACK_MQTT_SHADOW_TIMEOUT);
 #endif