[IOMultiplexerV2] coding style fixes

[NextIRCd.git] / src / IOHandler / IOSockets.c

diff --git a/src/IOHandler/IOSockets.c b/src/IOHandler/IOSockets.c
index b844d64f8228240729807aa6fece42c7474dec3c..a361126b5540dd10a69160587c9fcfca49bc597c 100644 (file)
--- a/src/IOHandler/IOSockets.c
+++ b/src/IOHandler/IOSockets.c
@@ -91,12 +91,12 @@ static void iosockets_init_engine() {
 void _init_sockets() {
        #ifdef WIN32
        WSADATA wsaData;
-    int iResult;
+       int iResult;
        //Initialize Winsock
-    iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
-    if(iResult != 0){
-        iolog_trigger(IOLOG_ERROR, "WSAStartup returned error code: %d", iResult);
-    }
+       iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+       if(iResult != 0){
+               iolog_trigger(IOLOG_ERROR, "WSAStartup returned error code: %d", iResult);
+       }
        #endif
        
        iosockets_init_engine();\r
@@ -551,7 +551,7 @@ static void iosocket_listen_finish(struct _IOSocket *iosock) {
        if((iosock->socket_flags & IOSOCKETFLAG_IPV6SOCKET)) {
                struct sockaddr_in6 *ip6bind = (void*) iosock->bind.addr.address;
                ip6bind->sin6_family = AF_INET6;
-               ip6bind->sin6_port = htons(0);
+               ip6bind->sin6_port = htons(iosock->port);
                
                int opt = 1;
                setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
@@ -560,7 +560,7 @@ static void iosocket_listen_finish(struct _IOSocket *iosock) {
        } else {
                struct sockaddr_in *ip4bind = (void*) iosock->bind.addr.address;
                ip4bind->sin_family = AF_INET;
-               ip4bind->sin_port = htons(0);
+               ip4bind->sin_port = htons(iosock->port);
                
                int opt = 1;
                setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
@@ -591,6 +591,7 @@ struct _IOSocket *iosocket_accept_client(struct _IOSocket *iosock) {
        }
        new_iosocket->iosocket = new_iosock;
        new_iosocket->status = IOSOCKET_CONNECTED;
+       new_iosocket->data = iosock;
        new_iosock->parent = new_iosocket;
        new_iosock->socket_flags |= IOSOCKETFLAG_PARENT_PUBLIC | IOSOCKETFLAG_INCOMING | (iosock->socket_flags & IOSOCKETFLAG_IPV6SOCKET);
        
@@ -753,7 +754,7 @@ struct IOSocket *iosocket_listen_ssl(const char *hostname, unsigned int port, co
 struct IOSocket *iosocket_listen_ssl_flags(const char *hostname, unsigned int port, const char *certfile, const char *keyfile, iosocket_callback *callback, int flags) {
        struct IOSocket *iosocket = iosocket_listen_flags(hostname, port, callback, flags);\r
        struct _IOSocket *iosock = iosocket->iosocket;\r
-       iosock->socket_flags |= IOSOCKETFLAG_SSLSOCKET | IOSOCKETFLAG_SSL_HANDSHAKE;\r
+       iosock->socket_flags |= IOSOCKETFLAG_SSLSOCKET;\r
        iossl_listen(iosock, certfile, keyfile);
        return iosocket;
 }
@@ -809,7 +810,7 @@ static int iosocket_try_write(struct _IOSocket *iosock) {
                        res = 0;
        } else {
                iosock->writebuf.bufpos -= res;
-               if((iosock->socket_flags & (IOSOCKETFLAG_ACTIVE & IOSOCKETFLAG_SHUTDOWN)) == IOSOCKETFLAG_ACTIVE)
+               if((iosock->socket_flags & (IOSOCKETFLAG_ACTIVE | IOSOCKETFLAG_SHUTDOWN)) == IOSOCKETFLAG_ACTIVE)
                        engine->update(iosock);
        }
        return res;
@@ -859,6 +860,28 @@ void iosocket_printf(struct IOSocket *iosocket, const char *text, ...) {
 }
 
 
+int iosocket_wants_reads(struct _IOSocket *iosock) {
+       if((iosock->socket_flags & (IOSOCKETFLAG_SSL_READHS | IOSOCKETFLAG_SSL_WRITEHS)))
+               return ((iosock->socket_flags & IOSOCKETFLAG_SSL_WANTWRITE) ? 0 : 1);
+       if(!(iosock->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_RW))
+               return 1;
+       else if((iosock->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_R))
+               return 1;
+       return 0;
+}
+int iosocket_wants_writes(struct _IOSocket *iosock) {
+       if((iosock->socket_flags & (IOSOCKETFLAG_SSL_READHS | IOSOCKETFLAG_SSL_WRITEHS)))
+               return ((iosock->socket_flags & IOSOCKETFLAG_SSL_WANTWRITE) ? 1 : 0);
+       if(!(iosock->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_RW)) {
+               if(iosock->writebuf.bufpos || (iosock->socket_flags & IOSOCKETFLAG_CONNECTING))
+                       return 1;
+               else
+                       return 0;
+       } else if((iosock->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_W))
+               return 1;
+       return 0;
+}
+
 
 static void iosocket_trigger_event(struct IOSocketEvent *event) {
        if(!event->socket->callback) 
@@ -888,7 +911,12 @@ void iosocket_events_callback(struct _IOSocket *iosock, int readable, int writea
                                        //incoming SSL connection accepted\r
                                        iosock->socket_flags &= ~IOSOCKETFLAG_SSL_HANDSHAKE;\r
                                        callback_event.type = IOSOCKETEVENT_ACCEPT;\r
-                                       callback_event.data.accept_socket = iosock->parent;\r
+                                       callback_event.data.accept_socket = iosock->parent;
+                                       struct _IOSocket *parent_socket = iosocket->data;
+                                       callback_event.socket = parent_socket->parent;
+                                       
+                                       //initialize readbuf
+                                       iosocket_increase_buffer(&iosock->readbuf, 1024);\r
                                } else {\r
                                        //incoming SSL connection failed, simply drop\r
                                        iosock->socket_flags |= IOSOCKETFLAG_DEAD;\r
@@ -965,15 +993,22 @@ void iosocket_events_callback(struct _IOSocket *iosock, int readable, int writea
                                else if((iosock->socket_flags & IOSOCKETFLAG_SSL_WRITEHS))\r
                                        ssl_rehandshake = 2;\r
                        }
+                       iosocketevents_callback_retry_read:
                        if((readable && ssl_rehandshake == 0) || ssl_rehandshake == 1) {
                                int bytes;
-                               if(iosock->readbuf.buflen - iosock->readbuf.bufpos >= 128)
-                                       iosocket_increase_buffer(&iosock->readbuf, iosock->readbuf.buflen + 1024);
+                               if(iosock->readbuf.buflen - iosock->readbuf.bufpos >= 128) {
+                                       int addsize;
+                                       if(iosock->readbuf.buflen >= 2048)
+                                               addsize = 1024;
+                                       else
+                                               addsize = iosock->readbuf.buflen;
+                                       iosocket_increase_buffer(&iosock->readbuf, iosock->readbuf.buflen + addsize);
+                               }
                                if((iosock->socket_flags & IOSOCKETFLAG_SSLSOCKET))
                                        bytes = iossl_read(iosock, iosock->readbuf.buffer + iosock->readbuf.bufpos, iosock->readbuf.buflen - iosock->readbuf.bufpos);
                                else 
                                        bytes = recv(iosock->fd, iosock->readbuf.buffer + iosock->readbuf.bufpos, iosock->readbuf.buflen - iosock->readbuf.bufpos, 0);
-                                       
+                               
                                if(bytes <= 0) {\r
                                        if((iosock->socket_flags & (IOSOCKETFLAG_SSLSOCKET | IOSOCKETFLAG_SSL_READHS)) == (IOSOCKETFLAG_SSLSOCKET | IOSOCKETFLAG_SSL_READHS)) {\r
                                                ssl_rehandshake = 1;\r
@@ -987,6 +1022,7 @@ void iosocket_events_callback(struct _IOSocket *iosock, int readable, int writea
                                        int i;
                                        iolog_trigger(IOLOG_DEBUG, "received %d bytes (fd: %d). readbuf position: %d", bytes, iosock->fd, iosock->readbuf.bufpos);
                                        iosock->readbuf.bufpos += bytes;
+                                       int retry_read = (iosock->readbuf.bufpos == iosock->readbuf.buflen);
                                        callback_event.type = IOSOCKETEVENT_RECV;
                                        
                                        if(iosocket->parse_delimiter) {
@@ -1035,6 +1071,8 @@ void iosocket_events_callback(struct _IOSocket *iosock, int readable, int writea
                                                callback_event.type = IOSOCKETEVENT_IGNORE;
                                        } else
                                                callback_event.data.recv_buf = &iosock->readbuf;
+                                       if(retry_read)
+                                               goto iosocketevents_callback_retry_read;
                                }
                        }
                        if((writeable && ssl_rehandshake == 0) || ssl_rehandshake == 2) {