iiiypuk/sic
iiiypuk/sic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merged kris' changes into mainstream sic

Browse Source
This commit is contained in:
Anselm R Garbe 2009-11-28 12:16:35 +00:00
parent 9c7027fcbf
commit 1a4256ef71
7 changed files with 168 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LICENSE
View File

@ -1,8 +1,8 @@
MIT/X Consortium License MIT/X Consortium License
© 2005-2009 Anselm R Garbe <anselm@garbe.us>
© 2005-2009 Anselm R Garbe <garbeam at gmail dot com> © 2008-2009 Jeroen Schot <schot@a-eskwadraat.nl>
© 2008-2009 Jeroen Schot <schot at a-eskwadraat dot nl> © 2007-2009 Kris Maglione <maglione.k@gmail.com>
© 2005 Nico Golde <nico at ngolde dot de> © 2005 Nico Golde <nico at ngolde dot de>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a

2
config.mk
View File

@ -1,5 +1,5 @@
# sic version # sic version
VERSION = 1.0 VERSION = 1.1
# Customize below to fit your system # Customize below to fit your system

1
kris/Makefile
View File

@ -1 +0,0 @@
../Makefile

1
kris/config.mk
View File

@ -1 +0,0 @@
../config.mk

215
kris/sic.c
View File

@ -1,215 +0,0 @@
/* ? 2005-2007 Anselm R. Garbe <garbeam at gmail dot com>
* ? 2007 Kris Maglione <fbsdaemon@gmail.com>
* ? 2005 Nico Golde <nico at ngolde dot de>
* See LICENSE file for license details.
*/
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#define nil ((void*)0)
typedef unsigned short ushort;
#define PINGTIMEOUT 300
static char* host = "irc.oftc.net";
static char* port = "ircd";
static char* password;
static char nick[32];
static char bufin[4096];
static char bufout[4096];
static char channel[256];
static time_t trespond;
static FILE *srv;
#include "util.c"
static void
pout(char *channel, char *fmt, ...) {
static char timestr[18];
time_t t;
va_buf(bufout, fmt);
t = time(nil);
strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
}
static void
sout(char *fmt, ...) {
va_buf(bufout, fmt);
fprintf(srv, "%s\r\n", bufout);
}
static void
privmsg(char *channel, char *msg) {
if(channel[0] == '\0') {
pout("", "No channel to send to");
return;
}
pout(channel, "<%s> %s", nick, msg);
sout("PRIVMSG %s :%s", channel, msg);
}
static void
parsein(char *msg) {
char *p;
char c;
if(msg[0] == '\0')
return;
msg = ctok(&msg, '\n');
if(msg[0] != ':') {
privmsg(channel, msg);
return;
}
c = *++msg;
if(!c || !isspace(msg[1]))
sout("%s", msg);
else {
if(msg[1])
msg += 2;
switch(c) {
case 'j':
sout("JOIN %s", msg);
if(channel[0] == '\0')
strlcpy(channel, msg, sizeof channel);
break;
case 'l':
p = tok(&msg);
if(!*p)
p = channel;
if(!*msg)
msg = "sic - 250 LOC are too much!";
sout("PART %s :%s", p, msg);
break;
case 'm':
p = tok(&msg);
privmsg(p, msg);
break;
case 's':
strlcpy(channel, msg, sizeof channel);
break;
default:
sout("%c %s", c, msg);
break;
}
}
}
static void
parsesrv(char *msg) {
char *cmd, *p, *usr, *txt;
usr = host;
if(!msg || !*msg)
return;
if(msg[0] == ':') {
msg++;
p = tok(&msg);
if(!*msg)
return;
usr = ctok(&p, '!');
}
txt = ctok(&msg, '\r');
msg = ctok(&txt, ':');
cmd = tok(&msg);
if(!strcmp("PONG", cmd))
return;
if(!strcmp("PRIVMSG", cmd))
pout(msg, "<%s> %s", usr, txt);
else if(!strcmp("PING", cmd))
sout("PONG %s", txt);
else {
pout(usr, ">< %s: %s", cmd, txt);
if(!strcmp("NICK", cmd) && !strcmp(usr, nick))
strlcpy(nick, txt, sizeof nick);
}
}
int
main(int argc, char *argv[]) {
int i, c;
struct timeval tv;
fd_set rd;
strlcpy(nick, getenv("USER"), sizeof nick);
for(i = 1; i < argc; i++) {
c = argv[i][1];
if(argv[i][0] != '-' || argv[i][2])
c = -1;
switch(c) {
case 'h':
if(++i < argc) host = argv[i];
break;
case 'p':
if(++i < argc) port = argv[i];
break;
case 'n':
if(++i < argc) strlcpy(nick, argv[i], sizeof nick);
break;
case 'k':
if(++i < argc) password = argv[i];
break;
case 'v':
eprint("sic-"VERSION", ©2005-2009 Kris Maglione, Anselm R. Garbe, Nico Golde\n");
default:
eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
}
}
/* init */
i = dial(host, port);
srv = fdopen(i, "r+");
/* login */
if(password)
sout("PASS %s", password);
sout("NICK %s", nick);
sout("USER %s localhost %s :%s", nick, host, nick);
fflush(srv);
setbuf(stdout, nil);
setbuf(srv, nil);
for(;;) { /* main loop */
FD_ZERO(&rd);
FD_SET(0, &rd);
FD_SET(fileno(srv), &rd);
tv.tv_sec = 120;
tv.tv_usec = 0;
i = select(fileno(srv) + 1, &rd, 0, 0, &tv);
if(i < 0) {
if(errno == EINTR)
continue;
eprint("sic: error on select():");
}
else if(i == 0) {
if(time(nil) - trespond >= PINGTIMEOUT)
eprint("sic shutting down: parse timeout\n");
sout("PING %s", host);
continue;
}
if(FD_ISSET(fileno(srv), &rd)) {
if(fgets(bufin, sizeof bufin, srv) == nil)
eprint("sic: remote host closed connection\n");
parsesrv(bufin);
trespond = time(nil);
}
if(FD_ISSET(0, &rd)) {
if(fgets(bufin, sizeof bufin, stdin) == nil)
eprint("sic: broken pipe\n");
parsein(bufin);
}
}
return 0;
}

