IPv6

Xcode/BZFlag.xcodeproj/Makefile.am

@@ -0,0 +1,5 @@
+EXTRA_DIST =	\
+	project.pbxproj
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

data/l10n/bzflag_es.po

@@ -2024,7 +2024,7 @@ msgstr "<** Código de paquete UDP %x tamaño %x\n"
 msgid "Fallback to normal TCP receive"
 msgstr "Retraso en recepción TCP normal"
 
-msgid "Communication error joining game [No immediate respose]."
+msgid "Communication error joining game [No immediate response]."
 msgstr "Error de comunicación al unirse a la partida [No hay respuesta inmediata]."
 
 msgid "Server forced disconnection."

data/l10n/bzflag_ru.po

@@ -2323,7 +2323,7 @@ msgstr "<** UDP Kod paketa %x dlina %x\n"
 msgid "Fallback to normal TCP receive"
 msgstr "Vozvrat k obychnomu priyomu TCP"
 
-msgid "Communication error joining game [No immediate respose]."
+msgid "Communication error joining game [No immediate response]."
 msgstr "Oshibka ustanovki svyazi s igroj [net nemedlennogo otveta]"
 
 msgid "Server forced disconnection."

data/l10n/bzflag_sk.po

@@ -2312,7 +2312,7 @@ msgstr "<** UDP kod paketu %x Dlzka %x\n"
 msgid "Fallback to normal TCP receive"
 msgstr "Navrat k obycajnemu prijmu TCP"
 
-msgid "Communication error joining game [No immediate respose]."
+msgid "Communication error joining game [No immediate response]."
 msgstr "Chyba komunikacie pri pripajani sa k hre [Ziadna bezprostredna odpoved]."
 
 msgid "Server forced disconnection."

data/l10n/bzflag_xx.po

@@ -2370,7 +2370,7 @@ msgstr ""
 msgid "Fallback to normal TCP receive"
 msgstr ""
 
-msgid "Communication error joining game [No immediate respose]."
+msgid "Communication error joining game [No immediate response]."
 msgstr ""
 
 msgid "Server forced disconnection."

include/Address.h

@@ -33,41 +33,50 @@
 #include "Pack.h"
 #include "Protocol.h"
 
-typedef struct in_addr  InAddr;         // shorthand
-
 // helpers
 char *sockaddr2iptext(const struct sockaddr *sa);
 char *sockaddr2iptextport(const struct sockaddr *sa);
+bool splitNamePort(std::string nameport, std::string &name, int &port);
+std::string joinNamePort(std::string name, int port);
 
 class Address
 {
 public:
     Address();
     Address(const std::string&);
     Address(const Address&);
-    Address(const InAddr&);         // input in nbo
-    Address(const struct sockaddr_in&); // input in nbo
+    Address(const Address *);
+    Address(const struct sockaddr_in6*); // input in nbo
     ~Address();
     Address&        operator=(const Address&);
 
-    operator InAddr() const;
     bool        operator==(const Address&) const;
     bool        operator!=(const Address&) const;
     bool        operator<(Address const&) const;
+    bool        isMapped() const;
     bool        isAny() const;
     bool        isPrivate() const;
+    sockaddr *getAddr();
+    sockaddr_in *getAddr_in();
+    sockaddr_in6 *getAddr_in6();
+    /* return port in network order */
+    in_port_t getNPort() const;
+    std::string getIpText();
+    std::string getIpTextPort();
+
     std::string     getDotNotation() const;
     uint8_t     getIPVersion() const;
 
     void*       pack(void*) const;
     const void*     unpack(const void*);
 
     static Address  getHostAddress(const std::string &hostname = std::string(""));
-    static std::string  getHostByAddress(InAddr);
     static const std::string getHostName(const std::string &hostname = std::string(""));
 
 private:
-    std::vector <InAddr> addr;
+    struct sockaddr_in6 addr;
+    std::string iptext;
+    std::string iptextport;
 };
 
 // FIXME - enum maybe? put into namespace or class cage?
@@ -78,21 +87,6 @@ const PlayerId      AdminPlayers = 252;
 const PlayerId      FirstTeam = 251;
 const PlayerId      LastRealPlayer = FirstTeam - NumTeams;
 
-class ServerId
-{
-public:
-    void*       pack(void*) const;
-    const void*     unpack(const void*);
-
-    bool        operator==(const ServerId&) const;
-    bool        operator!=(const ServerId&) const;
-
-public:
-    // host and port in network byte order
-    struct sockaddr_in addr;
-    int16_t     number;         // local player number
-};
-
 #endif // BZF_INET_ADDR_H
 
 // Local Variables: ***

include/AresHandler.h

@@ -43,10 +43,11 @@ class AresHandler
     {
         index = i;
     }
-    void      queryHostname(const struct sockaddr *clientAddr);
-    void      queryHost(const char *hostName);
+    void      queryHostname(const sockaddr *);
+    void      queryHost(const char *hostName, const char *service);
     const char   *getHostname();
