X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=121b3ee336311be04ddeb77f2c657d1420e97a0c;hb=4a4f924fee3f3779e5856eabaed7672ca8d92a77;hp=efb0507a3d4062e1f4314c85f7d42b6ef5ca4f76;hpb=5569a14e8edbc4e8e219b28658c7194201ed0417;p=sic.git diff --git a/sic.c b/sic.c index efb0507..121b3ee 100644 --- a/sic.c +++ b/sic.c @@ -1,10 +1,8 @@ -/* (C)opyright MMV-MMVI Anselm R. Garbe - * (C)opyright MMV-MMVI Nico Golde - * See LICENSE file for license details. - */ +/* See LICENSE file for license details. */ #include #include #include +#include #include #include #include @@ -14,235 +12,208 @@ #include #define PINGTIMEOUT 300 -#define MAXMSG 4096 - -enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast }; - -static char *server = "irc.oftc.net"; -static unsigned short port = 6667; -static char *nick = NULL; -static char *fullname = NULL; -static char *password = NULL; +#define MAXMSG 4096 +#ifndef VERSION +#define VERSION "dev" +#endif + +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 nick[32]; static char bufin[MAXMSG], bufout[MAXMSG]; static char channel[256]; static int srv; static time_t trespond; -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; +void +die(const char *errstr, ...) { + va_list ap; + va_start(ap, errstr); + (void) vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); } -static void -pout(char *channel, char *msg) { +void +printl(char *channel, char *msg) { static char timestr[18]; time_t t = time(0); - - strftime(timestr, sizeof timestr, "%F %R", localtime(&t)); - fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg); + (void) strftime(timestr, sizeof timestr, "%D %R", localtime(&t)); + fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg); } -static void +void privmsg(char *channel, char *msg) { - snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg); - pout(channel, bufout); - snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg); - write(srv, bufout, strlen(bufout)); + if(channel[0] == '\0') + return; + (void) snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg); + printl(channel, bufout); + (void) snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg); + (void) write(srv, bufout, strlen(bufout)); } -static void +void parsein(char *msg) { - char *p; - - if(msg[0] == 0) + char *p = NULL; + if(msg[0] == '\0') return; if(msg[0] != ':') { privmsg(channel, msg); return; } - if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#')) - snprintf(bufout, sizeof bufout, "JOIN %s\r\n", &msg[3]); - else if(!strncmp(msg + 1, "l ", 2)) - snprintf(bufout, sizeof bufout, "PART %s :sic - 300 LOC are too much!\r\n", &msg[3]); - else if(!strncmp(msg + 1, "m ", 2)) { - if((p = strchr(&msg[3], ' '))) - *(p++) = 0; - privmsg(&msg[3], p); + if(strncmp(msg + 1, "j ", 2) == 0 && (msg[3] == '#')) + (void) snprintf(bufout, sizeof bufout, "JOIN %s\r\n", msg + 3); + else if(strncmp(msg + 1, "l ", 2) == 0) + (void) snprintf(bufout, sizeof bufout, "PART %s :sic - 250 LOC are too much!\r\n", msg + 3); + else if(strncmp(msg + 1, "m ", 2) == 0) { + if((p = strchr(msg + 3, ' '))) + *(p++) = '\0'; + privmsg(msg + 3, p); return; } - else if(!strncmp(msg + 1, "s ", 2)) { - strncpy(channel, &msg[3], sizeof channel); + else if(strncmp(msg + 1, "s ", 2) == 0) { + strncpy(channel, msg + 3, sizeof channel); return; } - else if(!strncmp(msg + 1, "t ", 2)) { - if((p = strchr(&msg[3], ' '))) - *(p++) = 0; - snprintf(bufout, sizeof bufout, "TOPIC %s :%s\r\n", &msg[3], p); - } else - snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]); - write(srv, bufout, strlen(bufout)); + (void) snprintf(bufout, sizeof bufout, "%s\r\n", msg + 1); + (void) write(srv, bufout, strlen(bufout)); } -static unsigned int -tokenize(char **result, unsigned int reslen, char *str, char delim) { - char *p, *n; - unsigned int i = 0; - - if(!str) - return 0; - for(n = str; *n == delim; n++); - p = n; - for(i = 0; *n != 0;) { - if(i == reslen) - return i; - if(*n == delim) { - *n = 0; - if(strlen(p)) - result[i++] = p; - p = ++n; - } else - n++; - } - if((i < reslen) && (p < n) && strlen(p)) - result[i++] = p; - return i; /* number of tokens */ -} - -static void +void parsesrv(char *msg) { - char *argv[Tlast], *cmd, *p; - int i; + char *chan, *cmd, *p, *txt, *usr; - if(!msg || !(*msg)) + txt = NULL; + usr = host; + if(msg == NULL || *msg == '\0' ) return; - for(i = 0; i < Tlast; i++) - argv[i] = NULL; - /* ::= [':' ] - * ::= | [ '!' ] [ '@' ] - * ::= { } | - * ::= ' ' { ' ' } - * ::= [ ':' | ] - * ::= - * ::= - * ::= CR LF - */ - if(msg[0] == ':') { /* check prefix */ - if (!(p = strchr(msg, ' '))) - return; - *p = 0; - for(++p; *p == ' '; p++); - cmd = p; - argv[Tnick] = &msg[1]; - if((p = strchr(msg, '!'))) { - *p = 0; - argv[Tuser] = ++p; - } - } else + if(msg[0] != ':') cmd = msg; - /* remove CRLFs */ - for(p = cmd; p && *p != 0; p++) + else { + if(!(p = strchr(msg, ' '))) + return; + *p = '\0'; + usr = msg + 1; + cmd = ++p; + if((p = strchr(usr, '!'))) + *p = '\0'; + } + for(p = cmd; *p != '\0'; p++) /* remove CRLFs */ if(*p == '\r' || *p == '\n') - *p = 0; + *p = '\0'; if((p = strchr(cmd, ':'))) { - *p = 0; - argv[Ttext] = ++p; + *p = '\0'; + txt = ++p; } - - if(!strncmp("PRIVMSG", cmd, 7) || !strncmp("PING", cmd, 4)) { - if(tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ') != Tlast - Tcmd) - return; - if(!strncmp("PRIVMSG", argv[Tcmd], 8)) { - snprintf(bufout, sizeof bufout, "<%s> %s", - argv[Tnick], argv[Ttext] ? argv[Ttext] : ""); - pout(argv[Tchan], bufout); - } - else if(!strncmp("PING", argv[Tcmd], 5)) { - snprintf(bufout, sizeof bufout, "PONG %s\r\n", argv[Ttext]); - write(srv, bufout, strlen(bufout)); - } + if(strncmp("PONG", cmd, 4) == 0) return; + if(strncmp("PRIVMSG", cmd, 7) == 0 && txt != NULL) { + if(!(p = strchr(cmd, ' '))) + return; + *p = '\0'; + chan = ++p; + for(; *p != '\0' && *p != ' '; p++); + *p = '\0'; + (void) snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt); + printl(chan, bufout); + } + else if(strncmp("PING", cmd, 4) == 0 && txt != NULL) { + (void) snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt); + (void) write(srv, bufout, strlen(bufout)); + } + else { + if (txt != NULL) + (void) snprintf(bufout, sizeof bufout, ">< %s: %s", cmd, txt); + else + (void) snprintf(bufout, sizeof bufout, ">< %s: ", cmd); + printl(usr, bufout); + if(strncmp("NICK", cmd, 4) == 0 && strncmp(usr, nick, sizeof nick) == 0 && + txt != NULL) + (void) strncpy(nick, txt, sizeof nick); } - snprintf(bufout, sizeof bufout, "-!- %s", cmd); - pout(server, bufout); } int -main(int argc, char *argv[]) { +readl(int fd, unsigned int len, char *buf) { + unsigned int i = 0; + char c = '\0'; + + do { + if(read(fd, &c, sizeof(char)) != (ssize_t) sizeof(char)) + return -1; + buf[i++] = c; + } + while(c != '\n' && i < len); + buf[i - 1] = '\0'; + return 0; +} + + +int +main(const int argc, char *const 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; + char *password = NULL; - nick = fullname = getenv("USER"); + strncpy(nick, getenv("USER"), sizeof nick); for(i = 1; i < argc; i++) - if(!strncmp(argv[i], "-s", 3)) { - if(++i < argc) server = argv[i]; + if(strncmp(argv[i], "-h", 3) == 0) { + if(++i < argc) host = argv[i]; } - else if(!strncmp(argv[i], "-p", 3)) { - if(++i < argc) port = (unsigned short)atoi(argv[i]); + else if(strncmp(argv[i], "-p", 3) == 0) { + if(++i < argc) port = argv[i]; } - else if(!strncmp(argv[i], "-n", 3)) { - if(++i < argc) nick = argv[i]; + else if(strncmp(argv[i], "-n", 3) == 0) { + if(++i < argc) strncpy(nick, argv[i], sizeof nick); } - else if(!strncmp(argv[i], "-k", 3)) { + else if(strncmp(argv[i], "-k", 3) == 0) { if(++i < argc) password = argv[i]; } - else if(!strncmp(argv[i], "-f", 3)) { - if(++i < argc) fullname = argv[i]; - } - else if(!strncmp(argv[i], "-v", 3)) { - fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); - exit(EXIT_SUCCESS); - } - else { - fputs("usage: sic [-s server] [-p port] [-n nick]" - " [-k keyword] [-f fullname] [-v]\n", stderr); - exit(EXIT_FAILURE); - } + else if(strncmp(argv[i], "-v", 3) == 0) + die("sic-%s, © 2005-2009 sic engineers\n", VERSION); + else + die("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n"); /* init */ - if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "sic: cannot connect server '%s'\n", server); - exit(EXIT_FAILURE); - } - if (NULL == (hp = gethostbyname(server))) { - fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server); - exit(EXIT_FAILURE); - } - 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))) { - close(srv); - fprintf(stderr, "sic: cannot connect server '%s'\n", server); - exit(EXIT_FAILURE); + 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(r = 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; + (void) close(srv); } + 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, server, fullname); + if (password) + (void) snprintf(bufout, sizeof bufout, + "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, server, fullname); - write(srv, bufout, strlen(bufout)); - snprintf(ping, sizeof ping, "PING %s\r\n", server); - channel[0] = 0; + (void) snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n", + nick, nick, host, nick); + (void) write(srv, bufout, strlen(bufout)); + (void) snprintf(ping, sizeof ping, "PING %s\r\n", host); + channel[0] = '\0'; setbuf(stdout, NULL); /* unbuffered stdout */ for(;;) { /* main loop */ @@ -255,29 +226,23 @@ main(int argc, char *argv[]) { if(i < 0) { if(errno == EINTR) continue; - perror("sic: error on select()"); - exit(EXIT_FAILURE); - } else if(i == 0) { - if(time(NULL) - trespond >= PINGTIMEOUT) { - pout(server, "-!- sic shutting down: parse timeout"); - exit(EXIT_FAILURE); - } - write(srv, ping, strlen(ping)); + die("error: error on select()\n"); + } + else if(i == 0) { + if(time(NULL) - trespond >= PINGTIMEOUT) + die("error: sic shutting down: parse timeout\n"); + (void) write(srv, ping, strlen(ping)); continue; } - if(FD_ISSET(srv, &rd)) { - if(getline(srv, sizeof bufin, bufin) == -1) { - perror("sic: remote server closed connection"); - exit(EXIT_FAILURE); - } + if(FD_ISSET(srv, &rd) != 0) { + 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) { - perror("sic: broken pipe"); - exit(EXIT_FAILURE); - } + if(FD_ISSET(0, &rd) != 0) { + if(readl(0, (unsigned int) sizeof bufin, bufin) == -1) + die("error: broken pipe\n"); parsein(bufin); } }