/*
* 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
#include "utils.h"
#include "net.h"
+static void freepeer(struct fnetpeer *peer);
+
static struct fnet *networks = NULL;
struct fnetnode *fnetnodes = NULL;
int numfnetnodes = 0;
void killfnetnode(struct fnetnode *fn)
{
fnetsetstate(fn, FNN_DEAD);
- if(fn->sk != NULL)
- {
- fn->sk->close = 1;
- putsock(fn->sk);
- fn->sk = NULL;
- }
+ if(fn->connected)
+ fn->fnet->kill(fn);
}
-struct fnetnode *getfnetnode(struct fnetnode *fn)
+void 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);
+}
+
+static void freepeers(struct btree *n)
+{
+ if(n == NULL)
+ return;
+ freepeers(n->l);
+ freepeers(n->r);
+ freepeer(n->d);
+ free(n);
}
void putfnetnode(struct fnetnode *fn)
CBCHAINFREE(fn, fnetpeer_new);
CBCHAINFREE(fn, fnetpeer_del);
CBCHAINFREE(fn, fnetpeer_chdi);
- if(fn->fnet->destroy != NULL)
+ if((fn->fnet->destroy != NULL) && fn->connected)
fn->fnet->destroy(fn);
while(fn->args != NULL)
freewcspair(fn->args, &fn->args);
- while(fn->peers != NULL)
- fnetdelpeer(fn->peers);
+ freepeers(fn->peers);
if(fn->mynick != NULL)
free(fn->mynick);
if(fn->pubid != NULL)
free(fn->pubid);
if(fn->name != NULL)
free(fn->name);
- if(fn->sk != NULL)
- putsock(fn->sk);
if(fn->owner != NULL)
free(fn->owner);
free(fn);
putfnetnode(fn);
}
-static int conncb(struct socket *sk, int err, struct fnetnode *data)
+static void conncb(struct socket *sk, int err, struct fnetnode *data)
{
if(err != 0)
{
killfnetnode(data);
putfnetnode(data);
- return(1);
+ return;
}
- data->sk = sk;
fnetsetstate(data, FNN_HS);
socksettos(sk, confgetint("fnet", "fntos"));
- data->fnet->connect(data);
+ data->fnet->connect(data, sk);
+ data->connected = 1;
putfnetnode(data);
- return(1);
}
static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
{
- if(addr == NULL)
+ struct socket *sk;
+
+ sk = NULL;
+ if(addr != NULL)
+ sk = netcsconn(addr, addrlen, (void (*)(struct socket *, int, void *))conncb, data);
+ if(sk == NULL)
{
killfnetnode(data);
putfnetnode(data);
} else {
- netcsconn(addr, addrlen, (int (*)(struct socket *, int, void *))conncb, data);
+ putsock(sk);
}
}
putdatum(peer, datum);
}
+static int peercmpid(void *a, void *b)
+{
+ return(wcscmp(((struct fnetpeer *)a)->id, ((struct fnetpeer *)b)->id));
+}
+
struct fnetpeer *fnetaddpeer(struct fnetnode *fn, wchar_t *id, wchar_t *nick)
{
struct fnetpeer *new;
new->flags.w = 0;
new->dinum = 0;
new->peerdi = NULL;
- new->next = fn->peers;
- new->prev = NULL;
- if(fn->peers != NULL)
- fn->peers->prev = new;
- fn->peers = new;
+ bbtreeput(&fn->peers, new, peercmpid);
fn->numpeers++;
CBCHAINDOCB(fn, fnetnode_ac, fn, L"numpeers");
CBCHAINDOCB(fn, fnetpeer_new, fn, new);
return(new);
}
-void fnetdelpeer(struct fnetpeer *peer)
+static void freepeer(struct fnetpeer *peer)
{
int i;
- if(peer->next != NULL)
- peer->next->prev = peer->prev;
- if(peer->prev != NULL)
- peer->prev->next = peer->next;
- if(peer->fn->peers == peer)
- peer->fn->peers = peer->next;
peer->fn->numpeers--;
- CBCHAINDOCB(peer->fn, fnetnode_ac, peer->fn, L"numpeers");
- CBCHAINDOCB(peer->fn, fnetpeer_del, peer->fn, peer);
free(peer->id);
free(peer->nick);
for(i = 0; i < peer->dinum; i++)
free(peer);
}
+void fnetdelpeer(struct fnetpeer *peer)
+{
+ bbtreedel(&peer->fn->peers, peer, peercmpid);
+ CBCHAINDOCB(peer->fn, fnetnode_ac, peer->fn, L"numpeers");
+ CBCHAINDOCB(peer->fn, fnetpeer_del, peer->fn, peer);
+ freepeer(peer);
+}
+
+void fnetpeerdm(struct fnetnode *fn)
+{
+ struct btree *new;
+ struct fnetpeer *peer;
+ int intact;
+
+ new = NULL;
+ intact = 1;
+ for(peer = btreeiter(fn->peers); peer != NULL; peer = btreeiter(NULL)) {
+ if(!peer->flags.b.delete) {
+ bbtreeput(&new, peer, peercmpid);
+ } else {
+ intact = 0;
+ CBCHAINDOCB(peer->fn, fnetpeer_del, peer->fn, peer);
+ freepeer(peer);
+ }
+ }
+ btreefree(fn->peers);
+ fn->peers = new;
+ if(!intact)
+ CBCHAINDOCB(peer->fn, fnetnode_ac, peer->fn, L"numpeers");
+}
+
struct fnetpeer *fnetfindpeer(struct fnetnode *fn, wchar_t *id)
{
- struct fnetpeer *cur;
+ struct fnetpeer key;
- for(cur = fn->peers; (cur != NULL) && wcscmp(cur->id, id); cur = cur->next);
- return(cur);
+ key.id = id;
+ return(btreeget(fn->peers, &key, peercmpid));
}
int fnetsetnick(struct fnetnode *fn, wchar_t *newnick)
{
int ret;
- if(fn->fnet->setnick != NULL)
+ if((fn->fnet->setnick != NULL) && fn->connected)
ret = fn->fnet->setnick(fn, newnick);
else
ret = 0;
int fnetsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *string)
{
- if(fn->fnet->sendchat == NULL)
+ if((fn->fnet->sendchat == NULL) || !fn->connected)
{
errno = ENOTSUP;
return(-1);
CBCHAINDOCB(fn, fnetnode_ac, fn, L"state");
}
+wchar_t *fnfilebasename(wchar_t *path)
+{
+ wchar_t *p;
+
+ if((p = wcsrchr(path, L'/')) != NULL)
+ return(p + 1);
+ return(path);
+}
+
struct fnet *findfnet(wchar_t *name)
{
struct fnet *fnet;
static struct configvar myvars[] =
{
+ /** The number of seconds to wait between searches. Most hubs
+ * require at least ten seconds, and quite often network lag will
+ * often make searches arrive to the hub more often than sent. It
+ * may be semi-dangerous to specify too low a value, since hubs
+ * will often kick users that search too often (even when the
+ * reason is network lag -- there is no way for the hub to know
+ * this), but it is quite annoying to set too high a value. 15 to
+ * 40 seconds are the recommended range (although the default is
+ * 15 seconds, it is recommended to set to 30 seconds). */
{CONF_VAR_INT, "srchwait", {.num = 15}},
+ /** The TOS value to use for hub connections (see the TOS VALUES
+ * section). */
{CONF_VAR_INT, "fntos", {.num = 0}},
+ /** The TOS value to use for peer connections (see the TOS VALUES
+ * section). */
{CONF_VAR_INT, "fnptos", {.num = 0}},
+ /** Specifies a maximum number of simultaneously connected
+ * hubs. Attempts to connect to new hubs beyond this limit will
+ * return an error. Set to zero to remove the limit. */
{CONF_VAR_INT, "maxnodes", {.num = 0}},
{CONF_VAR_END}
};
Dolda2000 GitWeb / doldaconnect.git / blobdiff