LBRYFoundation/lbcd
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcd.git synced 2025-08-31 09:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more naked returns
Some checks failed
Build and Test / Go CI (push) Has been cancelled
Details
golangci-lint / lint (push) Has been cancelled
Details

Browse source
This commit is contained in:
Ben van Hartingsveldt 2025-08-29 19:44:22 +02:00
parent 84f05db599
commit 3f075c62b9
No known key found for this signature in database
GPG key ID: 261AA214130CE7AB
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
upnp.go
View file

@ -95,7 +95,7 @@ func Discover() (nat NAT, err error) {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
_, err = socket.WriteToUDP(message, ssdp) _, err = socket.WriteToUDP(message, ssdp)
if err != nil { if err != nil {
return return nil, err
} }
var n int var n int
n, _, err = socket.ReadFromUDP(answerBytes) n, _, err = socket.ReadFromUDP(answerBytes)
@ -124,16 +124,16 @@ func Discover() (nat NAT, err error) {
var serviceURL string var serviceURL string
serviceURL, err = getServiceURL(locURL) serviceURL, err = getServiceURL(locURL)
if err != nil { if err != nil {
return return nil, err
} }
var serviceIP string = getServiceIP(serviceURL) var serviceIP string = getServiceIP(serviceURL)
var ourIP string var ourIP string
ourIP, err = getOurIP(serviceIP) ourIP, err = getOurIP(serviceIP)
if err != nil { if err != nil {
return return nil, err
} }
nat = &upnpNAT{serviceURL: serviceURL, ourIP: ourIP} nat = &upnpNAT{serviceURL: serviceURL, ourIP: ourIP}
return return nat, nil
} }
err = errors.New("UPnP port discovery failed") err = errors.New("UPnP port discovery failed")
return nat, err return nat, err
@ -228,7 +228,7 @@ func getOurIP(serviceIP string) (ip string, err error) {
return ip.String(), nil return ip.String(), nil
} }
} }
return return "", err
} }
// getServiceURL parses the xml description at the given root url to find the // getServiceURL parses the xml description at the given root url to find the
@ -251,22 +251,22 @@ func getServiceURL(rootURL string) (url string, err error) {
a := &root.Device a := &root.Device
if a.DeviceType != "urn:schemas-upnp-org:device:InternetGatewayDevice:1" { if a.DeviceType != "urn:schemas-upnp-org:device:InternetGatewayDevice:1" {
err = errors.New("no InternetGatewayDevice") err = errors.New("no InternetGatewayDevice")
return return "", err
} }
b := getChildDevice(a, "urn:schemas-upnp-org:device:WANDevice:1") b := getChildDevice(a, "urn:schemas-upnp-org:device:WANDevice:1")
if b == nil { if b == nil {
err = errors.New("no WANDevice") err = errors.New("no WANDevice")
return return "", err
} }
c := getChildDevice(b, "urn:schemas-upnp-org:device:WANConnectionDevice:1") c := getChildDevice(b, "urn:schemas-upnp-org:device:WANConnectionDevice:1")
if c == nil { if c == nil {
err = errors.New("no WANConnectionDevice") err = errors.New("no WANConnectionDevice")
return return "", err
} }
d := getChildService(c, "urn:schemas-upnp-org:service:WANIPConnection:1") d := getChildService(c, "urn:schemas-upnp-org:service:WANIPConnection:1")
if d == nil { if d == nil {
err = errors.New("no WANIPConnection") err = errors.New("no WANIPConnection")
return return "", err
} }
url = combineURL(rootURL, d.ControlURL) url = combineURL(rootURL, d.ControlURL)
return url, err return url, err
@ -380,7 +380,7 @@ func (n *upnpNAT) AddPortMapping(protocol string, externalPort, internalPort int
response, err := soapRequest(n.serviceURL, "AddPortMapping", message) response, err := soapRequest(n.serviceURL, "AddPortMapping", message)
if err != nil { if err != nil {
return return 0, err
} }
// TODO: check response to see if the port was forwarded // TODO: check response to see if the port was forwarded
@ -389,7 +389,7 @@ func (n *upnpNAT) AddPortMapping(protocol string, externalPort, internalPort int
// codes here. // codes here.
mappedExternalPort = externalPort mappedExternalPort = externalPort
_ = response _ = response
return return mappedExternalPort, nil
} }
// DeletePortMapping implements the NAT interface by removing up a port forwarding // DeletePortMapping implements the NAT interface by removing up a port forwarding
@ -403,11 +403,11 @@ func (n *upnpNAT) DeletePortMapping(protocol string, externalPort, internalPort
response, err := soapRequest(n.serviceURL, "DeletePortMapping", message) response, err := soapRequest(n.serviceURL, "DeletePortMapping", message)
if err != nil { if err != nil {
return return err
} }
// TODO: check response to see if the port was deleted // TODO: check response to see if the port was deleted
// log.Println(message, response) // log.Println(message, response)
_ = response _ = response
return return nil
} }