From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Tue, 30 Jan 2007 02:10:17 +0000 (+0000)
Subject: Major rework to use cbchains on sockets.
X-Git-Tag: 0.3~94
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=5ec60e4217863b0e2d6a86ba3f60f60c68608227

Major rework to use cbchains on sockets.


git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@836 959494ce-11ee-0310-bf91-de5d638817bd
---

diff --git a/daemon/client.c b/daemon/client.c
index 7cdfbe3..fc2776b 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -408,7 +408,7 @@ static void writehashcache(int now)
     fclose(stream);
 }
 
-static void hashread(struct socket *sk, void *uudata)
+static int hashread(struct socket *sk, void *uudata)
 {
     static char *hashbuf;
     static size_t hashbufsize = 0, hashbufdata = 0;
@@ -422,7 +422,7 @@ static void hashread(struct socket *sk, void *uudata)
     struct hashcache *hc;
     
     if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
+	return(0);
     bufcat(hashbuf, buf, bufsize);
     free(buf);
     while((lp = memchr(hashbuf, '\n', hashbufdata)) != NULL)
@@ -464,6 +464,7 @@ static void hashread(struct socket *sk, void *uudata)
 	}
 	memmove(hashbuf, lp, hashbufdata -= (lp - hashbuf));
     }
+    return(0);
 }
 
 static void hashexit(pid_t pid, int status, struct socket *outsock)
@@ -542,7 +543,7 @@ static int hashfile(char *path)
     close(fd);
     close(pfd[1]);
     outsock = wrapsock(pfd[0]);
-    outsock->readcb = hashread;
+    CBREG(outsock, socket_read, hashread, NULL, NULL);
     childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
     return(0);
 }
diff --git a/daemon/filenet.c b/daemon/filenet.c
index be6c5af..99e094a 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -67,22 +67,18 @@ void killfnetnode(struct fnetnode *fn)
     if(fn->sk != NULL)
     {
 	fn->sk->close = 1;
-	if(fn->sk->data == fn)
-	{
-	    fn->sk->data = NULL;
-	    putfnetnode(fn);
-	}
 	putsock(fn->sk);
 	fn->sk = NULL;
     }
 }
 
-void getfnetnode(struct fnetnode *fn)
+struct fnetnode *getfnetnode(struct fnetnode *fn)
 {
     fn->refcount++;
 #ifdef DEBUG
     fprintf(stderr, "getfnetnode on id %i at %p, refcount=%i\n", fn->id, fn, fn->refcount);
 #endif
+    return(fn);
 }
 
 void putfnetnode(struct fnetnode *fn)
@@ -163,19 +159,20 @@ void unlinkfnetnode(struct fnetnode *fn)
     putfnetnode(fn);
 }
 
-static void conncb(struct socket *sk, int err, struct fnetnode *data)
+static int conncb(struct socket *sk, int err, struct fnetnode *data)
 {
     if(err != 0)
     {
 	killfnetnode(data);
 	putfnetnode(data);
-	return;
+	return(1);
     }
     data->sk = sk;
     fnetsetstate(data, FNN_HS);
     socksettos(sk, confgetint("fnet", "fntos"));
     data->fnet->connect(data);
     putfnetnode(data);
+    return(1);
 }
 
 static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
@@ -185,7 +182,7 @@ static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
 	killfnetnode(data);
 	putfnetnode(data);
     } else {
-	netcsconn(addr, addrlen, (void (*)(struct socket *, int, void *))conncb, data);
+	netcsconn(addr, addrlen, (int (*)(struct socket *, int, void *))conncb, data);
     }
 }
 
diff --git a/daemon/filenet.h b/daemon/filenet.h
index 261b1ba..5a0caeb 100644
--- a/daemon/filenet.h
+++ b/daemon/filenet.h
@@ -127,7 +127,7 @@ struct fnet *findfnet(wchar_t *name);
 struct fnetnode *fnetinitconnect(wchar_t *name, wchar_t *owner, char *addr, struct wcspair *args);
 void linkfnetnode(struct fnetnode *fn);
 void unlinkfnetnode(struct fnetnode *fn);
-void getfnetnode(struct fnetnode *fn);
+struct fnetnode *getfnetnode(struct fnetnode *fn);
 void putfnetnode(struct fnetnode *fn);
 void killfnetnode(struct fnetnode *fn);
 struct fnetpeer *fnetaddpeer(struct fnetnode *fn, wchar_t *id, wchar_t *nick);
diff --git a/daemon/fnet-adc.c b/daemon/fnet-adc.c
index ecbffe3..459ef9a 100644
--- a/daemon/fnet-adc.c
+++ b/daemon/fnet-adc.c
@@ -286,7 +286,7 @@ static void dispatch(struct qcmd *qcmd, struct fnetnode *fn)
     flog(LOG_DEBUG, "unknown adc command: %ls", qcmd->args[0]);
 }
 
-static void hubread(struct socket *sk, struct fnetnode *fn)
+static int hubread(struct socket *sk, struct fnetnode *fn)
 {
     int ret;
     struct adchub *hub;
@@ -296,7 +296,7 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
     
     hub = fn->data;
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
-	return;
+	return(0);
     if(hub->inbufdata > 1024)
 	hub->inbufdata = 0;
     bufcat(hub->inbuf, newbuf, datalen);
@@ -321,14 +321,14 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
 	    if(errno == EILSEQ) {
 		flog(LOG_DEBUG, "adc fnetnode %i sent illegal utf-8 sequence", fn->id);
 		killfnetnode(fn);
-		return;
+		return(0);
 	    } else if(errno == EINVAL) {
 		break;
 	    } else if(errno == E2BIG) {
 		/* continue; */
 	    } else {
 		flog(LOG_WARNING, "bug? iconv returned unexpected error: %s", strerror(errno));
-		return;
+		return(0);
 	    }
 	}
     }
