From 264bdbb09bc86797f1f80d151ac408cb780b9355 Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Thu, 13 May 2010 18:00:24 -0600 Subject: [PATCH 1/1] socket and packet copying --- src/Moof/Packet.cc | 46 ++++++++++++++-- src/Moof/Packet.hh | 6 +++ src/Moof/Socket.hh | 128 ++++++++++++++++++++++++++++++++++++++------- 3 files changed, 156 insertions(+), 24 deletions(-) diff --git a/src/Moof/Packet.cc b/src/Moof/Packet.cc index 8cd45b5..6923e7c 100644 --- a/src/Moof/Packet.cc +++ b/src/Moof/Packet.cc @@ -103,9 +103,7 @@ Packet::Packet(size_t size) : mBoolR(0), mBoolW(0), mBoolNumR(0), - mBoolNumW(0) -{ -} + mBoolNumW(0) {} Packet::Packet(const char* data, size_t size) : mBuffer((char*)malloc(size)), @@ -117,7 +115,36 @@ Packet::Packet(const char* data, size_t size) : mBoolNumR(0), mBoolNumW(0) { - memcpy(mBuffer, data, size); + if (mBuffer) memcpy(mBuffer, data, size); +} + + +Packet::Packet(const Packet& copy) : + mBuffer((char*)malloc(copy.mSize)), + mSize(copy.mSize), + mR(copy.mR), + mW(copy.mW), + mBoolR(copy.mBoolR), + mBoolW(copy.mBoolW), + mBoolNumR(copy.mBoolNumR), + mBoolNumW(copy.mBoolNumW) +{ + if (mBuffer) memcpy(mBuffer, copy.mBuffer, mSize); +} + +Packet& Packet::operator=(const Packet& copy) +{ + free(mBuffer); + + mBuffer = (char*)malloc(copy.mSize); + mSize = copy.mSize; + mR = copy.mR; + mW = copy.mW; + mBoolR = copy.mBoolR; + mBoolW = copy.mBoolW; + mBoolNumR = copy.mBoolNumR; + mBoolNumW = copy.mBoolNumW; + return *this; } @@ -324,5 +351,16 @@ size_t Packet::read(void* bytes, size_t size) } +void Packet::clear() +{ + mR = 0; + mW = 0; + mBoolR = 0; + mBoolW = 0; + mBoolNumR = 0; + mBoolNumW = 0; +} + + } // namespace Mf diff --git a/src/Moof/Packet.hh b/src/Moof/Packet.hh index 0095612..1a5e42f 100644 --- a/src/Moof/Packet.hh +++ b/src/Moof/Packet.hh @@ -32,6 +32,9 @@ public: Packet(size_t size = PAGE_SIZE); Packet(const char* data, size_t size); + Packet(const Packet& copy); + Packet& operator=(const Packet& copy); + ~Packet(); Packet& operator<<(bool value); @@ -63,6 +66,9 @@ public: size_t read(void* bytes, size_t size); + void clear(); + + const char* bytes() const { return mBuffer + mR; diff --git a/src/Moof/Socket.hh b/src/Moof/Socket.hh index c53ca06..948f942 100644 --- a/src/Moof/Socket.hh +++ b/src/Moof/Socket.hh @@ -12,6 +12,7 @@ #ifndef _MOOF_SOCKET_HH_ #define _MOOF_SOCKET_HH_ +#include #include #include #include @@ -54,8 +55,8 @@ public: mSize(0), mType(0) { - mAddress.sa.sa_family = AF_UNSPEC; - mAddress.v4.sin_port = 0; + mAddr.sa.sa_family = AF_UNSPEC; + mAddr.in.sin_port = 0; } SocketAddress(const std::string& service, const std::string& name, @@ -73,7 +74,7 @@ public: SocketAddress(const struct addrinfo* addr, const std::string& name) { mType = addr->ai_socktype; - memcpy(&mAddress.sa, addr->ai_addr, addr->ai_addrlen); + memcpy(&mAddr.sa, addr->ai_addr, addr->ai_addrlen); mName = name; mSize = addr->ai_addrlen; } @@ -82,7 +83,7 @@ public: int type = SOCK_STREAM) { mType = type; - memcpy(&mAddress.sa, addr, size); + memcpy(&mAddr.sa, addr, size); mSize = size; setNameFromAddress(); } @@ -121,7 +122,7 @@ public: if (status == 0) { mType = addr->ai_socktype; - memcpy(&mAddress.sa, addr->ai_addr, addr->ai_addrlen); + memcpy(&mAddr.sa, addr->ai_addr, addr->ai_addrlen); mSize = addr->ai_addrlen; if (name != "") mName = name; @@ -134,8 +135,8 @@ public: Mf::logWarning(gai_strerror(status)); mType = 0; mSize = 0; - mAddress.sa.sa_family = AF_UNSPEC; - mAddress.v4.sin_port = 0; + mAddr.sa.sa_family = AF_UNSPEC; + mAddr.in.sin_port = 0; } } @@ -158,7 +159,7 @@ public: unsigned short port() const { - return ntohs(mAddress.v4.sin_port); + return ntohs(mAddr.in.sin_port); } int type() const @@ -168,13 +169,13 @@ public: int family() const { - return mAddress.sa.sa_family; + return mAddr.sa.sa_family; } const struct sockaddr* address() const { - return mSize != 0 ? &mAddress.sa : 0; + return mSize != 0 ? &mAddr.sa : 0; } size_t size() const @@ -226,10 +227,10 @@ private: { #if defined(_WIN32) // inet_ntop was introduced in Vista - mName = inet_ntoa(mAddress.v4.sin_addr); + mName = inet_ntoa(mAddr.in.sin_addr); #else char name[INET6_ADDRSTRLEN] = {'\0'}; - inet_ntop(mAddress.sa.sa_family, &mAddress.sa, name, sizeof(name)); + inet_ntop(mAddr.sa.sa_family, &mAddr.sa, name, sizeof(name)); mName = name; #endif } @@ -238,10 +239,9 @@ private: union { sockaddr sa; - sockaddr_in v4; - sockaddr_in6 v6; + sockaddr_in in; sockaddr_storage storage; - } mAddress; + } mAddr; size_t mSize; std::string mName; int mType; @@ -250,16 +250,92 @@ private: class Socket { + struct Impl + { + int fd; + bool isConnected; + SocketAddress address; + }; + + public: + Socket() : + mFd(-1), + mIsConnected(false) {} + Socket(const SocketAddress& address) : mFd(-1), mIsConnected(false), - mAddress(address) + mAddress(address) {} + + Socket(const std::string& service, const std::string& name, + int type = SOCK_STREAM, int family = AF_UNSPEC) : + mFd(-1), + mIsConnected(false), + mAddress(SocketAddress(service, name, type, family)) {} + + Socket(const std::string& service, + int type = SOCK_STREAM, int family = AF_UNSPEC) : + mFd(-1), + mIsConnected(false), + mAddress(SocketAddress(service, type, family)) {} + + + Socket(Socket& move) : + mFd(move.mFd), + mIsConnected(move.mIsConnected), + mAddress(move.mAddress) + { + move.mFd = -1; + move.mIsConnected = false; + } + + Socket(Impl move) : + mFd(move.fd), + mIsConnected(move.isConnected), + mAddress(move.address) {} + + Socket& operator=(Socket& move) + { +#if defined(_WIN32) + if (mFd != -1) closesocket(mFd); +#else + if (mFd != -1) close(mFd); +#endif + mFd = move.mFd; + mIsConnected = move.mIsConnected; + mAddress = move.mAddress; + move.mFd = -1; + move.mIsConnected = false; + return *this; + } + + Socket& operator=(Impl move) + { +#if defined(_WIN32) + if (mFd != -1) closesocket(mFd); +#else + if (mFd != -1) close(mFd); +#endif + mFd = move.fd; + mIsConnected = move.isConnected; + mAddress = move.address; + return *this; + } + + operator Impl() { - mFd = socket(address.family(), address.type(), 0); + Impl impl; + impl.fd = mFd; + impl.isConnected = mIsConnected; + impl.address = mAddress; + mFd = -1; + mIsConnected = false; + return impl; } + ~Socket() { #if defined(_WIN32) @@ -283,6 +359,7 @@ public: int connect() { + if (mFd == -1) mFd = socket(mAddress.family(), mAddress.type(), 0); int result = ::connect(mFd, mAddress.address(), mAddress.size()); mIsConnected = result != -1; return result; @@ -290,6 +367,7 @@ public: int bind() { + if (mFd == -1) mFd = socket(mAddress.family(), mAddress.type(), 0); return ::bind(mFd, mAddress.address(), mAddress.size()); } @@ -298,9 +376,15 @@ public: return ::listen(mFd, backlog > 0 ? backlog : SOMAXCONN); } - Socket accept() + int accept(Socket& socket) { - return Socket(mFd); + Socket temp = Socket(mFd); + if (temp.mFd != -1) + { + socket = temp; + return socket.mFd; + } + return -1; } @@ -423,7 +507,11 @@ private: socklen_t length = sizeof(addr); mFd = ::accept(fd, &addr.sa, &length); - mAddress = SocketAddress(&addr.sa, length); + if (mFd != -1) + { + mIsConnected = true; + mAddress = SocketAddress(&addr.sa, length); + } } -- 2.43.0