perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upnp: Use a separate error for the error unmarshalling

Browse Source 
Previously, when unmarshing the SOAP error code data we would overwrite
the original err, typically with null since the parsing of the error
code information succeeds. If we don't have a upnp 725 error, we would fall
back to returning null or no error. This broke our upnp error handling
logic for AddPortMappings as it would think it succeeds if it gets a 718
permission error.
This commit is contained in:
William A. Kennington III
2015-12-12 09:55:37 -08:00
parent 80aaf6a065
commit 5bdf4c6143
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/upnp/upnp.go
View File

@@ -531,9 +531,9 @@ func (s *IGDService) AddPortMapping(localIPAddress string, protocol Protocol, ex
if err != nil && timeout > 0 {
// Try to repair error code 725 - OnlyPermanentLeasesSupported
envelope := &soapErrorResponse{}
err = xml.Unmarshal(response, envelope)
if err != nil {
return err
err2 := xml.Unmarshal(response, envelope)
if err2 != nil {
return err2
}
if envelope.ErrorCode == 725 {
return s.AddPortMapping(localIPAddress, protocol, externalPort, internalPort, description, 0)