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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
|
Index: nxcl-0.9/lib/notQt.cpp
===================================================================
--- nxcl-0.9.orig/lib/notQt.cpp 2008-10-10 20:09:53.000000000 +0200
+++ nxcl-0.9/lib/notQt.cpp 2008-10-10 20:10:26.000000000 +0200
@@ -443,6 +443,9 @@
void
notQtUtilities::splitString (string& line, char token, vector<string>& rtn)
{
+ if (line.size() < 1)
+ return;
+
rtn.clear();
unsigned int i=0;
while (i < (line.size())-1) {
@@ -459,6 +462,9 @@
void
notQtUtilities::splitString (string& line, char token, list<string>& rtn)
{
+ if (line.size() < 1)
+ return;
+
rtn.clear();
unsigned int i=0;
while (i < (line.size())-1) {
Index: nxcl-0.9/lib/nxclientlib.cpp
===================================================================
--- nxcl-0.9.orig/lib/nxclientlib.cpp 2008-10-10 20:09:53.000000000 +0200
+++ nxcl-0.9/lib/nxclientlib.cpp 2008-10-10 20:10:26.000000000 +0200
@@ -152,6 +152,8 @@
this->sessionRunning = false;
this->proxyData.encrypted = false;
this->password = false;
+ this->useHttpProxy = false;
+ this->httpProxyAuthenticated = false;
dbgln ("In NXClientLib constructor");
@@ -172,6 +174,22 @@
dbgln ("In NXClientLib destructor");
}
+void NXClientLib::setProxy (string proxyHost,
+ string proxyUser,
+ string proxyPass,
+ int proxyPort)
+{
+ useHttpProxy = true;
+ httpProxyHost = proxyHost;
+
+ if (!httpProxyUser.empty())
+ httpProxyAuthenticated = true;
+
+ httpProxyUser = proxyUser;
+ httpProxyPass = proxyPass;
+ httpProxyPort = proxyPort;
+}
+
void NXClientLib::invokeNXSSH (string publicKey, string serverHost,
bool encryption, string key, int port)
{
@@ -228,6 +246,21 @@
arguments.push_back ("-oRhostsRSAAuthentication no");
arguments.push_back ("-oPubkeyAuthentication yes");
+ // Proxy support
+
+ if (useHttpProxy) {
+ arguments.push_back("-P");
+
+ argtmp.str("");
+
+ if (httpProxyAuthenticated)
+ argtmp << this->httpProxyUser << ":" << this->httpProxyPass << "@";
+
+ argtmp << this->httpProxyHost << ":" << this->httpProxyPort;
+
+ arguments.push_back(argtmp.str());
+ }
+
if (encryption == true) {
arguments.push_back("-B");
session.setEncryption (true);
@@ -785,7 +818,7 @@
nxwinArguments.push_back(fontPath.str());
nxwinArguments.push_back("-name");
- nxwinArguments.push_back("NXWin");
+ nxwinArguments.push_back("DoD");
nxwinArguments.push_back(":0");
nxwinArguments.push_back("-screen");
Index: nxcl-0.9/lib/nxclientlib.h
===================================================================
--- nxcl-0.9.orig/lib/nxclientlib.h 2008-10-10 20:09:53.000000000 +0200
+++ nxcl-0.9/lib/nxclientlib.h 2008-10-10 20:10:26.000000000 +0200
@@ -178,6 +178,21 @@
int port = 22);
/*!
+ * Set proxy server settings for nxssh.
+ *
+ * \param proxyHost is the hostname
+ *
+ * \param proxyUser is the username (null if not necessary)
+ *
+ * \param proxyPass is the password
+ *
+ * \param proxyPort is the port
+ */
+ void setProxy (string proxyHost,
+ string proxyUser,
+ string proxyPass,
+ int proxyPort);
+ /*!
* Overloaded to give callback data on write.
*
* Writes data to this->nxsshProcess stdin and also
@@ -453,6 +468,31 @@
* Password for the connection
*/
string nxpass;
+ /*!
+ * Whether to use an http proxy for nxssh
+ */
+ bool useHttpProxy;
+ /*!
+ * A proxy server to be used with nxssh
+ */
+ string httpProxyHost;
+ /*!
+ * Whether to use authentication
+ */
+ bool httpProxyAuthenticated;
+ /*!
+ * Username for the http proxy
+ */
+ string httpProxyUser;
+ /*!
+ * Password for the http proxy
+ */
+ string httpProxyPass;
+ /*!
+ * Port for the http proxy
+ */
+ int httpProxyPort;
+
};
} // namespace
Index: nxcl-0.9/lib/nxdata.h
===================================================================
--- nxcl-0.9.orig/lib/nxdata.h 2008-10-10 20:09:53.000000000 +0200
+++ nxcl-0.9/lib/nxdata.h 2008-10-10 20:10:26.000000000 +0200
@@ -1,12 +1,12 @@
/***************************************************************************
- nxdata.h
- -------------------
- begin : Wednesday 9th August 2006
- modifications : July 2007
- copyright : (C) 2006 by George Wright
- modifications : (C) 2007 Embedded Software Foundry Ltd. (U.K.)
- : Author: Sebastian James
- email : seb@esfnet.co.uk, gwright@kde.org
+ nxdata.h
+ -------------------
+begin : Wednesday 9th August 2006
+modifications : July 2007
+copyright : (C) 2006 by George Wright
+modifications : (C) 2007 Embedded Software Foundry Ltd. (U.K.)
+: Author: Sebastian James
+email : seb@esfnet.co.uk, gwright@kde.org
***************************************************************************/
/***************************************************************************
@@ -43,77 +43,83 @@
namespace nxcl {
- struct NXConfigData {
- string serverHost;
- int serverPort;
- string sessionUser;
- string sessionPass;
- string sessionName;
- string sessionType;
- int cache;
- int images;
- string linkType;
- bool render;
- string backingstore;
- int imageCompressionMethod;
- int imageCompressionLevel;
- string geometry;
- string keyboard;
- string kbtype;
- bool media;
- string agentServer;
- string agentUser;
- string agentPass;
- int cups;
- string key;
- bool encryption;
- bool fullscreen;
- bool virtualDesktop;
- string customCommand;
- };
-
- struct NXSessionData {
- string sessionName;
- string sessionType;
- int cache;
- int images;
- string linkType;
- bool render;
- string backingstore;
- int imageCompressionMethod;
- int imageCompressionLevel;
- string geometry;
- string keyboard;
- string kbtype;
- bool media;
- string agentServer;
- string agentUser;
- string agentPass;
- int cups;
- string id;
- string key;
- bool encryption;
- bool fullscreen;
- bool virtualDesktop;
- string customCommand;
- bool suspended;
- int xRes;
- int yRes;
- int depth;
- int display;
- bool terminate;
- };
-
- struct NXResumeData {
- int display;
- string sessionType;
- string sessionID;
- string options;
- int depth;
- string screen;
- string available;
- string sessionName;
- };
+ struct NXConfigData {
+ string serverHost;
+ int serverPort;
+ string sessionUser;
+ string sessionPass;
+ string sessionName;
+ string sessionType;
+ int cache;
+ int images;
+ string linkType;
+ bool render;
+ string backingstore;
+ int imageCompressionMethod;
+ int imageCompressionLevel;
+ string geometry;
+ string keyboard;
+ string kbtype;
+ bool media;
+ string agentServer;
+ string agentUser;
+ string agentPass;
+ int cups;
+ string key;
+ bool encryption;
+ bool fullscreen;
+ bool virtualDesktop;
+ string customCommand;
+ bool useProxy;
+ string proxyHost;
+ int proxyPort;
+ bool proxyAuthenticated;
+ string proxyUser;
+ string proxyPass;
+ };
+
+ struct NXSessionData {
+ string sessionName;
+ string sessionType;
+ int cache;
+ int images;
+ string linkType;
+ bool render;
+ string backingstore;
+ int imageCompressionMethod;
+ int imageCompressionLevel;
+ string geometry;
+ string keyboard;
+ string kbtype;
+ bool media;
+ string agentServer;
+ string agentUser;
+ string agentPass;
+ int cups;
+ string id;
+ string key;
+ bool encryption;
+ bool fullscreen;
+ bool virtualDesktop;
+ string customCommand;
+ bool suspended;
+ int xRes;
+ int yRes;
+ int depth;
+ int display;
+ bool terminate;
+ };
+
+ struct NXResumeData {
+ int display;
+ string sessionType;
+ string sessionID;
+ string options;
+ int depth;
+ string screen;
+ string available;
+ string sessionName;
+ };
} // namespace
#endif
|
