From d2d934547c5ade2dddd85b4dd065c2c803c9fcd9 Mon Sep 17 00:00:00 2001
From: Dan Sagunov <danilka.pro@gmail.com>
Date: Fri, 1 Nov 2013 19:57:05 +0400
Subject: Remove nacltcpnet due to SDL_net support
---
src/CMakeLists.txt | 2 -
src/Makefile.am | 2 -
src/net/ea/network.h | 5 ---
src/net/nacltcpnet.cpp | 116 -------------------------------------------------
src/net/nacltcpnet.h | 71 ------------------------------
src/net/sdltcpnet.cpp | 2 -
src/net/sdltcpnet.h | 3 --
7 files changed, 201 deletions(-)
delete mode 100644 src/net/nacltcpnet.cpp
delete mode 100644 src/net/nacltcpnet.h
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6bada3941..254704a88 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -418,8 +418,6 @@ SET(SRCS
net/messageout.cpp
net/messageout.h
net/npchandler.h
- net/nacltcpnet.cpp
- net/nacltcpnet.h
net/net.cpp
net/net.h
net/partyhandler.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b2889594..8f7f49367 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -432,8 +432,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
net/messagein.h \
net/messageout.cpp \
net/messageout.h \
- net/nacltcpnet.cpp \
- net/nacltcpnet.h \
net/net.cpp \
net/net.h \
net/npchandler.h \
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 1473a1413..c608358cd 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -24,12 +24,7 @@
#define NET_EA_NETWORK_H
#include "net/serverinfo.h"
-
-#if defined __native_client__
-#include "net/nacltcpnet.h"
-#else
#include "net/sdltcpnet.h"
-#endif
#include <SDL_thread.h>
diff --git a/src/net/nacltcpnet.cpp b/src/net/nacltcpnet.cpp
deleted file mode 100644
index f2db71b56..000000000
--- a/src/net/nacltcpnet.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2013 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#if defined __native_client__
-
-#include "net/nacltcpnet.h"
-
-#if defined __linux__ || defined __linux
-#include "logger.h"
-
-#include <sys/socket.h>
-
-#if defined(M_TCPOK) && !defined(ANDROID)
-#include <netinet/in.h>
-#include <netdb.h>
-#include <linux/tcp.h>
-#else
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-// Use linear timeouts for thin streams
-#define TCP_THIN_LINEAR_TIMEOUTS 16
-// Fast retrans. after 1 dupack
-#define TCP_THIN_DUPACK 17
-#endif
-
-#endif
-
-#include "debug.h"
-
-struct _SDLNet_SocketSet
-{
-};
-
-struct _TCPsocket
-{
- int ready;
- int channel;
- IPaddress remoteAddress;
- IPaddress localAddress;
- int sflag;
-};
-
-void TcpNet::init()
-{
-}
-
-void TcpNet::quit()
-{
-}
-
-void TcpNet::closeSocket(const TcpNet::Socket socket)
-{
-}
-
-int TcpNet::send(const TcpNet::Socket sock, const void *const data,
- const int len)
-{
-}
-
-const char *TcpNet::getError()
-{
-}
-
-int TcpNet::resolveHost(IPaddress *const address, const char *const host,
- const Uint16 port)
-{
-}
-
-TcpNet::Socket TcpNet::open(IPaddress *const ip)
-{
-}
-
-TcpNet::SocketSet TcpNet::allocSocketSet(const int maxsockets)
-{
-}
-
-int TcpNet::addSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock)
-{
-}
-
-int TcpNet::checkSockets(const TcpNet::SocketSet set, const Uint32 timeout)
-{
-}
-
-int TcpNet::recv(const TcpNet::Socket sock, void *const data, const int maxlen)
-{
-}
-
-int TcpNet::delSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock)
-{
-}
-
-void TcpNet::freeSocketSet(const TcpNet::SocketSet set)
-{
-}
-
-#endif // __native_client__
diff --git a/src/net/nacltcpnet.h b/src/net/nacltcpnet.h
deleted file mode 100644
index 770384e7e..000000000
--- a/src/net/nacltcpnet.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2013 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NET_NACLTCPNET_H
-#define NET_NACLTCPNET_H
-
-#if defined __native_client__
-
-#include <SDL.h>
-#include "localconsts.h"
-
-typedef struct {
- Uint32 host; /* 32-bit IPv4 host address */
- Uint16 port; /* 16-bit protocol port */
-} IPaddress;
-
-typedef struct _SDLNet_SocketSet *SDLNet_SocketSet;
-typedef struct _TCPsocket *TCPsocket;
-
-namespace TcpNet
-{
- typedef ::SDLNet_SocketSet SocketSet;
- typedef ::TCPsocket Socket;
-
- void init();
-
- void quit();
-
- void closeSocket(const TcpNet::Socket socket);
-
- int send(const TcpNet::Socket sock, const void *const data, const int len);
-
- const char *getError();
-
- int resolveHost(IPaddress *const address, const char *const host,
- const Uint16 port);
-
- TcpNet::Socket open(IPaddress *const ip);
-
- SocketSet allocSocketSet(const int maxsockets);
-
- int addSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock);
-
- int checkSockets(const TcpNet::SocketSet set, const Uint32 timeout);
-
- int recv(const TcpNet::Socket sock, void *const data, const int maxlen);
-
- int delSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock);
-
- void freeSocketSet(const TcpNet::SocketSet set);
-} // namespace TcpNet
-
-#endif // __native_client__
-#endif // NET_NACLTCPNET_H
diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp
index 4d708ea68..51da24d8c 100644
--- a/src/net/sdltcpnet.cpp
+++ b/src/net/sdltcpnet.cpp
@@ -152,5 +152,3 @@ void TcpNet::freeSocketSet(const TcpNet::SocketSet set)
{
SDLNet_FreeSocketSet(set);
}
-
-#endif // __native_client__
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 04c80e71a..a61c218b8 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -21,8 +21,6 @@
#ifndef NET_SDLTCPNET_H
#define NET_SDLTCPNET_H
-#if !defined __native_client__
-
#include <SDL_net.h>
#include "localconsts.h"
@@ -60,5 +58,4 @@ namespace TcpNet
void freeSocketSet(const TcpNet::SocketSet set);
} // namespace TcpNet
-#endif // __native_client__
#endif // NET_SDLTCPNET_H
--
cgit v1.2.3-70-g09d2