Fix WiFi SSID and Password sscanf issue

PaulZC · PaulZC · commit 534cf54286d1 · 2024-04-24T16:35:39.000-06:00
diff --git a/Firmware/RTK_Everywhere/NVM.ino b/Firmware/RTK_Everywhere/NVM.ino
@@ -1147,15 +1147,22 @@ bool parseLine(char *str)
                     case _wifiNetwork:
                         {
                             int network;
-                            if (sscanf(suffix, "%dSSID", &network) == 1)
+
+                            if (strstr(suffix, "SSID") != nullptr)
                             {
-                                strncpy(settings.wifiNetworks[network].ssid, settingString, sizeof(settings.wifiNetworks[0].ssid));
-                                knownSetting = true;
+                                if (sscanf(suffix, "%dSSID", &network) == 1)
+                                {
+                                    strncpy(settings.wifiNetworks[network].ssid, settingString, sizeof(settings.wifiNetworks[0].ssid));
+                                    knownSetting = true;
+                                }
                             }
-                            else if (sscanf(suffix, "%dPassword", &network) == 1)
+                            else if (strstr(suffix, "Password") != nullptr)
                             {
-                                strncpy(settings.wifiNetworks[network].password, settingString, sizeof(settings.wifiNetworks[0].password));
-                                knownSetting = true;
+                                if (sscanf(suffix, "%dPassword", &network) == 1)
+                                {
+                                    strncpy(settings.wifiNetworks[network].password, settingString, sizeof(settings.wifiNetworks[0].password));
+                                    knownSetting = true;
+                                }
                             }
                         }
                         break;
