}
#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 socket *sk UNUSED = fn->sk; \
+ struct adchub *hub UNUSED = fn->data;
ADC_CMDFN(cmd_sup)
{
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;
hub = fn->data;
if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
- return(0);
+ return;
if(hub->inbufdata > 1024)
hub->inbufdata = 0;
bufcat(hub->inbuf, newbuf, datalen);
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;
}
}
}
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)
{
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);
+ fn->sk->readcb = (void (*)(struct socket *, void *))hubread;
+ fn->sk->errcb = (void (*)(struct socket *, int, void *))huberr;
+ fn->sk->data = fn;
+ getfnetnode(fn);
hub = smalloc(sizeof(*hub));
memset(hub, 0, sizeof(*hub));
}
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}
};