abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-18 06:06:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoL2TP, switched to dual stack IPv4/IPv6

Browse Source 
Replaced ip4_addr_t to ip_addr_t in pppapi_pppol2tp_create() prototype,
now binding to UDPv6 or UDPv4 depending on the passed ip_addr_t type.

Removed pppol2tp_create_ip6() and pppapi_pppol2tp_create_ip6().
This commit is contained in:
Sylvain Rochet
2015-04-11 13:15:06 +02:00
parent cf180b651b
commit d6fdf7d4b1
4 changed files with 16 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/api/pppapi.c
View File

@@ -213,7 +213,7 @@ pppapi_do_pppol2tp_create(struct pppapi_msg_msg *msg)
* tcpip_thread context.
*/
ppp_pcb*
pppapi_pppol2tp_create(struct netif *pppif, struct netif *netif, ip4_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,
ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
{
@@ -232,52 +232,6 @@ pppapi_pppol2tp_create(struct netif *pppif, struct netif *netif, ip4_addr_t *ipa
TCPIP_PPPAPI(&msg);
return msg.msg.ppp;
}
#if LWIP_IPV6
/**
* Call pppol2tp_create_ip6() inside the tcpip_thread context.
*/
static void
pppapi_do_pppol2tp_create_ip6(struct pppapi_msg_msg *msg)
{
msg->ppp = pppol2tp_create_ip6(msg->msg.l2tpcreateip6.pppif,
msg->msg.l2tpcreateip6.netif, msg->msg.l2tpcreateip6.ip6addr, msg->msg.l2tpcreateip6.port,
#if PPPOL2TP_AUTH_SUPPORT
msg->msg.l2tpcreateip6.secret,
msg->msg.l2tpcreateip6.secret_len,
#else /* PPPOL2TP_AUTH_SUPPORT */
NULL,
#endif /* PPPOL2TP_AUTH_SUPPORT */
msg->msg.l2tpcreateip6.link_status_cb, msg->msg.l2tpcreateip6.ctx_cb);
TCPIP_PPPAPI_ACK(msg);
}
/**
* Call pppol2tp_create_ip6() in a thread-safe way by running that function inside the
* tcpip_thread context.
*/
ppp_pcb*
pppapi_pppol2tp_create_ip6(struct netif *pppif, struct netif *netif, ip6_addr_t *ip6addr, 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_pppol2tp_create_ip6;
msg.msg.msg.l2tpcreateip6.pppif = pppif;
msg.msg.msg.l2tpcreateip6.netif = netif;
msg.msg.msg.l2tpcreateip6.ip6addr = ip6addr;
msg.msg.msg.l2tpcreateip6.port = port;
#if PPPOL2TP_AUTH_SUPPORT
msg.msg.msg.l2tpcreateip6.secret = secret;
msg.msg.msg.l2tpcreateip6.secret_len = secret_len;
#endif /* PPPOL2TP_AUTH_SUPPORT */
msg.msg.msg.l2tpcreateip6.link_status_cb = link_status_cb;
msg.msg.msg.l2tpcreateip6.ctx_cb = ctx_cb;
TCPIP_PPPAPI(&msg);
return msg.msg.ppp;
}
#endif /* LWIP_IPV6 */
#endif /* PPPOL2TP_SUPPORT */