X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=3ef526cac58e3d5ed2eebf7ccc4a0dbbd4366711;hb=fe1e3560bedafa1d923bf34abb8f72aef2acb75f;hp=bda5f88455102576447d943975426266bfa72d36;hpb=72a49d1ed355b7aab70f3ed5a37354911a1d1074;p=sic.git diff --git a/sic.c b/sic.c index bda5f88..3ef526c 100644 --- a/sic.c +++ b/sic.c @@ -1,28 +1,25 @@ -/* - * (C)opyright MMV-MMVI Anselm R. Garbe +/* (C)opyright MMV-MMVI Anselm R. Garbe * (C)opyright MMV-MMVI Nico Golde * See LICENSE file for license details. */ - #include #include #include #include #include #include -#include #include +#include +#include +#include #define PINGTIMEOUT 300 #define MAXMSG 4096 -enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast }; - -/* CUSTOMIZE */ -static char *server = "irc.oftc.net"; -static int port = 6667; -static char *nick = "arg"; -static char *fullname = "Anselm R. Garbe"; +static char *host = "irc.oftc.net"; +static unsigned short port = 6667; +static char *nick = NULL; +static char *fullname = NULL; static char *password = NULL; static char bufin[MAXMSG], bufout[MAXMSG]; @@ -31,10 +28,10 @@ static int srv; static time_t trespond; static int -getline(int fd, unsigned int len, char *buf) -{ +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; @@ -46,260 +43,171 @@ getline(int fd, unsigned int len, char *buf) } static void -pout(char *channel, char *msg) -{ +pout(char *channel, char *msg) { static char timestr[18]; time_t t = time(0); - strftime(timestr, sizeof(timestr), "%a %R", localtime(&t)); - fprintf(stdout, "%s %s: %s\n", timestr, channel, msg); + strftime(timestr, sizeof timestr, "%F %R", localtime(&t)); + fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg); } static void -privmsg(char *channel, char *msg) -{ - snprintf(bufout, sizeof(bufout), "<%s> %s", nick, msg); +privmsg(char *channel, char *msg) { + if(channel[0] == 0) + return; + snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg); pout(channel, bufout); - snprintf(bufout, sizeof(bufout), "PRIVMSG %s :%s\r\n", channel, msg); + snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg); write(srv, bufout, strlen(bufout)); } static void -parsein(char *msg) -{ +parsein(char *msg) { char *p; - if(msg[0] != '/') { + if(msg[0] == 0) + return; + if(msg[0] != ':') { privmsg(channel, msg); return; } - if((p = strchr(&msg[3], ' '))) - *(p++) = 0; - switch (msg[1]) { - default: - snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]); - break; - case 'j': - if(msg[3] == '#') - snprintf(bufout, sizeof(bufout), "JOIN %s\r\n", &msg[3]); - else if(p) { - privmsg(&msg[3], p + 1); - return; - } - break; - case 'l': - if(p) - snprintf(bufout, sizeof(bufout), "PART %s :%s\r\n", &msg[3], p); - else - snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]); - break; - case 'm': + 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 - 250 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); return; - case 's': - strncpy(channel, &msg[3], sizeof(channel)); + } + else if(!strncmp(msg + 1, "s ", 2)) { + strncpy(channel, &msg[3], sizeof channel); return; - case 't': - snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p); - break; } - 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++; + 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); } - if((i < reslen) && (p < n) && strlen(p)) - result[i++] = p; - return i; /* number of tokens */ + else + snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]); + write(srv, bufout, strlen(bufout)); } static void -parsesrv(char *msg) -{ - char *argv[Tlast], *cmd, *p; - int i; +parsesrv(char *msg) { + char *chan, *cmd, *p, *txt, *usr; + if(!msg || !(*msg)) return; - - for(i = 0; i < Tlast; i++) - argv[i] = NULL; - - /* - ::= [':' ] - ::= | [ '!' ] [ '@' ] - ::= { } | - ::= ' ' { ' ' } - ::= [ ':' | ] - ::= - ::= - ::= CR LF - */ - if(msg[0] == ':') { /* check prefix */ - p = strchr(msg, ' '); + pout("debug", msg); + if(msg[0] != ':') + return; /* don't handle prefix-less server commands */ + if(!(p = strchr(msg, ' '))) + return; + usr = &msg[1]; + *p = 0; + cmd = ++p; + if((p = strchr(usr, '!'))) *p = 0; - for(++p; *p == ' '; p++); - cmd = p; - argv[Tnick] = &msg[1]; - if((p = strchr(msg, '!'))) { - *p = 0; - argv[Tuser] = ++p; - } - } else - cmd = msg; - /* remove CRLFs */ - for(p = cmd; p && *p != 0; p++) + if(!(p = strchr(cmd, ':'))) + return; + *p = 0; + txt = ++p; + for(p = txt; *p; p++) if(*p == '\r' || *p == '\n') *p = 0; - - if((p = strchr(cmd, ':'))) { + if(!strncmp("PONG", cmd, 4)) + return; + if(!strncmp("PRIVMSG", cmd, 7) && txt) { + if(!(p = strchr(cmd, ' '))) + return; + *p = 0; + chan = ++p; + for(; *p && *p != ' '; p++); *p = 0; - argv[Ttext] = ++p; + snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt); + pout(chan, bufout); } - tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' '); - - if(!strncmp("PONG", argv[Tcmd], 5)) { - return; - } else if(!strncmp("PING", argv[Tcmd], 5)) { - snprintf(bufout, sizeof(bufout), "PONG %s\r\n", argv[Ttext]); + else if(!strncmp("PING", cmd, 4) && txt) { + snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt); write(srv, bufout, strlen(bufout)); - return; - } else if(!argv[Tnick] || !argv[Tuser]) { /* server command */ - snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : ""); - pout(server, bufout); - return; - } else if(!strncmp("ERROR", argv[Tcmd], 6)) - snprintf(bufout, sizeof(bufout), "-!- error %s", - argv[Ttext] ? argv[Ttext] : "unknown"); - else if(!strncmp("JOIN", argv[Tcmd], 5)) { - if(argv[Ttext]!=NULL){ - p = strchr(argv[Ttext], ' '); - if(p) - *p = 0; - } - argv[Tchan] = argv[Ttext]; - snprintf(bufout, sizeof(bufout), "-!- %s(%s) has joined %s", - argv[Tnick], argv[Tuser], argv[Ttext]); - } else if(!strncmp("PART", argv[Tcmd], 5)) { - snprintf(bufout, sizeof(bufout), "-!- %s(%s) has left %s", - argv[Tnick], argv[Tuser], argv[Tchan]); - } else if(!strncmp("MODE", argv[Tcmd], 5)) - snprintf(bufout, sizeof(bufout), "-!- %s changed mode/%s -> %s %s", - argv[Tnick], argv[Tcmd + 1], - argv[Tcmd + 2], argv[Tcmd + 3]); - else if(!strncmp("QUIT", argv[Tcmd], 5)) - snprintf(bufout, sizeof(bufout), "-!- %s(%s) has quit \"%s\"", - argv[Tnick], argv[Tuser], - argv[Ttext] ? argv[Ttext] : ""); - else if(!strncmp("NICK", argv[Tcmd], 5)) - snprintf(bufout, sizeof(bufout), "-!- %s changed nick to %s", - argv[Tnick], argv[Ttext]); - else if(!strncmp("TOPIC", argv[Tcmd], 6)) - snprintf(bufout, sizeof(bufout), "-!- %s changed topic to \"%s\"", - argv[Tnick], argv[Ttext] ? argv[Ttext] : ""); - else if(!strncmp("KICK", argv[Tcmd], 5)) - snprintf(bufout, sizeof(bufout), "-!- %s kicked %s (\"%s\")", - argv[Tnick], argv[Targ], - argv[Ttext] ? argv[Ttext] : ""); - else if(!strncmp("NOTICE", argv[Tcmd], 7)) - snprintf(bufout, sizeof(bufout), "-!- \"%s\")", - argv[Ttext] ? argv[Ttext] : ""); - else if(!strncmp("PRIVMSG", argv[Tcmd], 8)) snprintf(bufout, sizeof(bufout), "<%s> %s", - argv[Tnick], argv[Ttext] ? argv[Ttext] : ""); - if(!argv[Tchan] || !strncmp(argv[Tchan], nick, strlen(nick))) - pout(argv[Tnick], bufout); - else - pout(argv[Tchan], bufout); + } + else { + snprintf(bufout, sizeof bufout, "-!- %s: %s", cmd, txt ? txt : ""); + pout(usr, bufout); + } } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { int i; struct timeval tv; struct hostent *hp; - struct sockaddr_in addr = { 0 }; + static struct sockaddr_in addr; /* initially filled with 0's */ char ping[256]; fd_set rd; - for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { - switch (argv[i][1]) { - default: - fputs("usage: sic [-s server] [-p port] [-n nick]" - " [-k keyword] [-f fullname] [-v]\n", stderr); - exit(EXIT_FAILURE); - break; - case 's': - server = argv[i++]; - break; - case 'p': - port = atoi(argv[i++]); - break; - case 'n': - nick = argv[i++]; - break; - case 'k': - password = argv[i++]; - break; - case 'f': - fullname = argv[i++]; - break; - case 'v': + nick = fullname = getenv("USER"); + for(i = 1; i < argc; i++) + if(!strncmp(argv[i], "-h", 3)) { + 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], "-n", 3)) { + if(++i < argc) nick = argv[i]; + } + else if(!strncmp(argv[i], "-k", 3)) { + 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); - break; } - } + else { + fputs("usage: sic [-h host] [-p port] [-n nick]" + " [-k keyword] [-f fullname] [-v]\n", stderr); + exit(EXIT_FAILURE); + } /* init */ if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "sic: cannot connect server '%s'\n", server); + fprintf(stderr, "sic: cannot connect host '%s'\n", host); + exit(EXIT_FAILURE); + } + if (NULL == (hp = gethostbyname(host))) { + fprintf(stderr, "sic: cannot resolve hostname '%s'\n", host); exit(EXIT_FAILURE); } - hp = gethostbyname(server); addr.sin_family = AF_INET; addr.sin_port = htons(port); - bcopy(hp->h_addr, &addr.sin_addr, hp->h_length); + 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); + fprintf(stderr, "sic: cannot connect host '%s'\n", host); exit(EXIT_FAILURE); } - /* login */ if(password) - snprintf(bufout, sizeof(bufout), - "PASS %s\r\nNICK %s\r\nUSER %s localserver %s :%s\r\n", - password, nick, nick, server, fullname ? fullname : nick); + snprintf(bufout, sizeof bufout, + "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", + password, nick, nick, host, fullname); else - snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localserver %s :%s\r\n", - nick, nick, server, fullname ? fullname : nick); + snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n", + nick, nick, host, fullname); write(srv, bufout, strlen(bufout)); - - snprintf(ping, sizeof(ping), "PING %s\r\n", server); + snprintf(ping, sizeof ping, "PING %s\r\n", host); channel[0] = 0; setbuf(stdout, NULL); /* unbuffered stdout */ - for(;;) { + + for(;;) { /* main loop */ FD_ZERO(&rd); FD_SET(0, &rd); FD_SET(srv, &rd); @@ -313,28 +221,27 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } else if(i == 0) { if(time(NULL) - trespond >= PINGTIMEOUT) { - pout(server, "-!- sic shutting down: parseing timeout"); + pout(host, "-!- sic shutting down: parse timeout"); exit(EXIT_FAILURE); } write(srv, ping, strlen(ping)); continue; } if(FD_ISSET(srv, &rd)) { - if(getline(srv, sizeof(bufin), bufin) == -1) { - perror("sic: remote server closed connection"); + if(getline(srv, sizeof bufin, bufin) == -1) { + perror("sic: remote host closed connection"); exit(EXIT_FAILURE); } parsesrv(bufin); trespond = time(NULL); } if(FD_ISSET(0, &rd)) { - if(getline(0, sizeof(bufin), bufin) == -1) { + if(getline(0, sizeof bufin, bufin) == -1) { perror("sic: broken pipe"); exit(EXIT_FAILURE); } parsein(bufin); } } - return 0; }