Browse Source

Repackage discovery registry so that it can be converted to JSON.

The registry uses a non-string type as keys which is not possible in JSON.
Phill Luby 11 years ago
parent
commit
fffae9a741
1 changed files with 6 additions and 1 deletions
  1. 6 1
      cmd/syncthing/gui.go

+ 6 - 1
cmd/syncthing/gui.go

@@ -451,7 +451,12 @@ func restPostDiscoveryHint(w http.ResponseWriter, r *http.Request) {
 }
 
 func restGetDiscovery(w http.ResponseWriter, r *http.Request) {
-	json.NewEncoder(w).Encode(discoverer.All())
+	registry := discoverer.All()
+	devices := make(map[string][]struct{}, len(registry))
+	for device, addrs := range registry {
+		devices[device.String()] = make([]struct{}, len(addrs))
+	}
+	json.NewEncoder(w).Encode(devices)
 }
 
 func restGetReport(m *model.Model, w http.ResponseWriter, r *http.Request) {