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

PPP, MPPE, try to use pbuf_header() in mppe_compress()

Browse Source 
If there is enough space in front of the buffer, use it instead of
allocating a new pbuf.
This commit is contained in:
Sylvain Rochet 2015-04-26 23:27:31 +02:00
parent 900f3c9a09
commit 3a3c823ddb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,16 +198,20 @@ void mppe_comp_reset(ppp_pcb *pcb, ppp_mppe_state *state)
err_t err_t
mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t protocol) mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t protocol)
{ {
struct pbuf *np, *n; struct pbuf *n;
u8_t *pl; u8_t *pl;
/* FIXME: try to use pbuf_header() here! */ if (pbuf_header(*pb, (s16_t)(MPPE_OVHD + sizeof(protocol))) == 0) {
np = pbuf_alloc(PBUF_RAW, MPPE_OVHD + sizeof(protocol), PBUF_RAM); pbuf_ref(*pb);
if (!np) { } else {
return ERR_MEM; struct pbuf *np = pbuf_alloc(PBUF_RAW, MPPE_OVHD + sizeof(protocol), PBUF_RAM);
if (!np) {
return ERR_MEM;
}
pbuf_chain(np, *pb);
*pb = np;
} }
pbuf_chain(np, *pb); pl = (u8_t*)(*pb)->payload;
pl = (u8_t*)np->payload;
state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE; state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE;
PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: ccount %d\n", pcb->netif->num, state->ccount)); PPPDEBUG(LOG_DEBUG, ("mppe_compress[%d]: ccount %d\n", pcb->netif->num, state->ccount));
@ -229,11 +233,13 @@ mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t proto
state->bits &= ~MPPE_BIT_FLUSHED; /* reset for next xmit */ state->bits &= ~MPPE_BIT_FLUSHED; /* reset for next xmit */
pl += MPPE_OVHD; pl += MPPE_OVHD;
/* Add and encrypt protocol */ /* Add protocol */
/* FIXME: add PFC support */ /* FIXME: add PFC support */
pl[0] = protocol >> 8; pl[0] = protocol >> 8;
pl[1] = protocol; pl[1] = protocol;
arc4_crypt(&state->arc4, pl, sizeof(protocol));
/* Hide MPPE header */
pbuf_header(*pb, -(s16_t)MPPE_OVHD);
/* Encrypt packet */ /* Encrypt packet */
for (n = *pb; n != NULL; n = n->next) { for (n = *pb; n != NULL; n = n->next) {
@ -243,7 +249,9 @@ mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t proto
} }
} }
*pb = np; /* Reveal MPPE header */
pbuf_header(*pb, (s16_t)MPPE_OVHD);
return ERR_OK; return ERR_OK;
} }