1
=== modified file 'ibid/source/manhole.py'
2
--- ibid/source/manhole.py	2009-05-31 08:10:44 +0000
3
+++ ibid/source/manhole.py	2009-06-27 22:55:51 +0000
4
@@ -18,11 +18,16 @@
5
18
18
6
19
    def setServiceParent(self, service=None):
19
    def setServiceParent(self, service=None):
7
20
        if service:
20
        if service:
9
21
            return internet.TCPServer(self.port, ShellFactory()).setServiceParent(service)
21
            self.listener = internet.TCPServer(self.port, self).setServiceParent(service)
10
22
            return self.listener
11
22
        else:
23
        else:
13
23
            reactor.listenTCP(self.port, self)
24
            self.listener = reactor.listenTCP(self.port, self)
14
24
    
25
    
15
25
    def connect(self):
26
    def connect(self):
16
26
        return self.setServiceParent(None)
27
        return self.setServiceParent(None)
17
27
28
18
29
    def disconnect(self):
19
30
        self.listener.stopListening()
20
31
        return True
21
32
22
28
# vi: set et sta sw=4 ts=4:
33
# vi: set et sta sw=4 ts=4:
23
29
34
24
=== modified file 'ibid/source/telnet.py'
25
--- ibid/source/telnet.py	2009-06-20 22:50:43 +0000
26
+++ ibid/source/telnet.py	2009-06-27 22:56:41 +0000
27
@@ -7,6 +7,7 @@
28
7
import ibid
7
import ibid
29
8
from ibid.source import IbidSourceFactory
8
from ibid.source import IbidSourceFactory
30
9
from ibid.event import Event
9
from ibid.event import Event
31
10
from ibid.config import IntOption
32
10
11
33
11
class TelnetProtocol(telnet.StatefulTelnetProtocol):
12
class TelnetProtocol(telnet.StatefulTelnetProtocol):
34
12
13
35
@@ -45,7 +46,7 @@
36
45
class SourceFactory(protocol.ServerFactory, IbidSourceFactory):
46
class SourceFactory(protocol.ServerFactory, IbidSourceFactory):
37
46
    protocol = TelnetProtocol
47
    protocol = TelnetProtocol
38
47
48
40
48
    port = 3000
49
    port = IntOption('port', 'Port number to listen on', 3000)
41
49
50
42
50
    def __init__(self, name, *args, **kwargs):
51
    def __init__(self, name, *args, **kwargs):
43
51
        #protocol.ServerFactory.__init__(self, *args, **kwargs)
52
        #protocol.ServerFactory.__init__(self, *args, **kwargs)
Status:	Merged
Approved by:	Stefano Rivera on 2009-07-03
Approved revision:	675
Merged at revision:	679
Proposed branch:	lp:~stefanor/ibid/manhole-disconnect
Merge into:	lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target:	None lines
To merge this branch:	bzr merge lp:~stefanor/ibid/manhole-disconnect
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-07-02
Jonathan Hitchcock	2009-06-27	Approve on 2009-06-29
Review via email: mp+7973@code.launchpad.net