Commit 92854f14 authored by jan.koester's avatar jan.koester
Browse files

test

parent 36af33e7

src/posix/tcp.cpp

+3 −3
Original line number Diff line number Diff line
@@ -240,10 +240,10 @@ size_t netplus::tcp::recvData(buffer &data,int flags){ 
    return (size_t)recvsize;

}



void netplus::tcp::connect(std::unique_ptr<socket> &csock){

void netplus::tcp::connect(std::unique_ptr<socket> &srvsock){

    NetException exception;



    copyAddrInfo(&_SocketInfo,csock->_SocketInfo, csock->_SocketInfoLen);

    copyAddrInfo(&_SocketInfo,srvsock->_SocketInfo, srvsock->_SocketInfoLen);



    if( (_Socket=::socket(((struct addrinfo*)_SocketInfo)->ai_family,SOCK_STREAM,0) ) < 0 ){

        NetException exception;
@@ -253,7 +253,7 @@ void netplus::tcp::connect(std::unique_ptr<socket> &csock){ 
        throw exception;

    }



    if ( ::connect(_Socket,((struct addrinfo*)csock->_SocketInfo)->ai_addr,((struct addrinfo*)csock->_SocketInfo)->ai_addrlen) < 0) {

    if ( ::connect(_Socket,((struct addrinfo*)srvsock->_SocketInfo)->ai_addr,((struct addrinfo*)srvsock->_SocketInfo)->ai_addrlen) < 0) {



        char errstr[512];

        strerror_r_netplus(errno,errstr,512);

src/posix/udp.cpp

+4 −4
Original line number Diff line number Diff line
@@ -242,10 +242,10 @@ size_t netplus::udp::recvData(buffer &data,int flags){ 
    return (size_t)recvsize != 0 ? recvsize : data.size;

}



void netplus::udp::connect(std::unique_ptr<socket> &csock){

void netplus::udp::connect(std::unique_ptr<socket> &srvsock){

    NetException exception;



    copyAddrInfo(&_SocketInfo,csock->_SocketInfo,csock->_SocketInfoLen);

    copyAddrInfo(&_SocketInfo,srvsock->_SocketInfo,srvsock->_SocketInfoLen);



    if( (_Socket=::socket(((struct addrinfo*)_SocketInfo)->ai_family,SOCK_DGRAM,0) ) < 0 ){

        NetException exception;
@@ -255,7 +255,7 @@ void netplus::udp::connect(std::unique_ptr<socket> &csock){ 
        throw exception;

    }



    if ( ::connect(_Socket,((struct addrinfo*)csock->_SocketInfo)->ai_addr,((struct addrinfo*)csock->_SocketInfo)->ai_addrlen) < 0) {

    if ( ::connect(_Socket,((struct addrinfo*)srvsock->_SocketInfo)->ai_addr,((struct addrinfo*)srvsock->_SocketInfo)->ai_addrlen) < 0) {



        char errstr[512];

        strerror_r_netplus(errno,errstr,512);

src/socket.h

+3 −3
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ namespace netplus { 
		size_t sendData(buffer& data, int flags = 0);

		size_t recvData(buffer& data, int flags = 0);



		virtual void connect(std::unique_ptr<socket>& csock);

		virtual void connect(std::unique_ptr<socket>& srvsock);



		void getAddress(std::string& addr);

	private:
@@ -261,7 +261,7 @@ namespace netplus { 
		size_t sendData(buffer& data, int flags = 0);

		size_t recvData(buffer& data, int flags = 0);



		void connect(std::unique_ptr <socket>& csock);

		void connect(std::unique_ptr <socket>& srvsock);



		void getAddress(std::string& addr);
@@ -282,7 +282,7 @@ namespace netplus { 


		void accept(std::unique_ptr<socket>& csock) override;

		void handshake_after_accept();

		void connect(std::unique_ptr<socket>& csock) override;

		void connect(std::unique_ptr<socket>& srvsock) override;



		size_t sendData(buffer& data, int flags = 0) override;

		size_t recvData(buffer& data, int flags = 0) override;

src/ssl.cpp

+184 −166

File changed.

Preview size limit exceeded, changes collapsed.

src/windows/tcp.cpp

+4 −4

File changed.

Preview size limit exceeded, changes collapsed.