mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-16 07:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, MPPE, removed address, control and protocol from compressor output

Browse Source 
Our PPP stack deals with packet without address and control byte nor 2-byte
protocol field, improved mppe_compress() so we don't have to worry about
them.
This commit is contained in:
Sylvain Rochet 2015-04-14 22:15:11 +02:00
parent e241f880e8
commit 9164c4f309
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/netif/ppp/mppe.c
View File

@ -295,27 +295,17 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
return 0; return 0;
/* Make sure we have enough room to generate an encrypted packet. */ /* Make sure we have enough room to generate an encrypted packet. */
if (osize < isize + MPPE_OVHD + 2) { if (osize < isize + MPPE_OVHD - PPP_HDRLEN + 2) {
/* Drop the packet if we should encrypt it, but can't. */ /* Drop the packet if we should encrypt it, but can't. */
PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: osize too small! " PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: osize too small! "
"(have: %d need: %d)\n", state->unit, "(have: %d need: %d)\n", state->unit,
osize, osize + MPPE_OVHD + 2)); osize, osize + MPPE_OVHD - PPP_HDRLEN + 2));
return -1; return -1;
} }
osize = isize + MPPE_OVHD + 2; osize = isize + MPPE_OVHD - PPP_HDRLEN + 2;
/*
* Copy over the PPP header and set control bits.
*/
/* FIXME: use PUT* macros */
obuf[0] = PPP_ADDRESS(ibuf);
obuf[1] = PPP_CONTROL(ibuf);
obuf[2] = PPP_COMP>>8;
obuf[3] = PPP_COMP;
obuf += PPP_HDRLEN;
state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE; state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE;
if (state->debug >= 7) if (state->debug >= 7)
PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: ccount %d\n", state->unit, PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: ccount %d\n", state->unit,