yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

Reverse port forwarding works, but changes don't apply to new devices yet.

Browse source
This commit is contained in:
Simo Kinnunen 2014-04-15 15:52:00 +09:00
parent a1fa91a356
commit f8a2eeab26
6 changed files with 97 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/roles/device/plugins/forward.js
View file

@ -59,7 +59,7 @@ module.exports = syrup.serial()
function createForward(data) {
log.info(
'Reverse forwarding port %d to %s:%d'
'Reverse port forwarding port %d to %s:%d'
, data.devicePort
, data.targetHost
, data.targetPort
@ -136,6 +136,7 @@ module.exports = syrup.serial()
}
function removeForward(data) {
log.info('Removing reverse port forwarding on port %d', data.devicePort)
var forward = service.forwards[data.devicePort]
if (forward) {
forward.connection.end()
@ -152,7 +153,7 @@ module.exports = syrup.serial()
})
function connectListener() {
resolver.resolve()
resolver.resolve(conn)
}
function errorListener(err) {
@ -165,7 +166,6 @@ module.exports = syrup.serial()
return resolver.promise.finally(function() {
conn.removeListener('connect', connectListener)
conn.removeListener('error', errorListener)
conn.end()
})
}
@ -208,7 +208,7 @@ module.exports = syrup.serial()
])
})
})
.on(wire.ForwardMessage, function(channel, message) {
.on(wire.ForwardCreateMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
createForward(message)
.then(function() {
@ -225,13 +225,6 @@ module.exports = syrup.serial()
])
})
})
.on(wire.ForwardListMessage, function(channel) {
var reply = wireutil.reply(options.serial)
push.send([
channel
, reply.okay('success', listForwards())
])
})
.on(wire.ForwardRemoveMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
removeForward(message)