abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 05:24:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, all protocols, uniformised naming

Browse Source 
Uniformised fonction naming between and inside PPPoS, PPPoE, PPPoL2TP.
This commit is contained in:
Sylvain Rochet 2015-02-17 22:51:35 +01:00
parent 5b29f1cdec
commit ee2936ffbf
8 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/api/pppapi.c
View File

@ -122,26 +122,26 @@ pppapi_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_pha
#if PPPOS_SUPPORT #if PPPOS_SUPPORT
/** /**
* Call ppp_over_serial_create() inside the tcpip_thread context. * Call pppos_create() inside the tcpip_thread context.
*/ */
static void static void
pppapi_do_ppp_over_serial_create(struct pppapi_msg_msg *msg) pppapi_do_pppos_create(struct pppapi_msg_msg *msg)
{ {
msg->ppp = ppp_over_serial_create(msg->msg.serialcreate.pppif, msg->msg.serialcreate.fd, msg->ppp = pppos_create(msg->msg.serialcreate.pppif, msg->msg.serialcreate.fd,
msg->msg.serialcreate.link_status_cb, msg->msg.serialcreate.ctx_cb); msg->msg.serialcreate.link_status_cb, msg->msg.serialcreate.ctx_cb);
TCPIP_PPPAPI_ACK(msg); TCPIP_PPPAPI_ACK(msg);
} }
/** /**
* Call ppp_over_serial_create() in a thread-safe way by running that function inside the * Call pppos_create() in a thread-safe way by running that function inside the
* tcpip_thread context. * tcpip_thread context.
*/ */
ppp_pcb* ppp_pcb*
pppapi_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, pppapi_pppos_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb,
void *ctx_cb) void *ctx_cb)
{ {
struct pppapi_msg msg; struct pppapi_msg msg;
msg.function = pppapi_do_ppp_over_serial_create; msg.function = pppapi_do_pppos_create;
msg.msg.msg.serialcreate.pppif = pppif; msg.msg.msg.serialcreate.pppif = pppif;
msg.msg.msg.serialcreate.fd = fd; msg.msg.msg.serialcreate.fd = fd;
msg.msg.msg.serialcreate.link_status_cb = link_status_cb; msg.msg.msg.serialcreate.link_status_cb = link_status_cb;
@ -154,29 +154,29 @@ pppapi_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_f
#if PPPOE_SUPPORT #if PPPOE_SUPPORT
/** /**
* Call ppp_over_ethernet_create() inside the tcpip_thread context. * Call pppoe_create() inside the tcpip_thread context.
*/ */
static void static void
pppapi_do_ppp_over_ethernet_create(struct pppapi_msg_msg *msg) pppapi_do_pppoe_create(struct pppapi_msg_msg *msg)
{ {
msg->ppp = ppp_over_ethernet_create(msg->msg.ethernetcreate.pppif, msg->msg.ethernetcreate.ethif, msg->ppp = pppoe_create(msg->msg.ethernetcreate.pppif, msg->msg.ethernetcreate.ethif,
msg->msg.ethernetcreate.service_name, msg->msg.ethernetcreate.concentrator_name, msg->msg.ethernetcreate.service_name, msg->msg.ethernetcreate.concentrator_name,
msg->msg.ethernetcreate.link_status_cb, msg->msg.ethernetcreate.ctx_cb); msg->msg.ethernetcreate.link_status_cb, msg->msg.ethernetcreate.ctx_cb);
TCPIP_PPPAPI_ACK(msg); TCPIP_PPPAPI_ACK(msg);
} }
/** /**
* Call ppp_over_ethernet_create() in a thread-safe way by running that function inside the * Call pppoe_create() in a thread-safe way by running that function inside the
* tcpip_thread context. * tcpip_thread context.
*/ */
ppp_pcb* ppp_pcb*
pppapi_over_ethernet_create(struct netif *pppif, struct netif *ethif, const char *service_name, pppapi_pppoe_create(struct netif *pppif, struct netif *ethif, const char *service_name,
const char *concentrator_name, ppp_link_status_cb_fn link_status_cb, const char *concentrator_name, ppp_link_status_cb_fn link_status_cb,
void *ctx_cb) void *ctx_cb)
{ {
struct pppapi_msg msg; struct pppapi_msg msg;
msg.function = pppapi_do_ppp_over_ethernet_create; msg.function = pppapi_do_pppoe_create;
msg.msg.msg.ethernetcreate.pppif = pppif; msg.msg.msg.ethernetcreate.pppif = pppif;
msg.msg.msg.ethernetcreate.ethif = ethif; msg.msg.msg.ethernetcreate.ethif = ethif;
msg.msg.msg.ethernetcreate.service_name = service_name; msg.msg.msg.ethernetcreate.service_name = service_name;
@ -191,12 +191,12 @@ pppapi_over_ethernet_create(struct netif *pppif, struct netif *ethif, const char
#if PPPOL2TP_SUPPORT #if PPPOL2TP_SUPPORT
/** /**
* Call ppp_over_l2tp_create() inside the tcpip_thread context. * Call pppol2tp_create() inside the tcpip_thread context.
*/ */
static void static void
pppapi_do_ppp_over_l2tp_create(struct pppapi_msg_msg *msg) pppapi_do_pppol2tp_create(struct pppapi_msg_msg *msg)
{ {
msg->ppp = ppp_over_l2tp_create(msg->msg.l2tpcreate.pppif, msg->ppp = pppol2tp_create(msg->msg.l2tpcreate.pppif,
msg->msg.l2tpcreate.netif, msg->msg.l2tpcreate.ipaddr, msg->msg.l2tpcreate.port, msg->msg.l2tpcreate.netif, msg->msg.l2tpcreate.ipaddr, msg->msg.l2tpcreate.port,
#if PPPOL2TP_AUTH_SUPPORT #if PPPOL2TP_AUTH_SUPPORT
msg->msg.l2tpcreate.secret, msg->msg.l2tpcreate.secret,
@ -209,16 +209,16 @@ pppapi_do_ppp_over_l2tp_create(struct pppapi_msg_msg *msg)
} }
/** /**
* Call ppp_over_l2tp_create() in a thread-safe way by running that function inside the * Call pppol2tp_create() in a thread-safe way by running that function inside the
* tcpip_thread context. * tcpip_thread context.
*/ */
ppp_pcb* ppp_pcb*
pppapi_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port, pppapi_pppol2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
u8_t *secret, u8_t secret_len, u8_t *secret, u8_t secret_len,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb) ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
{ {
struct pppapi_msg msg; struct pppapi_msg msg;
msg.function = pppapi_do_ppp_over_l2tp_create; msg.function = pppapi_do_pppol2tp_create;
msg.msg.msg.l2tpcreate.pppif = pppif; msg.msg.msg.l2tpcreate.pppif = pppif;
msg.msg.msg.l2tpcreate.netif = netif; msg.msg.msg.l2tpcreate.netif = netif;
msg.msg.msg.l2tpcreate.ipaddr = ipaddr; msg.msg.msg.l2tpcreate.ipaddr = ipaddr;

6
src/include/lwip/pppapi.h
View File

@ -121,15 +121,15 @@ void pppapi_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *
void pppapi_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_phase_cb); void pppapi_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_phase_cb);
#endif /* PPP_NOTIFY_PHASE */ #endif /* PPP_NOTIFY_PHASE */
#if PPPOS_SUPPORT #if PPPOS_SUPPORT
ppp_pcb *pppapi_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb); ppp_pcb *pppapi_pppos_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
#endif /* PPPOS_SUPPORT */ #endif /* PPPOS_SUPPORT */
#if PPPOE_SUPPORT #if PPPOE_SUPPORT
ppp_pcb *pppapi_over_ethernet_create(struct netif *pppif, struct netif *ethif, const char *service_name, ppp_pcb *pppapi_pppoe_create(struct netif *pppif, struct netif *ethif, const char *service_name,
const char *concentrator_name, ppp_link_status_cb_fn link_status_cb, const char *concentrator_name, ppp_link_status_cb_fn link_status_cb,
void *ctx_cb); void *ctx_cb);
#endif /* PPPOE_SUPPORT */ #endif /* PPPOE_SUPPORT */
#if PPPOL2TP_SUPPORT #if PPPOL2TP_SUPPORT
ppp_pcb *pppapi_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port, ppp_pcb *pppapi_pppol2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
u8_t *secret, u8_t secret_len, u8_t *secret, u8_t secret_len,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb); ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
#endif /* PPPOL2TP_SUPPORT */ #endif /* PPPOL2TP_SUPPORT */

8
src/include/netif/ppp/pppoe.h
View File

@ -162,10 +162,10 @@ struct pppoe_softc {
#define pppoe_init() /* compatibility define, no initialization needed */ #define pppoe_init() /* compatibility define, no initialization needed */
ppp_pcb *ppp_over_ethernet_create(struct netif *pppif, ppp_pcb *pppoe_create(struct netif *pppif,
struct netif *ethif, struct netif *ethif,
const char *service_name, const char *concentrator_name, const char *service_name, const char *concentrator_name,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb); ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
void pppoe_disc_input(struct netif *netif, struct pbuf *p); void pppoe_disc_input(struct netif *netif, struct pbuf *p);
void pppoe_data_input(struct netif *netif, struct pbuf *p); void pppoe_data_input(struct netif *netif, struct pbuf *p);

7
src/include/netif/ppp/pppol2tp.h
View File

@ -192,9 +192,10 @@ struct pppol2tp_pcb_s {
/* Create a new L2TP session. */ /* Create a new L2TP session. */
ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port, ppp_pcb *pppol2tp_create(struct netif *pppif,
u8_t *secret, u8_t secret_len, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb); u8_t *secret, u8_t secret_len,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
#endif /* PPPOL2TP_H_ */ #endif /* PPPOL2TP_H_ */
#endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */ #endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */

4
src/include/netif/ppp/pppos.h
View File

@ -90,8 +90,8 @@ struct pppos_pcb_s {
}; };
/* Create a new PPPoS session. */ /* Create a new PPPoS session. */
ppp_pcb *ppp_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb); ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
/* PPP over Serial: this is the input function to be called for received data. */ /* PPP over Serial: this is the input function to be called for received data. */
void pppos_input(ppp_pcb *ppp, u_char* data, int len); void pppos_input(ppp_pcb *ppp, u_char* data, int len);

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

@ -153,10 +153,10 @@ static struct pppoe_softc *pppoe_softc_list;
* *
* Return 0 on success, an error code on failure. * Return 0 on success, an error code on failure.
*/ */
ppp_pcb *ppp_over_ethernet_create(struct netif *pppif, ppp_pcb *pppoe_create(struct netif *pppif,
struct netif *ethif, struct netif *ethif,
const char *service_name, const char *concentrator_name, const char *service_name, const char *concentrator_name,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb) ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
{ {
ppp_pcb *ppp; ppp_pcb *ppp;
struct pppoe_softc *sc; struct pppoe_softc *sc;

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

@ -99,9 +99,10 @@ static err_t pppol2tp_xmit(pppol2tp_pcb *l2tp, struct pbuf *pb);
/* Create a new L2TP session. */ /* Create a new L2TP session. */
ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port, ppp_pcb *pppol2tp_create(struct netif *pppif,
u8_t *secret, u8_t secret_len, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb) { u8_t *secret, u8_t secret_len,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
ppp_pcb *ppp; ppp_pcb *ppp;
pppol2tp_pcb *l2tp; pppol2tp_pcb *l2tp;
struct udp_pcb *udp; struct udp_pcb *udp;

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

@ -148,9 +148,8 @@ static pppos_pcb *pppos_pcb_list;
* *
* Return 0 on success, an error code on failure. * Return 0 on success, an error code on failure.
*/ */
ppp_pcb * ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
ppp_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
{ {
pppos_pcb *pppos; pppos_pcb *pppos;
ppp_pcb *ppp; ppp_pcb *ppp;