@@ -337,21 +337,21 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
 	newqcmd(&hub->queue, parseadc(hub->cb));
 	memmove(hub->cb, p, (hub->cbdata -= (p - hub->cb)) * sizeof(*(hub->cb)));
     }
+    return(0);
 }
 
-static void huberr(struct socket *sk, int err, struct fnetnode *fn)
+static int huberr(struct socket *sk, int err, struct fnetnode *fn)
 {
     killfnetnode(fn);
+    return(0);
 }
 
 static void hubconnect(struct fnetnode *fn)
 {
     struct adchub *hub;
     
-    fn->sk->readcb = (void (*)(struct socket *, void *))hubread;
-    fn->sk->errcb = (void (*)(struct socket *, int, void *))huberr;
-    fn->sk->data = fn;
-    getfnetnode(fn);
+    CBREG(fn->sk, socket_read, (int (*)(struct socket *, void *))hubread, (void (*)(void *))putfnetnode, fn);
+    CBREG(fn->sk, socket_err, (int (*)(struct socket *, int, void *))huberr, (void (*)(void *))putfnetnode, fn);
     
     hub = smalloc(sizeof(*hub));
     memset(hub, 0, sizeof(*hub));
diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index d45b144..804bd2c 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -160,11 +160,13 @@ static char *xmllistname = NULL;
 static char *xmlbz2listname = NULL;
 static struct timer *listwritetimer = NULL;
 
-static void peerconnect(struct socket *sk, int err, struct fnetnode *fn);
+static int peerconnect(struct socket *sk, int err, struct fnetnode *fn);
+static int peerread(struct socket *sk, struct dcpeer *peer);
+static int peererror(struct socket *sk, int err, struct dcpeer *peer);
 static void freedcpeer(struct dcpeer *peer);
-static void transread(struct socket *sk, struct dcpeer *peer);
-static void transerr(struct socket *sk, int err, struct dcpeer *peer);
-static void transwrite(struct socket *sk, struct dcpeer *peer);
+static void transread(struct dcpeer *peer);
+static void transerr(struct dcpeer *peer);
+static int transwrite(struct socket *sk, struct dcpeer *peer);
 static void updatehmlist(void);
 static void updatexmllist(void);
 static void updatexmlbz2list(void);
@@ -1300,7 +1302,7 @@ static void cmd_connecttome(struct socket *sk, struct fnetnode *fn, char *cmd, c
     addr.sin_port = htons(atoi(p));
     if(!inet_aton(args, &addr.sin_addr))
 	return;
-    newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (void (*)(struct socket *, int, void *))peerconnect, fn);
+    newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (int (*)(struct socket *, int, void *))peerconnect, fn);
     getfnetnode(fn);
     hubhandleaction(sk, fn, cmd, args);
 }
@@ -1633,8 +1635,6 @@ static void startdl(struct dcpeer *peer)
 	canceltimer(peer->timeout);
     peer->state = PEER_TRNS;
     transferstartdl(peer->transfer, peer->sk);
-    peer->sk->readcb = (void (*)(struct socket *, void *))transread;
-    peer->sk->errcb = (void (*)(struct socket *, int, void *))transerr;
 }
 
 static void startul(struct dcpeer *peer)
@@ -1643,7 +1643,7 @@ static void startul(struct dcpeer *peer)
 	canceltimer(peer->timeout);
     peer->state = PEER_TRNS;
     transferstartul(peer->transfer, peer->sk);
-    peer->sk->writecb = (void (*)(struct socket *, void *))transwrite;
+    CBREG(peer->sk, socket_write, (int (*)(struct socket *, void *))transwrite, NULL, peer);
 }
 
 static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
@@ -2215,12 +2215,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    goto out;
 	}
 	startdl(peer);
-	if(peer->inbufdata > 0)
-	{
-	    sockpushdata(sk, peer->inbuf, peer->inbufdata);
-	    peer->inbufdata = 0;
-	    transread(sk, peer);
-	}
+	transread(peer);
     } else {
 	/* We certainly didn't request this...*/
 	freedcpeer(peer);
@@ -2248,12 +2243,7 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	return;
     }
     startdl(peer);
