mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-08-24 15:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, MPPE, fixed compiler warnings

Browse Source
This commit is contained in:
Sylvain Rochet 2015-03-29 12:13:33 +02:00
parent ea6f624b58
commit 52b7ebd4e7
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,14 +147,13 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
static void *mppe_alloc(unsigned char *options, int optlen) static void *mppe_alloc(unsigned char *options, int optlen)
{ {
struct ppp_mppe_state *state; struct ppp_mppe_state *state;
unsigned int digestsize;
if (optlen != CILEN_MPPE + sizeof(state->master_key) || if (optlen != CILEN_MPPE + sizeof(state->master_key) ||
options[0] != CI_MPPE || options[1] != CILEN_MPPE) options[0] != CI_MPPE || options[1] != CILEN_MPPE)
goto out; goto out;
/* FIXME: remove malloc() */ /* FIXME: remove malloc() */
state = malloc(sizeof(*state)); state = (struct ppp_mppe_state *)malloc(sizeof(*state));
if (state == NULL) if (state == NULL)
goto out; goto out;
@ -171,8 +170,6 @@ static void *mppe_alloc(unsigned char *options, int optlen)
return (void *)state; return (void *)state;
out_free:
free(state);
out: out:
return NULL; return NULL;
} }
@ -227,9 +224,9 @@ mppe_init(void *arg, unsigned char *options, int optlen, int unit, int debug,
debugstr, unit, (state->keylen == 16) ? 128 : 40, debugstr, unit, (state->keylen == 16) ? 128 : 40,
(state->stateful) ? "stateful" : "stateless")); (state->stateful) ? "stateful" : "stateless"));
for (i = 0; i < sizeof(state->master_key); i++) for (i = 0; i < (int)sizeof(state->master_key); i++)
sprintf(mkey + i * 2, "%02x", state->master_key[i]); sprintf(mkey + i * 2, "%02x", state->master_key[i]);
for (i = 0; i < sizeof(state->session_key); i++) for (i = 0; i < (int)sizeof(state->session_key); i++)
sprintf(skey + i * 2, "%02x", state->session_key[i]); sprintf(skey + i * 2, "%02x", state->session_key[i]);
PPPDEBUG(LOG_DEBUG, PPPDEBUG(LOG_DEBUG,
("%s[%d]: keys: master: %s initial session: %s\n", ("%s[%d]: keys: master: %s initial session: %s\n",
@ -260,7 +257,7 @@ static int
mppe_comp_init(void *arg, unsigned char *options, int optlen, int unit, mppe_comp_init(void *arg, unsigned char *options, int optlen, int unit,
int hdrlen, int debug) int hdrlen, int debug)
{ {
/* ARGSUSED */ LWIP_UNUSED_ARG(hdrlen);
return mppe_init(arg, options, optlen, unit, debug, "mppe_comp_init"); return mppe_init(arg, options, optlen, unit, debug, "mppe_comp_init");
} }
@ -310,19 +307,24 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
osize = isize + MPPE_OVHD + 2; osize = isize + MPPE_OVHD + 2;
/* /*
* Copy over the PPP header and set control bits. * Copy over the PPP header and set control bits.
*/ */
/* FIXME: use PUT* macros */
obuf[0] = PPP_ADDRESS(ibuf); obuf[0] = PPP_ADDRESS(ibuf);
obuf[1] = PPP_CONTROL(ibuf); obuf[1] = PPP_CONTROL(ibuf);
put_unaligned_be16(PPP_COMP, obuf + 2); obuf[2] = PPP_COMP>>8;
obuf[3] = PPP_COMP;
obuf += PPP_HDRLEN; 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,
state->ccount)); state->ccount));
put_unaligned_be16(state->ccount, obuf); /* FIXME: use PUT* macros */
obuf[0] = state->ccount>>8;
obuf[1] = state->ccount;
if (!state->stateful || /* stateless mode */ if (!state->stateful || /* stateless mode */
((state->ccount & 0xff) == 0xff) || /* "flag" packet */ ((state->ccount & 0xff) == 0xff) || /* "flag" packet */
@ -351,7 +353,8 @@ static int
mppe_decomp_init(void *arg, unsigned char *options, int optlen, int unit, mppe_decomp_init(void *arg, unsigned char *options, int optlen, int unit,
int hdrlen, int mru, int debug) int hdrlen, int mru, int debug)
{ {
/* ARGSUSED */ LWIP_UNUSED_ARG(hdrlen);
LWIP_UNUSED_ARG(mru);
return mppe_init(arg, options, optlen, unit, debug, "mppe_decomp_init"); return mppe_init(arg, options, optlen, unit, debug, "mppe_decomp_init");
} }
@ -360,7 +363,7 @@ mppe_decomp_init(void *arg, unsigned char *options, int optlen, int unit,
*/ */
static void mppe_decomp_reset(void *arg) static void mppe_decomp_reset(void *arg)
{ {
/* ARGSUSED */ LWIP_UNUSED_ARG(arg);
return; return;
} }
@ -541,6 +544,7 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
static void mppe_incomp(void *arg, unsigned char *ibuf, int icnt) static void mppe_incomp(void *arg, unsigned char *ibuf, int icnt)
{ {
struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
LWIP_UNUSED_ARG(icnt);
if (state->debug && if (state->debug &&
(PPP_PROTOCOL(ibuf) >= 0x0021 && PPP_PROTOCOL(ibuf) <= 0x00fa)) (PPP_PROTOCOL(ibuf) >= 0x0021 && PPP_PROTOCOL(ibuf) <= 0x00fa))