SF.net SVN: bzflag:[22768] trunk/bzflag

[<bul...@us...>]

Revision: 22768
          http://sourceforge.net/p/bzflag/code/22768
Author:   bullet_catcher
Date:     2013-05-25 06:40:52 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Preserve const quality in server network handling.

Modified Paths:
--------------
    trunk/bzflag/include/AresHandler.h
    trunk/bzflag/src/game/NetHandler.cxx
    trunk/bzflag/src/net/AresHandler.cxx

Modified: trunk/bzflag/include/AresHandler.h
===================================================================
--- trunk/bzflag/include/AresHandler.h	2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/include/AresHandler.h	2013-05-25 06:40:52 UTC (rev 22768)
@@ -42,7 +42,7 @@
   };
 
   void		setIndex ( int i ) {index = i;}
-  void		queryHostname(struct sockaddr *clientAddr);
+  void		queryHostname(const struct sockaddr *clientAddr);
   void		queryHost(char *hostName);
   const char   *getHostname();
   ResolutionStatus getHostAddress(struct in_addr *clientAddr);

Modified: trunk/bzflag/src/game/NetHandler.cxx
===================================================================
--- trunk/bzflag/src/game/NetHandler.cxx	2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/src/game/NetHandler.cxx	2013-05-25 06:40:52 UTC (rev 22768)
@@ -278,7 +278,7 @@
 #endif
   if (!netPlayer[playerIndex])
     netPlayer[playerIndex] = this;
-  ares->queryHostname((struct sockaddr *) &clientAddr);
+  ares->queryHostname((const struct sockaddr *) &clientAddr);
 }
 
 NetHandler::NetHandler(const struct sockaddr_in &_clientAddr, int _fd)
@@ -402,7 +402,7 @@
       return -1;
     }
     if (n > 0) {
-      buffer  = (void*)(((const char*)buffer) + n);
+      buffer  = (const void*)(((const char*)buffer) + n);
       length -= n;
     }
   }

Modified: trunk/bzflag/src/net/AresHandler.cxx
===================================================================
--- trunk/bzflag/src/net/AresHandler.cxx	2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/src/net/AresHandler.cxx	2013-05-25 06:40:52 UTC (rev 22768)
@@ -80,13 +80,13 @@
 }
 
 
-void AresHandler::queryHostname(struct sockaddr *clientAddr)
+void AresHandler::queryHostname(const struct sockaddr *clientAddr)
 {
   if (aresFailed)
     return;
   status = HbAPending;
   // launch the asynchronous query to look up this hostname
-  ares_gethostbyaddr(aresChannel, &((sockaddr_in *)clientAddr)->sin_addr,
+  ares_gethostbyaddr(aresChannel, &((const sockaddr_in *)clientAddr)->sin_addr,
 		     sizeof(in_addr), AF_INET, staticCallback, (void *)this);
   logDebugMessage(2,"Player [%d] submitted reverse resolve query\n", index);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.