Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Networking: auto-restart PPP on error

Browse Source 
this makes it easier to handle startup timing with PPP
This commit is contained in:
Andrew Tridgell 2024-01-04 13:30:41 +11:00 committed by Tom Pittenger
parent 5acf58c310
commit 7292c89766
2 changed files with 34 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
libraries/AP_Networking/AP_Networking_PPP.cpp
View File

@ -53,70 +53,28 @@ void AP_Networking_PPP::ppp_status_callback(struct ppp_pcb_s *pcb, int code, voi
{ {
auto &driver = *(AP_Networking_PPP *)ctx; auto &driver = *(AP_Networking_PPP *)ctx;
struct netif *pppif = ppp_netif(pcb); struct netif *pppif = ppp_netif(pcb);
const char *msg = nullptr;
switch (code) { switch (code) {
case PPPERR_NONE: { case PPPERR_NONE:
// got addresses // got new addresses for the link
driver.activeSettings.ip = ntohl(netif_ip4_addr(pppif)->addr); driver.activeSettings.ip = ntohl(netif_ip4_addr(pppif)->addr);
driver.activeSettings.gw = ntohl(netif_ip4_gw(pppif)->addr); driver.activeSettings.gw = ntohl(netif_ip4_gw(pppif)->addr);
driver.activeSettings.nm = ntohl(netif_ip4_netmask(pppif)->addr); driver.activeSettings.nm = ntohl(netif_ip4_netmask(pppif)->addr);
driver.activeSettings.last_change_ms = AP_HAL::millis(); driver.activeSettings.last_change_ms = AP_HAL::millis();
break;
case PPPERR_OPEN:
case PPPERR_CONNECT:
case PPPERR_PEERDEAD:
case PPPERR_IDLETIMEOUT:
case PPPERR_CONNECTTIME:
driver.need_restart = true;
break; break;
}
case PPPERR_PARAM: { /* Invalid parameter. */ default:
msg = "PPPERR_PARAM"; GCS_SEND_TEXT(MAV_SEVERITY_INFO, "PPP: error %d", code);
break; break;
} }
case PPPERR_OPEN: { /* Unable to open PPP session. */
msg = "PPPERR_OPEN";
break;
}
case PPPERR_DEVICE: { /* Invalid I/O device for PPP. */
msg = "PPPERR_DEVICE";
break;
}
case PPPERR_ALLOC: { /* Unable to allocate resources. */
msg = "PPPERR_ALLOC";
break;
}
case PPPERR_USER: { /* User interrupt. */
msg = "PPPERR_USER";
break;
}
case PPPERR_CONNECT: { /* Connection lost. */
msg = "PPPERR_CONNECT";
break;
}
case PPPERR_AUTHFAIL: { /* Failed authentication challenge. */
msg = "PPPERR_AUTHFAIL";
break;
}
case PPPERR_PROTOCOL: { /* Failed to meet protocol. */
msg = "PPPERR_PROTOCOL";
break;
}
case PPPERR_PEERDEAD: { /* Connection timeout */
msg = "PPPERR_PEERDEAD";
break;
}
case PPPERR_IDLETIMEOUT: { /* Idle Timeout */
msg = "PPPERR_IDLETIMEOUT";
break;
}
case PPPERR_CONNECTTIME: { /* Max connect time reached */
msg = "PPPERR_CONNECTTIME";
break;
}
case PPPERR_LOOPBACK: { /* Loopback detected */
msg = "PPPERR_LOOPBACK";
break;
}
}
if (msg != nullptr) {
GCS_SEND_TEXT(MAV_SEVERITY_INFO, "PPP: %s", msg);
}
} }
@ -169,13 +127,6 @@ void AP_Networking_PPP::ppp_loop(void)
while (!hal.scheduler->is_system_initialized()) { while (!hal.scheduler->is_system_initialized()) {
hal.scheduler->delay_microseconds(1000); hal.scheduler->delay_microseconds(1000);
} }
// connect and set as default route
LWIP_TCPIP_LOCK();
ppp_connect(ppp, 0);
netif_set_default(pppif);
LWIP_TCPIP_UNLOCK();
// ensure this thread owns the uart // ensure this thread owns the uart
uart->begin(0); uart->begin(0);
@ -183,13 +134,27 @@ void AP_Networking_PPP::ppp_loop(void)
while (true) { while (true) {
uint8_t buf[1024]; uint8_t buf[1024];
auto n = uart->read(buf, sizeof(buf));
if (n > 0) { // connect and set as default route
LWIP_TCPIP_LOCK(); LWIP_TCPIP_LOCK();
pppos_input(ppp, buf, n); ppp_connect(ppp, 0);
LWIP_TCPIP_UNLOCK();
} else { netif_set_default(pppif);
hal.scheduler->delay_microseconds(200); LWIP_TCPIP_UNLOCK();
need_restart = false;
GCS_SEND_TEXT(MAV_SEVERITY_INFO, "PPP: connected");
while (!need_restart) {
auto n = uart->read(buf, sizeof(buf));
if (n > 0) {
LWIP_TCPIP_LOCK();
pppos_input(ppp, buf, n);
LWIP_TCPIP_UNLOCK();
} else {
hal.scheduler->delay_microseconds(200);
}
} }
} }
} }

1
libraries/AP_Networking/AP_Networking_PPP.h
View File

@ -21,6 +21,7 @@ private:
AP_HAL::UARTDriver *uart; AP_HAL::UARTDriver *uart;
struct netif *pppif; struct netif *pppif;
struct ppp_pcb_s *ppp; struct ppp_pcb_s *ppp;
bool need_restart;
static void ppp_status_callback(struct ppp_pcb_s *pcb, int code, void *ctx); static void ppp_status_callback(struct ppp_pcb_s *pcb, int code, void *ctx);
static uint32_t ppp_output_cb(struct ppp_pcb_s *pcb, const void *data, uint32_t len, void *ctx); static uint32_t ppp_output_cb(struct ppp_pcb_s *pcb, const void *data, uint32_t len, void *ctx);