Merge 'remotes/trunk'

0ad · Nov 8, 2018 · ad868bb · ad868bb
2 parents 9a89ffc + 4041928
commit ad868bb
Show file tree

Hide file tree

Showing 14 changed files with 1,513 additions and 197 deletions.
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
@@ -1567,6 +1567,7 @@ function sendLobbyPlayerlistUpdate()
 
 /**
  * Send a report on the gamestatus to the lobby.
+ * Keep in sync with source/tools/XpartaMuPP/LobbyRanking.py
  */
 function reportGame()
 {

diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp
@@ -789,6 +789,8 @@ bool XmppClient::handleIq(const glooxwrapper::IQ& iq)
 
 			if (g_NetServer)
 				g_NetServer->OnLobbyAuth(iq.from().username(), lobbyAuth->m_Token.to_string());
+			else
+				LOGERROR("Received lobby authentication request, but not hosting currently!");
 		}
 	}
 	else if (iq.subtype() == gloox::IQ::Error)
@@ -1224,5 +1226,11 @@ void XmppClient::handleSessionInitiation(const glooxwrapper::Jingle::Session::Ji
 		return;
 	}
 
+	if (!g_NetServer)
+	{
+		LOGERROR("Received STUN connection request, but not hosting currently!");
+		return;
+	}
+
 	g_NetServer->SendHolePunchingMessage(candidate.ip.to_string(), candidate.port);
 }
diff --git a/source/tools/LICENSE.txt b/source/tools/LICENSE.txt
@@ -68,5 +68,5 @@ in particular, let us know and we can try to clarify it.
   xmlvalidator
     MIT
 
-  XpartaMuPP
+  lobbybots
     GPL version 2 (or later)
diff --git a/source/tools/XpartaMuPP/README.md b/source/tools/XpartaMuPP/README.md
diff --git a/source/tools/XpartaMuPP/ELO.py → source/tools/lobbybots/EcheLOn/ELO.py b/source/tools/XpartaMuPP/ELO.py → source/tools/lobbybots/EcheLOn/ELO.py
diff --git a/source/tools/XpartaMuPP/EcheLOn.py → source/tools/lobbybots/EcheLOn/EcheLOn.py b/source/tools/XpartaMuPP/EcheLOn.py → source/tools/lobbybots/EcheLOn/EcheLOn.py
@@ -771,6 +771,9 @@ def sendProfileNotFound(self, to, player, recipient):
   optp.add_option('-s', '--server', help='address of the ejabberd server',
                   action='store', dest='xserver',
                   default="localhost")
+  optp.add_option('-t', '--disable-tls', help='Pass this argument to connect without TLS encryption',
+                  action='store_true', dest='xdisabletls',
+                  default=False)
 
   opts, args = optp.parse_args()
 
@@ -786,7 +789,7 @@ def sendProfileNotFound(self, to, player, recipient):
   xmpp.register_plugin('xep_0060') # PubSub
   xmpp.register_plugin('xep_0199') # XMPP Ping
 
-  if xmpp.connect((opts.xserver, 5222)):
+  if xmpp.connect((opts.xserver, 5222), True, not opts.xdisabletls):
     xmpp.process(threaded=False)
   else:
     logging.error("Unable to connect")
diff --git a/source/tools/XpartaMuPP/LobbyRanking.py → ...e/tools/lobbybots/EcheLOn/LobbyRanking.py b/source/tools/XpartaMuPP/LobbyRanking.py → ...e/tools/lobbybots/EcheLOn/LobbyRanking.py