mirror of https://github.com/tiyn/ii
parent
28ba39e9ea
commit
70b9ca1613
@ -1,73 +0,0 @@
|
|||||||
1.8 (2018-02-04):
|
|
||||||
- prevent nick collisions by only setting the nick after the server
|
|
||||||
accepted it and print a message about change to server log.
|
|
||||||
- remove query.sh.
|
|
||||||
- add OpenBSD pledge(2) support.
|
|
||||||
- fix QUIT message string.
|
|
||||||
- raw IRC output to stdout.
|
|
||||||
- add quit command (/q [string]).
|
|
||||||
- write timestamp in outfile as UNIX timestamp (UTC+0).
|
|
||||||
- server host (-s) doesn't default to irc.freenode and is now required.
|
|
||||||
- add option (-u) to connect directly to a UNIX domain socket, this
|
|
||||||
is useful for tunneling connections.
|
|
||||||
- remove "in" file when leaving a channel (enabled commented code).
|
|
||||||
- remove "in" files on exit.
|
|
||||||
- use IRC_MAX (512), instead of PIPE_BUF (4096) on most systems.
|
|
||||||
PIPE_BUF is guaranteed to be atleast 512 bytes for atomic operations.
|
|
||||||
- Makefile: always be verbose.
|
|
||||||
- use C99 and -D_DEFAULT_SOURCE
|
|
||||||
- remove obsolete gethostbyname, use getaddrinfo.
|
|
||||||
- IPV6 support.
|
|
||||||
- timeout now uses separate exit statuscode 2.
|
|
||||||
- cleanup:
|
|
||||||
- use arg.h for command-line option parsing.
|
|
||||||
- use sbase util functions (estrtol, eprintf).
|
|
||||||
- use and import OpenBSD strlcpy().
|
|
||||||
- man page typos.
|
|
||||||
- style:
|
|
||||||
- linewrap to 79 characters.
|
|
||||||
- coding style fixes.
|
|
||||||
- non-roman numerals for LICENSE period.
|
|
||||||
|
|
||||||
1.7 (2013-01-05)
|
|
||||||
- -k now specifies an environment variable that contains the
|
|
||||||
server key. This behaviour has been changed in order to not
|
|
||||||
expose the password in the process list.
|
|
||||||
- Fix parsing of JOIN messages for certain servers.
|
|
||||||
Thanks Ivan Kanakarakis!
|
|
||||||
- Use , rather than _ for slash characters in channel names.
|
|
||||||
As per RFC , is not allowed in a channel name, while _ is.
|
|
||||||
Thanks plomplomplom and Nils Dagsson Moskopp!
|
|
||||||
|
|
||||||
1.6 (2011-01-31):
|
|
||||||
- fix regression introduced for handling unknown commands
|
|
||||||
|
|
||||||
1.5 (2011-01-24):
|
|
||||||
- fix channel name comparison in add_channel(), compare lowercase
|
|
||||||
to prevent leaking file descriptors in the long run => Thanks samurai!
|
|
||||||
- only handle commands ii explicitely understands and treat the rest
|
|
||||||
as raw irc (only worked for raw commands in capital lettersin the past) => Thanks samurai!
|
|
||||||
- create in FIFO on receiving a privmsg directly instead of requiring a new
|
|
||||||
/j command first => Thanks Evan Gates
|
|
||||||
this also implies that in FIFOs aren't deleted on channel leaves any longer because
|
|
||||||
this itself creates a channel event again which in turn would recreate the file
|
|
||||||
- minor changes
|
|
||||||
|
|
||||||
1.4 (2008-08-09):
|
|
||||||
- fix directory traversal on servers that support SAJOIN
|
|
||||||
NOTE: not marking as security relevant as it is only possible to
|
|
||||||
create directories outside (which is of course annoying) of the irc
|
|
||||||
hierarchy but not overwriting arbitrary files with the channel name.
|
|
||||||
- documentation fixes
|
|
||||||
- general cleanup
|
|
||||||
|
|
||||||
1.3 (2007-07-14):
|
|
||||||
- server messages about users (QUIT,JOIN) will no longer
|
|
||||||
go to the user directories but to the server out file to
|
|
||||||
give an easy method to monitor it and to prevent spamming
|
|
||||||
the irc directory.
|
|
||||||
|
|
||||||
1.2 (2007-06-23):
|
|
||||||
- Exit on channel creation failure, thanks Michael Prokop
|
|
||||||
- Implemented joining of password protected channels
|
|
||||||
- Removed -v option from the manpage since it's not implemented
|
|
||||||
@ -1,55 +1,60 @@
|
|||||||
# ii - irc it - simple but flexible IRC client
|
.POSIX:
|
||||||
# (C)opyright MMV-MMVI Anselm R. Garbe
|
|
||||||
# (C)opyright MMV-MMVII Anselm R. Garbe, Nico Golde
|
|
||||||
|
|
||||||
include config.mk
|
VERSION = 2.0
|
||||||
|
|
||||||
SRC = ii.c
|
# paths
|
||||||
OBJ = ${SRC:.c=.o}
|
PREFIX = /usr/local
|
||||||
|
MANPREFIX = $(PREFIX)/share/man
|
||||||
|
DOCPREFIX = $(PREFIX)/share/doc
|
||||||
|
|
||||||
all: options ii
|
SRC = ii.c
|
||||||
@echo built ii
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
|
# use system flags.
|
||||||
|
II_CFLAGS = $(CFLAGS)
|
||||||
|
II_LDFLAGS = $(LDFLAGS)
|
||||||
|
|
||||||
|
# on systems which provide strlcpy(3),
|
||||||
|
# remove NEED_STRLCPY from CPPFLAGS and
|
||||||
|
# remove strlcpy.o from LIBS
|
||||||
|
II_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -DNEED_STRLCPY
|
||||||
|
LIBS = strlcpy.o
|
||||||
|
|
||||||
|
all: ii
|
||||||
|
|
||||||
options:
|
options:
|
||||||
@echo ii build options:
|
@echo ii build options:
|
||||||
@echo "LIBS = ${LIBS}"
|
@echo "CFLAGS = $(CFLAGS)"
|
||||||
@echo "INCLUDES = ${INCLUDES}"
|
@echo "LDFLAGS = $(LDFLAGS)"
|
||||||
@echo "CFLAGS = ${CFLAGS}"
|
@echo "CC = $(CC)"
|
||||||
@echo "LDFLAGS = ${LDFLAGS}"
|
|
||||||
@echo "CC = ${CC}"
|
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
@echo CC $<
|
$(CC) -c $< $(II_CFLAGS) $(II_CPPFLAGS)
|
||||||
@${CC} -c ${CFLAGS} $<
|
|
||||||
|
|
||||||
dist: clean
|
ii: $(OBJ) $(LIBS)
|
||||||
@mkdir -p ii-${VERSION}
|
$(CC) -o $@ $(OBJ) $(LIBS) $(II_LDFLAGS)
|
||||||
@cp -R query.sh Makefile CHANGES README FAQ LICENSE config.mk ii.c ii.1 ii-${VERSION}
|
|
||||||
@tar -cf ii-${VERSION}.tar ii-${VERSION}
|
|
||||||
@gzip ii-${VERSION}.tar
|
|
||||||
@rm -rf ii-${VERSION}
|
|
||||||
@echo created distribution ii-${VERSION}.tar.gz
|
|
||||||
|
|
||||||
ii: ${OBJ}
|
$(OBJ): arg.h
|
||||||
@echo LD $@
|
|
||||||
@${CC} -o $@ ${OBJ} ${LDFLAGS}
|
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
@mkdir -p ${DESTDIR}${DOCDIR}
|
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||||
@mkdir -p ${DESTDIR}${BINDIR}
|
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
||||||
@mkdir -p ${DESTDIR}${MAN1DIR}
|
mkdir -p $(DESTDIR)$(DOCPREFIX)/ii
|
||||||
|
install -m 644 README FAQ LICENSE $(DESTDIR)$(DOCPREFIX)/ii
|
||||||
@install -d ${DESTDIR}${BINDIR} ${DESTDIR}${MAN1DIR}
|
install -m 775 ii $(DESTDIR)$(PREFIX)/bin
|
||||||
@install -m 644 CHANGES README query.sh FAQ LICENSE ${DESTDIR}${DOCDIR}
|
sed "s/VERSION/$(VERSION)/g" < ii.1 > $(DESTDIR)$(MANPREFIX)/man1/ii.1
|
||||||
@install -m 775 ii ${DESTDIR}${BINDIR}
|
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/ii.1
|
||||||
@install -m 444 ii.1 ${DESTDIR}${MAN1DIR}
|
|
||||||
@echo "installed ii"
|
|
||||||
|
|
||||||
uninstall: all
|
uninstall: all
|
||||||
@rm -f ${DESTDIR}${MAN1DIR}/ii.1
|
rm -f $(DESTDIR)$(MANPREFIX)/man1/ii.1 $(DESTDIR)$(PREFIX)/bin/ii
|
||||||
@rm -rf ${DESTDIR}${DOCDIR}
|
rm -rf $(DESTDIR)$(DOCPREFIX)/ii
|
||||||
@rm -f ${DESTDIR}${BINDIR}/ii
|
|
||||||
@echo "uninstalled ii"
|
dist: clean
|
||||||
|
mkdir -p ii-$(VERSION)
|
||||||
|
cp -R Makefile README FAQ LICENSE strlcpy.c arg.h \
|
||||||
|
ii.c ii.1 ii-$(VERSION)
|
||||||
|
tar -cf - ii-$(VERSION) | gzip -c > ii-$(VERSION).tar.gz
|
||||||
|
rm -rf ii-$(VERSION)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f ii *~ *.o *core *.tar.gz
|
rm -f ii *.o
|
||||||
|
|||||||
@ -1,92 +0,0 @@
|
|||||||
Abstract
|
|
||||||
--------
|
|
||||||
ii is a minimalistic FIFO and filesystem based IRC client. It creates an irc
|
|
||||||
directory tree with server, channel and nick name directories. In every
|
|
||||||
directory a FIFO file (in) and normal file (out) is placed.
|
|
||||||
|
|
||||||
The in file is used to communicate with the servers and the out files include
|
|
||||||
the server messages. For every channel and every nick name there will be new in
|
|
||||||
and out files.
|
|
||||||
|
|
||||||
The basic idea of this is to be able to communicate with an IRC server with
|
|
||||||
standard command line tools. For example if you want to join a channel just do
|
|
||||||
echo "/j #channel" > in and ii creates a new channel directory with in and out
|
|
||||||
file.
|
|
||||||
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
Edit config.mk to match your local setup. ii is installed into
|
|
||||||
/usr/local by default.
|
|
||||||
|
|
||||||
Afterwards enter the following command to build and install ii (if
|
|
||||||
necessary as root):
|
|
||||||
|
|
||||||
$ make clean install
|
|
||||||
|
|
||||||
|
|
||||||
Running ii
|
|
||||||
------------
|
|
||||||
Simply invoke the 'ii' command with required arguments
|
|
||||||
|
|
||||||
To make ii a bit more comfortable use it in combination with the multitail
|
|
||||||
program and for example with vim. Run vim in the server directory and use
|
|
||||||
key mapping like:
|
|
||||||
map w1 :.w >> \#ii/in<cr>
|
|
||||||
map w2 :.w >> \#wmii/in<cr>
|
|
||||||
to post to channels.
|
|
||||||
|
|
||||||
If you use the next editor line for a new posting you can use ctrl-p for nick
|
|
||||||
completion if you wrote the nick in the past.
|
|
||||||
Thanks to Matthias Kopfermann for this hint.
|
|
||||||
|
|
||||||
You can find an example of how this nested environment could look like on:
|
|
||||||
http://nion.modprobe.de/blog/archives/440-Using-the-ii-irc-client.html
|
|
||||||
|
|
||||||
|
|
||||||
SSL/TLS support
|
|
||||||
---------------
|
|
||||||
|
|
||||||
Below is an example using OpenBSD relayd which sets up a TCP TLS relay
|
|
||||||
connection on localhost. A similar setup can be accomplished using
|
|
||||||
stunnel or netcat with TLS support. This also works for other programs
|
|
||||||
that don't support TLS natively.
|
|
||||||
|
|
||||||
/etc/relayd.conf:
|
|
||||||
|
|
||||||
table <freenode> { irc.freenode.net }
|
|
||||||
table <oftc> { irc.oftc.net }
|
|
||||||
|
|
||||||
protocol "irctls" {
|
|
||||||
tcp { nodelay, sack }
|
|
||||||
}
|
|
||||||
|
|
||||||
relay "freenode" {
|
|
||||||
listen on 127.0.0.1 port 6668
|
|
||||||
protocol "irctls"
|
|
||||||
forward with tls to <freenode> port 6697
|
|
||||||
}
|
|
||||||
|
|
||||||
relay "oftc" {
|
|
||||||
listen on 127.0.0.1 port 6669
|
|
||||||
protocol "irctls"
|
|
||||||
forward with tls to <oftc> port 6697
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Then connect:
|
|
||||||
|
|
||||||
./irc -n nick -u name -s 127.0.0.1 -p 6668
|
|
||||||
./irc -n nick -u name -s 127.0.0.1 -p 6669
|
|
||||||
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
No configuration is needed.
|
|
||||||
|
|
||||||
|
|
||||||
Changelog
|
|
||||||
---------
|
|
||||||
Since I missed the chance to add a proper changelog right from the beginning,
|
|
||||||
please have a look at the commit messages on http://git.suckless.org/ii/
|
|
||||||
they are fairly descriptive on releases prior to 1.2.
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
# ii
|
|
||||||
This is my patched version of ii, a commandline irc client.
|
|
||||||
The base version is directly from suckless.org.
|
|
||||||
Due to problems with newer version it uses the version 1.7.
|
|
||||||
|
|
||||||
## Patches
|
|
||||||
The list below shows the currently applied patches to this build.
|
|
||||||
- ii-1.7-ssl.diff
|
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copy me if you can.
|
||||||
|
* by 20h
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ARG_H__
|
||||||
|
#define ARG_H__
|
||||||
|
|
||||||
|
extern char *argv0;
|
||||||
|
|
||||||
|
/* use main(int argc, char *argv[]) */
|
||||||
|
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
||||||
|
argv[0] && argv[0][0] == '-'\
|
||||||
|
&& argv[0][1];\
|
||||||
|
argc--, argv++) {\
|
||||||
|
char argc_;\
|
||||||
|
char **argv_;\
|
||||||
|
int brk_;\
|
||||||
|
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
||||||
|
argv++;\
|
||||||
|
argc--;\
|
||||||
|
break;\
|
||||||
|
}\
|
||||||
|
int i_;\
|
||||||
|
for (i_ = 1, brk_ = 0, argv_ = argv;\
|
||||||
|
argv[0][i_] && !brk_;\
|
||||||
|
i_++) {\
|
||||||
|
if (argv_ != argv)\
|
||||||
|
break;\
|
||||||
|
argc_ = argv[0][i_];\
|
||||||
|
switch (argc_)
|
||||||
|
|
||||||
|
#define ARGEND }\
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ARGC() argc_
|
||||||
|
|
||||||
|
#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
||||||
|
((x), abort(), (char *)0) :\
|
||||||
|
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
||||||
|
(&argv[0][i_+1]) :\
|
||||||
|
(argc--, argv++, argv[0])))
|
||||||
|
|
||||||
|
#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
||||||
|
(char *)0 :\
|
||||||
|
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
||||||
|
(&argv[0][i_+1]) :\
|
||||||
|
(argc--, argv++, argv[0])))
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -1,27 +0,0 @@
|
|||||||
# Customize to fit your system
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
BINDIR = ${PREFIX}/bin
|
|
||||||
MANDIR = ${PREFIX}/share/man
|
|
||||||
MAN1DIR = ${MANDIR}/man1
|
|
||||||
DOCDIR = ${PREFIX}/share/doc/ii
|
|
||||||
|
|
||||||
# Set the following to install to a different root
|
|
||||||
DESTDIR =
|
|
||||||
|
|
||||||
INCDIR = ${PREFIX}/include
|
|
||||||
LIBDIR = ${PREFIX}/lib
|
|
||||||
VERSION = 1.7
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCLUDES = -I. -I${INCDIR} -I/usr/include
|
|
||||||
LIBS = -L${LIBDIR} -L/usr/lib -lc -lssl -lcrypto
|
|
||||||
# uncomment and comment other variables for compiling on Solaris
|
|
||||||
#LIBS = -L${LIBDIR} -L/usr/lib -lc -lsocket -lnsl
|
|
||||||
#CFLAGS = -g ${INCLUDES} -DVERSION=\"${VERSION}\"
|
|
||||||
|
|
||||||
# compiler
|
|
||||||
CC = cc
|
|
||||||
CFLAGS = -g -O0 -W -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
|
|
||||||
LDFLAGS = ${LIBS}
|
|
||||||
@ -1,225 +0,0 @@
|
|||||||
diff -up a/config.mk b/config.mk
|
|
||||||
--- a/config.mk 2013-01-05 08:26:47.000000000 -0500
|
|
||||||
+++ b/config.mk 2013-02-15 15:27:10.183075163 -0500
|
|
||||||
@@ -16,7 +16,7 @@ VERSION = 1.7
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCLUDES = -I. -I${INCDIR} -I/usr/include
|
|
||||||
-LIBS = -L${LIBDIR} -L/usr/lib -lc
|
|
||||||
+LIBS = -L${LIBDIR} -L/usr/lib -lc -lssl -lcrypto
|
|
||||||
# uncomment and comment other variables for compiling on Solaris
|
|
||||||
#LIBS = -L${LIBDIR} -L/usr/lib -lc -lsocket -lnsl
|
|
||||||
#CFLAGS = -g ${INCLUDES} -DVERSION=\"${VERSION}\"
|
|
||||||
diff -up a/ii.1 b/ii.1
|
|
||||||
--- a/ii.1 2013-01-05 08:26:47.000000000 -0500
|
|
||||||
+++ b/ii.1 2013-02-15 15:28:42.739074771 -0500
|
|
||||||
@@ -25,6 +25,8 @@ and ii creates a new channel directory w
|
|
||||||
.IR servername ]
|
|
||||||
.RB [ \-p
|
|
||||||
.IR port ]
|
|
||||||
+.RB [ \-e
|
|
||||||
+.IR ssl ]
|
|
||||||
.RB [ \-k
|
|
||||||
.IR environment variable ]
|
|
||||||
.RB [ \-i
|
|
||||||
@@ -42,6 +44,9 @@ lets you override the default servername
|
|
||||||
.BI \-p " port"
|
|
||||||
lets you override the default port (6667)
|
|
||||||
.TP
|
|
||||||
+.BI \-e " ssl"
|
|
||||||
+lets you connect using ssl encryption. The default ssl port is 6697.
|
|
||||||
+.TP
|
|
||||||
.BI \-k " environment variable"
|
|
||||||
lets you specify an environment variable that contains your IRC password, e.g. IIPASS="foobar" ii -k IIPASS.
|
|
||||||
This is done in order to prevent other users from eavesdropping the server password via the process list.
|
|
||||||
diff -up a/ii.c b/ii.c
|
|
||||||
--- a/ii.c 2013-01-05 08:26:47.000000000 -0500
|
|
||||||
+++ b/ii.c 2013-02-15 15:33:39.603075095 -0500
|
|
||||||
@@ -18,12 +18,23 @@
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <openssl/rand.h>
|
|
||||||
+#include <openssl/ssl.h>
|
|
||||||
+#include <openssl/err.h>
|
|
||||||
|
|
||||||
#ifndef PIPE_BUF /* FreeBSD don't know PIPE_BUF */
|
|
||||||
#define PIPE_BUF 4096
|
|
||||||
#endif
|
|
||||||
#define PING_TIMEOUT 300
|
|
||||||
#define SERVER_PORT 6667
|
|
||||||
+#define SSL_SERVER_PORT 6697
|
|
||||||
+#define WRITE(con, mes, len) (use_ssl ? SSL_write(irc->sslHandle, mes, len) : write(con->irc, mes, len))
|
|
||||||
+#define READ(fd, buf, size) (from_server && use_ssl ? SSL_read(irc->sslHandle, buf, size) : read(fd, buf, size))
|
|
||||||
+typedef struct {
|
|
||||||
+ int irc;
|
|
||||||
+ SSL *sslHandle;
|
|
||||||
+ SSL_CTX *sslContext;
|
|
||||||
+} conn;
|
|
||||||
enum { TOK_NICKSRV = 0, TOK_USER, TOK_CMD, TOK_CHAN, TOK_ARG, TOK_TEXT, TOK_LAST };
|
|
||||||
|
|
||||||
typedef struct Channel Channel;
|
|
||||||
@@ -33,7 +44,8 @@ struct Channel {
|
|
||||||
Channel *next;
|
|
||||||
};
|
|
||||||
|
|
||||||
-static int irc;
|
|
||||||
+conn *irc;
|
|
||||||
+static int use_ssl;
|
|
||||||
static time_t last_response;
|
|
||||||
static Channel *channels = NULL;
|
|
||||||
static char *host = "irc.freenode.net";
|
|
||||||
@@ -45,7 +57,7 @@ static void usage() {
|
|
||||||
fputs("ii - irc it - " VERSION "\n"
|
|
||||||
"(C)opyright MMV-MMVI Anselm R. Garbe\n"
|
|
||||||
"(C)opyright MMV-MMXI Nico Golde\n"
|
|
||||||
- "usage: ii [-i <irc dir>] [-s <host>] [-p <port>]\n"
|
|
||||||
+ "usage: ii [-i <irc dir>] [-s <host>] [-p <port>] [-e ssl]\n"
|
|
||||||
" [-n <nick>] [-k <password>] [-f <fullname>]\n", stderr);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
@@ -148,11 +160,12 @@ static void login(char *key, char *fulln
|
|
||||||
nick, nick, host, fullname ? fullname : nick);
|
|
||||||
else snprintf(message, PIPE_BUF, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
|
|
||||||
nick, nick, host, fullname ? fullname : nick);
|
|
||||||
- write(irc, message, strlen(message)); /* login */
|
|
||||||
+ WRITE(irc, message, strlen(message)); /* login */
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int tcpopen(unsigned short port) {
|
|
||||||
+conn *tcpopen(unsigned short port) {
|
|
||||||
int fd;
|
|
||||||
+ conn *c;
|
|
||||||
struct sockaddr_in sin;
|
|
||||||
struct hostent *hp = gethostbyname(host);
|
|
||||||
|
|
||||||
@@ -172,7 +185,22 @@ static int tcpopen(unsigned short port)
|
|
||||||
perror("ii: cannot connect to host");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
- return fd;
|
|
||||||
+ c = malloc(sizeof(conn));
|
|
||||||
+ c->irc = fd;
|
|
||||||
+ if(use_ssl) {
|
|
||||||
+ c->sslHandle = NULL;
|
|
||||||
+ c->sslContext = NULL;
|
|
||||||
+ SSL_load_error_strings();
|
|
||||||
+ SSL_library_init();
|
|
||||||
+ c->sslContext = SSL_CTX_new(SSLv23_client_method());
|
|
||||||
+ if(c->sslContext == NULL)
|
|
||||||
+ ERR_print_errors_fp(stderr);
|
|
||||||
+ c->sslHandle = SSL_new(c->sslContext);
|
|
||||||
+ if(!SSL_set_fd(c->sslHandle, c->irc)
|
|
||||||
+ || (SSL_connect(c->sslHandle) != 1))
|
|
||||||
+ ERR_print_errors_fp(stderr);
|
|
||||||
+ }
|
|
||||||
+ return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t tokenize(char **result, size_t reslen, char *str, char delim) {
|
|
||||||
@@ -219,7 +247,7 @@ static void proc_channels_privmsg(char *
|
|
||||||
snprintf(message, PIPE_BUF, "<%s> %s", nick, buf);
|
|
||||||
print_out(channel, message);
|
|
||||||
snprintf(message, PIPE_BUF, "PRIVMSG %s :%s\r\n", channel, buf);
|
|
||||||
- write(irc, message, strlen(message));
|
|
||||||
+ WRITE(irc, message, strlen(message));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void proc_channels_input(Channel *c, char *buf) {
|
|
||||||
@@ -273,7 +301,7 @@ static void proc_channels_input(Channel
|
|
||||||
else
|
|
||||||
snprintf(message, PIPE_BUF,
|
|
||||||
"PART %s :ii - 500 SLOC are too much\r\n", c->name);
|
|
||||||
- write(irc, message, strlen(message));
|
|
||||||
+ WRITE(irc, message, strlen(message));
|
|
||||||
close(c->fd);
|
|
||||||
/*create_filepath(infile, sizeof(infile), c->name, "in");
|
|
||||||
unlink(infile); */
|
|
||||||
@@ -288,7 +316,7 @@ static void proc_channels_input(Channel
|
|
||||||
snprintf(message, PIPE_BUF, "%s\r\n", &buf[1]);
|
|
||||||
|
|
||||||
if (message[0] != '\0')
|
|
||||||
- write(irc, message, strlen(message));
|
|
||||||
+ WRITE(irc, message, strlen(message));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void proc_server_cmd(char *buf) {
|
|
||||||
@@ -339,7 +367,7 @@ static void proc_server_cmd(char *buf) {
|
|
||||||
return;
|
|
||||||
} else if(!strncmp("PING", argv[TOK_CMD], 5)) {
|
|
||||||
snprintf(message, PIPE_BUF, "PONG %s\r\n", argv[TOK_TEXT]);
|
|
||||||
- write(irc, message, strlen(message));
|
|
||||||
+ WRITE(irc, message, strlen(message));
|
|
||||||
return;
|
|
||||||
} else if(!argv[TOK_NICKSRV] || !argv[TOK_USER]) { /* server command */
|
|
||||||
snprintf(message, PIPE_BUF, "%s%s", argv[TOK_ARG] ? argv[TOK_ARG] : "", argv[TOK_TEXT] ? argv[TOK_TEXT] : "");
|
|
||||||
@@ -373,11 +401,11 @@ static void proc_server_cmd(char *buf) {
|
|
||||||
print_out(argv[TOK_CHAN], message);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int read_line(int fd, size_t res_len, char *buf) {
|
|
||||||
+static int read_line(int fd, size_t res_len, char *buf, int from_server) {
|
|
||||||
size_t i = 0;
|
|
||||||
char c = 0;
|
|
||||||
do {
|
|
||||||
- if(read(fd, &c, sizeof(char)) != sizeof(char))
|
|
||||||
+ if(READ(fd, &c, sizeof(char)) != sizeof(char))
|
|
||||||
return -1;
|
|
||||||
buf[i++] = c;
|
|
||||||
}
|
|
||||||
@@ -388,7 +416,7 @@ static int read_line(int fd, size_t res_
|
|
||||||
|
|
||||||
static void handle_channels_input(Channel *c) {
|
|
||||||
static char buf[PIPE_BUF];
|
|
||||||
- if(read_line(c->fd, PIPE_BUF, buf) == -1) {
|
|
||||||
+ if(read_line(c->fd, PIPE_BUF, buf, 0) == -1) {
|
|
||||||
close(c->fd);
|
|
||||||
int fd = open_channel(c->name);
|
|
||||||
if(fd != -1)
|
|
||||||
@@ -402,7 +430,7 @@ static void handle_channels_input(Channe
|
|
||||||
|
|
||||||
static void handle_server_output() {
|
|
||||||
static char buf[PIPE_BUF];
|
|
||||||
- if(read_line(irc, PIPE_BUF, buf) == -1) {
|
|
||||||
+ if(read_line(irc->irc, PIPE_BUF, buf, 1) == -1) {
|
|
||||||
perror("ii: remote host closed connection");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
@@ -419,8 +447,8 @@ static void run() {
|
|
||||||
snprintf(ping_msg, sizeof(ping_msg), "PING %s\r\n", host);
|
|
||||||
for(;;) {
|
|
||||||
FD_ZERO(&rd);
|
|
||||||
- maxfd = irc;
|
|
||||||
- FD_SET(irc, &rd);
|
|
||||||
+ maxfd = irc->irc;
|
|
||||||
+ FD_SET(irc->irc, &rd);
|
|
||||||
for(c = channels; c; c = c->next) {
|
|
||||||
if(maxfd < c->fd)
|
|
||||||
maxfd = c->fd;
|
|
||||||
@@ -440,10 +468,10 @@ static void run() {
|
|
||||||
print_out(NULL, "-!- ii shutting down: ping timeout");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
- write(irc, ping_msg, strlen(ping_msg));
|
|
||||||
+ WRITE(irc, ping_msg, strlen(ping_msg));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
- if(FD_ISSET(irc, &rd)) {
|
|
||||||
+ if(FD_ISSET(irc->irc, &rd)) {
|
|
||||||
handle_server_output();
|
|
||||||
last_response = time(NULL);
|
|
||||||
}
|
|
||||||
@@ -475,10 +503,13 @@ int main(int argc, char *argv[]) {
|
|
||||||
case 'p': port = strtol(argv[++i], NULL, 10); break;
|
|
||||||
case 'n': snprintf(nick,sizeof(nick),"%s", argv[++i]); break;
|
|
||||||
case 'k': key = getenv(argv[++i]); break;
|
|
||||||
+ case 'e': use_ssl = 1; ++i; break;
|
|
||||||
case 'f': fullname = argv[++i]; break;
|
|
||||||
default: usage(); break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ if(use_ssl)
|
|
||||||
+ port = port == SERVER_PORT ? SSL_SERVER_PORT : port;
|
|
||||||
irc = tcpopen(port);
|
|
||||||
if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
|
|
||||||
fputs("ii: path to irc directory too long\n", stderr);
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------
|
|
||||||
# Nico Golde <nico@ngolde.de>
|
|
||||||
# License: do whatever you want with this code
|
|
||||||
# Purpose: locate new queries for the ii irc client
|
|
||||||
# ----------------------------------------------------
|
|
||||||
|
|
||||||
IRCPATH=$HOME/irc
|
|
||||||
TMPFILE=$IRCPATH/queries.tmp
|
|
||||||
|
|
||||||
if [ ! -f $TMPFILE ]; then
|
|
||||||
touch $TMPFILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "searching new query data"
|
|
||||||
for i in `find $IRCPATH -newer $TMPFILE -name 'out'`
|
|
||||||
do
|
|
||||||
grep -v '\-!\-' $i > /dev/null 2>&1 # if file doesnt just contain server stuff
|
|
||||||
if [ $? -ne 1 ]; then
|
|
||||||
# strip server, nickserv and channel out files
|
|
||||||
echo $i | egrep -v -i "nickserv|#|$IRCPATH/(irc\.freenode\.net|irc\.oftc\.net)/out" > /dev/null 2>&1
|
|
||||||
if [ $? -ne 1 ]; then
|
|
||||||
printf "new data in: %s\n========================================================\n" "$i"
|
|
||||||
tail -5 $i
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
touch $TMPFILE
|
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
/* Taken from OpenBSD */
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copy src to string dst of size siz. At most siz-1 characters
|
||||||
|
* will be copied. Always NUL terminates (unless siz == 0).
|
||||||
|
* Returns strlen(src); if retval >= siz, truncation occurred.
|
||||||
|
*/
|
||||||
|
size_t
|
||||||
|
strlcpy(char *dst, const char *src, size_t siz)
|
||||||
|
{
|
||||||
|
char *d = dst;
|
||||||
|
const char *s = src;
|
||||||
|
size_t n = siz;
|
||||||
|
|
||||||
|
/* Copy as many bytes as will fit */
|
||||||
|
if (n != 0) {
|
||||||
|
while (--n != 0) {
|
||||||
|
if ((*d++ = *s++) == '\0')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Not enough room in dst, add NUL and traverse rest of src */
|
||||||
|
if (n == 0) {
|
||||||
|
if (siz != 0)
|
||||||
|
*d = '\0'; /* NUL-terminate dst */
|
||||||
|
while (*s++)
|
||||||
|
;
|
||||||
|
}
|
||||||
|
return(s - src - 1); /* count does not include NUL */
|
||||||
|
}
|
||||||
Loading…
Reference in new issue