Commit 0d45e29f authored by jan.koester's avatar jan.koester
Browse files

type fixes in socket

parent 2754b009

src/linux/socket.cpp

+6 −6
Original line number Diff line number Diff line
@@ -214,14 +214,14 @@ unsigned int netplus::tcp::recvData(socket* socket, void* data, unsigned long si 
    return recvsize;

}



netplus::socket* netplus::tcp::connect(){

netplus::tcp* netplus::tcp::connect(){

    NetException exception;

    int sock=0;

    if ((sock=::connect(_Socket, (struct sockaddr*)_SocketPtr, sizeof(struct sockaddr))) < 0) {

        exception[NetException::Error] << "Socket connect: can't connect to server aborting ";

        throw exception;

    }

    socket *clntsock=new tcp();

    tcp *clntsock=new tcp();

    clntsock->_Socket=sock;

    return clntsock;

}
@@ -390,14 +390,14 @@ unsigned int netplus::udp::recvData(socket* socket, void* data, unsigned long si 
    return recvsize;

}



netplus::socket* netplus::udp::connect(){

netplus::udp* netplus::udp::connect(){

    NetException exception;

    int sock=0;

    if ((sock=::connect(_Socket, (struct sockaddr*)_SocketPtr, sizeof(struct sockaddr))) < 0) {

        exception[NetException::Error] << "Socket connect: can't connect to server aborting ";

        throw exception;

    }

    socket *clntsock=new udp();

    udp *clntsock=new udp();

    clntsock->_Socket=sock;

    return clntsock;

}
@@ -536,14 +536,14 @@ unsigned int netplus::ssl::recvData(socket *socket,void *data,unsigned long size 
    return recvsize;    

}



netplus::socket* netplus::ssl::connect(){

netplus::ssl* netplus::ssl::connect(){

    NetException exception;

    int sock=0;

    if ((sock=::connect(_Socket, (struct sockaddr*)_SocketPtr, sizeof(struct sockaddr))) < 0) {

        exception[NetException::Error] << "Socket connect: can't connect to server aborting ";

        throw exception;

    }

    socket *clntsock=new ssl();

    ssl *clntsock=new ssl();

    clntsock->_Socket=sock;

    return clntsock;

}

src/socket.h

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ namespace netplus { 
            unsigned int recvData(socket *socket,void *data,unsigned long size);

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



            socket* connect();

            tcp* connect();



            void getAddress(std::string &addr);
@@ -109,7 +109,7 @@ namespace netplus { 
            unsigned int recvData(socket *socket,void *data,unsigned long size);

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



            socket* connect();

            udp* connect();



            void getAddress(std::string &addr);
@@ -136,7 +136,7 @@ namespace netplus { 
            unsigned int recvData(socket *socket,void *data,unsigned long size);

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

            

            socket* connect();

            ssl* connect();



            void getAddress(std::string &addr);