Merge branch 'master' into stable

1 files changed, 42 insertions, 0 deletions

diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp
new file mode 100644
index 0000000000..365d69b04e
--- /dev/null
+++ b/Source/Core/Common/ENetUtil.cpp
@@ -0,0 +1,42 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "ENetUtil.h"
+
+#include "Common/CommonTypes.h"
+
+namespace ENetUtil
+{
+
+void WakeupThread(ENetHost* host)
+{
+	// Send ourselves a spurious message.  This is hackier than it should be.
+	// comex reported this as https://github.com/lsalzman/enet/issues/23, so
+	// hopefully there will be a better way to do it in the future.
+	ENetAddress address;
+	if (host->address.port != 0)
+		address.port = host->address.port;
+	else
+		enet_socket_get_address(host->socket, &address);
+	address.host = 0x0100007f; // localhost
+	u8 byte = 0;
+	ENetBuffer buf;
+	buf.data = &byte;
+	buf.dataLength = 1;
+	enet_socket_send(host->socket, &address, &buf, 1);
+}
+
+int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
+{
+	// wakeup packet received
+	if (host->receivedDataLength == 1 && host->receivedData[0] == 0)
+	{
+		event->type = (ENetEventType) 42;
+		return 1;
+	}
+	return 0;
+}
+
+
+}