-    if(peer->inbufdata > 0)
-    {
-	sockpushdata(sk, peer->inbuf, peer->inbufdata);
-	peer->inbufdata = 0;
-	transread(sk, peer);
-    }
+    transread(peer);
 }
 
 /*
@@ -2602,7 +2592,7 @@ static struct command peercmds[] =
 
 static void dctransdetach(struct transfer *transfer, struct dcpeer *peer)
 {
-    CBUNREG(transfer, trans_filterout, peer);
+    CBUNREG(transfer, trans_filterout, trresumecb, peer);
     if(peer->freeing)
 	return;
     peer->transfer = NULL;
@@ -2677,7 +2667,7 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 		    transfersetstate(transfer, TRNS_HS);
 		    socksettos(peer->sk, confgetint("fnet", "fnptos"));
 		    transfer->flags.b.minislot = 0;
-		    peer->sk->writecb = NULL;
+		    CBUNREG(peer->sk, socket_write, transwrite, peer);
 		}
 	    }
 	}
@@ -2696,22 +2686,22 @@ static void dcwantdata(struct transfer *transfer, struct dcpeer *peer)
 	peer->sk->ignread = 0;
 }
 
-static void transread(struct socket *sk, struct dcpeer *peer)
+static void transread(struct dcpeer *peer)
 {
-    void *buf;
-    size_t bufsize;
+    size_t num;
     struct transfer *transfer;
     
-    if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
     if(peer->transfer == NULL)
     {
-	free(buf);
 	freedcpeer(peer);
 	return;
     }
-    transferputdata(peer->transfer, buf, bufsize);
-    free(buf);
+    if(peer->inbufsize > peer->transfer->size - peer->transfer->curpos)
+	num = peer->transfer->size - peer->transfer->curpos;
+    else
+	num = peer->inbufsize;
+    transferputdata(peer->transfer, peer->inbuf, num);
+    memmove(peer->inbuf, peer->inbuf + num, peer->inbufsize -= num);
     if(peer->transfer->curpos >= peer->transfer->size)
     {
 	transfer = peer->transfer;
@@ -2720,35 +2710,33 @@ static void transread(struct socket *sk, struct dcpeer *peer)
 	return;
     }
     if(transferdatasize(peer->transfer) > 65535)
-	sk->ignread = 1;
+	peer->sk->ignread = 1;
 }
 
-static void transerr(struct socket *sk, int err, struct dcpeer *peer)
+static void transerr(struct dcpeer *peer)
 {
     struct transfer *transfer;
 
     if((transfer = peer->transfer) == NULL)
-    {
-	freedcpeer(peer);
 	return;
-    }
     transferdetach(transfer);
     transferendofdata(transfer);
 }
 
-static void transwrite(struct socket *sk, struct dcpeer *peer)
+static int transwrite(struct socket *sk, struct dcpeer *peer)
 {
     if((peer->state != PEER_TRNS) && (peer->state != PEER_SYNC))
-	return;
+	return(1);
     if(peer->transfer == NULL)
     {
 	freedcpeer(peer);
-	return;
+	return(1);
     }
     dctransgotdata(peer->transfer, peer);
+    return(0);
 }
 
-static void udpread(struct socket *sk, void *data)
+static int udpread(struct socket *sk, void *data)
 {
     char *buf, *p, *p2, *hashbuf;
     size_t buflen, hashlen;
@@ -2762,7 +2750,7 @@ static void udpread(struct socket *sk, void *data)
     struct hash *hash;
     
     if((buf = sockgetinbuf(sk, &buflen)) == NULL)
-	return;
+	return(0);
     buf = srealloc(buf, buflen + 1);
     buf[buflen] = 0;
     if(!strncmp(buf, "$SR ", 4))
@@ -2772,7 +2760,7 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, ' ')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	p = p2 + 1;
@@ -2780,14 +2768,14 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, 5)) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	p = p2 + 1;
 	if((p2 = strchr(p, ' ')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	size = atoi(p);
@@ -2795,7 +2783,7 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, '/')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	slots = atoi(p);
@@ -2803,34 +2791,34 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, 5)) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	p = p2 + 1;
 	hubname = p;
 	if((p2 = strstr(p, " (")) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	p = p2 + 2;
 	if((p2 = strchr(p, ':')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*(p2++) = 0;
 	hubaddr.sin_family = AF_INET;
 	if(!inet_aton(p, &hubaddr.sin_addr))
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	p = p2;
 	if((p2 = strchr(p, ')')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	hubaddr.sin_port = htons(atoi(p));
@@ -2838,7 +2826,7 @@ static void udpread(struct socket *sk, void *data)
 	if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	myfn = NULL;
 	hash = NULL;
@@ -2885,7 +2873,7 @@ static void udpread(struct socket *sk, void *data)
 	if((wnick = icmbstowcs(nick, (hub == NULL)?DCCHARSET:(hub->charset))) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	sr = newsrchres(&dcnet, wfile, wnick);
 	if(sr->peernick != NULL)
@@ -2903,6 +2891,7 @@ static void udpread(struct socket *sk, void *data)
 	freesrchres(sr);
     }
     free(buf);
+    return(0);
 }
 
 static void hubread(struct socket *sk, struct fnetnode *fn)
@@ -3044,11 +3033,9 @@ static void freedcpeer(struct dcpeer *peer)
     }
     if(peer->timeout != NULL)
 	canceltimer(peer->timeout);
-    if(peer->sk->data == peer)
-	peer->sk->data = NULL;
-    peer->sk->readcb = NULL;
-    peer->sk->writecb = NULL;
-    peer->sk->errcb = NULL;
+    /* XXX: Unregister transwrite from peer->sk->socket_write? */
+    CBUNREG(peer->sk, socket_read, peerread, peer);
+    CBUNREG(peer->sk, socket_err, peererror, peer);
     putsock(peer->sk);
     endcompress(peer);
     if(peer->supports != NULL)
@@ -3077,11 +3064,9 @@ static void freedcpeer(struct dcpeer *peer)
 
 static void hubconnect(struct fnetnode *fn)
 {
-    fn->sk->readcb = (void (*)(struct socket *, void *))hubread;
-    fn->sk->errcb = (void (*)(struct socket *, int, void *))huberr;
-    getfnetnode(fn);
+    CBREG(fn->sk, socket_read, (int (*)(struct socket *, void *))hubread, (void (*)(void *))putfnetnode, getfnetnode(fn));
+    CBREG(fn->sk, socket_err, (int (*)(struct socket *, int, void *))huberr, (void (*)(void *))putfnetnode, getfnetnode(fn));
     fn->data = newdchub(fn);
-    fn->sk->data = fn;
     return;
 }
 
@@ -3091,10 +3076,10 @@ static void hubdestroy(struct fnetnode *fn)
     struct qcommand *qcmd;
     
     hub = (struct dchub *)fn->data;
-    if((fn->sk != NULL) && (fn->sk->data == fn))
+    if(fn->sk != NULL)
     {
-	fn->sk->data = NULL;
-	putfnetnode(fn);
+	CBUNREG(fn->sk, socket_read, hubread, fn);
+	CBUNREG(fn->sk, socket_err, huberr, fn);
     }
     if(hub == NULL)
 	return;
