mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, uniformised callbacks naming

Browse Source
This commit is contained in:
Sylvain Rochet 2015-02-19 23:51:33 +01:00
parent b92fe3eecb
commit ec362536f5
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,8 @@ static char pppoe_error_tmp[PPPOE_ERRORSTRING_LEN];
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p); static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
static err_t pppoe_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol); static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
static err_t pppoe_connect(ppp_pcb *ppp, void *ctx); static err_t pppoe_connect(ppp_pcb *ppp, void *ctx);
static void pppoe_disconnect(ppp_pcb *ppp, void *ctx); static void pppoe_disconnect(ppp_pcb *ppp, void *ctx);
static err_t pppoe_destroy(ppp_pcb *ppp, void *ctx); static err_t pppoe_destroy(ppp_pcb *ppp, void *ctx);
@ -152,8 +152,8 @@ static const struct link_callbacks pppoe_callbacks = {
pppoe_connect, pppoe_connect,
pppoe_disconnect, pppoe_disconnect,
pppoe_destroy, pppoe_destroy,
pppoe_link_write_callback, pppoe_write,
pppoe_link_netif_output_callback, pppoe_netif_output,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -201,7 +201,7 @@ ppp_pcb *pppoe_create(struct netif *pppif,
} }
/* Called by PPP core */ /* Called by PPP core */
static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p) { static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
struct pppoe_softc *sc = (struct pppoe_softc *)ctx; struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
struct pbuf *ph; /* Ethernet + PPPoE header */ struct pbuf *ph; /* Ethernet + PPPoE header */
#if LWIP_SNMP #if LWIP_SNMP
@ -241,7 +241,7 @@ static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p)
} }
/* Called by PPP core */ /* Called by PPP core */
static err_t pppoe_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) { static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
struct pppoe_softc *sc = (struct pppoe_softc *)ctx; struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
struct pbuf *pb; struct pbuf *pb;
int i=0; int i=0;

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

@ -75,8 +75,8 @@
#endif /* PPPOL2TP_AUTH_SUPPORT */ #endif /* PPPOL2TP_AUTH_SUPPORT */
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p); static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
static err_t pppol2tp_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol); static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
static err_t pppol2tp_destroy(ppp_pcb *ppp, void *ctx); /* Destroy a L2TP control block */ static err_t pppol2tp_destroy(ppp_pcb *ppp, void *ctx); /* Destroy a L2TP control block */
static err_t pppol2tp_connect(ppp_pcb *ppp, void *ctx); /* Be a LAC, connect to a LNS. */ static err_t pppol2tp_connect(ppp_pcb *ppp, void *ctx); /* Be a LAC, connect to a LNS. */
static void pppol2tp_disconnect(ppp_pcb *ppp, void *ctx); /* Disconnect */ static void pppol2tp_disconnect(ppp_pcb *ppp, void *ctx); /* Disconnect */
@ -101,8 +101,8 @@ static const struct link_callbacks pppol2tp_callbacks = {
pppol2tp_connect, pppol2tp_connect,
pppol2tp_disconnect, pppol2tp_disconnect,
pppol2tp_destroy, pppol2tp_destroy,
pppol2tp_link_write_callback, pppol2tp_write,
pppol2tp_link_netif_output_callback, pppol2tp_netif_output,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -154,7 +154,7 @@ ppp_pcb *pppol2tp_create(struct netif *pppif,
} }
/* Called by PPP core */ /* Called by PPP core */
static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p) { static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx; pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx;
struct pbuf *ph; /* UDP + L2TP header */ struct pbuf *ph; /* UDP + L2TP header */
#if LWIP_SNMP #if LWIP_SNMP
@ -191,7 +191,7 @@ static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *
} }
/* Called by PPP core */ /* Called by PPP core */
static err_t pppol2tp_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) { static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx; pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx;
struct pbuf *pb; struct pbuf *pb;
int i=0; int i=0;

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

@ -82,8 +82,8 @@ static u8_t pppos_exist(pppos_pcb *pppos);
#endif /* PPPOS_PCB_LIST */ #endif /* PPPOS_PCB_LIST */
/* callbacks called from PPP core */ /* callbacks called from PPP core */
static err_t pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p); static err_t pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
static err_t pppos_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol); static err_t pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol);
static err_t pppos_connect(ppp_pcb *ppp, void *ctx); static err_t pppos_connect(ppp_pcb *ppp, void *ctx);
static void pppos_disconnect(ppp_pcb *ppp, void *ctx); static void pppos_disconnect(ppp_pcb *ppp, void *ctx);
static err_t pppos_destroy(ppp_pcb *ppp, void *ctx); static err_t pppos_destroy(ppp_pcb *ppp, void *ctx);
@ -107,8 +107,8 @@ static const struct link_callbacks pppos_callbacks = {
pppos_connect, pppos_connect,
pppos_disconnect, pppos_disconnect,
pppos_destroy, pppos_destroy,
pppos_link_write_callback, pppos_write,
pppos_link_netif_output_callback, pppos_netif_output,
pppos_send_config, pppos_send_config,
pppos_recv_config, pppos_recv_config,
#if VJ_SUPPORT #if VJ_SUPPORT
@ -226,7 +226,7 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
/* Called by PPP core */ /* Called by PPP core */
static err_t static err_t
pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p) pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p)
{ {
pppos_pcb *pppos = (pppos_pcb *)ctx; pppos_pcb *pppos = (pppos_pcb *)ctx;
u_char *s = (u_char*)p->payload; u_char *s = (u_char*)p->payload;
@ -295,7 +295,7 @@ pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p)
/* Called by PPP core */ /* Called by PPP core */
static err_t static err_t
pppos_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol) pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol)
{ {
pppos_pcb *pppos = (pppos_pcb *)ctx; pppos_pcb *pppos = (pppos_pcb *)ctx;
u_int fcs_out = PPP_INITFCS; u_int fcs_out = PPP_INITFCS;