octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/upnp: Don’t log unknown device types (fixes #5038) (#5087)

Browse Source
This commit is contained in:
Oyebanji Jacob Mayowa 2018-07-30 15:34:35 +01:00 committed by Jakob Borg
parent 24d307531d
commit adc5bf6604
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/upnp/upnp.go
View File

@ -72,6 +72,15 @@ type upnpRoot struct {
Device upnpDevice `xml:"device"` Device upnpDevice `xml:"device"`
} }
// UnsupportedDeviceTypeError for unsupported UPnP device types (i.e upnp:rootdevice)
type UnsupportedDeviceTypeError struct {
deviceType string
}
func (e UnsupportedDeviceTypeError) Error() string {
return fmt.Sprintf("Unsupported UPnP device of type %s", e.deviceType)
}
// Discover discovers UPnP InternetGatewayDevices. // Discover discovers UPnP InternetGatewayDevices.
// The order in which the devices appear in the results list is not deterministic. // The order in which the devices appear in the results list is not deterministic.
func Discover(renewal, timeout time.Duration) []nat.Device { func Discover(renewal, timeout time.Duration) []nat.Device {
@ -180,7 +189,12 @@ USER-AGENT: syncthing/1.0
} }
igds, err := parseResponse(deviceType, resp[:n]) igds, err := parseResponse(deviceType, resp[:n])
if err != nil { if err != nil {
switch err.(type) {
case *UnsupportedDeviceTypeError:
l.Debugln(err.Error())
default:
l.Infoln("UPnP parse:", err) l.Infoln("UPnP parse:", err)
}
continue continue
} }
for _, igd := range igds { for _, igd := range igds {
@ -203,7 +217,7 @@ func parseResponse(deviceType string, resp []byte) ([]IGDService, error) {
respondingDeviceType := response.Header.Get("St") respondingDeviceType := response.Header.Get("St")
if respondingDeviceType != deviceType { if respondingDeviceType != deviceType {
return nil, errors.New("unrecognized UPnP device of type " + respondingDeviceType) return nil, &UnsupportedDeviceTypeError{deviceType: respondingDeviceType}
} }
deviceDescriptionLocation := response.Header.Get("Location") deviceDescriptionLocation := response.Header.Get("Location")