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

Fix naked returns

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

14
upnp.go
View file

@ -69,18 +69,18 @@ type upnpNAT struct {
func Discover() (nat NAT, err error) { func Discover() (nat NAT, err error) {
ssdp, err := net.ResolveUDPAddr("udp4", "239.255.255.250:1900") ssdp, err := net.ResolveUDPAddr("udp4", "239.255.255.250:1900")
if err != nil { if err != nil {
return return nil, err
} }
conn, err := net.ListenPacket("udp4", ":0") conn, err := net.ListenPacket("udp4", ":0")
if err != nil { if err != nil {
return return nil, err
} }
socket := conn.(*net.UDPConn) socket := conn.(*net.UDPConn)
defer socket.Close() defer socket.Close()
err = socket.SetDeadline(time.Now().Add(3 * time.Second)) err = socket.SetDeadline(time.Now().Add(3 * time.Second))
if err != nil { if err != nil {
return return nil, err
} }
st := "ST: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" st := "ST: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n"
@ -236,17 +236,17 @@ func getOurIP(serviceIP string) (ip string, err error) {
func getServiceURL(rootURL string) (url string, err error) { func getServiceURL(rootURL string) (url string, err error) {
r, err := http.Get(rootURL) r, err := http.Get(rootURL)
if err != nil { if err != nil {
return return "", err
} }
defer r.Body.Close() defer r.Body.Close()
if r.StatusCode >= 400 { if r.StatusCode >= 400 {
err = errors.New(fmt.Sprint(r.StatusCode)) err = errors.New(fmt.Sprint(r.StatusCode))
return return "", err
} }
var root root var root root
err = xml.NewDecoder(r.Body).Decode(&root) err = xml.NewDecoder(r.Body).Decode(&root)
if err != nil { if err != nil {
return return "", err
} }
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" {
@ -325,7 +325,7 @@ func soapRequest(url, function, message string) (replyXML []byte, err error) {
if r.StatusCode >= 400 { if r.StatusCode >= 400 {
err = errors.New("Error " + strconv.Itoa(r.StatusCode) + " for " + function) err = errors.New("Error " + strconv.Itoa(r.StatusCode) + " for " + function)
r = nil r = nil
return return nil, err
} }
var reply soapEnvelope var reply soapEnvelope
err = xml.NewDecoder(r.Body).Decode(&reply) err = xml.NewDecoder(r.Body).Decode(&reply)