mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-17 02:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS, moved common FCS output code in pppos_output_last()

Browse Source
This commit is contained in:
Sylvain Rochet 2015-03-14 13:49:53 +01:00
parent 2fb1859732
commit d628a9bc78
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/netif/ppp/pppos.c
View File

@ -79,7 +79,7 @@ static void pppos_input_callback(void *arg);
static void pppos_input_free_current_packet(pppos_pcb *pppos); static void pppos_input_free_current_packet(pppos_pcb *pppos);
static void pppos_input_drop(pppos_pcb *pppos); static void pppos_input_drop(pppos_pcb *pppos);
static err_t pppos_output_append(pppos_pcb *pppos, err_t err, struct pbuf *nb, u8_t c, u8_t accm, u16_t *fcs); static err_t pppos_output_append(pppos_pcb *pppos, err_t err, struct pbuf *nb, u8_t c, u8_t accm, u16_t *fcs);
static err_t pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb); static err_t pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb, u16_t *fcs);
/* Callbacks structure for PPP core */ /* Callbacks structure for PPP core */
static const struct link_callbacks pppos_callbacks = { static const struct link_callbacks pppos_callbacks = {
@ -251,14 +251,7 @@ pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p)
err = pppos_output_append(pppos, err, nb, c, 1, &fcs_out); err = pppos_output_append(pppos, err, nb, c, 1, &fcs_out);
} }
/* Add FCS and trailing flag. */ err = pppos_output_last(pppos, err, nb, &fcs_out);
c = ~fcs_out & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
c = (~fcs_out >> 8) & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
err = pppos_output_append(pppos, err, nb, PPP_FLAG, 0, NULL);
err = pppos_output_last(pppos, err, nb);
if (err == ERR_OK) { if (err == ERR_OK) {
PPPDEBUG(LOG_INFO, ("pppos_write[%d]: len=%d\n", ppp->netif->num, p->len)); PPPDEBUG(LOG_INFO, ("pppos_write[%d]: len=%d\n", ppp->netif->num, p->len));
} else { } else {
@ -345,14 +338,7 @@ pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u16_t protocol)
} }
} }
/* Add FCS and trailing flag. */ err = pppos_output_last(pppos, err, nb, &fcs_out);
c = ~fcs_out & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
c = (~fcs_out >> 8) & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
err = pppos_output_append(pppos, err, nb, PPP_FLAG, 0, NULL);
err = pppos_output_last(pppos, err, nb);
if (err == ERR_OK) { if (err == ERR_OK) {
PPPDEBUG(LOG_INFO, ("pppos_netif_output[%d]: proto=0x%"X16_F", len = %d\n", ppp->netif->num, protocol, pb->tot_len)); PPPDEBUG(LOG_INFO, ("pppos_netif_output[%d]: proto=0x%"X16_F", len = %d\n", ppp->netif->num, protocol, pb->tot_len));
} else { } else {
@ -1023,9 +1009,17 @@ pppos_output_append(pppos_pcb *pppos, err_t err, struct pbuf *nb, u8_t c, u8_t a
} }
static err_t static err_t
pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb) pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb, u16_t *fcs)
{ {
ppp_pcb *ppp = pppos->ppp; ppp_pcb *ppp = pppos->ppp;
u8_t c;
/* Add FCS and trailing flag. */
c = ~(*fcs) & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
c = (~(*fcs) >> 8) & 0xFF;
err = pppos_output_append(pppos, err, nb, c, 1, NULL);
err = pppos_output_append(pppos, err, nb, PPP_FLAG, 0, NULL);
if (err != ERR_OK) { if (err != ERR_OK) {
goto failed; goto failed;