SSH Fixes

This commit is contained in:
Valentin Boettcher 2017-08-16 11:20:06 +02:00
parent 58041578f7
commit 38768d7aae
5 changed files with 16 additions and 10 deletions

2
.gitignore vendored
View file

@ -8,3 +8,5 @@ ssh.pid
#*# #*#
*~ *~
.* .*
GTAGS
GPATH

View file

@ -45,7 +45,7 @@ let initialState = {
}, },
ssh: { ssh: {
status: 'DISCONNECTED', // TODO: CD // TODO: Implement in WEBIF status: 'DISCONNECTED', // TODO: CD // TODO: Implement in WEBIF
cameraForwardPort: false, camForwardPort: false,
sshForwardPort: false, sshForwardPort: false,
willReconnect: false, willReconnect: false,
error: false error: false

View file

@ -33,7 +33,7 @@ const {
SET_ERROR_RESOLVED, SET_ERROR_RESOLVED,
TRY_RECONNECT, TRY_RECONNECT,
HYDRATE, HYDRATE,
SET_CONNECTED, SET_SSH_REMOTE_PORTS,
SET_DISCONNECTED, SET_DISCONNECTED,
SET_SSH_CONNECTED SET_SSH_CONNECTED
} = require('./actions').actions; } = require('./actions').actions;
@ -177,10 +177,12 @@ Communicator.prototype.sendAction = function(action) {
}; };
break; break;
case SET_SSH_CONNECTED: case SET_SSH_REMOTE_PORTS:
change = { change = {
port: state.ssh.sshForwardPort, ssh: {
camForwardPort: state.ssh.camForwardPort port: state.ssh.sshForwardPort,
camForwardPort: state.ssh.camForwardPort
}
}; };
break; break;
@ -192,7 +194,8 @@ Communicator.prototype.sendAction = function(action) {
config: state.config, config: state.config,
haveSettings: true, // LEGACY haveSettings: true, // LEGACY
ssh: { ssh: {
port: state.ssh.sshForwardPort port: state.ssh.sshForwardPort,
camForwardPort: state.ssh.camForwardPort
} }
}); });
return; return;

View file

@ -165,10 +165,10 @@ reducers.ssh = function(state = {
enabled: false enabled: false
}, action) { }, action) {
switch (action.type) { switch (action.type) {
case SET_SSH_REMOTE_PORTS: case SET_SSH_REMOTE_PORTS:
return Object.assign({}, state, { return Object.assign({}, state, {
camForwardPort: action.camForwardPort, camForwardPort: action.data.camForwardPort,
sshForwardport: action.sshForwardPort sshForwardPort: action.data.sshForwardPort
}); });
case SET_SSH_CONNECTING: case SET_SSH_CONNECTING:
return Object.assign({}, state, { return Object.assign({}, state, {
@ -176,7 +176,7 @@ reducers.ssh = function(state = {
error: false, error: false,
willReconnect: false willReconnect: false
}); });
case SET_SSH_CONNECTED: case SET_SSH_CONNECTED:
return Object.assign({}, state, { return Object.assign({}, state, {
status: 'CONNECTED', status: 'CONNECTED',
willReconnect: false willReconnect: false

1
todo
View file

@ -5,6 +5,7 @@
- host identity - host identity
- config update - config update
- Patch submissionc - Patch submissionc
- SSH Enable Option
Host localhost Host localhost
StrictHostKeyChecking no StrictHostKeyChecking no
UserKnownHostsFile=/dev/null UserKnownHostsFile=/dev/null