new api (e7e73800) · Commits · jan.koester / libnetplus

src/event/kqueue.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ namespace netplus {
		assert(0);
		try{
		std::shared_ptr<char> buf(new char[BLOCKSIZE]);
		size_t rcvsize = _ServerSocket->recvData(rcon->csock, buf.get(), BLOCKSIZE);
		size_t rcvsize = rcon->csock->recvData(buf.get(), BLOCKSIZE);

		rcon->lasteventime = time(nullptr);

		@@ -250,7 +250,7 @@ namespace netplus {

		wcon->state=EVOUT;

		sended = _ServerSocket->sendData(wcon->csock,wcon->SendData.data(),ssize);
		sended = wcon->csock->sendData(wcon->SendData.data(),ssize);
		wcon->SendData.resize(sended);

		wcon->lasteventime = time(nullptr);

src/posix/tcp.cpp

+14 −20

Original line number	Diff line number	Diff line
		@@ -178,21 +178,15 @@ void netplus::tcp::bind(){
		}


		size_t netplus::tcp::sendData(socket csock, void data, unsigned long size){
		return sendData(csock,data,size,0);
		size_t netplus::tcp::sendData(void* data, unsigned long size){
		return sendData(data,size,0);
		}

		size_t netplus::tcp::sendData(socket csock, void data, unsigned long size,int flags){
		size_t netplus::tcp::sendData(void* data, unsigned long size,int flags){

		NetException exception;

		int rval=::sendto(csock->_Socket,
		data,
		size,
		flags,
		((struct addrinfo *)csock->_SocketInfo)->ai_addr,
		((struct addrinfo *)csock->_SocketInfo)->ai_addrlen
		);
		int rval=::send(_Socket,data,size,flags);
		if(rval<0){
		int etype=NetException::Error;

		@@ -202,7 +196,7 @@ size_t netplus::tcp::sendData(socket csock, void data, unsigned long size,int
		char errstr[512];
		strerror_r_netplus(errno,errstr,512);

		exception[etype] << "Socket senddata failed on Socket: " << csock->_Socket
		exception[etype] << "Socket senddata failed on Socket: " << _Socket
		<< " ErrorMsg: " << errstr;
		throw exception;
		}
		@@ -211,19 +205,19 @@ size_t netplus::tcp::sendData(socket csock, void data, unsigned long size,int
		}


		size_t netplus::tcp::recvData(socket csock, void data, unsigned long size){
		return recvData(csock,data,size,0);
		size_t netplus::tcp::recvData(void* data, unsigned long size){
		return recvData(data,size,0);
		}

		size_t netplus::tcp::recvData(socket csock, void data, unsigned long size,int flags){
		size_t netplus::tcp::recvData(void* data, unsigned long size,int flags){
		NetException exception;

		int recvsize=::recvfrom(csock->_Socket,
		socklen_t recvaddr=0;

		int recvsize=::recv(_Socket,
		data,
		size,
		flags,
		((struct addrinfo *)csock->_SocketInfo)->ai_addr,
		&((struct addrinfo *)csock->_SocketInfo)->ai_addrlen
		flags
		);
		if(recvsize<0){
		int etype=NetException::Error;
		@@ -235,7 +229,7 @@ size_t netplus::tcp::recvData(socket csock, void data, unsigned long size,int
		char errstr[512];
		strerror_r_netplus(errno,errstr,512);

		exception[etype] << "Socket recvdata failed on Socket: " << csock->_Socket
		exception[etype] << "Socket recvdata failed on Socket: " << _Socket
		<< " ErrorMsg: " << errstr;
		throw exception;
		}

src/posix/udp.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -177,15 +177,15 @@ void netplus::udp::bind(){
		}


		size_t netplus::udp::sendData(socket csock, void data, unsigned long size){
		return sendData(csock,data,size,0);
		size_t netplus::udp::sendData(void* data, unsigned long size){
		return sendData(data,size,0);
		}

		size_t netplus::udp::sendData(socket csock, void data, unsigned long size,int flags){
		size_t netplus::udp::sendData(void* data, unsigned long size,int flags){

		NetException exception;

		int rval=::send(csock->_Socket,
		int rval=::send(_Socket,
		data,
		size,
		flags
		@@ -199,7 +199,7 @@ size_t netplus::udp::sendData(socket csock, void data, unsigned long size,int
		char errstr[512];
		strerror_r_netplus(errno,errstr,512);

		exception[etype] << "Socket senddata failed on Socket: " << csock->_Socket
		exception[etype] << "Socket senddata failed on Socket: " << _Socket
		<< " ErrorMsg: " << errstr;
		throw exception;
		}
		@@ -208,14 +208,14 @@ size_t netplus::udp::sendData(socket csock, void data, unsigned long size,int
		}


		size_t netplus::udp::recvData(socket csock, void data, unsigned long size){
		return recvData(csock,data,size,0);
		size_t netplus::udp::recvData(void* data, unsigned long size){
		return recvData(data,size,0);
		}

		size_t netplus::udp::recvData(socket csock, void data, unsigned long size,int flags){
		size_t netplus::udp::recvData(void* data, unsigned long size,int flags){
		NetException exception;

		int recvsize=::recv(csock->_Socket,
		int recvsize=::recv(_Socket,
		data,
		size,
		flags
		@@ -230,7 +230,7 @@ size_t netplus::udp::recvData(socket csock, void data, unsigned long size,int
		char errstr[512];
		strerror_r_netplus(errno,errstr,512);

		exception[etype] << "Socket recvdata failed on Socket: " << csock->_Socket
		exception[etype] << "Socket recvdata failed on Socket: " << _Socket
		<< " ErrorMsg: " << errstr;
		throw exception;
		}

src/socket.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -57,8 +57,8 @@ namespace netplus {

		virtual int getMaxconnections()=0;

		virtual size_t sendData(socket csock,void data,unsigned long size)=0;
		virtual size_t recvData(socket csock,void data,unsigned long size)=0;
		virtual size_t sendData(void *data,unsigned long size)=0;
		virtual size_t recvData(void *data,unsigned long size)=0;

		virtual void connect(socket *csock)=0;

		@@ -96,10 +96,10 @@ namespace netplus {

		int getMaxconnections();

		size_t sendData(socket socket,void data,unsigned long size);
		size_t sendData(socket socket,void data,unsigned long size,int flags);
		size_t recvData(socket socket,void data,unsigned long size);
		size_t recvData(socket socket,void data,unsigned long size,int flags);
		size_t sendData(void *data,unsigned long size);
		size_t sendData(void *data,unsigned long size,int flags);
		size_t recvData(void *data,unsigned long size);
		size_t recvData(void *data,unsigned long size,int flags);

		virtual void connect(socket *csock);

		@@ -128,10 +128,10 @@ namespace netplus {

		int getMaxconnections();

		size_t sendData(socket socket,void data,unsigned long size);
		size_t sendData(socket socket,void data,unsigned long size,int flags);
		size_t recvData(socket socket,void data,unsigned long size);
		size_t recvData(socket socket,void data,unsigned long size,int flags);
		size_t sendData(void *data,unsigned long size);
		size_t sendData(void *data,unsigned long size,int flags);
		size_t recvData(void *data,unsigned long size);
		size_t recvData(void *data,unsigned long size,int flags);

		void connect(socket *csock);

		@@ -159,8 +159,8 @@ namespace netplus {
		ssl& operator=(int socket);
		int getMaxconnections();

		size_t sendData(socket socket,void data,unsigned long size);
		size_t recvData(socket socket,void data,unsigned long size);
		size_t sendData(void *data,unsigned long size);
		size_t recvData(void *data,unsigned long size);

		void connect(socket *csock);

src/ssl.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,12 +47,12 @@ int netplus::ssl::getMaxconnections(){
		return _Maxconnections;
		}

		size_t netplus::ssl::sendData(socket csock,void data,unsigned long size){
		size_t netplus::ssl::sendData(void *data,unsigned long size){
		NetException exception;
		return 0;
		}

		size_t netplus::ssl::recvData(socket csock,void data,unsigned long size){
		size_t netplus::ssl::recvData(void *data,unsigned long size){
		return 0;
		}