]> git.armaanb.net Git - sic.git/blobdiff - sic.c
applied Jeroen Schot's patch
[sic.git] / sic.c
diff --git a/sic.c b/sic.c
index 77c6a29a4a2202799f52899743fe40b2485fac94..2bfd7003c0137d677cc93af9332cd2312b9dbacc 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -1,7 +1,4 @@
-/* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for license details. */
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/time.h>
 
 #define PINGTIMEOUT 300
-#define MAXMSG 4096
+#define MAXMSG      4096
 
-static char *host = "irc.oftc.net";
-static unsigned short port = 6667;
+static void die(const char *errstr, ...);
+static void printl(char *channel, char *msg);
+static void privmsg(char *channel, char *msg);
+static void parsein(char *msg);
+static void parsesrv(char *msg);
+static int readl(int fd, unsigned int len, char *buf);
+
+static char *host = "irc6.oftc.net";
+static char *port = "6667";
 static char *password = NULL;
 static char nick[32];
 
@@ -27,8 +31,8 @@ static char channel[256];
 static int srv;
 static time_t trespond;
 
-static void
-eprint(const char *errstr, ...) {
+void
+die(const char *errstr, ...) {
        va_list ap;
 
        va_start(ap, errstr);
@@ -37,23 +41,8 @@ eprint(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
-static int
-getline(int fd, unsigned int len, char *buf) {
-       unsigned int i = 0;
-       char c;
-
-       do {
-               if(read(fd, &c, sizeof(char)) != sizeof(char))
-                       return -1;
-               buf[i++] = c;
-       }
-       while(c != '\n' && i < len);
-       buf[i - 1] = 0;
-       return 0;
-}
-
-static void
-pout(char *channel, char *msg) {
+void
+printl(char *channel, char *msg) {
        static char timestr[18];
        time_t t = time(0);
 
@@ -61,17 +50,17 @@ pout(char *channel, char *msg) {
        fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg);
 }
 
-static void
+void
 privmsg(char *channel, char *msg) {
        if(channel[0] == 0)
                return;
        snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
-       pout(channel, bufout);
+       printl(channel, bufout);
        snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
        write(srv, bufout, strlen(bufout));
 }
 
-static void
+void
 parsein(char *msg) {
        char *p;
 
@@ -100,7 +89,7 @@ parsein(char *msg) {
        write(srv, bufout, strlen(bufout));
 }
 
-static void
+void
 parsesrv(char *msg) {
        char *chan, *cmd, *p, *txt, *usr; 
 
@@ -136,7 +125,7 @@ parsesrv(char *msg) {
                for(; *p && *p != ' '; p++);
                *p = 0;
                snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt);
-               pout(chan, bufout);
+               printl(chan, bufout);
        }
        else if(!strncmp("PING", cmd, 4) && txt) {
                snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
@@ -144,18 +133,33 @@ parsesrv(char *msg) {
        }
        else {
                snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt ? txt : "");
-               pout(usr, bufout);
+               printl(usr, bufout);
                if(!strncmp("NICK", cmd, 4) && !strncmp(usr, nick, sizeof nick) && txt)
                        strncpy(nick, txt, sizeof nick);
        }
 }
 
+int
+readl(int fd, unsigned int len, char *buf) {
+       unsigned int i = 0;
+       char c;
+
+       do {
+               if(read(fd, &c, sizeof(char)) != sizeof(char))
+                       return -1;
+               buf[i++] = c;
+       }
+       while(c != '\n' && i < len);
+       buf[i - 1] = 0;
+       return 0;
+}
+
+
 int
 main(int argc, char *argv[]) {
        int i;
        struct timeval tv;
-       struct hostent *hp;
-       static struct sockaddr_in addr;  /* initially filled with 0's */
+       static struct addrinfo hints, *res, *r;
        char ping[256];
        fd_set rd;
 
@@ -165,7 +169,7 @@ main(int argc, char *argv[]) {
                        if(++i < argc) host = argv[i];
                }
                else if(!strncmp(argv[i], "-p", 3)) {
-                       if(++i < argc) port = (unsigned short)atoi(argv[i]);
+                       if(++i < argc) port = argv[i];
                }
                else if(!strncmp(argv[i], "-n", 3)) {
                        if(++i < argc) strncpy(nick, argv[i], sizeof nick);
@@ -174,30 +178,35 @@ main(int argc, char *argv[]) {
                        if(++i < argc) password = argv[i];
                }
                else if(!strncmp(argv[i], "-v", 3))
-                       eprint("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
+                       die("sic-"VERSION", © 2005-2009 sic engineers\n");
                else
-                       eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
+                       die("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
 
        /* init */
-       if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-               eprint("sic: cannot connect host '%s'\n", host);
-       if(NULL == (hp = gethostbyname(host)))
-               eprint("sic: cannot resolve hostname '%s'\n", host);
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(port);
-       memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
-       if(connect(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
+       memset(&hints, 0, sizeof hints);
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_STREAM;
+       if(getaddrinfo(host, port, &hints, &res) != 0)
+               die("error: cannot resolve hostname '%s'\n", host);
+       for(ri = res; r; r = r->ai_next) {
+               if((srv = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1)
+                       continue;
+               if(connect(srv, r->ai_addr, r->ai_addrlen) == 0)
+                       break;
                close(srv);
-               eprint("sic: cannot connect host '%s'\n", host);
        }
+       freeaddrinfo(res);
+       if(!r)
+               die("error: cannot connect to host '%s'\n", host);
+
        /* login */
        if(password)
                snprintf(bufout, sizeof bufout,
-                               "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
-                               password, nick, nick, host, nick);
+                       "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
+                       password, nick, nick, host, nick);
        else
                snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
-                                nick, nick, host, nick);
+                        nick, nick, host, nick);
        write(srv, bufout, strlen(bufout));
        snprintf(ping, sizeof ping, "PING %s\r\n", host);
        channel[0] = 0;
@@ -213,23 +222,23 @@ main(int argc, char *argv[]) {
                if(i < 0) {
                        if(errno == EINTR)
                                continue;
-                       eprint("sic: error on select()");
+                       die("error: error on select()\n");
                }
                else if(i == 0) {
                        if(time(NULL) - trespond >= PINGTIMEOUT)
-                               eprint("sic shutting down: parse timeout");
+                               die("error: sic shutting down: parse timeout\n");
                        write(srv, ping, strlen(ping));
                        continue;
                }
                if(FD_ISSET(srv, &rd)) {
-                       if(getline(srv, sizeof bufin, bufin) == -1)
-                               eprint("sic: remote host closed connection");
+                       if(readl(srv, sizeof bufin, bufin) == -1)
+                               die("error: remote host closed connection\n");
                        parsesrv(bufin);
                        trespond = time(NULL);
                }
                if(FD_ISSET(0, &rd)) {
-                       if(getline(0, sizeof bufin, bufin) == -1)
-                               eprint("sic: broken pipe");
+                       if(readl(0, sizeof bufin, bufin) == -1)
+                               die("error: broken pipe\n");
                        parsein(bufin);
                }
        }