@@ -3140,48 +3125,61 @@ static struct fnet dcnet =
     .filebasename = dcbasename
 };
 
-static void peerread(struct socket *sk, struct dcpeer *peer)
+static void cmdread(struct dcpeer *peer)
 {
-    char *newbuf, *p;
-    size_t datalen;
+    char *p;
     struct command *cmd;
 
+    p = peer->inbuf;
+    while((peer->inbufdata > 0) && (p = memchr(peer->inbuf, '|', peer->inbufdata)) != NULL)
+    {
+	*(p++) = 0;
+	newqcmd(&peer->queue, peer->inbuf);
+	for(cmd = peercmds; cmd->handler != NULL; cmd++)
+	{
+	    if(!memcmp(peer->inbuf, cmd->name, strlen(cmd->name)) && ((peer->inbuf[strlen(cmd->name)] == ' ') || (peer->inbuf[strlen(cmd->name)] == '|')))
+		break;
+	}
+	memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
+	if(cmd->stop)
+	{
+	    peer->state = PEER_STOP;
+	    break;
+	}
+    }
+}
+
+static int peerread(struct socket *sk, struct dcpeer *peer)
+{
+    char *newbuf;
+    size_t datalen;
+
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
-	return;
+	return(0);
     sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1);
     memcpy(peer->inbuf + peer->inbufdata, newbuf, datalen);
     free(newbuf);
     peer->inbufdata += datalen;
     if(peer->state == PEER_CMD)
     {
-	p = peer->inbuf;
-	while((peer->inbufdata > 0) && (p = memchr(peer->inbuf, '|', peer->inbufdata)) != NULL)
-	{
-	    *(p++) = 0;
-	    newqcmd(&peer->queue, peer->inbuf);
-	    for(cmd = peercmds; cmd->handler != NULL; cmd++)
-	    {
-		if(!memcmp(peer->inbuf, cmd->name, strlen(cmd->name)) && ((peer->inbuf[strlen(cmd->name)] == ' ') || (peer->inbuf[strlen(cmd->name)] == '|')))
-		    break;
-	    }
-	    memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
-	    if(cmd->stop)
-	    {
-		peer->state = PEER_STOP;
-		break;
-	    }
-	}
+	cmdread(peer);
+    } else if(peer->state == PEER_TRNS) {
+	transread(peer);
     } else if(peer->state == PEER_TTHL) {
 	handletthl(peer);
     }
+    return(0);
 }
 
-static void peererror(struct socket *sk, int err, struct dcpeer *peer)
+static int peererror(struct socket *sk, int err, struct dcpeer *peer)
 {
+    if(peer->state == PEER_TRNS)
+	transerr(peer);
     freedcpeer(peer);
+    return(0);
 }
 
-static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
+static int peerconnect(struct socket *sk, int err, struct fnetnode *fn)
 {
     struct dcpeer *peer;
     struct dchub *hub;
@@ -3190,34 +3188,34 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
     {
 	putfnetnode(fn);
 	putsock(sk);
-	return;
+	return(1);
     }
     hub = fn->data;
     peer = newdcpeer(sk);
     peer->fn = fn;
     peer->accepted = 0;
     peer->dcppemu = hub->dcppemu;
-    sk->readcb = (void (*)(struct socket *, void *))peerread;
-    sk->errcb = (void (*)(struct socket *, int, void *))peererror;
-    sk->data = peer;
+    CBREG(sk, socket_read, (int (*)(struct socket *, void *))peerread, NULL, peer);
+    CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))peererror, NULL, peer);
     socksettos(sk, confgetint("fnet", "fnptos"));
     putsock(sk);
     peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
     sendmynick(peer);
     sendpeerlock(peer);
+    return(1);
 }
 
-static void peeraccept(struct socket *sk, struct socket *newsk, void *data)
+static int peeraccept(struct socket *sk, struct socket *newsk, void *data)
 {
     struct dcpeer *peer;
     
     peer = newdcpeer(newsk);
     peer->accepted = 1;
-    newsk->readcb = (void (*)(struct socket *, void *))peerread;
-    newsk->errcb = (void (*)(struct socket *, int, void *))peererror;
-    newsk->data = peer;
+    CBREG(sk, socket_read, (int (*)(struct socket *, void *))peerread, NULL, peer);
+    CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))peererror, NULL, peer);
     socksettos(newsk, confgetint("fnet", "fnptos"));
     peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
+    return(0);
 }
 
 static void updatehmlist(void)
@@ -3635,7 +3633,7 @@ static int updateudpport(struct configvar *var, void *uudata)
 	flog(LOG_WARNING, "could not create new DC UDP socket, reverting to old: %s", strerror(errno));
 	return(0);
     }
-    newsock->readcb = udpread;
+    CBREG(newsock, socket_read, udpread, NULL, NULL);
     if(udpsock != NULL)
 	putsock(udpsock);
     udpsock = newsock;
@@ -3677,7 +3675,7 @@ static int init(int hup)
 	    flog(LOG_CRIT, "could not create DC UDP socket: %s", strerror(errno));
 	    return(1);
 	}
-	udpsock->readcb = udpread;
+	CBREG(udpsock, socket_read, udpread, NULL, NULL);
 	addr.sin_port = htons(confgetint("dc", "tcpport"));
 	if((tcpsock = netcslisten(SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr), peeraccept, NULL)) == NULL)
 	    flog(LOG_INFO, "could not listen to a remote address, going into passive mode");
diff --git a/daemon/net.c b/daemon/net.c
index 2a8fdef..4054518 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -174,11 +174,11 @@ static struct socket *newsock(int type)
 	new->inbuf.d.f = new->inbuf.d.l = NULL;
 	break;
     }
