From beac7a02bbcf1f3c935710c8fd468b04a5a55459 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Thu, 27 Jun 2019 09:45:54 +1000
Subject: [PATCH] send "unreachable" ping to allow half-p2p

---
 libloki/api.js                       | 29 ++++++++++++++++++++--------
 libloki/modules/local_loki_server.js |  8 ++++----
 libtextsecure/message_receiver.js    | 16 ++++++++-------
 protos/SignalService.proto           |  5 +++++
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/libloki/api.js b/libloki/api.js
index c4205c063..e092da1c2 100644
--- a/libloki/api.js
+++ b/libloki/api.js
@@ -26,16 +26,29 @@
   }
 
   async function sendOnlineBroadcastMessage(pubKey, isPing = false) {
-    if (!window.localLokiServer.isListening())
-      return;
-    // clearnet change: getMyLokiAddress -> getMyClearIP
-    // const myLokiAddress = await window.lokiSnodeAPI.getMyLokiAddress();
-    const myLokiAddress = await window.lokiSnodeAPI.getMyClearIp();
+    let p2pAddress = null;
+    let p2pPort = null;
+    let type;
+
+    if (!window.localLokiServer.isListening()) {
+      // Skip if server is not running AND we're not trying to ping a contact
+      if (!isPing)
+        return;
+
+      type = textsecure.protobuf.LokiAddressMessage.Type.HOST_UNREACHABLE;
+    } else {
+      // clearnet change: getMyLokiAddress -> getMyClearIP
+      // const myLokiAddress = await window.lokiSnodeAPI.getMyLokiAddress();
+      const myIp = await window.lokiSnodeAPI.getMyClearIp();
+      p2pAddress = `https://${myIp}`;
+      p2pPort = window.localLokiServer.getPublicPort();
+      type = textsecure.protobuf.LokiAddressMessage.Type.HOST_REACHABLE;
+    }
 
     const lokiAddressMessage = new textsecure.protobuf.LokiAddressMessage({
-      // clearnet change: http -> https
-      p2pAddress: `https://${myLokiAddress}`,
-      p2pPort: window.localLokiServer.getPublicPort(),
+      p2pAddress,
+      p2pPort,
+      type,
     });
     const content = new textsecure.protobuf.Content({
       lokiAddressMessage,
diff --git a/libloki/modules/local_loki_server.js b/libloki/modules/local_loki_server.js
index e1a8bcea2..fe255c4c6 100644
--- a/libloki/modules/local_loki_server.js
+++ b/libloki/modules/local_loki_server.js
@@ -90,12 +90,12 @@ class LocalLokiServer extends EventEmitter {
         if (err) {
           rej(err);
         } else {
-          try{
+          try {
             const publicPort = await this.punchHole();
             res(publicPort);
-          } catch(e) {
+          } catch (e) {
             if (e instanceof textsecure.HolePunchingError)
-            await this.close();
+              await this.close();
             rej(e);
           }
         }
@@ -139,7 +139,7 @@ class LocalLokiServer extends EventEmitter {
         await p;
         this.publicPort = publicPort;
         return publicPort;
-      } catch(e) {
+      } catch (e) {
         // continue
       }
     }
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 507f38963..1c0da9c7b 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1002,13 +1002,15 @@ MessageReceiver.prototype.extend({
     );
   },
   async handleLokiAddressMessage(envelope, lokiAddressMessage) {
-    const { p2pAddress, p2pPort } = lokiAddressMessage;
-    lokiP2pAPI.updateContactP2pDetails(
-      envelope.source,
-      p2pAddress,
-      p2pPort,
-      envelope.isP2p
-    );
+    const { p2pAddress, p2pPort, type } = lokiAddressMessage;
+    if (type === textsecure.protobuf.LokiAddressMessage.Type.HOST_REACHABLE) {
+      lokiP2pAPI.updateContactP2pDetails(
+        envelope.source,
+        p2pAddress,
+        p2pPort,
+        envelope.isP2p
+      );
+    }
     return this.removeFromCache(envelope);
   },
   handleDataMessage(envelope, msg) {
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 63f20ec07..be745b285 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -39,8 +39,13 @@ message Content {
 }
 
 message LokiAddressMessage {
+  enum Type {
+    HOST_REACHABLE = 0;
+    HOST_UNREACHABLE = 1;
+  }
   optional string p2pAddress    = 1;
   optional uint32 p2pPort       = 2;
+  optional Type   type          = 3;
 }
 
 message PreKeyBundleMessage {