From ad5f520c68178fbd9e8d1fe19b7c616b7e6354f4 Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Thu, 23 Aug 2012 20:47:14 +0200 Subject: [PATCH] PPP, updated pppapi_reopen() to follow ppp_reopen() prototype change --- src/api/pppapi.c | 5 +++-- src/include/lwip/pppapi.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/pppapi.c b/src/api/pppapi.c index f06aa797..50f8369e 100644 --- a/src/api/pppapi.c +++ b/src/api/pppapi.c @@ -209,7 +209,7 @@ int pppapi_over_l2tp_open(ppp_pcb *pcb, struct netif *netif, ip_addr_t *ipaddr, * Call ppp_reopen() inside the tcpip_thread context. */ static void pppapi_do_ppp_reopen(struct pppapi_msg_msg *msg) { - ppp_reopen(msg->ppp, msg->msg.reopen.holdoff); + msg->err = ppp_reopen(msg->ppp, msg->msg.reopen.holdoff); TCPIP_PPPAPI_ACK(msg); } @@ -217,12 +217,13 @@ static void pppapi_do_ppp_reopen(struct pppapi_msg_msg *msg) { * Call ppp_reopen() in a thread-safe way by running that function inside the * tcpip_thread context. */ -void pppapi_reopen(ppp_pcb *pcb, u16_t holdoff) { +int pppapi_reopen(ppp_pcb *pcb, u16_t holdoff) { struct pppapi_msg msg; msg.function = pppapi_do_ppp_reopen; msg.msg.ppp = pcb; msg.msg.msg.reopen.holdoff = holdoff; TCPIP_PPPAPI(&msg); + return msg.msg.err; } diff --git a/src/include/lwip/pppapi.h b/src/include/lwip/pppapi.h index f5713acb..c889b5bf 100644 --- a/src/include/lwip/pppapi.h +++ b/src/include/lwip/pppapi.h @@ -128,7 +128,7 @@ int pppapi_over_l2tp_open(ppp_pcb *pcb, struct netif *netif, ip_addr_t *ipaddr, u8_t *secret, u8_t secret_len, ppp_link_status_cb_fn link_status_cb, void *link_status_ctx); #endif /* PPPOL2TP_SUPPORT */ -void pppapi_reopen(ppp_pcb *pcb, u16_t holdoff); +int pppapi_reopen(ppp_pcb *pcb, u16_t holdoff); int pppapi_close(ppp_pcb *pcb); void pppapi_sighup(ppp_pcb *pcb); int pppapi_delete(ppp_pcb *pcb);