X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=91b2eec47f6aa148698e0f5466c6fb60e6569cca;hb=560111d4ba0603fa8bfd2784980de421f97dd287;hp=1c286f448565ee45b341f578f09f3ad0d526ed97;hpb=0d9d4548b25416f0ffb450e9ac6c5e54ab6f8bc1;p=sic.git diff --git a/sic.c b/sic.c index 1c286f4..91b2eec 100644 --- a/sic.c +++ b/sic.c @@ -1,40 +1,39 @@ -/* - * (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 const char *ping = "PING irc.oftc.net\r\n"; -static const char *host = "irc.oftc.net"; -static const int port = 6667; -static const char *nick = "garbeam2"; -static const char *fullname = "Anselm R. Garbe"; -static const char *password = NULL; +static char *server = "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]; +static char channel[256]; 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,18 +45,16 @@ 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:\t%s\t%s\n", channel, timestr, msg); + fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg); } static void -privmsg(char *channel, char *msg) -{ +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); @@ -65,46 +62,41 @@ privmsg(char *channel, char *msg) } static void -parsein(char *msg) -{ +parsein(char *msg) { char *p; - if((p = strchr(msg, ' '))) - *(p++) = 0; - if(msg[0] != '/' && msg[0] != 0) { - privmsg(msg, p); + if(msg[0] == 0) + return; + if(msg[0] != '/') { + privmsg(channel, msg); return; } - if((p = strchr(&msg[3], ' '))) - *(p++) = 0; - switch (msg[1]) { - 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 't': + 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\r\n", &msg[3]); + else if(!strncmp(msg + 1, "m ", 2)) { + 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)); + 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); - break; - default: - snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]); - break; } + else + snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]); write(srv, bufout, strlen(bufout)); } static unsigned int -tokenize(char **result, unsigned int reslen, char *str, char delim) -{ +tokenize(char **result, unsigned int reslen, char *str, char delim) { char *p, *n; unsigned int i = 0; @@ -129,26 +121,25 @@ tokenize(char **result, unsigned int reslen, char *str, char delim) } static void -parsesrv(char *msg) -{ +parsesrv(char *msg) { char *argv[Tlast], *cmd, *p; int i; + if(!msg || !(*msg)) return; for(i = 0; i < Tlast; i++) argv[i] = NULL; - /* - ::= [':' ] - ::= | [ '!' ] [ '@' ] - ::= { } | - ::= ' ' { ' ' } - ::= [ ':' | ] - ::= - ::= - ::= CR LF + /* ::= [':' ] + * ::= | [ '!' ] [ '@' ] + * ::= { } | + * ::= ' ' { ' ' } + * ::= [ ':' | ] + * ::= + * ::= + * ::= CR LF */ if(msg[0] == ':') { /* check prefix */ p = strchr(msg, ' '); @@ -162,29 +153,28 @@ parsesrv(char *msg) } } else cmd = msg; - /* remove CRLFs */ for(p = cmd; p && *p != 0; p++) if(*p == '\r' || *p == '\n') *p = 0; - if((p = strchr(cmd, ':'))) { *p = 0; argv[Ttext] = ++p; } tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' '); - - if(!strncmp("PONG", argv[Tcmd], 5)) { + if(!strncmp("PONG", argv[Tcmd], 5)) return; - } else if(!strncmp("PING", argv[Tcmd], 5)) { + else if(!strncmp("PING", argv[Tcmd], 5)) { snprintf(bufout, sizeof(bufout), "PONG %s\r\n", argv[Ttext]); write(srv, bufout, strlen(bufout)); return; - } else if(!argv[Tnick] || !argv[Tuser]) { /* server command */ + } + else if(!argv[Tnick] || !argv[Tuser]) { /* server command */ snprintf(bufout, sizeof(bufout), "%s", argv[Ttext] ? argv[Ttext] : ""); - pout((char *)host, bufout); + pout(server, bufout); return; - } else if(!strncmp("ERROR", argv[Tcmd], 6)) + } + 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)) { @@ -196,10 +186,12 @@ parsesrv(char *msg) 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)) { + } + 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)) + } + 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]); @@ -229,65 +221,68 @@ parsesrv(char *msg) pout(argv[Tchan], bufout); } -static int -tcpopen() -{ - int fd = -1; - struct sockaddr_in addr = { 0 }; - struct hostent *hp; - - /* init */ - if((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) - return -1; - hp = gethostbyname(host); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - bcopy(hp->h_addr, &addr.sin_addr, hp->h_length); - - if(connect(fd, (struct sockaddr *) &addr, - sizeof(struct sockaddr_in))) { - close(fd); - return -1; - } - return fd; -} - int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { int i; struct timeval tv; + struct hostent *hp; + 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 [-v]\n", stderr); - exit(EXIT_FAILURE); - break; - case 'v': + nick = fullname = getenv("USER"); + for(i = 1; i < argc; i++) + if(!strncmp(argv[i], "-s", 3)) + server = argv[++i]; + else if(!strncmp(argv[i], "-p", 3)) + port = (unsigned short)atoi(argv[++i]); + else if(!strncmp(argv[i], "-n", 3)) + nick = argv[++i]; + else if(!strncmp(argv[i], "-k", 3)) + password = argv[++i]; + else if(!strncmp(argv[i], "-f", 3)) + 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 [-s server] [-p port] [-n nick]" + " [-k keyword] [-f fullname] [-v]\n", stderr); + exit(EXIT_FAILURE); + } - if((srv = tcpopen()) == -1) { - fprintf(stderr, "sic: cannot connect server '%s'\n", host); + /* 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); } /* login */ if(password) snprintf(bufout, sizeof(bufout), "PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", - password, nick, nick, host, fullname ? fullname : nick); + password, nick, nick, server, fullname); else snprintf(bufout, sizeof(bufout), "NICK %s\r\nUSER %s localhost %s :%s\r\n", - nick, nick, host, fullname ? fullname : nick); + nick, nick, server, fullname); write(srv, bufout, strlen(bufout)); - + snprintf(ping, sizeof(ping), "PING %s\r\n", server); + channel[0] = 0; setbuf(stdout, NULL); /* unbuffered stdout */ - for(;;) { + + for(;;) { /* main loop */ FD_ZERO(&rd); FD_SET(0, &rd); FD_SET(srv, &rd); @@ -301,7 +296,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } else if(i == 0) { if(time(NULL) - trespond >= PINGTIMEOUT) { - pout((char *)host, "-!- sic shutting down: parseing timeout"); + pout(server, "-!- sic shutting down: parseing timeout"); exit(EXIT_FAILURE); } write(srv, ping, strlen(ping)); @@ -309,7 +304,7 @@ main(int argc, char *argv[]) } if(FD_ISSET(srv, &rd)) { if(getline(srv, sizeof(bufin), bufin) == -1) { - perror("sic: remote host closed connection"); + perror("sic: remote server closed connection"); exit(EXIT_FAILURE); } parsesrv(bufin); @@ -323,6 +318,5 @@ main(int argc, char *argv[]) parsein(bufin); } } - return 0; }