mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-12 16:16:37 +02:00
Code Issues Projects Releases Wiki Activity

bgp/operator/ssh: Enable to quit gracefully

Browse Source 
Currently, socket.error will be raised when 'quit' command is typed.
This patch enables to quit SSH session without tracebacks.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2016-10-24 17:18:43 +09:00 committed by FUJITA Tomonori
parent 252591aaae
commit 09e57c5993
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ryu/services/protocols/bgp/operator/ssh.py
View File

@ -110,6 +110,8 @@ class SshServer(paramiko.ServerInterface):
self.transport.add_server_key(host_key)
self.transport.start_server(server=self)
self.is_connected = True
# For pylint
self.buf = None
self.chan = None
@ -350,11 +352,15 @@ class SshServer(paramiko.ServerInterface):
def _execute_cmd(self, cmds):
result, _ = self.root(cmds)
LOG.debug("result: %s", result)
if cmds[0] == 'quit':
self.is_connected = False
return result.status
self.prompted = False
self._startnewline()
output = result.value.replace('\n', '\n\r').rstrip()
self.chan.send(output)
self.prompted = True
self._startnewline()
return result.status
def end_session(self):
@ -377,7 +383,7 @@ class SshServer(paramiko.ServerInterface):
self.chan.send(self.WELCOME)
self._startnewline()
while True:
while self.is_connected:
c = self.chan.recv(1)
c = c.decode() # For Python3 compatibility
@ -477,9 +483,14 @@ class SshServer(paramiko.ServerInterface):
self.history.insert(0, self.buf)
self.histindex = 0
self._execute_cmd(cmds)
else:
LOG.debug("no command is interpreted. "
"just start a new line.")
self._startnewline()
else:
LOG.debug("blank buf. just start a new line.")
self._startnewline()
LOG.debug("blank buf is detected. "
"just start a new line.")
self._startnewline()
LOG.debug("curpos: %d, buf: %s, prompted: %s", self.curpos,
self.buf, self.prompted)