fix POE Port Status and add more page lookups for the debug output

nitram509 · Apr 24, 2024 · 464d30e · 464d30e
1 parent 90736cf
commit 464d30e
Show file tree

Hide file tree

Showing 11 changed files with 2,681 additions and 627 deletions.
diff --git a/debug_report.go b/debug_report.go
@@ -50,6 +50,8 @@ func printDebugLoggedIn(args *GlobalOptions, model NetgearModel, host string) {
 			fmt.Sprintf("http://%s/iss/specific/poe.html", host),
 			fmt.Sprintf("http://%s/iss/specific/poePortConf.html", host),
 			fmt.Sprintf("http://%s/iss/specific/poePortStatus.html", host),
+			fmt.Sprintf("http://%s/iss/specific/poePortStatus.html?GetData=TRUE", host),
+			fmt.Sprintf("http://%s/iss/specific/getPortRate.html", host),
 			fmt.Sprintf("http://%s/iss/specific/dashboard.html", host),
 			fmt.Sprintf("http://%s/iss/specific/homepage.html", host),
 		)

diff --git a/http.go b/http.go
@@ -26,7 +26,12 @@ func doHttpRequestAndReadResponse(args *GlobalOptions, httpMethod string, host s
 	}
 
 	if isModel316(model) {
-		requestUrl = requestUrl + "?Gambit=" + token
+		if strings.Contains(requestUrl, "?") {
+			splits := strings.Split(requestUrl, "?")
+			requestUrl = splits[0] + "?Gambit=" + token + "&" + splits[1]
+		} else {
+			requestUrl = requestUrl + "?Gambit=" + token
+		}
 	}
 
 	req, err := http.NewRequest(httpMethod, requestUrl, strings.NewReader(requestBody))

diff --git a/poe_status.go b/poe_status.go
@@ -85,7 +85,7 @@ func requestPoePortStatusPage(args *GlobalOptions, host string) (string, error)
 		return requestPage(args, host, url)
 	}
 	if isModel316(model) {
-		url := fmt.Sprintf("http://%s/iss/specific/poe.html", host)
+		url := fmt.Sprintf("http://%s/iss/specific/poePortStatus.html?GetData=TRUE", host)
 		return requestPage(args, host, url)
 	}
 	panic("model not supported")

diff --git a/poe_status_test.go b/poe_status_test.go
@@ -51,7 +51,7 @@ func TestFindPortStatusInHtml(t *testing.T) {
 		},
 		{
 			model:                        "GS316EP",
-			fileName:                     "poePortStatus.html",
+			fileName:                     "poePortStatus_GetData_true.html",
 			expectedNumberOfStatuses:     15,
 			expectedPoePowerClass:        "3",
 			expectedPoePortStatus:        "Delivering Power",

diff --git a/port_settings_test.go b/port_settings_test.go
@@ -37,9 +37,9 @@ func TestFindPortSettingsInHtml(t *testing.T) {
 			expectedSettingsLength:   16,
 			expectedIndex:            1,
 			expectedName:             "port name 1",
-			expectedSpeed:            "1",
-			expectedIngressRateLimit: "1",
-			expectedEgressRateLimit:  "1",
+			expectedSpeed:            "Auto",
+			expectedIngressRateLimit: "No Limit",
+			expectedEgressRateLimit:  "No Limit",
 			expectedFlowControl:      "OFF",
 		},
 	}