-    new->conncb = NULL;
-    new->errcb = NULL;
-    new->readcb = NULL;
-    new->writecb = NULL;
-    new->acceptcb = NULL;
+    CBCHAININIT(new, socket_conn);
+    CBCHAININIT(new, socket_err);
+    CBCHAININIT(new, socket_read);
+    CBCHAININIT(new, socket_write);
+    CBCHAININIT(new, socket_accept);
     new->next = sockets;
     new->prev = NULL;
     if(sockets != NULL)
@@ -240,6 +240,11 @@ void putsock(struct socket *sk)
     
     if(--(sk->refcount) == 0)
     {
+	CBCHAINFREE(sk, socket_conn);
+	CBCHAINFREE(sk, socket_err);
+	CBCHAINFREE(sk, socket_read);
+	CBCHAINFREE(sk, socket_write);
+	CBCHAINFREE(sk, socket_accept);
 	switch(sk->type)
 	{
 	case SOCK_STREAM:
@@ -352,21 +357,18 @@ static void sockrecv(struct socket *sk)
 	{
 	    if((errno == EINTR) || (errno == EAGAIN))
 		return;
-	    if(sk->errcb != NULL)
-		sk->errcb(sk, errno, sk->data);
+	    CBCHAINDOCB(sk, socket_err, sk, errno);
 	    closesock(sk);
 	    return;
 	}
 	if(ret == 0)
 	{
-	    if(sk->errcb != NULL)
-		sk->errcb(sk, 0, sk->data);
+	    CBCHAINDOCB(sk, socket_err, sk, 0);
 	    closesock(sk);
 	    return;
 	}
 	sk->inbuf.s.datasize += ret;
-	if(sk->readcb != NULL)
-	    sk->readcb(sk, sk->data);
+	CBCHAINDOCB(sk, socket_read, sk);
 	break;
     case SOCK_DGRAM:
 	if(ioctl(sk->fd, SIOCINQ, &inq))
@@ -387,8 +389,7 @@ static void sockrecv(struct socket *sk)
 	    free(dbuf);
 	    if((errno == EINTR) || (errno == EAGAIN))
 		return;
-	    if(sk->errcb != NULL)
-		sk->errcb(sk, errno, sk->data);
+	    CBCHAINDOCB(sk, socket_err, sk, errno);
 	    closesock(sk);
 	    return;
 	}
@@ -403,8 +404,7 @@ static void sockrecv(struct socket *sk)
 	    free(dbuf);
 	    if(!((sk->family == AF_INET) || (sk->family == AF_INET6)))
 	    {
-		if(sk->errcb != NULL)
-		    sk->errcb(sk, 0, sk->data);
+		CBCHAINDOCB(sk, socket_err, sk, 0);
 		closesock(sk);
 	    }
 	    return;
@@ -417,8 +417,7 @@ static void sockrecv(struct socket *sk)
 	else
 	    sk->inbuf.d.f = dbuf;
 	sk->inbuf.d.l = dbuf;
-	if(sk->readcb != NULL)
-	    sk->readcb(sk, sk->data);
+	CBCHAINDOCB(sk, socket_read, sk);
 	break;
     }
 }
@@ -444,8 +443,7 @@ static void sockflush(struct socket *sk)
 	if(ret > 0)
 	{
 	    memmove(sk->outbuf.s.buf, ((char *)sk->outbuf.s.buf) + ret, sk->outbuf.s.datasize -= ret);
-	    if(sk->writecb != NULL)
-		sk->writecb(sk, sk->data);
+	    CBCHAINDOCB(sk, socket_write, sk);
 	}
 	break;
     case SOCK_DGRAM:
@@ -456,8 +454,7 @@ static void sockflush(struct socket *sk)
 	free(dbuf->data);
 	free(dbuf->addr);
 	free(dbuf);
-	if(sk->writecb != NULL)
-	    sk->writecb(sk, sk->data);
+	CBCHAINDOCB(sk, socket_write, sk);
 	break;
     }
 }
@@ -547,7 +544,7 @@ size_t sockqueuesize(struct socket *sk)
  * netcslisten() instead.
 */
 
-struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namelen, void (*func)(struct socket *, struct socket *, void *), void *data)
+struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namelen, int (*func)(struct socket *, struct socket *, void *), void *data)
 {
     struct socket *sk;
     int intbuf;
@@ -576,12 +573,12 @@ struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namel
 	putsock(sk);
 	return(NULL);
     }
-    sk->acceptcb = func;
-    sk->data = data;
+    if(func != NULL)
+	CBREG(sk, socket_accept, func, NULL, data);
     return(sk);
 }
 
-struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, void (*func)(struct socket *, struct socket *, void *), void *data)
+struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, int (*func)(struct socket *, struct socket *, void *), void *data)
 {
     if(confgetint("net", "mode") == 1)
     {
@@ -594,13 +591,13 @@ struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, v
     return(NULL);
 }
 
-struct socket *netcstcplisten(int port, int local, void (*func)(struct socket *, struct socket *, void *), void *data)
+struct socket *netcstcplisten(int port, int local, int (*func)(struct socket *, struct socket *, void *), void *data)
 {
     struct sockaddr_in addr;
 #ifdef HAVE_IPV6
     struct sockaddr_in6 addr6;
 #endif
-    struct socket *(*csfunc)(int, struct sockaddr *, socklen_t, void (*)(struct socket *, struct socket *, void *), void *);
+    struct socket *(*csfunc)(int, struct sockaddr *, socklen_t, int (*)(struct socket *, struct socket *, void *), void *);
     struct socket *ret;
     
     if(local)
@@ -671,7 +668,7 @@ void netdgramconn(struct socket *sk, struct sockaddr *addr, socklen_t addrlen)
     sk->ignread = 1;
 }
 
-struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)(struct socket *, int, void *), void *data)
+struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, int (*func)(struct socket *, int, void *), void *data)
 {
     struct socket *sk;
     int mode;
@@ -691,8 +688,8 @@ struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)(
 	if(errno == EINPROGRESS)
 	{
 	    sk->state = SOCK_SYN;
-	    sk->conncb = func;
-	    sk->data = data;
+	    if(func != NULL)
+		CBREG(sk, socket_conn, func, NULL, data);
 	    return(sk);
 	}
 	putsock(sk);
@@ -759,10 +756,7 @@ int pollsocks(int timeout)
 	    {
 		sslen = sizeof(ss);
 		if((newfd = accept(sk->fd, (struct sockaddr *)&ss, &sslen)) < 0)
-		{
-		    if(sk->errcb != NULL)
-			sk->errcb(sk, errno, sk->data);
-		}
+		    CBCHAINDOCB(sk, socket_err, sk, errno);
 		newsk = newsock(sk->type);
 		newsk->fd = newfd;
 		newsk->family = sk->family;
@@ -770,15 +764,13 @@ int pollsocks(int timeout)
 		memcpy(newsk->remote = smalloc(sslen), &ss, sslen);
 		newsk->remotelen = sslen;
 		putsock(newsk);
-		if(sk->acceptcb != NULL)
-		    sk->acceptcb(sk, newsk, sk->data);
+		CBCHAINDOCB(sk, socket_accept, sk, newsk);
 	    }
 	    if(pfds[i].revents & POLLERR)
 	    {
 		retlen = sizeof(ret);
 		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
-		if(sk->errcb != NULL)
-		    sk->errcb(sk, ret, sk->data);
+		CBCHAINDOCB(sk, socket_err, sk, ret);
 		continue;
 	    }
 	    break;
@@ -787,16 +779,14 @@ int pollsocks(int timeout)
 	    {
 		retlen = sizeof(ret);
 		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
-		if(sk->conncb != NULL)
-		    sk->conncb(sk, ret, sk->data);
+		CBCHAINDOCB(sk, socket_conn, sk, ret);
 		closesock(sk);
 		continue;
 	    }
 	    if(pfds[i].revents & (POLLIN | POLLOUT))
 	    {
 		sk->state = SOCK_EST;
-		if(sk->conncb != NULL)
-		    sk->conncb(sk, 0, sk->data);
+		CBCHAINDOCB(sk, socket_conn, sk, 0);
 	    }
 	    break;
 	case SOCK_EST:
@@ -804,8 +794,7 @@ int pollsocks(int timeout)
 	    {
 		retlen = sizeof(ret);
 		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
-		if(sk->errcb != NULL)
-		    sk->errcb(sk, ret, sk->data);
+		CBCHAINDOCB(sk, socket_err, sk, ret);
 		closesock(sk);
 		continue;
 	    }
@@ -827,8 +816,7 @@ int pollsocks(int timeout)
 	}
 	if(pfds[i].revents & POLLHUP)
 	{
-	    if(sk->errcb != NULL)
-		sk->errcb(sk, 0, sk->data);
+	    CBCHAINDOCB(sk, socket_err, sk, 0);
 	    closesock(sk);
 	    unlinksock(sk);
 	    continue;
diff --git a/daemon/net.h b/daemon/net.h
index 7d63981..da96315 100644
--- a/daemon/net.h
+++ b/daemon/net.h
@@ -21,6 +21,8 @@
 
 #include <sys/socket.h>
 
+#include <utils.h>
+
 #define SOCK_LST 0 /* Listening */
 #define SOCK_SYN 1 /* Connecting */
 #define SOCK_EST 2 /* Established */
@@ -80,20 +82,27 @@ struct socket
 	    size_t datasize;
 	} s;
     } inbuf;
+    /*
     void (*conncb)(struct socket *sk, int err, void *data);
     void (*errcb)(struct socket *sk, int err, void *data);
     void (*readcb)(struct socket *sk, void *data);
     void (*writecb)(struct socket *sk, void *data);
     void (*acceptcb)(struct socket *sk, struct socket *newsk, void *data);
     void *data;
+    */
+    CBCHAIN(socket_conn, struct socket *sk, int err);
+    CBCHAIN(socket_err, struct socket *sk, int err);
+    CBCHAIN(socket_read, struct socket *sk);
+    CBCHAIN(socket_write, struct socket *sk);
+    CBCHAIN(socket_accept, struct socket *sk, struct socket *newsk);
 };
 
 void putsock(struct socket *sk);
 void getsock(struct socket *sk);
-struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, void (*func)(struct socket *, struct socket *, void *), void *data);
-struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namelen, void (*func)(struct socket *, struct socket *, void *), void *data);
-struct socket *netcstcplisten(int port, int local, void (*func)(struct socket *, struct socket *, void *), void *data);
-struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)(struct socket *, int, void *), void *data);
+struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, int (*func)(struct socket *, struct socket *, void *), void *data);
+struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namelen, int (*func)(struct socket *, struct socket *, void *), void *data);
+struct socket *netcstcplisten(int port, int local, int (*func)(struct socket *, struct socket *, void *), void *data);
+struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, int (*func)(struct socket *, int, void *), void *data);
 int pollsocks(int timeout);
 void sockqueue(struct socket *sk, void *data, size_t size);
 size_t sockqueuesize(struct socket *sk);
diff --git a/daemon/transfer.c b/daemon/transfer.c
index 56b237d..ab2579d 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -39,6 +39,10 @@
 #include "client.h"
 
 static void killfilter(struct transfer *transfer);