344
sic.c
View File

@ -1,246 +1,204 @@
/* See LICENSE file for license details. */ /* See LICENSE file for license details. */
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <sys/time.h>
#define PINGTIMEOUT 300 static char *host = "irc.oftc.net";
#define MAXMSG 4096 static char *port = "ircd";
#ifndef VERSION static char *password;
#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 nick[32];
static char bufin[4096];
static char bufin[MAXMSG], bufout[MAXMSG]; static char bufout[4096];
static char channel[256]; static char channel[256];
static int srv;
static time_t trespond; static time_t trespond;
static FILE *srv;
void #include "util.c"
die(const char *errstr, ...) {
va_list ap;
va_start(ap, errstr);
vfprintf(stderr, errstr, ap);
va_end(ap);
exit(EXIT_FAILURE);
}
void static void
printl(char *channel, char *msg) { pout(char *channel, char *fmt, ...) {
static char timestr[18]; static char timestr[18];
time_t t = time(0); time_t t;
va_list ap;
va_start(ap, fmt);
vsnprintf(bufout, sizeof bufout, fmt, ap);
va_end(ap);
t = time(NULL);
strftime(timestr, sizeof timestr, "%D %R", localtime(&t)); strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
fprintf(stdout, "%-12.12s: %s %s\n", channel, timestr, msg); fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
} }
void static void
sout(char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
vsnprintf(bufout, sizeof bufout, fmt, ap);
va_end(ap);
fprintf(srv, "%s\r\n", bufout);
fprintf(stderr, "debug: %s\n", bufout);
}
static void
privmsg(char *channel, char *msg) { privmsg(char *channel, char *msg) {
if(channel[0] == '\0') if(channel[0] == '\0') {
pout("", "No channel to send to");
return; return;
snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg); }
printl(channel, bufout); pout(channel, "<%s> %s", nick, msg);
snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg); sout("PRIVMSG %s :%s", channel, msg);
write(srv, bufout, strlen(bufout));
} }
void static void
parsein(char *msg) { parsein(char *msg) {
char *p = NULL; char *p;
char c;
if(msg[0] == '\0') if(msg[0] == '\0')
return; return;
msg = ctok(&msg, '\n');
if(msg[0] != ':') { if(msg[0] != ':') {
privmsg(channel, msg); privmsg(channel, msg);
return; return;
} }
if(strncmp(msg + 1, "j ", 2) == 0 && (msg[3] == '#')) c = *++msg;
snprintf(bufout, sizeof bufout, "JOIN %s\r\n", msg + 3); if(!c || !isspace(msg[1]))
else if(strncmp(msg + 1, "l ", 2) == 0) sout("%s", msg);
snprintf(bufout, sizeof bufout, "PART %s :sic - 250 LOC are too much!\r\n", msg + 3);
else if(strncmp(msg + 1, "m ", 2) == 0 && (p = strchr(msg + 3, ' '))) {
*(p++) = '\0';
privmsg(msg + 3, p);
return;
}
else if(strncmp(msg + 1, "s ", 2) == 0) {
strncpy(channel, msg + 3, sizeof channel - 1);
return;
}
else
snprintf(bufout, sizeof bufout, "%s\r\n", msg + 1);
write(srv, bufout, strlen(bufout));
}
void
parsesrv(char *msg) {
char *chan, *cmd, *p, *txt, *usr;
txt = NULL;
usr = host;
if(msg == NULL || *msg == '\0' )
return;
if(msg[0] != ':')
cmd = msg;
else { else {
if(!(p = strchr(msg, ' '))) if(msg[1])
return; msg += 2;
*p = '\0'; switch(c) {
usr = msg + 1; case 'j':
cmd = ++p; sout("JOIN %s", msg);
if((p = strchr(usr, '!'))) if(channel[0] == '\0')
*p = '\0'; strlcpy(channel, msg, sizeof channel);
} break;
for(p = cmd; *p != '\0'; p++) /* remove CRLFs */ case 'l':
if(*p == '\r' || *p == '\n') p = tok(&msg);
*p = '\0'; if(!*p)
if((p = strchr(cmd, ':'))) { p = channel;
*p = '\0'; if(!*msg)
txt = ++p; msg = "sic - 250 LOC are too much!";
} sout("PART %s :%s", p, msg);
if(strncmp("PONG", cmd, 4) == 0) break;
return; case 'm':
if(strncmp("PRIVMSG", cmd, 7) == 0 && txt != NULL) { p = tok(&msg);
if(!(p = strchr(cmd, ' '))) privmsg(p, msg);
return; break;
*p = '\0'; case 's':
chan = ++p; strlcpy(channel, msg, sizeof channel);
for(; *p != '\0' && *p != ' '; p++); break;
*p = '\0'; default:
snprintf(bufout, sizeof bufout, "<%s> %s", usr, txt); sout("%c %s", c, msg);
printl(chan, bufout);
}
else if(strncmp("PING", cmd, 4) == 0 && txt != NULL) {
snprintf(bufout, sizeof bufout, "PONG %s\r\n", txt);
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)
strncpy(nick, txt, sizeof nick - 1);
}
}
int
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;
static struct addrinfo hints, *res, *r;
char ping[256];
fd_set rd;
char *password = NULL;
strncpy(nick, getenv("USER"), sizeof nick - 1);
for(i = 1; i < argc; i++)
if(strcmp(argv[i], "-h") == 0) {
if(++i < argc) host = argv[i];
}
else if(strcmp(argv[i], "-p") == 0) {
if(++i < argc) port = argv[i];
}
else if(strcmp(argv[i], "-n") == 0) {
if(++i < argc) strncpy(nick, argv[i], sizeof nick - 1);
}
else if(strcmp(argv[i], "-k") == 0) {
if(++i < argc) password = argv[i];
}
else if(strcmp(argv[i], "-v") == 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 */
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; break;
close(srv);
} }
freeaddrinfo(res); }
if(!r) }
die("error: cannot connect to host '%s'\n", host);
static void
parsesrv(char *msg) {
char *cmd, *p, *usr, *txt;
usr = host;
if(!msg || !*msg)
return;
if(msg[0] == ':') {
msg++;
p = tok(&msg);
if(!*msg)
return;
usr = ctok(&p, '!');
}
txt = ctok(&msg, '\r');
msg = ctok(&txt, ':');
cmd = tok(&msg);
if(!strcmp("PONG", cmd))
return;
if(!strcmp("PRIVMSG", cmd))
pout(msg, "<%s> %s", usr, txt);
else if(!strcmp("PING", cmd))
sout("PONG %s", txt);
else {
pout(usr, ">< %s: %s", cmd, txt);
if(!strcmp("NICK", cmd) && !strcmp(usr, nick))
strlcpy(nick, txt, sizeof nick);
}
}
int
main(int argc, char *argv[]) {
int i, c;
struct timeval tv;
fd_set rd;
strlcpy(nick, getenv("USER"), sizeof nick);
for(i = 1; i < argc; i++) {
c = argv[i][1];
if(argv[i][0] != '-' || argv[i][2])
c = -1;
switch(c) {
case 'h':
if(++i < argc) host = argv[i];
break;
case 'p':
if(++i < argc) port = argv[i];
break;
case 'n':
if(++i < argc) strlcpy(nick, argv[i], sizeof nick);
break;
case 'k':
if(++i < argc) password = argv[i];
break;
case 'v':
eprint("sic-"VERSION", © 2005-2009 Kris Maglione, Anselm R. Garbe, Nico Golde\n");
default:
eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
}
}
/* init */
i = dial(host, port);
srv = fdopen(i, "r+");
/* login */ /* login */
if(password) if(password)
snprintf(bufout, sizeof bufout, sout("PASS %s", password);
"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n", sout("NICK %s", nick);
password, nick, nick, host, nick); sout("USER %s localhost %s :%s", nick, host, nick);
else fflush(srv);
snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n", setbuf(stdout, NULL);
nick, nick, host, nick); setbuf(srv, NULL);
write(srv, bufout, strlen(bufout));
snprintf(ping, sizeof ping, "PING %s\r\n", host);
channel[0] = '\0';
setbuf(stdout, NULL); /* unbuffered stdout */
for(;;) { /* main loop */ for(;;) { /* main loop */
FD_ZERO(&rd); FD_ZERO(&rd);
FD_SET(0, &rd); FD_SET(0, &rd);
FD_SET(srv, &rd); FD_SET(fileno(srv), &rd);
tv.tv_sec = 120; tv.tv_sec = 120;
tv.tv_usec = 0; tv.tv_usec = 0;
i = select(srv + 1, &rd, 0, 0, &tv); i = select(fileno(srv) + 1, &rd, 0, 0, &tv);
if(i < 0) { if(i < 0) {
if(errno == EINTR) if(errno == EINTR)
continue; continue;
die("error: error on select()\n"); eprint("sic: error on select():");
} }
else if(i == 0) { else if(i == 0) {
if(time(NULL) - trespond >= PINGTIMEOUT) if(time(NULL) - trespond >= 300)
die("error: sic shutting down: parse timeout\n"); eprint("sic shutting down: parse timeout\n");
write(srv, ping, strlen(ping)); sout("PING %s", host);
continue; continue;
} }
if(FD_ISSET(srv, &rd) != 0) { if(FD_ISSET(fileno(srv), &rd)) {
if(readl(srv, sizeof bufin, bufin) == -1) if(fgets(bufin, sizeof bufin, srv) == NULL)
die("error: remote host closed connection\n"); eprint("sic: remote host closed connection\n");
parsesrv(bufin); parsesrv(bufin);
trespond = time(NULL); trespond = time(NULL);
} }
if(FD_ISSET(0, &rd) != 0) { if(FD_ISSET(0, &rd)) {
if(readl(0, sizeof bufin, bufin) == -1) if(fgets(bufin, sizeof bufin, stdin) == NULL)
die("error: broken pipe\n"); eprint("sic: broken pipe\n");
parsein(bufin); parsein(bufin);
} }
} }