diff --git a/Firmware/RTK_Everywhere/menuCommands.ino b/Firmware/RTK_Everywhere/menuCommands.ino
@@ -328,15 +328,22 @@ bool updateSettingWithValue(const char *settingName, const char *settingValueStr
                 case _wifiNetwork:
                     {
                         int network;
-                        if (sscanf(suffix, "%dSSID", &network) == 1)
+
+                        if (strstr(suffix, "SSID") != nullptr)
                         {
-                            strncpy(settings.wifiNetworks[network].ssid, settingValueStr, sizeof(settings.wifiNetworks[0].ssid));
-                            knownSetting = true;
+                            if (sscanf(suffix, "%dSSID", &network) == 1)
+                            {
+                                strncpy(settings.wifiNetworks[network].ssid, settingValueStr, sizeof(settings.wifiNetworks[0].ssid));
+                                knownSetting = true;
+                            }
                         }
-                        else if (sscanf(suffix, "%dPassword", &network) == 1)
+                        else if (strstr(suffix, "Password") != nullptr)
                         {
-                            strncpy(settings.wifiNetworks[network].password, settingValueStr, sizeof(settings.wifiNetworks[0].password));
-                            knownSetting = true;
+                            if (sscanf(suffix, "%dPassword", &network) == 1)
+                            {
+                                strncpy(settings.wifiNetworks[network].password, settingValueStr, sizeof(settings.wifiNetworks[0].password));
+                                knownSetting = true;
+                            }
                         }
                     }
                     break;
@@ -1763,15 +1770,22 @@ bool getSettingValue(const char *settingName, char *settingValueStr)
                 case _wifiNetwork:
                     {
                         int network;
-                        if (sscanf(suffix, "%dSSID", &network) == 1)
+
+                        if (strstr(suffix, "SSID") != nullptr)
                         {
-                            writeToString(settingValueStr, settings.wifiNetworks[network].ssid);
-                            knownSetting = true;
+                            if (sscanf(suffix, "%dSSID", &network) == 1)
+                            {
+                                writeToString(settingValueStr, settings.wifiNetworks[network].ssid);
+                                knownSetting = true;
+                            }
                         }
-                        else if (sscanf(suffix, "%dPassword", &network) == 1)
+                        else if (strstr(suffix, "Password") != nullptr)
                         {
-                            writeToString(settingValueStr, settings.wifiNetworks[network].password);
-                            knownSetting = true;
+                            if (sscanf(suffix, "%dPassword", &network) == 1)
+                            {
+                                writeToString(settingValueStr, settings.wifiNetworks[network].password);
+                                knownSetting = true;
+                            }
                         }
                     }
                     break;

Original file line number	Diff line number	Diff line change
`@@ -1147,15 +1147,22 @@ bool parseLine(char *str)`
`1147`	`1147`	`case _wifiNetwork:`
`1148`	`1148`	`{`
`1149`	`1149`	`int network;`
`1150`		`- if (sscanf(suffix, "%dSSID", &network) == 1)`
	`1150`	`+`
	`1151`	`+ if (strstr(suffix, "SSID") != nullptr)`
`1151`	`1152`	`{`
`1152`		`- strncpy(settings.wifiNetworks[network].ssid, settingString, sizeof(settings.wifiNetworks[0].ssid));`
`1153`		`- knownSetting = true;`
	`1153`	`+ if (sscanf(suffix, "%dSSID", &network) == 1)`
	`1154`	`+ {`
	`1155`	`+ strncpy(settings.wifiNetworks[network].ssid, settingString, sizeof(settings.wifiNetworks[0].ssid));`
	`1156`	`+ knownSetting = true;`
	`1157`	`+ }`
`1154`	`1158`	`}`
`1155`		`- else if (sscanf(suffix, "%dPassword", &network) == 1)`
	`1159`	`+ else if (strstr(suffix, "Password") != nullptr)`
`1156`	`1160`	`{`
`1157`		`- strncpy(settings.wifiNetworks[network].password, settingString, sizeof(settings.wifiNetworks[0].password));`
`1158`		`- knownSetting = true;`
	`1161`	`+ if (sscanf(suffix, "%dPassword", &network) == 1)`
	`1162`	`+ {`
	`1163`	`+ strncpy(settings.wifiNetworks[network].password, settingString, sizeof(settings.wifiNetworks[0].password));`
	`1164`	`+ knownSetting = true;`
	`1165`	`+ }`
`1159`	`1166`	`}`
`1160`	`1167`	`}`
`1161`	`1168`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -328,15 +328,22 @@ bool updateSettingWithValue(const char settingName, const char settingValueStr`
`328`	`328`	`case _wifiNetwork:`
`329`	`329`	`{`
`330`	`330`	`int network;`
`331`		`- if (sscanf(suffix, "%dSSID", &network) == 1)`
	`331`	`+`
	`332`	`+ if (strstr(suffix, "SSID") != nullptr)`
`332`	`333`	`{`
`333`		`- strncpy(settings.wifiNetworks[network].ssid, settingValueStr, sizeof(settings.wifiNetworks[0].ssid));`
`334`		`- knownSetting = true;`
	`334`	`+ if (sscanf(suffix, "%dSSID", &network) == 1)`
	`335`	`+ {`
	`336`	`+ strncpy(settings.wifiNetworks[network].ssid, settingValueStr, sizeof(settings.wifiNetworks[0].ssid));`
	`337`	`+ knownSetting = true;`
	`338`	`+ }`
`335`	`339`	`}`
`336`		`- else if (sscanf(suffix, "%dPassword", &network) == 1)`
	`340`	`+ else if (strstr(suffix, "Password") != nullptr)`
`337`	`341`	`{`
`338`		`- strncpy(settings.wifiNetworks[network].password, settingValueStr, sizeof(settings.wifiNetworks[0].password));`
`339`		`- knownSetting = true;`
	`342`	`+ if (sscanf(suffix, "%dPassword", &network) == 1)`
	`343`	`+ {`
	`344`	`+ strncpy(settings.wifiNetworks[network].password, settingValueStr, sizeof(settings.wifiNetworks[0].password));`
	`345`	`+ knownSetting = true;`
	`346`	`+ }`
`340`	`347`	`}`
`341`	`348`	`}`
`342`	`349`	`break;`
`@@ -1763,15 +1770,22 @@ bool getSettingValue(const char settingName, char settingValueStr)`
`1763`	`1770`	`case _wifiNetwork:`
`1764`	`1771`	`{`
`1765`	`1772`	`int network;`
`1766`		`- if (sscanf(suffix, "%dSSID", &network) == 1)`
	`1773`	`+`
	`1774`	`+ if (strstr(suffix, "SSID") != nullptr)`
`1767`	`1775`	`{`
`1768`		`- writeToString(settingValueStr, settings.wifiNetworks[network].ssid);`
`1769`		`- knownSetting = true;`
	`1776`	`+ if (sscanf(suffix, "%dSSID", &network) == 1)`
	`1777`	`+ {`
	`1778`	`+ writeToString(settingValueStr, settings.wifiNetworks[network].ssid);`
	`1779`	`+ knownSetting = true;`
	`1780`	`+ }`
`1770`	`1781`	`}`
`1771`		`- else if (sscanf(suffix, "%dPassword", &network) == 1)`
	`1782`	`+ else if (strstr(suffix, "Password") != nullptr)`
`1772`	`1783`	`{`
`1773`		`- writeToString(settingValueStr, settings.wifiNetworks[network].password);`
`1774`		`- knownSetting = true;`
	`1784`	`+ if (sscanf(suffix, "%dPassword", &network) == 1)`
	`1785`	`+ {`
	`1786`	`+ writeToString(settingValueStr, settings.wifiNetworks[network].password);`
	`1787`	`+ knownSetting = true;`
	`1788`	`+ }`
`1775`	`1789`	`}`
`1776`	`1790`	`}`
`1777`	`1791`	`break;`