CBCHAININIT(new, fnetnode_chat);
CBCHAININIT(new, fnetnode_unlink);
CBCHAININIT(new, fnetnode_destroy);
+ CBCHAININIT(new, fnetpeer_new);
+ CBCHAININIT(new, fnetpeer_del);
+ CBCHAININIT(new, fnetpeer_chdi);
new->next = NULL;
new->prev = NULL;
numfnetnodes++;
{
fn->sk->close = 1;
if(fn->sk->data == fn)
+ {
+ fn->sk->data = NULL;
putfnetnode(fn);
+ }
putsock(fn->sk);
fn->sk = NULL;
}
CBCHAINFREE(fn, fnetnode_chat);
CBCHAINFREE(fn, fnetnode_unlink);
CBCHAINFREE(fn, fnetnode_destroy);
+ CBCHAINFREE(fn, fnetpeer_new);
+ CBCHAINFREE(fn, fnetpeer_del);
+ CBCHAINFREE(fn, fnetpeer_chdi);
if(fn->fnet->destroy != NULL)
fn->fnet->destroy(fn);
+ while(fn->args != NULL)
+ freewcspair(fn->args, &fn->args);
while(fn->peers != NULL)
fnetdelpeer(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);
numfnetnodes--;
}
return(new);
}
-static struct fnetpeerdi *difindoradd(struct fnetpeer *peer, struct fnetpeerdatum *datum)
+static struct fnetpeerdi *difindoradd(struct fnetpeer *peer, struct fnetpeerdatum *datum, int *isnew)
{
int i;
memset(&peer->peerdi[peer->dinum], 0, sizeof(struct fnetpeerdi));
peer->peerdi[peer->dinum].datum = datum;
datum->refcount++;
+ if(isnew != NULL)
+ *isnew = 1;
return(&peer->peerdi[peer->dinum++]);
} else {
+ if(isnew != NULL)
+ *isnew = 0;
return(&peer->peerdi[i]);
}
}
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_STR);
- di = difindoradd(peer, datum);
- if(di->data.str != NULL)
+ di = difindoradd(peer, datum, &changed);
+ if(di->data.str != NULL) {
+ changed = (changed || wcscmp(value, di->data.str));
free(di->data.str);
+ } else {
+ changed = 1;
+ }
di->data.str = swcsdup(value);
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
void fnetpeersetnum(struct fnetpeer *peer, wchar_t *id, int value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_INT);
- di = difindoradd(peer, datum);
+ di = difindoradd(peer, datum, &changed);
+ changed = (changed || (di->data.num != value));
di->data.num = value;
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
void fnetpeersetlnum(struct fnetpeer *peer, wchar_t *id, long long value)
{
struct fnetpeerdatum *datum;
struct fnetpeerdi *di;
+ int changed;
if((datum = finddatum(peer->fn, id)) == NULL)
datum = adddatum(peer->fn, id, FNPD_LL);
- di = difindoradd(peer, datum);
+ di = difindoradd(peer, datum, &changed);
+ changed = (changed || (di->data.lnum != value));
di->data.lnum = value;
+ if(changed)
+ CBCHAINDOCB(peer->fn, fnetpeer_chdi, peer->fn, peer, di);
}
static void putdatum(struct fnetpeer *peer, struct fnetpeerdatum *datum)
fn->peers = new;
fn->numpeers++;
CBCHAINDOCB(fn, fnetnode_ac, fn, L"numpeers");
+ CBCHAINDOCB(fn, fnetpeer_new, fn, new);
return(new);
}
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++)
return(fnet);
}
-struct fnetnode *fnetinitconnect(wchar_t *name, char *addr)
+struct fnetnode *fnetinitconnect(wchar_t *name, wchar_t *owner, char *addr, struct wcspair *args)
{
struct fnet *fnet;
struct fnetnode *fn;
+ struct wcspair *arg;
if((fnet = findfnet(name)) == NULL)
{
return(NULL);
}
fn = newfn(fnet);
+ fn->owner = swcsdup(owner);
+ fn->pubid = icmbstowcs(addr, NULL);
+ if(fn->pubid == NULL)
+ fn->pubid = swcsdup(L"");
+ fn->args = args;
+ for(arg = fn->args; arg != NULL; arg = arg->next)
+ {
+ if(!wcscmp(arg->key, L"nick"))
+ fnetsetnick(fn, arg->val);
+ }
getfnetnode(fn);
if(netresolve(addr, (void (*)(struct sockaddr *, int, void *))resolvecb, fn) < 0)
return(NULL);
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}
};