From 0ae4327ed7067b469f9bd9db7d3460df732caece Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Tue, 19 Mar 2024 17:19:21 +1100
Subject: [PATCH] Latest libSession with tweaks for libQuic linking

---
 LibSession-Util                               |  2 +-
 .../SessionUtil/SessionUtil.swift             | 34 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/LibSession-Util b/LibSession-Util
index f88ac8779..0b48055f5 160000
--- a/LibSession-Util
+++ b/LibSession-Util
@@ -1 +1 @@
-Subproject commit f88ac8779a5a6a6cb7f3cb20f85de79b9a39d580
+Subproject commit 0b48055f5f00e15a2fae41fa846f8c9acc2628a7
diff --git a/SessionMessagingKit/SessionUtil/SessionUtil.swift b/SessionMessagingKit/SessionUtil/SessionUtil.swift
index faf839c78..b356d46cf 100644
--- a/SessionMessagingKit/SessionUtil/SessionUtil.swift
+++ b/SessionMessagingKit/SessionUtil/SessionUtil.swift
@@ -563,18 +563,26 @@ public extension SessionUtil {
         let cEndpoint: [CChar] = endpoint.cArray
         let cPayload: [UInt8] = payload.cArray
         
-        network_send_request(
-            cEd25519SecretKey,
-            cRemoteAddress,
-            cEndpoint,
-            cEndpoint.count,
-            cPayload,
-            cPayload.count,
-            { success, statusCode, dataPtr, dataLen, ctx in
-                let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) }
-                Unmanaged<CWrapper>.fromOpaque(ctx!).takeRetainedValue().callback(success, statusCode, data)
-            },
-            cWrapperPtr
-        )
+        do {
+            try CExceptionHelper.performSafely {
+                network_send_request(
+                    cEd25519SecretKey,
+                    cRemoteAddress,
+                    cEndpoint,
+                    cEndpoint.count,
+                    cPayload,
+                    cPayload.count,
+                    { success, statusCode, dataPtr, dataLen, ctx in
+                        let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) }
+                        Unmanaged<CWrapper>.fromOpaque(ctx!).takeRetainedValue().callback(success, statusCode, data)
+                    },
+                    cWrapperPtr
+                )
+            }
+        }
+        catch {
+            print("RAWR \(error)")
+            callback(false, -1, nil)
+        }
     }
 }