Commit d5af10a9 authored by jan.koester's avatar jan.koester
Browse files

win changes

parent adb0772b

src/windows/socket.cpp

+6 −3
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 


#define WIN32_LEAN_AND_MEAN



#define ADDRMAXSIZE 256



#pragma comment (lib, "Ws2_32.lib")



std::atomic<int> netplus::socket::_InitCount=0;
@@ -47,11 +49,11 @@ std::atomic<int> netplus::socket::_InitCount=0; 
WSAData _WSAData;



netplus::socket::socket(){

    _Socket=-1;

    memset(&_SocketInfo, 0,sizeof(sockaddr));

    _SocketInfo = (ULONG_PTR)malloc(ADDRMAXSIZE);

    _SocketInfoLen = sizeof(struct sockaddr);

    _Extension = 0;

    _SocketInfoLen = 0;

    _Type=-1;

    _Socket = -1;

    if (_InitCount<1) {

        if (WSAStartup(MAKEWORD(2, 2), &_WSAData) != 0) {

            NetException exception;
@@ -67,6 +69,7 @@ netplus::socket::~socket(){ 
        WSACleanup();

    }

    --_InitCount;

    free((void*)_SocketInfo);

}



void netplus::socket::setnonblocking(){

src/windows/tcp.cpp

+0 −2
Original line number Diff line number Diff line
@@ -100,14 +100,12 @@ netplus::tcp::~tcp(){ 
}



netplus::tcp::tcp() : socket() {

    _SocketInfoLen=0;

    ((struct addrinfo*)_SocketInfo)->ai_family=AF_UNSPEC;

    _Socket=-1;

    _Type=sockettype::TCP;

}



netplus::tcp::tcp(SOCKET sock) : socket() {

    _SocketInfoLen = 0;

    ((struct addrinfo*)_SocketInfo)->ai_family=AF_UNSPEC;

    _Socket=sock;

    _Type=sockettype::TCP;

src/windows/udp.cpp

+0 −2
Original line number Diff line number Diff line
@@ -100,14 +100,12 @@ netplus::udp::~udp() { 
}



netplus::udp::udp() : socket() {

    _SocketInfoLen = 0;

    ((struct addrinfo*)_SocketInfo)->ai_family = AF_UNSPEC;

    _Socket = -1;

    _Type = sockettype::UDP;

}



netplus::udp::udp(SOCKET sock) : socket() {

    _SocketInfoLen = 0;

    ((struct addrinfo*)_SocketInfo)->ai_family = AF_UNSPEC;

    _Socket = sock;

    _Type = sockettype::TCP;