mirror of
https://git.savannah.nongnu.org/git/lwip.git
synced 2026-05-19 06:36:51 +08:00
Merge branch 'ppp-new'
Based from pppd 2.4.5, released 2009-11-17, with huge changes to match code size and memory requirements for embedded devices, including: - Gluing together the previous low-level PPP code in lwIP to pppd 2.4.5, which is more or less what pppd sys-* files are, so that we get something working using the unix port. - Merged some patchs from lwIP Git repository which add interesting features or fix bugs. - Merged some patchs from Debian pppd package which add interesting features or fix bugs. - Ported PPP timeout handling to the lwIP timers system - Disabled all the PPP code using filesystem access, replaced in necessary cases to configuration variables. - Disabled all the PPP code forking processes. - Removed IPX support, lwIP does not support IPX. - Ported and improved random module from the previous PPP port. - Removed samba TDB (file-driven database) usage, because it needs a filesystem. - MS-CHAP required a DES implementation, we added the latest PolarSSL DES implementation which is under a BSD-ish license. - Also switched to PolarSSL MD4,MD5,SHA1 implementations, which are meant to be used in embedded devices with reduced memory footprint. - Removed PPP configuration file parsing support. - Added macro definition EAP_SUPPORT to make EAP support optional. - Added macro definition CHAP_SUPPORT to make CHAP support optional. - Added macro definition MSCHAP_SUPPORT to make MSCHAP support optional. - Added macro definition PAP_SUPPORT to make PAP support optional. - Cleared all Linux syscall calls. - Disabled demand support using a macro, so that it can be ported later. - Disabled ECP support using a macro, so that it can be ported later. - Disabled CCP support using a macro, so that it can be ported later. - Disabled CBCP support using a macro, so that it can be ported later. - Disabled LQR support using a macro, so that it can be ported later. - Print packet debug feature optional, through PRINTPKT_SUPPORT - Removed POSIX signal usage. - Fully ported PPPoS code from the previous port. - Fully ported PPPoE code from the previous port. - Fully ported VJ compression protocol code from the previous port. - Removed all malloc()/free() use from PPP, replaced by stack usage or PBUF. - Disabled PPP server support using a macro, so that it can be ported later. - Switched all PPP debug to lwIP debug system. - Created PPP Control Block (PPP PCB), removed PPP unit integer everywhere, removed all global variables everywhere, did everything necessary for the PPP stack to support more than one PPP session (pppd only support one session per process). - Removed the statically allocated output buffer, now using PBUF. - Improved structure size of all PPP modules, deep analyze of code to reduce variables size to the bare minimum. Switched all boolean type (char type in most architecture) to compiler generated bitfields. - Added PPP IPv6 support, glued lwIP IPv6 support to PPP. - Now using a persistent netif interface which can then be used in lwIP functions requiring a netif. - Now initializing PPP in lwip_init() function. - Reworked completely the PPP state machine, so that we don't end up in anymore in inconsistent state, especially with PPPoE. - Improved the way we handle PPP reconnection after disconnect, cleaning everything required so that we start the PPP connection again from a clean state. - Added PPP holdoff support, allow the lwIP user to wait a little bit before reconnecting, prevents connection flood, especially when using PPPoL2TP. - Added PPPoL2TP LAC support (a.k.a. UDP tunnels), adding a VPN client feature to lwIP, L2TP being a widely used tunnel protocol. - Switched all used PPP types to lwIP types (u8t, u16t, u32t, ...) - Added PPP API "sequential" thread-safe API, based from NETIFAPI.
This commit is contained in:
Sylvain Rochet
383
src/api/pppapi.c
Normal file
383
src/api/pppapi.c
Normal file
@@ -0,0 +1,383 @@
|
||||
/**
|
||||
* @file
|
||||
* Point To Point Protocol Sequential API module
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
* OF SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
#if LWIP_PPP_API /* don't build if not configured for use in lwipopts.h */
|
||||
|
||||
#include "lwip/pppapi.h"
|
||||
#include "lwip/tcpip.h"
|
||||
|
||||
/**
|
||||
* Call ppp_new() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_new(struct pppapi_msg_msg *msg) {
|
||||
msg->ppp = ppp_new();
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_new() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
ppp_pcb *pppapi_new(void) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_new;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.ppp;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_set_default() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_set_default(struct pppapi_msg_msg *msg) {
|
||||
ppp_set_default(msg->ppp);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_set_default() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_set_default(ppp_pcb *pcb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_set_default;
|
||||
msg.msg.ppp = pcb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_set_auth() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_set_auth(struct pppapi_msg_msg *msg) {
|
||||
ppp_set_auth(msg->ppp, msg->msg.setauth.authtype,
|
||||
msg->msg.setauth.user, msg->msg.setauth.passwd);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_set_auth() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_set_auth(ppp_pcb *pcb, u8_t authtype, char *user, char *passwd) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_set_auth;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.setauth.authtype = authtype;
|
||||
msg.msg.msg.setauth.user = user;
|
||||
msg.msg.msg.setauth.passwd = passwd;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
|
||||
|
||||
#if PPP_NOTIFY_PHASE
|
||||
/**
|
||||
* Call ppp_set_notify_phase_callback() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_set_notify_phase_callback(struct pppapi_msg_msg *msg) {
|
||||
ppp_set_notify_phase_callback(msg->ppp, msg->msg.setnotifyphasecb.notify_phase_cb);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_set_notify_phase_callback() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_phase_cb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_set_notify_phase_callback;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.setnotifyphasecb.notify_phase_cb = notify_phase_cb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
#endif /* PPP_NOTIFY_PHASE */
|
||||
|
||||
|
||||
#if PPPOS_SUPPORT
|
||||
/**
|
||||
* Call ppp_over_serial_create() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_over_serial_create(struct pppapi_msg_msg *msg) {
|
||||
msg->err = ppp_over_serial_create(msg->ppp, msg->msg.serialcreate.fd,
|
||||
msg->msg.serialcreate.link_status_cb, msg->msg.serialcreate.ctx_cb);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_over_serial_create() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_over_serial_create(ppp_pcb *pcb, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_over_serial_create;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.serialcreate.fd = fd;
|
||||
msg.msg.msg.serialcreate.link_status_cb = link_status_cb;
|
||||
msg.msg.msg.serialcreate.ctx_cb = ctx_cb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
#endif /* PPPOS_SUPPORT */
|
||||
|
||||
|
||||
#if PPPOE_SUPPORT
|
||||
/**
|
||||
* Call ppp_over_ethernet_create() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_over_ethernet_create(struct pppapi_msg_msg *msg) {
|
||||
|
||||
msg->err = ppp_over_ethernet_create(msg->ppp, msg->msg.ethernetcreate.ethif,
|
||||
msg->msg.ethernetcreate.service_name, msg->msg.ethernetcreate.concentrator_name,
|
||||
msg->msg.ethernetcreate.link_status_cb, msg->msg.ethernetcreate.ctx_cb);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_over_ethernet_create() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_over_ethernet_create(ppp_pcb *pcb, struct netif *ethif, const char *service_name,
|
||||
const char *concentrator_name, ppp_link_status_cb_fn link_status_cb,
|
||||
void *ctx_cb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_over_ethernet_create;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.ethernetcreate.ethif = ethif;
|
||||
msg.msg.msg.ethernetcreate.service_name = service_name;
|
||||
msg.msg.msg.ethernetcreate.concentrator_name = concentrator_name;
|
||||
msg.msg.msg.ethernetcreate.link_status_cb = link_status_cb;
|
||||
msg.msg.msg.ethernetcreate.ctx_cb = ctx_cb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
#endif /* PPPOE_SUPPORT */
|
||||
|
||||
|
||||
#if PPPOL2TP_SUPPORT
|
||||
/**
|
||||
* Call ppp_over_l2tp_create() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_over_l2tp_create(struct pppapi_msg_msg *msg) {
|
||||
|
||||
msg->err = ppp_over_l2tp_create(msg->ppp,
|
||||
msg->msg.l2tpcreate.netif, msg->msg.l2tpcreate.ipaddr, msg->msg.l2tpcreate.port,
|
||||
#if PPPOL2TP_AUTH_SUPPORT
|
||||
msg->msg.l2tpcreate.secret,
|
||||
msg->msg.l2tpcreate.secret_len,
|
||||
#else /* PPPOL2TP_AUTH_SUPPORT */
|
||||
NULL,
|
||||
#endif /* PPPOL2TP_AUTH_SUPPORT */
|
||||
msg->msg.l2tpcreate.link_status_cb, msg->msg.l2tpcreate.ctx_cb);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_over_l2tp_create() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_over_l2tp_create(ppp_pcb *pcb, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
|
||||
u8_t *secret, u8_t secret_len,
|
||||
ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_over_l2tp_create;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.l2tpcreate.netif = netif;
|
||||
msg.msg.msg.l2tpcreate.ipaddr = ipaddr;
|
||||
msg.msg.msg.l2tpcreate.port = port;
|
||||
#if PPPOL2TP_AUTH_SUPPORT
|
||||
msg.msg.msg.l2tpcreate.secret = secret;
|
||||
msg.msg.msg.l2tpcreate.secret_len = secret_len;
|
||||
#endif /* PPPOL2TP_AUTH_SUPPORT */
|
||||
msg.msg.msg.l2tpcreate.link_status_cb = link_status_cb;
|
||||
msg.msg.msg.l2tpcreate.ctx_cb = ctx_cb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
#endif /* PPPOL2TP_SUPPORT */
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_open() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_open(struct pppapi_msg_msg *msg) {
|
||||
msg->err = ppp_open(msg->ppp, msg->msg.open.holdoff);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_open() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_open(ppp_pcb *pcb, u16_t holdoff) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_open;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.open.holdoff = holdoff;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_close() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_close(struct pppapi_msg_msg *msg) {
|
||||
msg->err = ppp_close(msg->ppp);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_close() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_close(ppp_pcb *pcb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_close;
|
||||
msg.msg.ppp = pcb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_sighup() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_sighup(struct pppapi_msg_msg *msg) {
|
||||
ppp_sighup(msg->ppp);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_sighup() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_sighup(ppp_pcb *pcb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_sighup;
|
||||
msg.msg.ppp = pcb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_delete() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_delete(struct pppapi_msg_msg *msg) {
|
||||
msg->err = ppp_delete(msg->ppp);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_delete() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_delete(ppp_pcb *pcb) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_delete;
|
||||
msg.msg.ppp = pcb;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Call ppp_ioctl() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_ioctl(struct pppapi_msg_msg *msg) {
|
||||
msg->err = ppp_ioctl(msg->ppp, msg->msg.ioctl.cmd, msg->msg.ioctl.arg);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_ioctl() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
int pppapi_ioctl(ppp_pcb *pcb, int cmd, void *arg) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_ioctl;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.ioctl.cmd = cmd;
|
||||
msg.msg.msg.ioctl.arg = arg;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
return msg.msg.err;
|
||||
}
|
||||
|
||||
|
||||
#if LWIP_NETIF_STATUS_CALLBACK
|
||||
/**
|
||||
* Call ppp_set_netif_statuscallback() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_set_netif_statuscallback(struct pppapi_msg_msg *msg) {
|
||||
ppp_set_netif_statuscallback(msg->ppp, msg->msg.netifstatuscallback.status_callback);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_set_netif_statuscallback() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_set_netif_statuscallback(ppp_pcb *pcb, netif_status_callback_fn status_callback) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_set_netif_statuscallback;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.netifstatuscallback.status_callback = status_callback;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
#endif /* LWIP_NETIF_STATUS_CALLBACK */
|
||||
|
||||
|
||||
#if LWIP_NETIF_LINK_CALLBACK
|
||||
/**
|
||||
* Call ppp_set_netif_linkcallback() inside the tcpip_thread context.
|
||||
*/
|
||||
static void pppapi_do_ppp_set_netif_linkcallback(struct pppapi_msg_msg *msg) {
|
||||
ppp_set_netif_linkcallback(msg->ppp, msg->msg.netiflinkcallback.link_callback);
|
||||
TCPIP_PPPAPI_ACK(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ppp_set_netif_linkcallback() in a thread-safe way by running that function inside the
|
||||
* tcpip_thread context.
|
||||
*/
|
||||
void pppapi_set_netif_linkcallback(ppp_pcb *pcb, netif_status_callback_fn link_callback) {
|
||||
struct pppapi_msg msg;
|
||||
msg.function = pppapi_do_ppp_set_netif_linkcallback;
|
||||
msg.msg.ppp = pcb;
|
||||
msg.msg.msg.netiflinkcallback.link_callback = link_callback;
|
||||
TCPIP_PPPAPI(&msg);
|
||||
}
|
||||
#endif /* LWIP_NETIF_LINK_CALLBACK */
|
||||
|
||||
#endif /* LWIP_PPP_API */
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "lwip/init.h"
|
||||
#include "lwip/ip.h"
|
||||
#include "netif/etharp.h"
|
||||
#include "netif/ppp_oe.h"
|
||||
#include "netif/ppp/pppoe.h"
|
||||
|
||||
#define TCPIP_MSG_VAR_REF(name) API_VAR_REF(name)
|
||||
#define TCPIP_MSG_VAR_DECLARE(name) API_VAR_DECLARE(struct tcpip_msg, name)
|
||||
@@ -133,6 +133,13 @@ tcpip_thread(void *arg)
|
||||
break;
|
||||
#endif /* LWIP_NETIF_API */
|
||||
|
||||
#if LWIP_PPP_API
|
||||
case TCPIP_MSG_PPPAPI:
|
||||
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PPP API message %p\n", (void *)msg));
|
||||
msg->msg.pppapimsg->function(&(msg->msg.pppapimsg->msg));
|
||||
break;
|
||||
#endif /* LWIP_PPP_API */
|
||||
|
||||
#if LWIP_TCPIP_TIMEOUT
|
||||
case TCPIP_MSG_TIMEOUT:
|
||||
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: TIMEOUT %p\n", (void *)msg));
|
||||
@@ -395,6 +402,56 @@ tcpip_netifapi_lock(struct netifapi_msg* netifapimsg)
|
||||
#endif /* !LWIP_TCPIP_CORE_LOCKING */
|
||||
#endif /* LWIP_NETIF_API */
|
||||
|
||||
#if LWIP_PPP_API
|
||||
#if !LWIP_TCPIP_CORE_LOCKING
|
||||
/**
|
||||
* Much like tcpip_apimsg, but calls the lower part of a pppapi_*
|
||||
* function.
|
||||
*
|
||||
* @param pppapimsg a struct containing the function to call and its parameters
|
||||
* @return error code given back by the function that was called
|
||||
*/
|
||||
err_t
|
||||
tcpip_pppapi(struct pppapi_msg* pppapimsg)
|
||||
{
|
||||
struct tcpip_msg msg;
|
||||
|
||||
if (sys_mbox_valid(&mbox)) {
|
||||
err_t err = sys_sem_new(&pppapimsg->msg.sem, 0);
|
||||
if (err != ERR_OK) {
|
||||
pppapimsg->msg.err = err;
|
||||
return err;
|
||||
}
|
||||
|
||||
msg.type = TCPIP_MSG_PPPAPI;
|
||||
msg.msg.pppapimsg = pppapimsg;
|
||||
sys_mbox_post(&mbox, &msg);
|
||||
sys_sem_wait(&pppapimsg->msg.sem);
|
||||
sys_sem_free(&pppapimsg->msg.sem);
|
||||
return pppapimsg->msg.err;
|
||||
}
|
||||
return ERR_VAL;
|
||||
}
|
||||
#else /* !LWIP_TCPIP_CORE_LOCKING */
|
||||
/**
|
||||
* Call the lower part of a pppapi_* function
|
||||
* This function has exclusive access to lwIP core code by locking it
|
||||
* before the function is called.
|
||||
*
|
||||
* @param pppapimsg a struct containing the function to call and its parameters
|
||||
* @return ERR_OK (only for compatibility fo tcpip_pppapi())
|
||||
*/
|
||||
err_t
|
||||
tcpip_pppapi_lock(struct pppapi_msg* pppapimsg)
|
||||
{
|
||||
LOCK_TCPIP_CORE();
|
||||
pppapimsg->function(&(pppapimsg->msg));
|
||||
UNLOCK_TCPIP_CORE();
|
||||
return pppapimsg->msg.err;
|
||||
}
|
||||
#endif /* !LWIP_TCPIP_CORE_LOCKING */
|
||||
#endif /* LWIP_PPP_API */
|
||||
|
||||
/**
|
||||
* Allocate a structure for a static callback message and initialize it.
|
||||
* This is intended to be used to send "static" messages from interrupt context.
|
||||
|
||||
Reference in New Issue
Block a user