-    ResolutionStatus getHostAddress(struct in_addr *clientAddr);
+    ResolutionStatus getHostAddress(in_addr *);
+    ResolutionStatus getHostAddr(sockaddr_in6 *);
     void      setFd(fd_set *read_set, fd_set *write_set, int &maxFile);
     void      process(fd_set *read_set, fd_set *write_set);
     ResolutionStatus getStatus()
@@ -55,23 +56,25 @@ class AresHandler
     };
 private:
 #if ARES_VERSION_MAJOR >= 1 && ARES_VERSION_MINOR >= 5
-    static void   staticCallback(void *arg, int statusCallback, int timeouts,
-                                 struct hostent *hostent);
+    static void   staticHostCallback(void *arg, int statusCallback, int timeouts, hostent *);
 #else
-    static void   staticCallback(void *arg, int statusCallback,
-                                 struct hostent *hostent);
+    static void   staticHostCallback(void *arg, int statusCallback, hostent *);
 #endif
-    void      callback(int status, struct hostent *hostent);
+    void      callback(int status, hostent *);
+
+    static void staticAddrInfoCallback(void *arg, int callbackStatus, int, ares_addrinfo *result);
+    void callback(int callbackStatus, ares_addrinfo *result);
+
     int       index;
 
     std::string   hostName;
     in_addr   hostAddress;
+    sockaddr_in6 hostAddr;
     ares_channel  aresChannel;
     ResolutionStatus status;
     bool      aresFailed;
 
     static bool   globallyInited;
-
 };
 
 #endif

include/NetHandler.h

@@ -75,10 +75,10 @@ class NetHandler
         a player Index, a unique pointer to a player
         the file descriptor for the TCP connection with the user.
     */
