Skip to content

Maksimchepelev/bugs #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2018
Merged

Maksimchepelev/bugs #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59586e
EWC-396 Fix rsa-key description in cli tunnel help
mchepelev Dec 4, 2018
fc9fa54
fix(tunnel): if port range not provided in config use default values
mchepelev Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ $ iofog-controller tunnel <*command*> <*options*>
-u, --username string (Tunnel username) <br>
-p, --password string (Tunnel password) <br>
-s, --host string (Tunnel host address) <br>
-k, --rsa-key string (Tunnel RSA key) <br>
-k, --rsa-key string (Path to tunnel RSA key) <br>
-o, --port number (Tunnel port) <br>
-f, --iofogUuid string (Fog UUID) <br>

Expand Down
2 changes: 1 addition & 1 deletion src/cli/tunnel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Tunnel extends BaseCLIHandler {
},
{
name: 'rsa-key', alias: 'k', type: String,
description: 'Tunnel RSA key',
description: 'Path to tunnel RSA key',
group: [constants.CMD_UPDATE]
},
{
Expand Down
7 changes: 6 additions & 1 deletion src/helpers/app-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ async function checkPortAvailability(port) {
}

const findAvailablePort = async function (hostname) {
let portBounds = Config.get("Tunnel:PortRange").split("-").map(i => parseInt(i));
let portRange = Config.get("Tunnel:PortRange");
if (!portRange) {
logger.warn('Port range was\'n specified in config. Default range (2000-10000) will be used');
portRange = '2000-10000';
}
let portBounds = portRange.split("-").map(i => parseInt(i));
return await portscanner.findAPortNotInUse(portBounds[0], portBounds[1], hostname);
}

Expand Down