added Makefile

[TransparentIRC.git] / src / IOHandler.c

diff --git a/src/IOHandler.c b/src/IOHandler.c
index 127a99e12f7b15df5bc8f20a95ed1b641b7ccdf0..b276272ec11a44480468f95e87bc8bae00855598 100644 (file)
--- a/src/IOHandler.c
+++ b/src/IOHandler.c
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU General Public License 
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
+#include "IOHandler.h"
+#include "IOEngine.h"
 
 struct IODescriptor *first_descriptor = NULL;
 
@@ -25,16 +27,16 @@ struct IOEngine *engine = NULL;
 static void iohandler_init_engine() {
     //try other engines
     
-    if(engine)
+    if(engine) {
         //found an useable IO engine
-    else if (engine_select.init())
+    } else if (engine_select.init())
         engine = &engine_select;
     else {
         //STDERR: found no useable IO engine
     }
 }
 
-struct IODescriptor *iohandler_add(int sockfd, IOType type, iohandler_callback *callback) {
+struct IODescriptor *iohandler_add(int sockfd, enum IOType type, iohandler_callback *callback) {
     //just add a new IODescriptor
     struct IODescriptor *descriptor = calloc(1, sizeof(*descriptor));
     if(!descriptor) return NULL;
@@ -43,12 +45,12 @@ struct IODescriptor *iohandler_add(int sockfd, IOType type, iohandler_callback *
     descriptor->state = IO_CLOSED;
     descriptor->callback = callback;
     if(type != IOTYPE_TIMER) {
-        descriptor->readbuf.buffer = malloc(IOREADBUFLEN + 2);
+        descriptor->readbuf.buffer = malloc(IO_READ_BUFLEN + 2);
         descriptor->readbuf.bufpos = 0;
-        descriptor->readbuf.buflen = IOREADBUFLEN;
-        descriptor->writebuf.buffer = malloc(IOREADBUFLEN + 2);
+        descriptor->readbuf.buflen = IO_READ_BUFLEN;
+        descriptor->writebuf.buffer = malloc(IO_READ_BUFLEN + 2);
         descriptor->writebuf.bufpos = 0;
-        descriptor->writebuf.buflen = IOREADBUFLEN;
+        descriptor->writebuf.buflen = IO_READ_BUFLEN;
     }
     
     if(!engine) {
@@ -62,7 +64,8 @@ struct IODescriptor *iohandler_add(int sockfd, IOType type, iohandler_callback *
     //add IODescriptor to the list
     descriptor->prev = NULL;
     descriptor->next = first_descriptor;
-    first_descriptor->prev = descriptor;
+    if(first_descriptor)
+        first_descriptor->prev = descriptor;
     first_descriptor = descriptor;
     
     return descriptor;
@@ -93,7 +96,7 @@ static void iohandler_increase_iobuf(struct IOBuffer *iobuf, size_t required) {
     }
 }
 
-struct IODescriptor *iohandler_timer(timeval timeout, iohandler_callback *callback) {
+struct IODescriptor *iohandler_timer(struct timeval timeout, iohandler_callback *callback) {
     struct IODescriptor *descriptor;
     descriptor = iohandler_add(-1, IOTYPE_TIMER, callback);
     if(!descriptor) return NULL;
@@ -102,7 +105,7 @@ struct IODescriptor *iohandler_timer(timeval timeout, iohandler_callback *callba
     return descriptor;
 }
 
-struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port, const char *bind, iohandler_callback *callback) {
+struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port, const char *bindhost, iohandler_callback *callback) {
     //non-blocking connect
     int sockfd;
     struct addrinfo hints, *res, *freeres;
@@ -141,7 +144,7 @@ struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port,
         ip6->sin6_port = htons(port);
         
         struct sockaddr_in6 *ip6vhost = NULL;
-        if (bind && !getaddrinfo(bind, NULL, &hints, &res)) {
+        if (bindhost && !getaddrinfo(bindhost, NULL, &hints, &res)) {
             while (res) {
                 switch (res->ai_family) {
                 case AF_INET6:
@@ -168,7 +171,7 @@ struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port,
         ip4->sin_port = htons(port);
         
         struct sockaddr_in *ip4vhost = NULL;
-        if (bind && !getaddrinfo(bind, NULL, &hints, &res)) {
+        if (bindhost && !getaddrinfo(bindhost, NULL, &hints, &res)) {
             while (res) {
                 switch (res->ai_family) {
                 case AF_INET:
@@ -199,7 +202,6 @@ struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port,
     /* I hope you're using the Win32 backend or something else that
      * automatically marks the file descriptor non-blocking...
      */
-    (void)flags;
 #endif
     descriptor = iohandler_add(sockfd, IOTYPE_CLIENT, callback);
     if(!descriptor) {
@@ -210,6 +212,7 @@ struct IODescriptor *iohandler_connect(const char *hostname, unsigned int port,
     descriptor->state = IO_CONNECTING;
     descriptor->read_lines = 1;
     engine->update(descriptor);
+    return descriptor;
 }
 
 struct IODescriptor *iohandler_listen(const char *hostname, unsigned int port, iohandler_callback *callback) {
@@ -275,7 +278,6 @@ struct IODescriptor *iohandler_listen(const char *hostname, unsigned int port, i
     /* I hope you're using the Win32 backend or something else that
      * automatically marks the file descriptor non-blocking...
      */
-    (void)flags;
 #endif
     descriptor = iohandler_add(sockfd, IOTYPE_SERVER, callback);
     if(!descriptor) {
@@ -285,6 +287,7 @@ struct IODescriptor *iohandler_listen(const char *hostname, unsigned int port, i
     listen(sockfd, 1);
     descriptor->state = IO_LISTENING;
     engine->update(descriptor);
+    return descriptor;
 }
 
 void iohandler_write(struct IODescriptor *iofd, const char *line) {
@@ -300,6 +303,7 @@ void iohandler_send(struct IODescriptor *iofd, const char *data, size_t datalen)
             return;
     }
     memcpy(iofd->writebuf.buffer + iofd->writebuf.bufpos, data, datalen);
+    iofd->writebuf.bufpos += datalen;
     engine->update(iofd);
 }
 
@@ -366,9 +370,9 @@ void iohandler_events(struct IODescriptor *iofd, int readable, int writeable) {
             if(readable) { //could not connect
                 callback_event.type = IOEVENT_NOTCONNECTED;
                 socklen_t arglen;
-                arglen = sizeof(callback_event.errno);
-                if (getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &callback_event.errno, &arglen) < 0)
-                    callback_event.data.errno = errno;
+                arglen = sizeof(callback_event.data.errid);
+                if (getsockopt(iofd->fd, SOL_SOCKET, SO_ERROR, &callback_event.data.errid, &arglen) < 0)
+                    callback_event.data.errid = errno;
                 iofd->state = IO_CLOSED;
             } else if(writeable) {
                 callback_event.type = IOEVENT_CONNECTED;
@@ -383,10 +387,10 @@ void iohandler_events(struct IODescriptor *iofd, int readable, int writeable) {
                     if(bytes <= 0) {
                         if (errno != EAGAIN) {
                             callback_event.type = IOEVENT_CLOSED;
-                            callback_event.data.errno = errno;
+                            callback_event.data.errid = errno;
                         }
                     } else {
-                        int i, used_bytes = 0, buffer_offset = 0;
+                        int i, used_bytes = 0;
                         iofd->readbuf.bufpos += bytes;
                         callback_event.type = IOEVENT_RECV;
                         for(i = 0; i < iofd->readbuf.bufpos; i++) {