Move some code from network to base classes.

1 files changed, 111 insertions, 0 deletions

diff --git a/src/net/ea/network.h b/src/net/ea/network.h
new file mode 100644
index 000000000..2fe2037a9
--- /dev/null
+++ b/src/net/ea/network.h
@@ -0,0 +1,111 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  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_EA_NETWORK_H
+#define NET_EA_NETWORK_H
+
+#include "net/serverinfo.h"
+
+#include "net/messagein.h"
+#include "net/messageout.h"
+
+#include <SDL_net.h>
+#include <SDL_thread.h>
+
+#include <map>
+#include <string>
+
+namespace Ea
+{
+
+class Network
+{
+    public:
+        Network();
+
+        ~Network();
+
+        bool connect(ServerInfo server);
+
+        void disconnect();
+
+        ServerInfo getServer() const
+        { return mServer; }
+
+        int getState() const
+        { return mState; }
+
+        const std::string &getError() const
+        { return mError; }
+
+        bool isConnected() const
+        { return mState == CONNECTED; }
+
+        int getInSize() const
+        { return mInSize; }
+
+        void skip(int len);
+
+        void flush();
+
+        void fixSendBuffer();
+
+        // ERROR replaced by NET_ERROR because already defined in Windows
+        enum
+        {
+            IDLE = 0,
+            CONNECTED,
+            CONNECTING,
+            DATA,
+            NET_ERROR
+        };
+
+    protected:
+        friend int networkThread(void *data);
+
+        void setError(const std::string &error);
+
+        uint16_t readWord(int pos);
+
+        bool realConnect();
+
+        void receive();
+
+        TCPsocket mSocket;
+
+        ServerInfo mServer;
+
+        char *mInBuffer, *mOutBuffer;
+        unsigned int mInSize, mOutSize;
+
+        unsigned int mToSkip;
+
+        int mState;
+        std::string mError;
+
+        SDL_Thread *mWorkerThread;
+        SDL_mutex *mMutex;
+};
+
+} // namespace Ea
+
+#endif // NET_EA_NETWORK_H