Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use findfile instead of findconfig file.
[doldaconnect.git]
/
daemon
/
ui.c
diff --git
a/daemon/ui.c
b/daemon/ui.c
index
4484a1d
..
066615d
100644
(file)
--- a/
daemon/ui.c
+++ b/
daemon/ui.c
@@
-144,7
+144,7
@@
struct uidata
size_t inbufsize, indata;
/* Wordset storage */
wchar_t **argv;
size_t inbufsize, indata;
/* Wordset storage */
wchar_t **argv;
-
in
t argc, args;
+
size_
t argc, args;
/* WCS conversation stuff */
wchar_t *cb; /* Conversation buffer */
size_t cbsize, cbdata;
/* WCS conversation stuff */
wchar_t *cb; /* Conversation buffer */
size_t cbsize, cbdata;
@@
-571,6
+571,11
@@
static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
haveargs(3);
havepriv(PERM_FNETCTL);
haveargs(3);
havepriv(PERM_FNETCTL);
+ for(i = 0, fn = fnetnodes; fn != NULL; i++, fn = fn->next);
+ if((confgetint("fnet", "maxnodes") > 0) && (i >= confgetint("fnet", "maxnodes"))) {
+ sq(sk, 0, L"515", L"Too many fnetnodes connected already", NULL);
+ return;
+ }
if((buf = icwcstombs(argv[2], NULL)) == NULL)
{
sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL);
if((buf = icwcstombs(argv[2], NULL)) == NULL)
{
sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL);
@@
-592,8
+597,8
@@
static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
}
linkfnetnode(fn);
fnetsetname(fn, argv[2]);
}
linkfnetnode(fn);
fnetsetname(fn, argv[2]);
+ sq(sk, 0, L"200", L"%%i", fn->id, L"Connection under way", NULL);
putfnetnode(fn);
putfnetnode(fn);
- sq(sk, 0, L"200", L"Connection under way", NULL);
}
static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
}
static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)