Merge pull request #7161 from kjbracey-arm/ppp-gateway

Cruz Monrreal · web-flow · commit ed9a1f1327f5 · 2018-06-11T22:11:18.000-05:00
Correct PPPCellularInterface::get_gateway()
diff --git a/features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp b/features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp
@@ -452,7 +452,7 @@ const char *nsapi_ppp_get_gw_addr(FileHandle *stream)
 
     static char gwaddr[IPADDR_STRLEN_MAX];
     if (stream == my_stream) {
-        if (my_interface->get_netmask(gwaddr, IPADDR_STRLEN_MAX)) {
+        if (my_interface->get_gateway(gwaddr, IPADDR_STRLEN_MAX)) {
             return gwaddr;
         }
     }
diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
@@ -749,7 +749,7 @@ const char *PPPCellularInterface::get_netmask()
 
 const char *PPPCellularInterface::get_gateway()
 {
-    return nsapi_ppp_get_ip_addr(_fh);
+    return nsapi_ppp_get_gw_addr(_fh);
 }
 
 /** Power down modem

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ const char nsapi_ppp_get_gw_addr(FileHandle stream)`
`452`	`452`
`453`	`453`	`static char gwaddr[IPADDR_STRLEN_MAX];`
`454`	`454`	`if (stream == my_stream) {`
`455`		`- if (my_interface->get_netmask(gwaddr, IPADDR_STRLEN_MAX)) {`
	`455`	`+ if (my_interface->get_gateway(gwaddr, IPADDR_STRLEN_MAX)) {`
`456`	`456`	`return gwaddr;`
`457`	`457`	`}`
`458`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ const char *PPPCellularInterface::get_netmask()`
`749`	`749`
`750`	`750`	`const char *PPPCellularInterface::get_gateway()`
`751`	`751`	`{`
`752`		`- return nsapi_ppp_get_ip_addr(_fh);`
	`752`	`+ return nsapi_ppp_get_gw_addr(_fh);`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`/** Power down modem`