From d59ef1c66aa2d88ad91bdc60561ee66f4f26d889 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 27 Apr 2016 22:17:21 -0700
Subject: [PATCH] Util: Fix socket bind addresses

---
 CHANGES           | 1 +
 src/util/socket.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index f61590658..48fbb16bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Bugfixes:
  - All: Fix several file handle leaks
  - Util: Use closesocket on Windows
  - GBA Memory: Fix executing code from OBJ region of VRAM
+ - Util: Fix socket bind addresses
 Misc:
  - GBA: Slightly optimize GBAProcessEvents
  - Qt: Add preset for DualShock 4
diff --git a/src/util/socket.h b/src/util/socket.h
index 5eb2d5d8e..6ffe13608 100644
--- a/src/util/socket.h
+++ b/src/util/socket.h
@@ -139,7 +139,7 @@ static inline Socket SocketOpenTCP(int port, const struct Address* bindAddress)
 		memset(&bindInfo, 0, sizeof(bindInfo));
 		bindInfo.sin_family = AF_INET;
 		bindInfo.sin_port = htons(port);
-		bindInfo.sin_addr.s_addr = bindAddress->ipv4;
+		bindInfo.sin_addr.s_addr = htonl(bindAddress->ipv4);
 		err = bind(sock, (const struct sockaddr*) &bindInfo, sizeof(bindInfo));
 #ifndef _3DS
 	} else {
@@ -176,7 +176,7 @@ static inline Socket SocketConnectTCP(int port, const struct Address* destinatio
 		memset(&bindInfo, 0, sizeof(bindInfo));
 		bindInfo.sin_family = AF_INET;
 		bindInfo.sin_port = htons(port);
-		bindInfo.sin_addr.s_addr = destinationAddress->ipv4;
+		bindInfo.sin_addr.s_addr = htonl(destinationAddress->ipv4);
 		err = connect(sock, (const struct sockaddr*) &bindInfo, sizeof(bindInfo));
 #ifndef _3DS
 	} else {