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

Fix compilation for PPPOE without PPPOS and VJ_SUPPORT without PPPOS_SUPPORT

Browse Source
This commit is contained in:
goldsimon 2009-12-01 20:46:14 +00:00
parent 46dc1c9bfb
commit 04c5246e02
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/init.c
View File

@ -168,6 +168,9 @@
#if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC && !(defined(DNS_LOCAL_HOSTLIST_INIT))) #if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC && !(defined(DNS_LOCAL_HOSTLIST_INIT)))
#error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1', 0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST" #error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1', 0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST"
#endif #endif
#if PPP_SUPPORT && !PPPOS_SUPPORT & !PPPOE_SUPPORT
#error "PPP_SUPPORT needs wither PPPOS_SUPPORT or PPPOE_SUPPORT turned on"
#endif
/* Compile-time checks for deprecated options. /* Compile-time checks for deprecated options.

35
src/netif/ppp/ppp.c
View File

@ -306,13 +306,11 @@ pppMainWakeup(int pd)
void void
pppLinkTerminated(int pd) pppLinkTerminated(int pd)
{ {
PPPControl *pc = &pppControl[pd];
PPPDEBUG((LOG_DEBUG, "pppLinkTerminated: unit %d\n", pd)); PPPDEBUG((LOG_DEBUG, "pppLinkTerminated: unit %d\n", pd));
#if PPPOE_SUPPORT #if PPPOE_SUPPORT
if(pc->ethif) { if(pppControl[pd].ethif) {
pppoe_disconnect(pc->pppoe_sc); pppoe_disconnect(pppControl[pd].pppoe_sc);
} else } else
#endif /* PPPOE_SUPPORT */ #endif /* PPPOE_SUPPORT */
{ {
@ -325,13 +323,11 @@ pppLinkTerminated(int pd)
void void
pppLinkDown(int pd) pppLinkDown(int pd)
{ {
PPPControl *pc = &pppControl[pd];
PPPDEBUG((LOG_DEBUG, "pppLinkDown: unit %d\n", pd)); PPPDEBUG((LOG_DEBUG, "pppLinkDown: unit %d\n", pd));
#if PPPOE_SUPPORT #if PPPOE_SUPPORT
if(pc->ethif) { if(pppControl[pd].ethif) {
pppoe_disconnect(pc->pppoe_sc); pppoe_disconnect(pppControl[pd].pppoe_sc);
} else } else
#endif /* PPPOE_SUPPORT */ #endif /* PPPOE_SUPPORT */
{ {
@ -828,9 +824,9 @@ static err_t
pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *ipaddr) pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *ipaddr)
{ {
int pd = (int)netif->state; int pd = (int)netif->state;
u_short protocol = PPP_IP;
PPPControl *pc = &pppControl[pd]; PPPControl *pc = &pppControl[pd];
#if PPPOS_SUPPORT #if PPPOS_SUPPORT
u_short protocol = PPP_IP;
u_int fcsOut = PPP_INITFCS; u_int fcsOut = PPP_INITFCS;
struct pbuf *headMB = NULL, *tailMB = NULL, *p; struct pbuf *headMB = NULL, *tailMB = NULL, *p;
u_char c; u_char c;
@ -843,7 +839,7 @@ pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *ipaddr)
* and the peer will just drop it if it's not accepting it. */ * and the peer will just drop it if it's not accepting it. */
if (pd < 0 || pd >= NUM_PPP || !pc->openFlag || !pb) { if (pd < 0 || pd >= NUM_PPP || !pc->openFlag || !pb) {
PPPDEBUG((LOG_WARNING, "pppifOutput[%d]: bad parms prot=%d pb=%p\n", PPPDEBUG((LOG_WARNING, "pppifOutput[%d]: bad parms prot=%d pb=%p\n",
pd, protocol, pb)); pd, PPP_IP, pb));
LINK_STATS_INC(link.opterr); LINK_STATS_INC(link.opterr);
LINK_STATS_INC(link.drop); LINK_STATS_INC(link.drop);
return ERR_ARG; return ERR_ARG;
@ -1298,7 +1294,7 @@ GetMask(u32_t addr)
* sifvjcomp - config tcp header compression * sifvjcomp - config tcp header compression
*/ */
int int
sifvjcomp( int pd, int vjcomp, int cidcomp, int maxcid) sifvjcomp(int pd, int vjcomp, int cidcomp, int maxcid)
{ {
#if PPPOS_SUPPORT && VJ_SUPPORT #if PPPOS_SUPPORT && VJ_SUPPORT
PPPControl *pc = &pppControl[pd]; PPPControl *pc = &pppControl[pd];
@ -1308,6 +1304,11 @@ sifvjcomp( int pd, int vjcomp, int cidcomp, int maxcid)
pc->vjComp.maxSlotIndex = maxcid; pc->vjComp.maxSlotIndex = maxcid;
PPPDEBUG((LOG_INFO, "sifvjcomp: VJ compress enable=%d slot=%d max slot=%d\n", PPPDEBUG((LOG_INFO, "sifvjcomp: VJ compress enable=%d slot=%d max slot=%d\n",
vjcomp, cidcomp, maxcid)); vjcomp, cidcomp, maxcid));
#else /* PPPOS_SUPPORT && VJ_SUPPORT */
LWIP_UNUSED_ARG(pd);
LWIP_UNUSED_ARG(vjcomp);
LWIP_UNUSED_ARG(cidcomp);
LWIP_UNUSED_ARG(maxcid);
#endif /* PPPOS_SUPPORT && VJ_SUPPORT */ #endif /* PPPOS_SUPPORT && VJ_SUPPORT */
return 0; return 0;
@ -1662,7 +1663,7 @@ pppInput(void *arg)
switch(protocol) { switch(protocol) {
case PPP_VJC_COMP: /* VJ compressed TCP */ case PPP_VJC_COMP: /* VJ compressed TCP */
#if VJ_SUPPORT #if PPPOS_SUPPRORT && VJ_SUPPORT
PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_comp in pbuf len=%d\n", pd, nb->len)); PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_comp in pbuf len=%d\n", pd, nb->len));
/* /*
* Clip off the VJ header and prepend the rebuilt TCP/IP header and * Clip off the VJ header and prepend the rebuilt TCP/IP header and
@ -1674,14 +1675,14 @@ pppInput(void *arg)
} }
/* Something's wrong so drop it. */ /* Something's wrong so drop it. */
PPPDEBUG((LOG_WARNING, "pppInput[%d]: Dropping VJ compressed\n", pd)); PPPDEBUG((LOG_WARNING, "pppInput[%d]: Dropping VJ compressed\n", pd));
#else /* VJ_SUPPORT */ #else /* PPPOS_SUPPRORT && VJ_SUPPORT */
/* No handler for this protocol so drop the packet. */ /* No handler for this protocol so drop the packet. */
PPPDEBUG((LOG_INFO, "pppInput[%d]: drop VJ Comp in %d:%s\n", pd, nb->len, nb->payload)); PPPDEBUG((LOG_INFO, "pppInput[%d]: drop VJ Comp in %d:%s\n", pd, nb->len, nb->payload));
#endif /* VJ_SUPPORT */ #endif /* PPPOS_SUPPRORT && VJ_SUPPORT */
break; break;
case PPP_VJC_UNCOMP: /* VJ uncompressed TCP */ case PPP_VJC_UNCOMP: /* VJ uncompressed TCP */
#if VJ_SUPPORT #if PPPOS_SUPPRORT && VJ_SUPPORT
PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_un in pbuf len=%d\n", pd, nb->len)); PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_un in pbuf len=%d\n", pd, nb->len));
/* /*
* Process the TCP/IP header for VJ header compression and then pass * Process the TCP/IP header for VJ header compression and then pass
@ -1693,12 +1694,12 @@ pppInput(void *arg)
} }
/* Something's wrong so drop it. */ /* Something's wrong so drop it. */
PPPDEBUG((LOG_WARNING, "pppInput[%d]: Dropping VJ uncompressed\n", pd)); PPPDEBUG((LOG_WARNING, "pppInput[%d]: Dropping VJ uncompressed\n", pd));
#else /* VJ_SUPPORT */ #else /* PPPOS_SUPPRORT && VJ_SUPPORT */
/* No handler for this protocol so drop the packet. */ /* No handler for this protocol so drop the packet. */
PPPDEBUG((LOG_INFO, PPPDEBUG((LOG_INFO,
"pppInput[%d]: drop VJ UnComp in %d:.*H\n", "pppInput[%d]: drop VJ UnComp in %d:.*H\n",
pd, nb->len, LWIP_MIN(nb->len * 2, 40), nb->payload)); pd, nb->len, LWIP_MIN(nb->len * 2, 40), nb->payload));
#endif /* VJ_SUPPORT */ #endif /* PPPOS_SUPPRORT && VJ_SUPPORT */
break; break;
case PPP_IP: /* Internet Protocol */ case PPP_IP: /* Internet Protocol */