From 1c7af1a72e5ee1fefb501f10ddcfc49a0bda608c Mon Sep 17 00:00:00 2001
From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
Date: Sat, 16 Apr 2016 22:44:07 +0000
Subject: [PATCH] lib/upnp: Fix port order

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2980
---
 lib/osutil/mkdirall_windows.go | 6 +++++-
 lib/upnp/igd.go                | 4 ++--
 lib/upnp/igd_service.go        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/osutil/mkdirall_windows.go b/lib/osutil/mkdirall_windows.go
index 76263277..169f5196 100644
--- a/lib/osutil/mkdirall_windows.go
+++ b/lib/osutil/mkdirall_windows.go
@@ -25,7 +25,11 @@ func MkdirAll(path string, perm os.FileMode) error {
 		if dir.IsDir() {
 			return nil
 		}
-		return &os.PathError{"mkdir", path, syscall.ENOTDIR}
+		return &os.PathError{
+			Op:   "mkdir",
+			Path: path,
+			Err:  syscall.ENOTDIR,
+		}
 	}
 
 	// Slow path: make sure parent exists and then call Mkdir for path.
diff --git a/lib/upnp/igd.go b/lib/upnp/igd.go
index af8ab87e..2acb95b7 100644
--- a/lib/upnp/igd.go
+++ b/lib/upnp/igd.go
@@ -50,9 +50,9 @@ func (n *IGD) URL() *url.URL {
 // if action is fails for _any_ of the relevant services. For this reason, it
 // is generally better to configure port mapping for each individual service
 // instead.
-func (n *IGD) AddPortMapping(protocol nat.Protocol, externalPort, internalPort int, description string, duration time.Duration) (int, error) {
+func (n *IGD) AddPortMapping(protocol nat.Protocol, internalPort, externalPort int, description string, duration time.Duration) (int, error) {
 	for _, service := range n.services {
-		err := service.AddPortMapping(n.localIPAddress, protocol, externalPort, internalPort, description, duration)
+		err := service.AddPortMapping(n.localIPAddress, protocol, internalPort, externalPort, description, duration)
 		if err != nil {
 			return externalPort, err
 		}
diff --git a/lib/upnp/igd_service.go b/lib/upnp/igd_service.go
index a50f1aa5..b796756f 100644
--- a/lib/upnp/igd_service.go
+++ b/lib/upnp/igd_service.go
@@ -26,7 +26,7 @@ type IGDService struct {
 }
 
 // AddPortMapping adds a port mapping to the specified IGD service.
-func (s *IGDService) AddPortMapping(localIPAddress net.IP, protocol nat.Protocol, externalPort, internalPort int, description string, duration time.Duration) error {
+func (s *IGDService) AddPortMapping(localIPAddress net.IP, protocol nat.Protocol, internalPort, externalPort int, description string, duration time.Duration) error {
 	tpl := `<u:AddPortMapping xmlns:u="%s">
 	<NewRemoteHost></NewRemoteHost>
 	<NewExternalPort>%d</NewExternalPort>