X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-adc.c;h=5c609f84473f7c09a64113b0a670e91784b8157f;hb=refs%2Fheads%2Fjava;hp=459ef9abd108dfe8e8e808d7f91b37a8af31f81f;hpb=5ec60e4217863b0e2d6a86ba3f60f60c68608227;p=doldaconnect.git

diff --git a/daemon/fnet-adc.c b/daemon/fnet-adc.c
index 459ef9a..5c609f8 100644
--- a/daemon/fnet-adc.c
+++ b/daemon/fnet-adc.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -59,6 +59,7 @@ struct qcmd {
 };
 
 struct adchub {
+    struct socket *sk;
     char *inbuf;
     size_t inbufdata, inbufsize;
     wchar_t *sid;
@@ -192,7 +193,14 @@ static void freeqcmd(struct qcmd *qcmd)
 }
 
 #define ADC_CMDFN(name) static void name(struct fnetnode *fn, wchar_t *command, wchar_t *sender, int argc, wchar_t **argv)
-#define ADC_CMDCOM struct socket *sk = fn->sk; struct adchub *hub = fn->data;
+#ifdef __GNUC__
+#define UNUSED __attribute__ ((unused))
+#else
+#define UNUSED
+#endif
+#define ADC_CMDCOM \
+	struct adchub *hub UNUSED = fn->data; \
+	struct socket *sk UNUSED = hub->sk;
 
 ADC_CMDFN(cmd_sup)
 {
@@ -286,7 +294,7 @@ static void dispatch(struct qcmd *qcmd, struct fnetnode *fn)
     flog(LOG_DEBUG, "unknown adc command: %ls", qcmd->args[0]);
 }
 
-static int hubread(struct socket *sk, struct fnetnode *fn)
+static void hubread(struct socket *sk, struct fnetnode *fn)
 {
     int ret;
     struct adchub *hub;
@@ -296,7 +304,7 @@ static int hubread(struct socket *sk, struct fnetnode *fn)
     
     hub = fn->data;
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
-	return(0);
+	return;
     if(hub->inbufdata > 1024)
 	hub->inbufdata = 0;
     bufcat(hub->inbuf, newbuf, datalen);
@@ -321,14 +329,14 @@ static int 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(0);
+		return;
 	    } else if(errno == EINVAL) {
 		break;
 	    } else if(errno == E2BIG) {
 		/* continue; */
 	    } else {
 		flog(LOG_WARNING, "bug? iconv returned unexpected error: %s", strerror(errno));
-		return(0);
+		return;
 	    }
 	}
     }
@@ -337,39 +345,38 @@ static int 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 int huberr(struct socket *sk, int err, struct fnetnode *fn)
+static void huberr(struct socket *sk, int err, struct fnetnode *fn)
 {
     killfnetnode(fn);
-    return(0);
 }
 
-static void hubconnect(struct fnetnode *fn)
+static void hubconnect(struct fnetnode *fn, struct socket *sk)
 {
     struct adchub *hub;
     
-    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);
+    sk->readcb = (void (*)(struct socket *, void *))hubread;
+    sk->errcb = (void (*)(struct socket *, int, void *))huberr;
+    sk->data = fn;
     
     hub = smalloc(sizeof(*hub));
     memset(hub, 0, sizeof(*hub));
+    getsock(hub->sk = sk);
     if((hub->ich = iconv_open("wchar_t", "utf-8")) == (iconv_t)-1) {
 	flog(LOG_CRIT, "iconv cannot handle UTF-8: %s", strerror(errno));
 	killfnetnode(fn);
 	return;
     }
     fn->data = hub;
-    sendadc(fn->sk, 0, L"HSUP", L"ADBASE", eoc, NULL);
+    sendadc(sk, 0, L"HSUP", L"ADBASE", eoc, NULL);
 }
 
 static void hubdestroy(struct fnetnode *fn)
 {
     struct adchub *hub;
     
-    if((hub = fn->data) == NULL)
-	return;
+    hub = fn->data;
     iconv_close(hub->ich);
     if(hub->inbuf != NULL)
 	free(hub->inbuf);
@@ -378,6 +385,14 @@ static void hubdestroy(struct fnetnode *fn)
     free(hub);
 }
 
+static void hubkill(struct fnetnode *fn)
+{
+    struct adchub *hub;
+    
+    hub = fn->data;
+    hub->sk->close = 1;
+}
+
 static int hubsetnick(struct fnetnode *fn, wchar_t *newnick)
 {
     return(0);
@@ -391,6 +406,7 @@ static int hubreqconn(struct fnetpeer *peer)
 static struct fnet adcnet_store = {
     .connect = hubconnect,
     .destroy = hubdestroy,
+    .kill = hubkill,
     .setnick = hubsetnick,
     .reqconn = hubreqconn,
     .name = L"adc"
@@ -413,7 +429,7 @@ static int run(void)
 	if((hub = fn->data) == NULL)
 	    continue;
 	if((qcmd = ulqcmd(&hub->queue)) != NULL) {
-	    if((fn->sk != NULL) && (fn->sk->state == SOCK_EST))
+	    if((hub->sk != NULL) && (hub->sk->state == SOCK_EST))
 		dispatch(qcmd, fn);
 	    freeqcmd(qcmd);
 	    ret = 1;
@@ -469,7 +485,15 @@ static void terminate(void)
 }
 
 static struct configvar myvars[] = {
+    /** Specifies a specific UDP port to use for ADC search
+     * results. If left unspecified, a port is allocated
+     * dynamically. Useful for NAT routers (see also the
+     * net.visibleipv4 address for those cases). */
     {CONF_VAR_INT, "udpport", {.num = 0}},
+    /** Specifies a specific TCP port to use for ADC peer
+     * connections. If left unspecified, a port is allocated
+     * dynamically. Useful for NAT routers (see also the
+     * net.visibleipv4 address for those cases). */
     {CONF_VAR_INT, "tcpport", {.num = 0}},
     {CONF_VAR_END}
 };