diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e81392b..fb9e5c2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,7 @@ - - - - - - - + - - + + @@ -49,7 +43,7 @@ - + @@ -69,8 +63,8 @@ @@ -151,12 +145,12 @@ - @@ -189,13 +183,6 @@ - - - - - - - @@ -203,16 +190,6 @@ - - - - - - - - - - @@ -230,5 +207,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api/recorder_api.py b/api/recorder_api.py index 4cc6174..d4796b4 100644 --- a/api/recorder_api.py +++ b/api/recorder_api.py @@ -20,6 +20,11 @@ recorder_model = api_recorder.model('Recorder', { 'description': fields.String(required=False, description='The recorder\'s description'), 'ip': fields.String(required=False, description='The recorder\'s IP address'), 'network_name': fields.String(required=False, description='The recorder\'s network name'), + 'ssh_port': fields.Integer(required=True, default=443, description='The recorder\'s SSH port number'), + 'telnet_port': fields.Integer(required=True, default=23, description='The recorder\'s telned port number'), + 'use_telnet_instead_ssh': fields.Boolean(required=False, default=False, + description='If this is set, telnet will be used instead of ssh. ' + 'This might require specific commands.'), 'recorder_model': fields.Nested(api_recorder.model('recorder_model', {'id': fields.Integer(), 'name': fields.String()}), required=False, diff --git a/app.db b/app.db index dba5758..589aa59 100644 Binary files a/app.db and b/app.db differ