Skip to content
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.

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

Improvement/naive detection of nat #292

Merged
merged 3 commits into from
Jul 12, 2018

Conversation

tadovas
Copy link
Contributor

@tadovas tadovas commented Jul 12, 2018

No description provided.

@tadovas tadovas requested review from Waldz and zolia July 12, 2018 08:06
@tadovas tadovas requested a review from donce as a code owner July 12, 2018 08:06
@tadovas tadovas changed the base branch from master to release/0.2 July 12, 2018 08:07
@tadovas tadovas force-pushed the improvement/naive-detection-of-NAT branch from 064c483 to 5195372 Compare July 12, 2018 08:17
@tadovas tadovas force-pushed the improvement/naive-detection-of-NAT branch from 5195372 to 4c52040 Compare July 12, 2018 08:19
@@ -105,7 +110,16 @@ func (cmd *Command) Start() (err error) {
return err
}

sessionManager := cmd.sessionManagerFactory(primitives, vpnServerIP)
if outboundIP != publicIP {
log.Infof(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be higher level Error()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just a warning - not an error

// if for some reason we will need truly external IP, use GetPublicIP()
vpnServerIP, err := cmd.ipResolver.GetOutboundIP()
outboundIP, err := cmd.ipResolver.GetOutboundIP()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't we doing option openvpn.ip with this?
For those who wants has different public IP and wats to map it in router

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is not such option at the moment. And this is a quick detection with posibility for user to take some action.

@Waldz Waldz changed the base branch from release/0.2 to master July 12, 2018 10:44
@Waldz Waldz changed the base branch from master to release/0.2 July 12, 2018 10:45
forwardInfo := fmt.Sprintf("%s:%v -> %s:%v", publicIP, options.OpenvpnPort, outboundIP, options.OpenvpnPort)
log.Warnf(
`WARNING: It seems that publicaly visible ip: [%s] does not match your local machines ip: [%s].
You should probaly need to do port forwarding on your router: %s.`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

..on your router: PUBLIC_IP:1194 -> MACHINE_IP:1194 e.g. %s:1194->%s:1194
and you can put example values from detected values

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, did not see that it's already like that

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -76,14 +77,14 @@ func (cmd *Command) Start() (err error) {
providerContact, err := cmd.dialogWaiter.Start()

// if for some reason we will need truly external IP, use GetPublicIP()
vpnServerIP, err := cmd.ipResolver.GetOutboundIP()
outboundIP, err := cmd.ipResolver.GetOutboundIP()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sad that we do 2-3 requests. Is it possible to avoid it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without too much refactoring? Yes - by passing outboundIP to openvpnServiceAddress function as parameter instead of looking up it again inside. I can live with this approach :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed :) reduced ipify query to 1 request

@mysteriumnetwork mysteriumnetwork deleted a comment from tadovas Jul 12, 2018
Copy link
Contributor

@zolia zolia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all good

@tadovas tadovas merged commit b84f64e into release/0.2 Jul 12, 2018
@tadovas tadovas deleted the improvement/naive-detection-of-NAT branch July 12, 2018 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants