From 09466ff2ac19c5c970411941a69763712914ecf2 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Sun, 30 May 2010 01:12:37 +0000
Subject: [PATCH] avoid usage of ntohl/htonl

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5105 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/server.cpp        | 2 +-
 source/src/serverbrowser.cpp | 2 +-
 source/src/serverfiles.h     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/src/server.cpp b/source/src/server.cpp
index 696c8676..6554d4a0 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -273,7 +273,7 @@ int findcnbyaddress(ENetAddress *address)
 savedscore *findscore(client &c, bool insert)
 {
     if(c.type!=ST_TCPIP) return NULL;
-    enet_uint32 mask = htonl(mastermode == MM_MATCH ? 0xFFFF0000 : 0xFFFFFFFF); // in match mode, reconnecting from /16 subnet is allowed
+    enet_uint32 mask = ENET_HOST_TO_NET_32(mastermode == MM_MATCH ? 0xFFFF0000 : 0xFFFFFFFF); // in match mode, reconnecting from /16 subnet is allowed
     if(!insert)
     {
         loopv(clients)
diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp
index ddb96dd8..1acb3264 100644
--- a/source/src/serverbrowser.cpp
+++ b/source/src/serverbrowser.cpp
@@ -670,7 +670,7 @@ int sicompare(serverinfo **ap, serverinfo **bp)
     int dir = serversortdir ? -1 : 1;
     if(a->weight > b->weight) return -dir;
     if(a->weight < b->weight) return dir;
-    enet_uint32 ai = ntohl(a->address.host), bi = ntohl(b->address.host);
+    enet_uint32 ai = ENET_NET_TO_HOST_32(a->address.host), bi = ENET_NET_TO_HOST_32(b->address.host);
     int ips = ai < bi ? -dir : (ai > bi ? dir : 0);  // most steady base sorting
     switch(serversort)
     {
diff --git a/source/src/serverfiles.h b/source/src/serverfiles.h
index af877c8e..7be582da 100644
--- a/source/src/serverfiles.h
+++ b/source/src/serverfiles.h
@@ -388,7 +388,7 @@ struct serveripblacklist : serverconfigfile
     bool check(enet_uint32 ip) // ip: network byte order
     {
         iprange t;
-        t.lr = ntohl(ip); // blacklist uses host byte order
+        t.lr = ENET_NET_TO_HOST_32(ip); // blacklist uses host byte order
         t.ur = 0;
         return ipranges.search(&t, cmpipmatch) != NULL;
     }
@@ -517,7 +517,7 @@ struct servernickblacklist : serverconfigfile
     {
         if(c.type != ST_TCPIP) return NWL_PASS;
         iprange ipr;
-        ipr.lr = ntohl(c.peer->address.host); // blacklist uses host byte order
+        ipr.lr = ENET_NET_TO_HOST_32(c.peer->address.host); // blacklist uses host byte order
         int *idx = whitelist.access(c.name);
         if(!idx) return NWL_UNLISTED; // no matching entry
         int i = *idx;