fix Mac and Windows issue on survey

skycoin · Jul 13, 2024 · 556a5a3 · 556a5a3
1 parent 8229606
commit 556a5a3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/pkg/visor/visorconfig/values_darwin.go b/pkg/visor/visorconfig/values_darwin.go
@@ -42,13 +42,23 @@ type Survey struct {
 }
 
 // SystemSurvey returns system survey
-func SystemSurvey() (Survey, error) {
+func SystemSurvey(dmsgDisc string) (Survey, error) {
 	disks, err := ghw.Block(ghw.WithDisableWarnings())
 	if err != nil {
 		return Survey{}, err
 	}
+	var ipInfo IPSkycoin
+	fetchedIPInfo, err := IPSkycoinFetch()
+	if err != nil {
+		ipValue, err := IPSkycoinFetchDmsg(dmsgDisc)
+		if err == nil {
+			ipInfo.IPAddress = ipValue
+		}
+	} else {
+		ipInfo = *fetchedIPInfo
+	}
 	s := Survey{
-		IPInfo:         IPSkycoinFetch(),
+		IPInfo:         &ipInfo,
 		IPAddr:         IPA(),
 		GOOS:           runtime.GOOS,
 		GOARCH:         runtime.GOARCH,

diff --git a/pkg/visor/visorconfig/values_windows.go b/pkg/visor/visorconfig/values_windows.go
@@ -44,7 +44,7 @@ type Survey struct {
 }
 
 // SystemSurvey returns system survey
-func SystemSurvey() (Survey, error) {
+func SystemSurvey(dmsgDisc string) (Survey, error) {
 	disks, err := ghw.Block(ghw.WithDisableWarnings())
 	if err != nil {
 		return Survey{}, err
@@ -57,8 +57,18 @@ func SystemSurvey() (Survey, error) {
 	if err != nil {
 		return Survey{}, err
 	}
+	var ipInfo IPSkycoin
+	fetchedIPInfo, err := IPSkycoinFetch()
+	if err != nil {
+		ipValue, err := IPSkycoinFetchDmsg(dmsgDisc)
+		if err == nil {
+			ipInfo.IPAddress = ipValue
+		}
+	} else {
+		ipInfo = *fetchedIPInfo
+	}
 	s := Survey{
-		IPInfo:         IPSkycoinFetch(),
+		IPInfo:         &ipInfo,
 		GOOS:           runtime.GOOS,
 		GOARCH:         runtime.GOARCH,
 		UUID:           uuid.New(),