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

Important bug fixes and improvements.

Browse Source
This commit is contained in:
marcbou 2003-06-19 11:31:25 +00:00
parent bbc33080e7
commit 55f64f13c7
3 changed files with 172 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ typedef enum {
PDDATA /* Process data byte. */ PDDATA /* Process data byte. */
} PPPDevStates; } PPPDevStates;
#define ESCAPE_P(accm, c) ((accm)[(c) >> 3] & pppACCMMask[c & 0x07])
/************************/ /************************/
/*** LOCAL DATA TYPES ***/ /*** LOCAL DATA TYPES ***/
@ -141,7 +142,6 @@ typedef struct PPPControl_s {
char inEscaped; /* Escape next character. */ char inEscaped; /* Escape next character. */
u16_t inProtocol; /* The input protocol code. */ u16_t inProtocol; /* The input protocol code. */
u16_t inFCS; /* Input Frame Check Sequence value. */ u16_t inFCS; /* Input Frame Check Sequence value. */
u16_t inLen; /* Input packet length. */
int mtu; /* Peer's mru */ int mtu; /* Peer's mru */
int pcomp; /* Does peer accept protocol compression? */ int pcomp; /* Does peer accept protocol compression? */
int accomp; /* Does peer accept addr/ctl compression? */ int accomp; /* Does peer accept addr/ctl compression? */
@ -155,10 +155,10 @@ typedef struct PPPControl_s {
struct netif *netif; struct netif *netif;
struct ip_addr our_ipaddr, his_ipaddr, netmask, dns1, dns2; struct ppp_addrs addrs;
void (*linkStatusCB)(void *arg, int errCode); void (*linkStatusCB)(void *ctx, int errCode, void *arg);
void *linkStatusArg; void *linkStatusCtx;
} PPPControl; } PPPControl;
@ -180,10 +180,6 @@ struct npioctl {
static void pppMain(void *pd); static void pppMain(void *pd);
static void pppDrop(PPPControl *pc); static void pppDrop(PPPControl *pc);
static void pppInProc(int pd, u_char *s, int l); static void pppInProc(int pd, u_char *s, int l);
static struct pbuf *pppMPutC(u_char c, ext_accm *outACCM, struct pbuf *nb);
static struct pbuf *pppMPutRaw(u_char c, struct pbuf *nb);
#define ESCAPE_P(accm, c) ((accm)[(c) >> 3] & pppACCMMask[c & 0x07])
/******************************/ /******************************/
@ -339,7 +335,7 @@ void pppSetAuth(const char *user, const char *passwd)
* established before calling this. * established before calling this.
* Return a new PPP connection descriptor on success or * Return a new PPP connection descriptor on success or
* an error code (negative) on failure. */ * an error code (negative) on failure. */
int pppOpen(sio_fd_t fd, void (*linkStatusCB)(void *arg, int errCode), void *linkStatusArg) int pppOpen(sio_fd_t fd, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx)
{ {
PPPControl *pc; PPPControl *pc;
int pd; int pd;
@ -384,7 +380,7 @@ int pppOpen(sio_fd_t fd, void (*linkStatusCB)(void *arg, int errCode), void *lin
pc->outACCM[15] = 0x60; pc->outACCM[15] = 0x60;
pc->linkStatusCB = linkStatusCB; pc->linkStatusCB = linkStatusCB;
pc->linkStatusArg = linkStatusArg; pc->linkStatusCtx = linkStatusCtx;
sys_thread_new(pppMain, (void*)pd, PPP_THREAD_PRIO); sys_thread_new(pppMain, (void*)pd, PPP_THREAD_PRIO);
if(!linkStatusCB) { if(!linkStatusCB) {
@ -456,6 +452,44 @@ static void nPut(PPPControl *pc, struct pbuf *nb)
#endif /* LINK_STATS */ #endif /* LINK_STATS */
} }
/*
* pppAppend - append given character to end of given pbuf. If outACCM
* is not NULL and the character needs to be escaped, do so.
* If pbuf is full, append another.
* Return the current pbuf.
*/
static struct pbuf *pppAppend(u_char c, struct pbuf *nb, ext_accm *outACCM)
{
struct pbuf *tb = nb;
/* Make sure there is room for the character and an escape code.
* Sure we don't quite fill the buffer if the character doesn't
* get escaped but is one character worth complicating this? */
/* Note: We assume no packet header. */
if (nb && (PBUF_POOL_BUFSIZE - nb->len) < 2) {
tb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
if (tb) {
nb->next = tb;
}
#ifdef LINK_STATS
else {
lwip_stats.link.memerr++;
}
#endif /* LINK_STATS */
nb = tb;
}
if (nb) {
if (outACCM && ESCAPE_P(*outACCM, c)) {
*((u_char*)nb->payload + nb->len++) = PPP_ESCAPE;
*((u_char*)nb->payload + nb->len++) = c ^ PPP_TRANS;
}
else
*((u_char*)nb->payload + nb->len++) = c;
}
return tb;
}
/* Send a packet on the given connection. */ /* Send a packet on the given connection. */
static err_t pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *ipaddr) static err_t pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *ipaddr)
{ {
@ -536,22 +570,22 @@ static err_t pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *i
/* Build the PPP header. */ /* Build the PPP header. */
if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG) if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG)
tailMB = pppMPutRaw(PPP_FLAG, tailMB); tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
pc->lastXMit = sys_jiffies(); pc->lastXMit = sys_jiffies();
if (!pc->accomp) { if (!pc->accomp) {
fcsOut = PPP_FCS(fcsOut, PPP_ALLSTATIONS); fcsOut = PPP_FCS(fcsOut, PPP_ALLSTATIONS);
tailMB = pppMPutC(PPP_ALLSTATIONS, &pc->outACCM, tailMB); tailMB = pppAppend(PPP_ALLSTATIONS, tailMB, &pc->outACCM);
fcsOut = PPP_FCS(fcsOut, PPP_UI); fcsOut = PPP_FCS(fcsOut, PPP_UI);
tailMB = pppMPutC(PPP_UI, &pc->outACCM, tailMB); tailMB = pppAppend(PPP_UI, tailMB, &pc->outACCM);
} }
if (!pc->pcomp || protocol > 0xFF) { if (!pc->pcomp || protocol > 0xFF) {
c = (protocol >> 8) & 0xFF; c = (protocol >> 8) & 0xFF;
fcsOut = PPP_FCS(fcsOut, c); fcsOut = PPP_FCS(fcsOut, c);
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
} }
c = protocol & 0xFF; c = protocol & 0xFF;
fcsOut = PPP_FCS(fcsOut, c); fcsOut = PPP_FCS(fcsOut, c);
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
/* Load packet. */ /* Load packet. */
for(p = pb; p; p = p->next) { for(p = pb; p; p = p->next) {
@ -567,16 +601,16 @@ static err_t pppifOutput(struct netif *netif, struct pbuf *pb, struct ip_addr *i
fcsOut = PPP_FCS(fcsOut, c); fcsOut = PPP_FCS(fcsOut, c);
/* Copy to output buffer escaping special characters. */ /* Copy to output buffer escaping special characters. */
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
} }
} }
/* Add FCS and trailing flag. */ /* Add FCS and trailing flag. */
c = ~fcsOut & 0xFF; c = ~fcsOut & 0xFF;
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
c = (~fcsOut >> 8) & 0xFF; c = (~fcsOut >> 8) & 0xFF;
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
tailMB = pppMPutRaw(PPP_FLAG, tailMB); tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
/* If we failed to complete the packet, throw it away. */ /* If we failed to complete the packet, throw it away. */
if (!tailMB) { if (!tailMB) {
@ -685,7 +719,7 @@ int pppWrite(int pd, const u_char *s, int n)
/* If the link has been idle, we'll send a fresh flag character to /* If the link has been idle, we'll send a fresh flag character to
* flush any noise. */ * flush any noise. */
if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG) if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG)
tailMB = pppMPutRaw(PPP_FLAG, tailMB); tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
pc->lastXMit = sys_jiffies(); pc->lastXMit = sys_jiffies();
/* Load output buffer. */ /* Load output buffer. */
@ -696,21 +730,21 @@ int pppWrite(int pd, const u_char *s, int n)
fcsOut = PPP_FCS(fcsOut, c); fcsOut = PPP_FCS(fcsOut, c);
/* Copy to output buffer escaping special characters. */ /* Copy to output buffer escaping special characters. */
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
} }
/* Add FCS and trailing flag. */ /* Add FCS and trailing flag. */
c = ~fcsOut & 0xFF; c = ~fcsOut & 0xFF;
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
c = (~fcsOut >> 8) & 0xFF; c = (~fcsOut >> 8) & 0xFF;
tailMB = pppMPutC(c, &pc->outACCM, tailMB); tailMB = pppAppend(c, tailMB, &pc->outACCM);
tailMB = pppMPutRaw(PPP_FLAG, tailMB); tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
/* If we failed to complete the packet, throw it away. /* If we failed to complete the packet, throw it away.
* Otherwise send it. */ * Otherwise send it. */
if (!tailMB) { if (!tailMB) {
PPPDEBUG((LOG_WARNING, PPPDEBUG((LOG_WARNING,
"pppWrite[%d]: Alloc err - dropping nBuf len=%d\n", pd, headMB->len)); "pppWrite[%d]: Alloc err - dropping pbuf len=%d\n", pd, headMB->len));
/* "pppWrite[%d]: Alloc err - dropping %d:%.*H", pd, headMB->len, LWIP_MIN(headMB->len * 2, 40), headMB->payload)); */ /* "pppWrite[%d]: Alloc err - dropping %d:%.*H", pd, headMB->len, LWIP_MIN(headMB->len * 2, 40), headMB->payload)); */
pbuf_free(headMB); pbuf_free(headMB);
#ifdef LINK_STATS #ifdef LINK_STATS
@ -927,13 +961,14 @@ int sifup(int pd)
} else { } else {
if(pc->netif) if(pc->netif)
netif_remove(pc->netif); netif_remove(pc->netif);
pc->netif = netif_add(&pc->our_ipaddr, &pc->netmask, &pc->his_ipaddr, (void *)pd, pppifNetifInit, ip_input); pc->netif = netif_add(&pc->addrs.our_ipaddr, &pc->addrs.netmask, &pc->addrs.his_ipaddr, (void *)pd, pppifNetifInit, ip_input);
if(pc->netif) { if(pc->netif) {
pc->if_up = 1; pc->if_up = 1;
pc->errCode = 0; pc->errCode = PPPERR_NONE;
if(pc->linkStatusCB) PPPDEBUG((LOG_DEBUG, "sifup: unit %d: linkStatusCB=%lx errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
pc->linkStatusCB(pc->linkStatusArg, pc->errCode); if(pc->linkStatusCB)
pc->linkStatusCB(pc->linkStatusCtx, pc->errCode, &pc->addrs);
} else { } else {
st = 0; st = 0;
PPPDEBUG((LOG_ERR, "sifup[%d]: netif_add failed\n", pd)); PPPDEBUG((LOG_ERR, "sifup[%d]: netif_add failed\n", pd));
@ -948,10 +983,10 @@ int sifup(int pd)
*/ */
int sifnpmode(int u, int proto, enum NPmode mode) int sifnpmode(int u, int proto, enum NPmode mode)
{ {
(void)u; (void)u;
(void)proto; (void)proto;
(void)mode; (void)mode;
return 0; return 0;
} }
/* /*
@ -970,8 +1005,9 @@ int sifdown(int pd)
if(pc->netif) if(pc->netif)
netif_remove(pc->netif); netif_remove(pc->netif);
pc->netif = NULL; pc->netif = NULL;
PPPDEBUG((LOG_DEBUG, "sifdown: unit %d: linkStatusCB=%lx errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
if(pc->linkStatusCB) if(pc->linkStatusCB)
pc->linkStatusCB(pc->linkStatusArg, PPPERR_CONNECT); pc->linkStatusCB(pc->linkStatusCtx, PPPERR_CONNECT, NULL);
} }
return st; return st;
} }
@ -995,11 +1031,11 @@ int sifaddr(
st = 0; st = 0;
PPPDEBUG((LOG_WARNING, "sifup[%d]: bad parms\n", pd)); PPPDEBUG((LOG_WARNING, "sifup[%d]: bad parms\n", pd));
} else { } else {
memcpy(&pc->our_ipaddr, &o, sizeof(o)); memcpy(&pc->addrs.our_ipaddr, &o, sizeof(o));
memcpy(&pc->his_ipaddr, &h, sizeof(h)); memcpy(&pc->addrs.his_ipaddr, &h, sizeof(h));
memcpy(&pc->netmask, &m, sizeof(m)); memcpy(&pc->addrs.netmask, &m, sizeof(m));
memcpy(&pc->dns1, &ns1, sizeof(ns1)); memcpy(&pc->addrs.dns1, &ns1, sizeof(ns1));
memcpy(&pc->dns2, &ns2, sizeof(ns2)); memcpy(&pc->addrs.dns2, &ns2, sizeof(ns2));
} }
return st; return st;
} }
@ -1023,11 +1059,11 @@ int cifaddr(
st = 0; st = 0;
PPPDEBUG((LOG_WARNING, "sifup[%d]: bad parms\n", pd)); PPPDEBUG((LOG_WARNING, "sifup[%d]: bad parms\n", pd));
} else { } else {
IP4_ADDR(&pc->our_ipaddr, 0,0,0,0); IP4_ADDR(&pc->addrs.our_ipaddr, 0,0,0,0);
IP4_ADDR(&pc->his_ipaddr, 0,0,0,0); IP4_ADDR(&pc->addrs.his_ipaddr, 0,0,0,0);
IP4_ADDR(&pc->netmask, 255,255,255,0); IP4_ADDR(&pc->addrs.netmask, 255,255,255,0);
IP4_ADDR(&pc->dns1, 0,0,0,0); IP4_ADDR(&pc->addrs.dns1, 0,0,0,0);
IP4_ADDR(&pc->dns2, 0,0,0,0); IP4_ADDR(&pc->addrs.dns2, 0,0,0,0);
} }
return st; return st;
} }
@ -1077,6 +1113,7 @@ int cifdefaultroute(int pd, u32_t l, u32_t g)
void void
pppMainWakeup(int pd) pppMainWakeup(int pd)
{ {
PPPDEBUG((LOG_DEBUG, "pppMainWakeup: unit %d\n", pd));
sio_read_abort(pppControl[pd].fd); sio_read_abort(pppControl[pd].fd);
} }
@ -1091,6 +1128,7 @@ pppStartCB(void *arg)
{ {
int pd = (int)arg; int pd = (int)arg;
PPPDEBUG((LOG_DEBUG, "pppStartCB: unit %d\n", pd));
lcp_lowerup(pd); lcp_lowerup(pd);
lcp_open(pd); /* Start protocol */ lcp_open(pd); /* Start protocol */
} }
@ -1100,6 +1138,7 @@ pppStopCB(void *arg)
{ {
int pd = (int)arg; int pd = (int)arg;
PPPDEBUG((LOG_DEBUG, "pppStopCB: unit %d\n", pd));
lcp_close(pd, "User request"); lcp_close(pd, "User request");
} }
@ -1108,6 +1147,7 @@ pppHupCB(void *arg)
{ {
int pd = (int)arg; int pd = (int)arg;
PPPDEBUG((LOG_DEBUG, "pppHupCB: unit %d\n", pd));
lcp_lowerdown(pd); lcp_lowerdown(pd);
link_terminated(pd); link_terminated(pd);
} }
@ -1134,30 +1174,37 @@ static void pppMain(void *arg)
/* /*
* Start the connection and handle incoming events (packet or timeout). * Start the connection and handle incoming events (packet or timeout).
*/ */
ppp_trace(LOG_NOTICE, "Connecting\n"); PPPDEBUG((LOG_INFO, "pppMain: unit %d: Connecting\n", pd));
tcpip_callback(pppStartCB, arg); tcpip_callback(pppStartCB, arg);
while (lcp_phase[pd] != PHASE_DEAD) { while (lcp_phase[pd] != PHASE_DEAD) {
if (pc->kill_link) { if (pc->kill_link) {
PPPDEBUG((LOG_DEBUG, "pppMainWakeup: unit %d kill_link -> pppStopCB\n", pd));
pc->errCode = PPPERR_USER; pc->errCode = PPPERR_USER;
/* This will leave us at PHASE_DEAD. */ /* This will leave us at PHASE_DEAD. */
tcpip_callback(pppStopCB, arg); tcpip_callback(pppStopCB, arg);
pc->kill_link = 0; pc->kill_link = 0;
} }
else if (pc->sig_hup) { else if (pc->sig_hup) {
PPPDEBUG((LOG_DEBUG, "pppMainWakeup: unit %d sig_hup -> pppHupCB\n", pd));
pc->sig_hup = 0; pc->sig_hup = 0;
tcpip_callback(pppHupCB, arg); tcpip_callback(pppHupCB, arg);
} else { } else {
int c = sio_read(pc->fd, p->payload, p->len); int c = sio_read(pc->fd, p->payload, p->len);
if(c > 0) { if(c > 0) {
pppInProc(pd, p->payload, c); pppInProc(pd, p->payload, c);
} else {
PPPDEBUG((LOG_DEBUG, "pppMainWakeup: unit %d sio_read len=%d returned %d\n", pd, p->len, c));
sys_msleep(250); /* give other tasks a chance to run */
} }
} }
} }
PPPDEBUG((LOG_INFO, "pppMain: unit %d: PHASE_DEAD\n", pd));
pbuf_free(p); pbuf_free(p);
out: out:
PPPDEBUG((LOG_DEBUG, "pppMain: unit %d: linkStatusCB=%lx errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
if(pc->linkStatusCB) if(pc->linkStatusCB)
pc->linkStatusCB(pc->linkStatusArg, pc->errCode ? pc->errCode : PPPERR_PROTOCOL); pc->linkStatusCB(pc->linkStatusCtx, pc->errCode ? pc->errCode : PPPERR_PROTOCOL, NULL);
pc->openFlag = 0; pc->openFlag = 0;
} }
@ -1227,7 +1274,7 @@ static void pppInput(void *arg)
switch(protocol) { switch(protocol) {
case PPP_VJC_COMP: /* VJ compressed TCP */ case PPP_VJC_COMP: /* VJ compressed TCP */
#if VJ_SUPPORT > 0 #if VJ_SUPPORT > 0
PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_comp in nBuf 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
* pass the result to IP. * pass the result to IP.
@ -1245,7 +1292,7 @@ static void pppInput(void *arg)
break; break;
case PPP_VJC_UNCOMP: /* VJ uncompressed TCP */ case PPP_VJC_UNCOMP: /* VJ uncompressed TCP */
#if VJ_SUPPORT > 0 #if VJ_SUPPORT > 0
PPPDEBUG((LOG_INFO, "pppInput[%d]: vj_un in nBuf 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
* the packet to IP. * the packet to IP.
@ -1264,7 +1311,7 @@ static void pppInput(void *arg)
#endif /* VJ_SUPPORT > 0 */ #endif /* VJ_SUPPORT > 0 */
break; break;
case PPP_IP: /* Internet Protocol */ case PPP_IP: /* Internet Protocol */
PPPDEBUG((LOG_INFO, "pppInput[%d]: ip in nBuf len=%d", pd, nb->len)); PPPDEBUG((LOG_INFO, "pppInput[%d]: ip in pbuf len=%d\n", pd, nb->len));
pppControl[pd].netif->input(nb, pppControl[pd].netif); pppControl[pd].netif->input(nb, pppControl[pd].netif);
return; return;
default: default:
@ -1316,7 +1363,9 @@ static void pppDrop(PPPControl *pc)
#if 0 #if 0
PPPDEBUG((LOG_INFO, "pppDrop: %d:%.*H\n", pc->inHead->len, min(60, pc->inHead->len * 2), pc->inHead->payload)); PPPDEBUG((LOG_INFO, "pppDrop: %d:%.*H\n", pc->inHead->len, min(60, pc->inHead->len * 2), pc->inHead->payload));
#endif #endif
PPPDEBUG((LOG_INFO, "pppDrop: nBuf len=%d\n", pc->inHead->len)); PPPDEBUG((LOG_INFO, "pppDrop: pbuf len=%d\n", pc->inHead->len));
if (pc->inTail && (pc->inTail != pc->inHead))
pbuf_free(pc->inTail);
pbuf_free(pc->inHead); pbuf_free(pc->inHead);
pc->inHead = NULL; pc->inHead = NULL;
pc->inTail = NULL; pc->inTail = NULL;
@ -1382,26 +1431,33 @@ static void pppInProc(int pd, u_char *s, int l)
else { else {
/* Trim off the checksum. */ /* Trim off the checksum. */
if(pc->inTail->len >= 2) { if(pc->inTail->len >= 2) {
pc->inTail->len -= 2; pc->inTail->len -= 2;
pc->inLen -= 2;
/* Update the packet header. */ pc->inTail->tot_len = pc->inTail->len;
pc->inHead->tot_len = pc->inLen; if (pc->inTail != pc->inHead) {
} else { pbuf_chain(pc->inHead, pc->inTail);
pc->inHead->tot_len = pc->inLen; pbuf_free(pc->inTail);
pbuf_realloc(pc->inHead, pc->inLen - 2); }
} } else {
pc->inTail->tot_len = pc->inTail->len;
if (pc->inTail != pc->inHead) {
pbuf_chain(pc->inHead, pc->inTail);
pbuf_free(pc->inTail);
}
pbuf_realloc(pc->inHead, pc->inHead->tot_len - 2);
}
/* Dispatch the packet thereby consuming it. */ /* Dispatch the packet thereby consuming it. */
if(tcpip_callback(pppInput, pc->inHead) != ERR_OK) { if(tcpip_callback(pppInput, pc->inHead) != ERR_OK) {
PPPDEBUG((LOG_ERR, PPPDEBUG((LOG_ERR,
"pppInProc[%d]: tcpip_callback() failed, dropping packet\n", pd)); "pppInProc[%d]: tcpip_callback() failed, dropping packet\n", pd));
pbuf_free(pc->inHead); pbuf_free(pc->inHead);
#ifdef LINK_STATS #ifdef LINK_STATS
lwip_stats.link.drop++; lwip_stats.link.drop++;
#endif #endif
} }
pc->inHead = NULL; pc->inHead = NULL;
pc->inTail = NULL; pc->inTail = NULL;
} }
@ -1480,12 +1536,19 @@ static void pppInProc(int pd, u_char *s, int l)
case PDDATA: /* Process data byte. */ case PDDATA: /* Process data byte. */
/* Make space to receive processed data. */ /* Make space to receive processed data. */
if (pc->inTail == NULL || pc->inTail->len == PBUF_POOL_BUFSIZE) { if (pc->inTail == NULL || pc->inTail->len == PBUF_POOL_BUFSIZE) {
if(pc->inTail) {
pc->inTail->tot_len = pc->inTail->len;
if (pc->inTail != pc->inHead) {
pbuf_chain(pc->inHead, pc->inTail);
pbuf_free(pc->inTail);
}
}
/* If we haven't started a packet, we need a packet header. */ /* If we haven't started a packet, we need a packet header. */
nextNBuf = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL); nextNBuf = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
if (nextNBuf == NULL) { if (nextNBuf == NULL) {
/* No free buffers. Drop the input packet and let the /* No free buffers. Drop the input packet and let the
* higher layers deal with it. Continue processing * higher layers deal with it. Continue processing
* the received nBuf chain in case a new packet starts. */ * the received pbuf chain in case a new packet starts. */
PPPDEBUG((LOG_ERR, "pppInProc[%d]: NO FREE MBUFS!\n", pd)); PPPDEBUG((LOG_ERR, "pppInProc[%d]: NO FREE MBUFS!\n", pd));
#ifdef LINK_STATS #ifdef LINK_STATS
lwip_stats.link.memerr++; lwip_stats.link.memerr++;
@ -1493,27 +1556,21 @@ static void pppInProc(int pd, u_char *s, int l)
pppDrop(pc); pppDrop(pc);
pc->inState = PDSTART; /* Wait for flag sequence. */ pc->inState = PDSTART; /* Wait for flag sequence. */
break; break;
} else {
if (pc->inHead == NULL) {
struct pppInputHeader *pih = nextNBuf->payload;
pih->unit = pd;
pih->proto = pc->inProtocol;
nextNBuf->len += sizeof(*pih);
pc->inLen = nextNBuf->len;
pc->inHead = nextNBuf;
}
else { /* Since if inHead is not NULL, then neither is inTail! */
pc->inTail->next = nextNBuf;
}
pc->inTail = nextNBuf;
} }
if (pc->inHead == NULL) {
struct pppInputHeader *pih = nextNBuf->payload;
pih->unit = pd;
pih->proto = pc->inProtocol;
nextNBuf->len += sizeof(*pih);
pc->inHead = nextNBuf;
}
pc->inTail = nextNBuf;
} }
/* Load character into buffer. */ /* Load character into buffer. */
((u_char*)pc->inTail->payload)[pc->inTail->len++] = curChar; ((u_char*)pc->inTail->payload)[pc->inTail->len++] = curChar;
pc->inLen++;
break; break;
} }
@ -1524,74 +1581,4 @@ static void pppInProc(int pd, u_char *s, int l)
avRandomize(); avRandomize();
} }
/*
* pppMPutC - append given character to end of given nBuf. If the character
* needs to be escaped, do so. If nBuf is full, append another.
* Return the current nBuf.
*/
static struct pbuf *pppMPutC(u_char c, ext_accm *outACCM, struct pbuf *nb)
{
struct pbuf *tb = nb;
/* Make sure there is room for the character and an escape code.
* Sure we don't quite fill the buffer if the character doesn't
* get escaped but is one character worth complicating this? */
/* Note: We assume no packet header. */
if (nb && (PBUF_POOL_BUFSIZE - nb->len) < 2) {
tb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
if (tb) {
nb->next = tb;
}
#ifdef LINK_STATS
else {
lwip_stats.link.memerr++;
}
#endif /* LINK_STATS */
nb = tb;
}
if (nb) {
if (ESCAPE_P(*outACCM, c)) {
*((u_char*)nb->payload + nb->len++) = PPP_ESCAPE;
*((u_char*)nb->payload + nb->len++) = c ^ PPP_TRANS;
}
else
*((u_char*)nb->payload + nb->len++) = c;
}
return tb;
}
/*
* pppMPutRaw - append given character to end of given nBuf without escaping
* it. If nBuf is full, append another.
* This is normally used to add the flag character to a packet.
* Return the current nBuf.
*/
static struct pbuf *pppMPutRaw(u_char c, struct pbuf *nb)
{
struct pbuf *tb = nb;
/* Make sure there is room for the character and an escape code.
* Sure we don't quite fill the buffer if the character doesn't
* get escaped but is one character worth complicating this? */
/* Note: We assume no packet header. */
if (nb && (PBUF_POOL_BUFSIZE - nb->len) < 2) {
tb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
if (tb) {
nb->next = tb;
}
#ifdef LINK_STATS
else {
lwip_stats.link.memerr++;
}
#endif /* LINK_STATS */
nb = tb;
}
if (nb) {
*((u_char*)nb->payload + nb->len++) = c;
}
return tb;
}
#endif /* PPP_SUPPORT */ #endif /* PPP_SUPPORT */

5
src/netif/ppp/ppp.h
View File

@ -318,6 +318,9 @@ struct ppp_settings {
char remote_name[MAXNAMELEN + 1]; /* Peer's name for authentication */ char remote_name[MAXNAMELEN + 1]; /* Peer's name for authentication */
}; };
struct ppp_addrs {
struct ip_addr our_ipaddr, his_ipaddr, netmask, dns1, dns2;
};
/***************************** /*****************************
*** PUBLIC DATA STRUCTURES *** *** PUBLIC DATA STRUCTURES ***
@ -346,7 +349,7 @@ void pppSetAuth(const char *user, const char *passwd);
* Return a new PPP connection descriptor on success or * Return a new PPP connection descriptor on success or
* an error code (negative) on failure. * an error code (negative) on failure.
*/ */
int pppOpen(sio_fd_t fd, void (*linkStatusCB)(void *arg, int errCode), void *linkStatusArg); int pppOpen(sio_fd_t fd, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx);
/* /*
* Close a PPP connection and release the descriptor. * Close a PPP connection and release the descriptor.

29
src/netif/ppp/vj.c
View File

@ -574,6 +574,33 @@ int vj_uncompress_tcp(
/* Remove the compressed header and prepend the uncompressed header. */ /* Remove the compressed header and prepend the uncompressed header. */
pbuf_header(n0, -vjlen); pbuf_header(n0, -vjlen);
if(MEM_ALIGN(n0->payload) != n0->payload) {
struct pbuf *np, *q;
u8_t *bufptr;
np = pbuf_alloc(PBUF_RAW, n0->len + cs->cs_hlen, PBUF_POOL);
if(!np) {
PPPDEBUG((LOG_WARNING, "vj_uncompress_tcp: realign failed\n"));
*nb = NULL;
goto bad;
}
pbuf_header(np, -cs->cs_hlen);
bufptr = n0->payload;
for(q = np; q != NULL; q = q->next) {
memcpy(q->payload, bufptr, q->len);
bufptr += q->len;
}
if(n0->next) {
pbuf_chain(np, n0->next);
pbuf_dechain(n0);
}
pbuf_free(n0);
n0 = np;
}
if(pbuf_header(n0, cs->cs_hlen)) { if(pbuf_header(n0, cs->cs_hlen)) {
struct pbuf *np; struct pbuf *np;
@ -585,8 +612,10 @@ int vj_uncompress_tcp(
goto bad; goto bad;
} }
pbuf_chain(np, n0); pbuf_chain(np, n0);
pbuf_free(n0);
n0 = np; n0 = np;
} }
LWIP_ASSERT("n0->len >= cs->cs_hlen", n0->len >= cs->cs_hlen);
memcpy(n0->payload, &cs->cs_ip, cs->cs_hlen); memcpy(n0->payload, &cs->cs_ip, cs->cs_hlen);
*nb = n0; *nb = n0;