|
Revision 26756, 0.6 kB
(checked in by exarkun, 2 months ago)
|
Merge disable-connection-sharing-3498-2
Author: z3p
Reviewer: exarkun, therve, glyph
Fixes: #3498
Refs #3483, #3497, #716
Remove the Conch SSH connection sharing functionality. This feature is not well
tested and has numerous subtle bugs which can interfer with the normal operation
of the Conch SSH client.
The Conch command line arguments which supported configuring this functionality
have been removed (supplying them is now an error) has has the module primarily
responsible for the implementation.
It is expected that this feature will be re-introduced at some point, without
the problems afflicting this implementation.
|
| Line | |
|---|
| 1 |
|
|---|
| 2 |
|
|---|
| 3 |
|
|---|
| 4 |
|
|---|
| 5 |
import direct |
|---|
| 6 |
|
|---|
| 7 |
connectTypes = {"direct" : direct.connect} |
|---|
| 8 |
|
|---|
| 9 |
def connect(host, port, options, verifyHostKey, userAuthObject): |
|---|
| 10 |
useConnects = ['direct'] |
|---|
| 11 |
return _ebConnect(None, useConnects, host, port, options, verifyHostKey, |
|---|
| 12 |
userAuthObject) |
|---|
| 13 |
|
|---|
| 14 |
def _ebConnect(f, useConnects, host, port, options, vhk, uao): |
|---|
| 15 |
if not useConnects: |
|---|
| 16 |
return f |
|---|
| 17 |
connectType = useConnects.pop(0) |
|---|
| 18 |
f = connectTypes[connectType] |
|---|
| 19 |
d = f(host, port, options, vhk, uao) |
|---|
| 20 |
d.addErrback(_ebConnect, useConnects, host, port, options, vhk, uao) |
|---|
| 21 |
return d |
|---|