-    NetHandler(PlayerInfo *_info, const struct sockaddr_in &_clientAddr,
+    NetHandler(PlayerInfo *_info, const struct sockaddr_in6 &_clientAddr,
                int _playerIndex, int _fd);
 
-    NetHandler(const struct sockaddr_in &_clientAddr, int _fd);
+    NetHandler(const struct sockaddr_in6 &_clientAddr, int _fd);
 
     /** The default destructor
         free all internal resources, and close the tcp connection
@@ -90,7 +90,7 @@ class NetHandler
         InitHandlers needs the addr structure filled to point to the local port
         needed for udp communications
     */
-    static bool   initHandlers(struct sockaddr_in addr);
+    static bool   initHandlers(Address addr);
     static void   destroyHandlers();
 
     /// General function to support the select statement
@@ -117,7 +117,7 @@ class NetHandler
 
         udpLinkRequest report if the received message is a valid udpLinkRequest
     */
-    static int    udpReceive(char *buffer, struct sockaddr_in *uaddr,
+    static int    udpReceive(char *buffer, struct sockaddr_in6 *uaddr,
                              bool &udpLinkRequest);
 
     /**
@@ -152,8 +152,7 @@ class NetHandler
     int       sizeOfIP();
     void*     packAdminInfo(void *buf);
     static int    whoIsAtIP(const std::string& IP);
-    in_addr   getIPAddress();
-    const char*   getHostname();
+    const char* getHostname();
     bool      reverseDNSDone();
 
     size_t    getTcpReadSize ()
@@ -181,9 +180,14 @@ class NetHandler
     {
         return fd;
     }
-    const struct sockaddr *getUADDR ( void )
+    Address *getTaddr ( void )
     {
-        return (const struct sockaddr *)&uaddr;
+        return &taddr;
+    }
+
+    Address *getUaddr ( void )
+    {
+        return &uaddr;
     }
 
     // Returns the time that the connection was accepted
@@ -208,7 +212,7 @@ class NetHandler
 private:
     int       send(const void *buffer, size_t length);
     void      udpSend(const void *b, size_t l);
-    bool      isMyUdpAddrPort(struct sockaddr_in uaddr);
+    bool      isMyUaddr(const Address uaddr);
 #ifdef NETWORK_STATS
     void      countMessage(uint16_t code, int len, int direction);
     void      dumpMessageStats();
@@ -222,8 +226,8 @@ class NetHandler
     std::shared_ptr<AresHandler>  ares;
 
     PlayerInfo*   info;
-    struct sockaddr_in taddr;
-    struct sockaddr_in uaddr;
+    Address taddr;
+    Address uaddr;
     int       playerIndex;
     int       fd; // socket file descriptor
 

include/Ping.h

@@ -36,8 +36,8 @@ class PingPacket
     PingPacket();
     ~PingPacket();
 
-    bool        read(int fd, struct sockaddr_in*);
-    bool        write(int fd, const struct sockaddr_in*) const;
+    bool        read(int fd, struct sockaddr_in6*);
+    bool        write(int fd, const struct sockaddr_in6*) const;
     void*       pack(void*, const char* version) const;
     const void*     unpack(const void*, char* version);
 
@@ -48,12 +48,10 @@ class PingPacket
     bool        readFromFile(std::istream& in);
     static void     repackHexPlayerCounts(char*, int* counts);
 
-    static bool isRequest(int fd, struct sockaddr_in*);
-    static bool sendRequest(int fd, const struct sockaddr_in*);
+    static bool isRequest(int fd, struct sockaddr_in6*);
+    static bool sendRequest(int fd, const struct sockaddr_in6*);
 
 public:
-    ServerId    serverId;
-    Address     sourceAddr;
     uint16_t    gameOptions;
     uint16_t    gameType;
     uint16_t    maxShots;

include/Protocol.h

@@ -199,7 +199,6 @@ const uint16_t      MsgLagPing = 0x7069;            // 'pi'
 
 typedef uint8_t     PlayerId;
 const int       PlayerIdPLen = sizeof(PlayerId);
-const int       ServerIdPLen = 8;
 
 // 54 bytes
 const int PlayerUpdatePLenMax =

include/ServerItem.h

@@ -32,8 +32,6 @@ class ServerItem
     bool      readFromFile(std::istream& in, int subrevision); // serialize in
     void      setUpdateTime(); // set last updated to now
     int       getPlayerCount() const;
-    void      splitAddrTitle(std::string& addr, std::string& title) const;
-    std::string   getAddrName() const;
     time_t    getAgeMinutes() const;
     time_t    getAgeSeconds() const;
     std::string   getAgeString() const; // nifty formated age string

include/ServerList.h

@@ -54,7 +54,6 @@ class ServerList : cURLManager
 
 private:
     void readServerList();
-    void addToListWithLookup(ServerItem&);
     void addCacheToList();
     void _shutDown();
 
@@ -64,7 +63,7 @@ class ServerList : cURLManager
     std::vector<ServerItem> servers;
     ServerListCache* serverCache;
     int pingBcastSocket;
-    struct sockaddr_in pingBcastAddr;
+    struct sockaddr_in6 pingBcastAddr;
     StartupInfo *startupInfo;
 };
 

include/ServerListCache.h

@@ -71,13 +71,13 @@ class ServerListCache
 
     /** search for some address in the cache.  this is a wrapper that
      * allows access to the maps find method */
-    SRV_STR_MAP::iterator find(const std::string &ServerAddress);
+    SRV_STR_MAP::iterator find(const std::string &namePort);
 
     /** add an entry to the cache list */
-    void          insert(const std::string &serverAddress, const ServerItem &info);
+    void          insert(const std::string &namePort, const ServerItem &info);
 
     /** is given server in cache and marked as favorite? */
-    bool        isFavorite(const std::string &serverAddress) const;
+    bool        isFavorite(const std::string &namePort) const;
 
 private:
     /** the full path of the file the cache is stored in **/

include/common.h

@@ -208,6 +208,10 @@ extern int debugLevel;
 #  include <inttypes.h>
 #endif
 
+#ifndef in_port_t
+#  define in_port_t uint16_t
+#endif
+
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
 #else

include/multicast.h

@@ -36,12 +36,12 @@
  *  -1 if failed
  */
 int         openBroadcast(int port, const char* service,
-                          struct sockaddr_in* addr);
+                          struct sockaddr_in6* addr);
 int         closeBroadcast(int fd);
 int         sendBroadcast(int fd, const void* buffer,
-                          int bufferLength, const struct sockaddr_in*);
+                          int bufferLength, const struct sockaddr_in6*);
 int         recvBroadcast(int fd, void* buffer,
-                          int bufferLength, struct sockaddr_in*);
+                          int bufferLength, struct sockaddr_in6*);
 
 #endif  // __MULTICAST_H__
 

include/network.h

@@ -64,6 +64,10 @@ extern "C" {
 
 }
 
+# ifndef s6_addr16
+#  define s6_addr16 u.Word
+# endif
+
 #else   // !defined(_WIN32)
 
 // unistd has close(). It is poor encapsulation the close() is called from
@@ -113,13 +117,21 @@ extern "C" {
     void          bzfherror(const char* msg);
 }
 
+# if defined(__APPLE__) && !defined(s6_addr16)
+#  define s6_addr16 __u6_addr.__u6_addr16
+# endif
+
 #endif /* defined(_WIN32) */
 
 // Can this happen?
 #if !defined(INADDR_NONE)
 #  define INADDR_NONE   ((in_addr_t)0xffffffff)
 #endif
 
+// Identifiers for IP address family that will be passed between server and client as a uint8_t
+#define BZF_INET 4
+#define BZF_INET6 6
+
 // for all platforms
 extern "C" {
     void          nerror(const char* msg);

man/bzfs.6.in

@@ -266,6 +266,8 @@ than the first 50 lines of \fIfile\fR to the player.
 Server will listen for and respond to ``pings'' (sent via broadcast)
 on the given interface.  Clients use this to find active servers on the
 network. This is the TCP/UDP/IP address the server will listen on.
+Default is \fI::\fR which should accept IPv4 and IPv6 clients. Use
+\fB-i 0.0.0.0\fR to support only IPv4 clients.
 .TP
 .B \-j
 Allows jumping.