21
kris/util.c → util.c
View File

@ -1,20 +1,16 @@
/* See LICENSE file for license details. */
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#define va_buf(buf, fmt) {\
va_list ap; \
va_start(ap, fmt); \
vsnprintf(buf, sizeof buf, fmt, ap); \
va_end(ap); \
}
static void static void
eprint(const char *fmt, ...) { eprint(const char *fmt, ...) {
va_list ap;
va_buf(bufout, fmt); va_start(ap, fmt);
vsnprintf(bufout, sizeof bufout, fmt, ap);
va_end(ap);
fprintf(stderr, "%s", bufout); fprintf(stderr, "%s", bufout);
if(fmt[0] && fmt[strlen(fmt) - 1] == ':') if(fmt[0] && fmt[strlen(fmt) - 1] == ':')
fprintf(stderr, " %s\n", strerror(errno)); fprintf(stderr, " %s\n", strerror(errno));
exit(1); exit(1);
@ -23,8 +19,8 @@ eprint(const char *fmt, ...) {
static int static int
dial(char *host, char *port) { dial(char *host, char *port) {
static struct addrinfo hints; static struct addrinfo hints;
struct addrinfo *res, *r;
int srv; int srv;
struct addrinfo *res, *r;
memset(&hints, 0, sizeof hints); memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
@ -67,7 +63,8 @@ tok(char **s) {
eat(s, isspace, 1); eat(s, isspace, 1);
p = *s; p = *s;
eat(s, isspace, 0); eat(s, isspace, 0);
if(**s) *(*s)++ = '\0'; if(**s)
*(*s)++ = '\0';
return p; return p;
} }
@ -82,5 +79,3 @@ ctok(char **s, int c) {
*s = p; *s = p;
return q; return q;
} }