X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=sic.c;h=8d6580918df69c13a3395d71654876350af4e4c5;hb=c2fcf48e6d334234859c5e015ec6cc816bca451b;hp=fed649f81344f7e8fecfbc316e76b5a95219d6f5;hpb=ff4072f5e43b677ad68ea9de7a5d210fed60b144;p=sic.git diff --git a/sic.c b/sic.c index fed649f..8d65809 100644 --- a/sic.c +++ b/sic.c @@ -10,23 +10,24 @@ #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.freenode.net\r\n"; -static const char *host = "irc.freenode.net"; -static const int port = 6667; -static const char *nick = "garbeam"; -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; @@ -51,8 +52,8 @@ pout(char *channel, char *msg) static char timestr[18]; time_t t = time(0); - strftime(timestr, sizeof(timestr), "%F %R", localtime(&t)); - fprintf(stdout, "%s: %s %s\n", channel, timestr, msg); + strftime(timestr, sizeof(timestr), "%a %R", localtime(&t)); + fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg); } static void @@ -69,15 +70,18 @@ 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]) { + 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]); @@ -92,12 +96,15 @@ parsein(char *msg) else snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]); break; + case 'm': + privmsg(&msg[3], p); + return; + case 's': + strncpy(channel, &msg[3], sizeof(channel)); + return; case 't': snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p); break; - default: - snprintf(bufout, sizeof(bufout), "%s\r\n", &msg[1]); - break; } write(srv, bufout, strlen(bufout)); } @@ -141,7 +148,7 @@ parsesrv(char *msg) /* ::= [':' ] - ::= | [ '!' ] [ '@' ] + ::= | [ '!' ] [ '@' ] ::= { } | ::= ' ' { ' ' } ::= [ ':' | ] @@ -182,7 +189,7 @@ parsesrv(char *msg) return; } 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)) snprintf(bufout, sizeof(bufout), "-!- error %s", @@ -229,42 +236,39 @@ 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[]) { int i; struct timeval tv; + struct hostent *hp; + static struct sockaddr_in addr; /* initially filled with 0's */ + char ping[256]; fd_set rd; + nick = fullname = getenv("USER"); for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { switch (argv[i][1]) { default: - fputs("usage: sic [-v]\n", stderr); + 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 = (unsigned short)atoi(argv[++i]); + break; + case 'n': + nick = argv[++i]; + break; + case 'k': + password = argv[++i]; + break; + case 'f': + fullname = argv[++i]; + break; case 'v': fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); exit(EXIT_SUCCESS); @@ -272,20 +276,37 @@ main(int argc, char *argv[]) } } - 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(;;) { FD_ZERO(&rd); FD_SET(0, &rd); @@ -300,7 +321,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)); @@ -308,7 +329,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);