1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
| | commit f697c603ef196eb88c1d7d629e456bf5054e35a4
Author: Lars-Dominik Braun <ldb@leibniz-psychology.org>
Date: Thu Jul 2 13:26:21 2020 +0200
modules/ssh/session.scm: Add nodelay to make-session
* modules/ssh/session.scm (make-session): Add key nodelay
diff --git a/modules/ssh/session.scm b/modules/ssh/session.scm
index d7c0831..042bd5f 100644
--- a/modules/ssh/session.scm
+++ b/modules/ssh/session.scm
@@ -74,7 +74,7 @@
knownhosts timeout timeout-usec ssh1 ssh2 log-verbosity
ciphers-c-s ciphers-s-c compression-c-s compression-s-c
proxycommand stricthostkeycheck compression
- compression-level callbacks config)
+ compression-level nodelay callbacks config)
"Make a new SSH session with specified configuration.\n
Return a new SSH session."
(let ((session (%make-session)))
@@ -98,6 +98,7 @@ Return a new SSH session."
(session-set-if-specified! stricthostkeycheck)
(session-set-if-specified! compression)
(session-set-if-specified! compression-level)
+ (session-set-if-specified! nodelay)
(session-set-if-specified! callbacks)
(when config
commit b80121ae3e851a676f25fd2b7e33371b94a6e030
Author: Lars-Dominik Braun <ldb@leibniz-psychology.org>
Date: Thu Jul 2 08:52:13 2020 +0200
libguile-ssh/session-func.c: Add NODELAY option
* libguile-ssh/session-func.c (session_options, set_option): Add libssh’s
nodelay option.
* tests/session.scm ("session-set!, valid values", "session-set!, invalid
values"): Add unit-tests.
diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c
index 48db779..9240734 100644
--- a/libguile-ssh/session-func.c
+++ b/libguile-ssh/session-func.c
@@ -71,6 +71,7 @@ static struct symbol_mapping session_options[] = {
{ "stricthostkeycheck", SSH_OPTIONS_STRICTHOSTKEYCHECK },
{ "compression", SSH_OPTIONS_COMPRESSION },
{ "compression-level", SSH_OPTIONS_COMPRESSION_LEVEL },
+ { "nodelay", SSH_OPTIONS_NODELAY },
{ "callbacks", GSSH_OPTIONS_CALLBACKS },
{ NULL, -1 }
};
@@ -366,6 +367,7 @@ set_option (SCM scm_session, struct session_data* sd, int type, SCM value)
case SSH_OPTIONS_SSH1:
case SSH_OPTIONS_SSH2:
case SSH_OPTIONS_STRICTHOSTKEYCHECK:
+ case SSH_OPTIONS_NODELAY:
return set_bool_opt (session, type, value);
case SSH_OPTIONS_FD:
diff --git a/tests/session.scm b/tests/session.scm
index 2eb1df7..83a864d 100644
--- a/tests/session.scm
+++ b/tests/session.scm
@@ -70,6 +70,7 @@
nolog)
(compression "yes" "no")
(compression-level 1 2 3 4 5 6 7 8 9)
+ (nodelay #f #t)
(callbacks ((user-data . "hello")
(global-request-callback . ,(const #f))))))
(res #t))
@@ -95,6 +96,7 @@
(log-verbosity "string" -1 0 1 2 3 4 5)
(compression 12345)
(compression-level -1 0 10)
+ (nodelay 12345 "string")
(callbacks "not a list"
((global-request-callback . #f)))))
(res #t))
|