mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-17 19:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, CORE, prepared for lower protocols callbacks returning state

Browse Source 
Until now, callbacks used void return, preparing callbacks to return
PPPERR_ status.
This commit is contained in:
Sylvain Rochet 2015-02-17 22:57:42 +01:00
parent ee2936ffbf
commit 1ae3808e13
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/netif/ppp/ppp.h
View File

@ -303,7 +303,7 @@ struct ppp_addrs {
/* /*
* PPP interface control block. * PPP interface control block.
*/ */
typedef void (*link_command_cb_fn)(void *pcb, u8_t command); typedef int (*link_command_cb_fn)(void *pcb, u8_t command);
typedef int (*link_write_cb_fn)(void *pcb, struct pbuf *p); typedef int (*link_write_cb_fn)(void *pcb, struct pbuf *p);
typedef err_t (*link_netif_output_cb_fn)(void *pcb, struct pbuf *p, u_short protocol); typedef err_t (*link_netif_output_cb_fn)(void *pcb, struct pbuf *p, u_short protocol);

6
src/netif/ppp/pppoe.c
View File

@ -117,7 +117,7 @@ static char pppoe_error_tmp[PPPOE_ERRORSTRING_LEN];
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static void pppoe_link_command_callback(void *pcb, u8_t command); static int pppoe_link_command_callback(void *pcb, u8_t command);
static int pppoe_link_write_callback(void *pcb, struct pbuf *p); static int pppoe_link_write_callback(void *pcb, struct pbuf *p);
static err_t pppoe_link_netif_output_callback(void *pcb, struct pbuf *p, u_short protocol); static err_t pppoe_link_netif_output_callback(void *pcb, struct pbuf *p, u_short protocol);
@ -190,7 +190,7 @@ ppp_pcb *pppoe_create(struct netif *pppif,
} }
/* Called by PPP core */ /* Called by PPP core */
static void pppoe_link_command_callback(void *pcb, u8_t command) { static int pppoe_link_command_callback(void *pcb, u8_t command) {
struct pppoe_softc *sc = (struct pppoe_softc *)pcb; struct pppoe_softc *sc = (struct pppoe_softc *)pcb;
switch(command) { switch(command) {
@ -208,6 +208,8 @@ static void pppoe_link_command_callback(void *pcb, u8_t command) {
default: ; default: ;
} }
return PPPERR_NONE;
} }
/* Called by PPP core */ /* Called by PPP core */

6
src/netif/ppp/pppol2tp.c
View File

@ -75,7 +75,7 @@
#endif /* PPPOL2TP_AUTH_SUPPORT */ #endif /* PPPOL2TP_AUTH_SUPPORT */
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static void pppol2tp_link_command_callback(void *pcb, u8_t command); static int pppol2tp_link_command_callback(void *pcb, u8_t command);
static int pppol2tp_link_write_callback(void *pcb, struct pbuf *p); static int pppol2tp_link_write_callback(void *pcb, struct pbuf *p);
static err_t pppol2tp_link_netif_output_callback(void *pcb, struct pbuf *p, u_short protocol); static err_t pppol2tp_link_netif_output_callback(void *pcb, struct pbuf *p, u_short protocol);
@ -143,7 +143,7 @@ ppp_pcb *pppol2tp_create(struct netif *pppif,
} }
/* Called by PPP core */ /* Called by PPP core */
static void pppol2tp_link_command_callback(void *pcb, u8_t command) { static int pppol2tp_link_command_callback(void *pcb, u8_t command) {
pppol2tp_pcb *l2tp = (pppol2tp_pcb *)pcb; pppol2tp_pcb *l2tp = (pppol2tp_pcb *)pcb;
switch(command) { switch(command) {
@ -161,6 +161,8 @@ static void pppol2tp_link_command_callback(void *pcb, u8_t command) {
default: ; default: ;
} }
return PPPERR_NONE;
} }
/* Called by PPP core */ /* Called by PPP core */

6
src/netif/ppp/pppos.c
View File

@ -51,7 +51,7 @@
#include "netif/ppp/vj.h" #include "netif/ppp/vj.h"
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static void pppos_link_command_callback(void *pcb, u8_t command); static int pppos_link_command_callback(void *pcb, u8_t command);
static int pppos_link_write_callback(void *pcb, struct pbuf *p); static int pppos_link_write_callback(void *pcb, struct pbuf *p);
static err_t pppos_link_netif_output_callback(void *pcb, struct pbuf *pb, u_short protocol); static err_t pppos_link_netif_output_callback(void *pcb, struct pbuf *pb, u_short protocol);
@ -176,7 +176,7 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
} }
/* Called by PPP core */ /* Called by PPP core */
static void static int
pppos_link_command_callback(void *pcb, u8_t command) pppos_link_command_callback(void *pcb, u8_t command)
{ {
pppos_pcb *pppos = (pppos_pcb *)pcb; pppos_pcb *pppos = (pppos_pcb *)pcb;
@ -196,6 +196,8 @@ pppos_link_command_callback(void *pcb, u8_t command)
default: ; default: ;
} }
return PPPERR_NONE;
} }
/* Called by PPP core */ /* Called by PPP core */