From 43954d000e19a622576063de0b48cf9235dec395 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 7 Sep 2016 16:10:51 +0100
Subject: [PATCH] Add a new method to enqueue the device messages rather than
 sending a dummy EDU

---
 synapse/federation/federation_client.py |  6 ++++++
 synapse/federation/transaction_queue.py | 11 +++++++++++
 synapse/handlers/devicemessage.py       | 10 +++-------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 627acc6a4..78719eed2 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -137,6 +137,12 @@ class FederationClient(FederationBase):
         self._transaction_queue.enqueue_edu(edu)
         return defer.succeed(None)
 
+    @log_function
+    def send_device_messages(self, destination):
+        """Sends the device messages in the local database to the remote
+        destination"""
+        self._transaction_queue.enqueue_device_messages(destination)
+
     @log_function
     def send_failure(self, failure, destination):
         self._transaction_queue.enqueue_failure(failure, destination)
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index c0ee946ac..633c79c35 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -157,6 +157,17 @@ class TransactionQueue(object):
             self._attempt_new_transaction, destination
         )
 
+    def enqueue_device_messages(self, destination):
+        if destination == self.server_name or destination == "localhost":
+            return
+
+        if not self.can_send_to(destination):
+            return
+
+        preserve_context_over_fn(
+            self._attempt_new_transaction, destination
+        )
+
     @defer.inlineCallbacks
     def _attempt_new_transaction(self, destination):
         yield run_on_reactor()
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py
index 7e59c0d48..c5368e5df 100644
--- a/synapse/handlers/devicemessage.py
+++ b/synapse/handlers/devicemessage.py
@@ -112,10 +112,6 @@ class DeviceMessageHandler(object):
         )
 
         for destination in remote_messages.keys():
-            # Hack to send make synapse send a federation transaction
-            # to the remote servers.
-            self.federation.send_edu(
-                destination=destination,
-                edu_type="m.ping",
-                content={},
-            )
+            # Enqueue a new federation transaction to send the new
+            # device messages to each remote destination.
+            self.federation.send_device_messages(destination)