nyyu/freebox-exporter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: mDNS lookup

Browse Source
This commit is contained in:
nyyu 2023-03-06 20:44:56 +01:00
parent 95eedc417b
commit a4e2d54457
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
fbx/api_version.go
View File

@ -124,54 +124,51 @@ func (f *FreeboxAPIVersion) newFreeboxAPIVersionMDNS(*FreeboxHttpClient) error {
// mDNS lookup
go func() {
defer close(entries)
if err := mdns.Lookup(mdnsService, entries); err != nil {
log.Error.Println("mDNS lookup failed:", err)
for entry := range entries {
deviceName := entry.Name
idx := strings.Index(deviceName, ".")
if idx >= 0 {
deviceName = deviceName[0:idx]
}
deviceName = strings.ReplaceAll(deviceName, "\\", "")
*f = FreeboxAPIVersion{
DeviceName: deviceName,
}
for i := range entry.InfoFields {
kv := strings.SplitN(entry.InfoFields[i], "=", 2)
if len(kv) != 2 {
break
}
switch kv[0] {
case "api_domain":
f.APIDomain = kv[1]
case "uid":
f.UID = kv[1]
case "https_available":
f.HTTPSAvailable = (kv[1] == "1")
case "https_port":
port, _ := strconv.ParseUint(kv[1], 10, 16)
f.HTTPSPort = uint16(port)
case "api_version":
f.APIVersion = kv[1]
case "api_base_url":
f.APIBaseURL = kv[1]
case "device_type":
f.DeviceType = kv[1]
default:
}
}
}
log.Debug.Println("End of mDNS lookup")
}()
for entry := range entries {
deviceName := entry.Name
idx := strings.Index(deviceName, ".")
if idx >= 0 {
deviceName = deviceName[0:idx]
}
deviceName = strings.ReplaceAll(deviceName, "\\", "")
*f = FreeboxAPIVersion{
DeviceName: deviceName,
}
for i := range entry.InfoFields {
kv := strings.SplitN(entry.InfoFields[i], "=", 2)
if len(kv) != 2 {
break
}
switch kv[0] {
case "api_domain":
f.APIDomain = kv[1]
case "uid":
f.UID = kv[1]
case "https_available":
f.HTTPSAvailable = (kv[1] == "1")
case "https_port":
port, _ := strconv.ParseUint(kv[1], 10, 16)
f.HTTPSPort = uint16(port)
case "api_version":
f.APIVersion = kv[1]
case "api_base_url":
f.APIBaseURL = kv[1]
case "device_type":
f.DeviceType = kv[1]
default:
}
}
if f.IsValid() {
return nil
}
if err := mdns.Lookup(mdnsService, entries); err != nil {
log.Error.Println("mDNS lookup failed:", err)
return err
}
return errors.New("MDNS timeout")
log.Debug.Println("End of mDNS lookup")
close(entries)
return nil
}
func (f *FreeboxAPIVersion) setQueryApiVersion(forceApiVersion int) error {