+static int transferread(struct socket *sk, struct transfer *transfer);
+static int transferwrite(struct socket *sk, struct transfer *transfer);
+static int transfererr(struct socket *sk, int errno, struct transfer *transfer);
+static int filterread(struct socket *sk, struct transfer *transfer);
 
 unsigned long long bytesupload = 0;
 unsigned long long bytesdownload = 0;
@@ -84,16 +88,14 @@ void freetransfer(struct transfer *transfer)
 	free(transfer->exitstatus);
     if(transfer->localend != NULL)
     {
-	transfer->localend->readcb = NULL;
-	transfer->localend->writecb = NULL;
-	transfer->localend->errcb = NULL;
+	CBUNREG(transfer->localend, socket_read, transferread, transfer);
+	CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+	CBUNREG(transfer->localend, socket_err, transfererr, transfer);
 	putsock(transfer->localend);
     }
     if(transfer->filterout != NULL)
     {
-	transfer->filterout->readcb = NULL;
-	transfer->filterout->writecb = NULL;
-	transfer->filterout->errcb = NULL;
+	CBUNREG(transfer->filterout, socket_read, filterread, transfer);
 	putsock(transfer->filterout);
     }
     if(transfer->fn != NULL)
@@ -231,24 +233,27 @@ static void transexpire(int cancelled, struct transfer *transfer)
 	transfer->timeout = 0;
 }
 
-static void transferread(struct socket *sk, struct transfer *transfer)
+static int transferread(struct socket *sk, struct transfer *transfer)
 {
     if(sockgetdatalen(sk) >= 65536)
 	sk->ignread = 1;
     if((transfer->iface != NULL) && (transfer->iface->gotdata != NULL))
 	transfer->iface->gotdata(transfer, transfer->ifacedata);
+    return(0);
 }
 
-static void transferwrite(struct socket *sk, struct transfer *transfer)
+static int transferwrite(struct socket *sk, struct transfer *transfer)
 {
     if((transfer->iface != NULL) && (transfer->iface->wantdata != NULL))
 	transfer->iface->wantdata(transfer, transfer->ifacedata);
+    return(0);
 }
 
-static void transfererr(struct socket *sk, int errno, struct transfer *transfer)
+static int transfererr(struct socket *sk, int errno, struct transfer *transfer)
 {
     if((transfer->iface != NULL) && (transfer->iface->endofdata != NULL))
 	transfer->iface->endofdata(transfer, transfer->ifacedata);
+    return(0);
 }
 
 void transferputdata(struct transfer *transfer, void *buf, size_t size)
@@ -265,9 +270,9 @@ void transferendofdata(struct transfer *transfer)
     if(transfer->curpos >= transfer->size)
     {
 	transfersetstate(transfer, TRNS_DONE);
-	transfer->localend->readcb = NULL;
-	transfer->localend->writecb = NULL;
-	transfer->localend->errcb = NULL;
+	CBUNREG(transfer->localend, socket_read, transferread, transfer);
+	CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+	CBUNREG(transfer->localend, socket_err, transfererr, transfer);
 	putsock(transfer->localend);
 	transfer->localend = NULL;
     } else {
@@ -329,10 +334,9 @@ void transfersetlocalend(struct transfer *transfer, struct socket *sk)
     if(transfer->localend != NULL)
 	putsock(transfer->localend);
     getsock(transfer->localend = sk);
-    sk->data = transfer;
-    sk->readcb = (void (*)(struct socket *, void *))transferread;
-    sk->writecb = (void (*)(struct socket *, void *))transferwrite;
-    sk->errcb = (void (*)(struct socket *, int, void *))transfererr;
+    CBREG(sk, socket_read, (int (*)(struct socket *, void *))transferread, NULL, transfer);
+    CBREG(sk, socket_write, (int (*)(struct socket *, void *))transferwrite, NULL, transfer);
+    CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))transfererr, NULL, transfer);
 }
 
 static int tryreq(struct transfer *transfer)
@@ -508,15 +512,15 @@ static void killfilter(struct transfer *transfer)
     }
     if(transfer->localend)
     {
-	transfer->localend->readcb = NULL;
-	transfer->localend->writecb = NULL;
-	transfer->localend->errcb = NULL;
+	CBUNREG(transfer->localend, socket_read, transferread, transfer);
+	CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+	CBUNREG(transfer->localend, socket_err, transfererr, transfer);
 	putsock(transfer->localend);
 	transfer->localend = NULL;
     }
     if(transfer->filterout)
     {
-	transfer->filterout->readcb = NULL;
+	CBUNREG(transfer->filterout, socket_read, filterread, transfer);
 	putsock(transfer->filterout);
 	transfer->filterout = NULL;
     }
@@ -591,14 +595,14 @@ static void handletranscmd(struct transfer *transfer, wchar_t *cmd, wchar_t *arg
     }
 }
 
-static void filterread(struct socket *sk, struct transfer *transfer)
+static int filterread(struct socket *sk, struct transfer *transfer)
 {
     char *buf, *p, *p2;
     size_t bufsize;
     wchar_t *cmd, *arg;
     
     if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
+	return(0);
     bufcat(transfer->filterbuf, buf, bufsize);
     free(buf);
     while((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
@@ -624,6 +628,7 @@ static void filterread(struct socket *sk, struct transfer *transfer)
 	}
 	memmove(transfer->filterbuf, p, transfer->filterbufdata -= (p - transfer->filterbuf));
     }
+    return(0);
 }
 
 static void filterexit(pid_t pid, int status, void *data)
@@ -760,8 +765,7 @@ int forkfilter(struct transfer *transfer)
     transfer->filter = pid;
     transfersetlocalend(transfer, insock);
     getsock(transfer->filterout = outsock);
-    outsock->data = transfer;
-    outsock->readcb = (void (*)(struct socket *, void *))filterread;
+    CBREG(outsock, socket_read, (int (*)(struct socket *, void *))filterread, NULL, transfer);
     putsock(insock);
     putsock(outsock);
     free(filtername);
diff --git a/daemon/ui.c b/daemon/ui.c
index 5152808..44e4605 100644
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -159,6 +159,8 @@ struct uidata
     size_t cwsize, cwdata;
 };
 
+static int uiread(struct socket *sk, struct uidata *data);
+static int uierror(struct socket *sk, int err, struct uidata *data);
 static int srcheta(struct search *srch, void *uudata);
 static int srchcommit(struct search *srch, void *uudata);
 static int srchres(struct search *srch, struct srchres *sr, void *uudata);
@@ -1054,18 +1056,19 @@ static void cmd_cansrch(struct socket *sk, struct uidata *data, int argc, wchar_
     sq(sk, 0, L"200", L"Search cancelled", NULL);
 }
 
-static void fcmdread(struct socket *sk, struct uidata *data)
+static int fcmdread(struct socket *sk, struct uidata *data)
 {
     char *buf;
     size_t bufsize;
     
     if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
+	return(0);
     bufcat(data->fcmdbuf, buf, bufsize);
     free(buf);
+    return(0);
 }
 
-static void fcmderr(struct socket *sk, int err, struct uidata *data)
+static int fcmderr(struct socket *sk, int err, struct uidata *data)
 {
     wchar_t *wbuf, *p, *p2;
     
@@ -1082,7 +1085,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data)
 	}
 	data->fcmdbufsize = data->fcmdbufdata = 0;
 	sq(data->sk, 0, L"505", L"An error occurred on the pipe to the filtercmd", L"%%s", strerror(err), NULL);
-	return;
+	return(0);
     }
     putsock(data->fcmdsk);
     data->fcmdsk = NULL;
@@ -1100,7 +1103,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data)
     if(wbuf == NULL)
     {
 	sq(data->sk, 0, L"504", L"Filtercmd sent data which could not be converted from the local charset", NULL);
-	return;
+	return(0);
     }
     p = wbuf;
     for(p2 = wcschr(p, L'\n'); p2 != NULL; p2 = wcschr(p, L'\n'))
@@ -1117,6 +1120,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data)
 	sq(data->sk, 0, L"200", L"%%ls", p, NULL);
     }
     free(wbuf);
+    return(0);
 }
 
 static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
@@ -1182,9 +1186,8 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha
 	data->fcmdbuf = NULL;
     }
     data->fcmdbufsize = data->fcmdbufdata = 0;
-    data->fcmdsk->data = data;
-    data->fcmdsk->readcb = (void (*)(struct socket *, void *))fcmdread;
-    data->fcmdsk->errcb = (void (*)(struct socket *, int, void *))fcmderr;
+    CBREG(data->fcmdsk, socket_read, (int (*)(struct socket *, void *))fcmdread, NULL, NULL);
+    CBREG(data->fcmdsk, socket_err, (int (*)(struct socket *, int, void *))fcmderr, NULL, NULL);
 }
 
 static void cmd_lstrarg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
@@ -1511,8 +1514,8 @@ static void freeuidata(struct uidata *data)
 	data->prev->next = data->next;
     if(data == actives)
 	actives = data->next;
-    data->sk->readcb = NULL;
-    data->sk->errcb = NULL;
+    CBUNREG(data->sk, socket_read, uiread, data);
+    CBUNREG(data->sk, socket_err, uierror, data);
     putsock(data->sk);
     while((qcmd = unlinkqcmd(data)) != NULL)
 	freequeuecmd(qcmd);
@@ -1590,7 +1593,7 @@ static struct uidata *newuidata(struct socket *sk)
     return(data);
 }
 
-static void uiread(struct socket *sk, struct uidata *data)
+static int uiread(struct socket *sk, struct uidata *data)
 {
     int ret, done;
     char *newbuf;
@@ -1602,7 +1605,7 @@ static void uiread(struct socket *sk, struct uidata *data)
     if(data->indata > 1024)
 	data->indata = 0;
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
-	return;
+	return(0);
     sizebuf(&data->inbuf, &data->inbufsize, data->indata + datalen, 1, 1);
     memcpy(data->inbuf + data->indata, newbuf, datalen);
     free(newbuf);
@@ -1755,26 +1758,29 @@ static void uiread(struct socket *sk, struct uidata *data)
 	    break;
 	}
     }
+    return(0);
 }
 
-static void uierror(struct socket *sk, int err, struct uidata *data)
+static int uierror(struct socket *sk, int err, struct uidata *data)
 {
     if(err)
 	flog(LOG_WARNING, "error occurred on UI socket: %s", strerror(err));
     freeuidata(data);
+    return(0);
 }
 
-static void uiaccept(struct socket *sk, struct socket *newsk, void *data)
+static int uiaccept(struct socket *sk, struct socket *newsk, void *data)
 {
     struct uidata *uidata;
     
-    newsk->data = uidata = newuidata(newsk);
+    uidata = newuidata(newsk);
     socksettos(newsk, confgetint("ui", "uitos"));
     if(uidata == NULL)
-	return;
-    newsk->errcb = (void (*)(struct socket *, int, void *))uierror;
-    newsk->readcb = (void (*)(struct socket *, void *))uiread;
+	return(0);
+    CBREG(newsk, socket_err, (int (*)(struct socket *, int, void *))uierror, NULL, data);
+    CBREG(newsk, socket_read, (int (*)(struct socket *, void *))uiread, NULL, data);
     queuecmd(uidata, &commands[0], 0, NULL);
+    return(0);
 }
 
 static int srcheta(struct search *srch, void *uudata)