abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 17:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, ppp->last_xmit is only used in PPPoS, moved to PPPoS

Browse Source 
Only PPPoS need to keep track of last transmitted packet for HDLC flag,
removed from PPPoE and PPPoL2TP and moved to PPPoS.
This commit is contained in:
Sylvain Rochet
2015-03-14 01:03:58 +01:00
parent 6a04357547
commit 50336aaedd
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/netif/ppp/pppoe.c
View File

@@ -232,8 +232,6 @@ static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
tot_len = ph->tot_len;
#endif /* LWIP_SNMP */
ppp->last_xmit = sys_jiffies();
ret = pppoe_xmit(sc, ph);
if (ret != ERR_OK) {
LINK_STATS_INC(link.err);
@@ -268,8 +266,6 @@ static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short
pbuf_header(pb, -(s16_t)PPPOE_HEADERLEN);
ppp->last_xmit = sys_jiffies();
pl = (u8_t*)pb->payload;
PUTSHORT(protocol, pl);

4
src/netif/ppp/pppol2tp.c
View File

@@ -234,8 +234,6 @@ static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
tot_len = ph->tot_len;
#endif /* LWIP_SNMP */
ppp->last_xmit = sys_jiffies();
ret = pppol2tp_xmit(l2tp, ph);
if (ret != ERR_OK) {
LINK_STATS_INC(link.err);
@@ -270,8 +268,6 @@ static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_sh
pbuf_header(pb, -(s16_t)PPPOL2TP_OUTPUT_DATA_HEADER_LEN);
ppp->last_xmit = sys_jiffies();
pl = (u8_t*)pb->payload;
PUTSHORT(protocol, pl);

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

@@ -238,7 +238,7 @@ pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p)
/* If the link has been idle, we'll send a fresh flag character to
* flush any noise. */
err = ERR_OK;
if ((sys_jiffies() - ppp->last_xmit) >= PPP_MAXIDLEFLAG) {
if ((sys_jiffies() - pppos->last_xmit) >= PPP_MAXIDLEFLAG) {
err = pppos_output_append(pppos, err, nb, PPP_FLAG, 0);
}
@@ -321,7 +321,7 @@ pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol)
/* If the link has been idle, we'll send a fresh flag character to
* flush any noise. */
err = ERR_OK;
if ((sys_jiffies() - ppp->last_xmit) >= PPP_MAXIDLEFLAG) {
if ((sys_jiffies() - pppos->last_xmit) >= PPP_MAXIDLEFLAG) {
err = pppos_output_append(pppos, err, nb, PPP_FLAG, 0);
}
@@ -384,7 +384,7 @@ pppos_connect(ppp_pcb *ppp, void *ctx)
ppp_clear(ppp);
/* reset PPPoS control block to its initial state */
memset(&pppos->out_accm, 0, sizeof(pppos_pcb) - ( (char*)&((pppos_pcb*)0)->out_accm - (char*)0 ) );
memset(&pppos->last_xmit, 0, sizeof(pppos_pcb) - ( (char*)&((pppos_pcb*)0)->last_xmit - (char*)0 ) );
#if PPP_IPV4_SUPPORT && VJ_SUPPORT
vj_compress_init(&pppos->vj_comp);
@@ -974,7 +974,7 @@ pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb)
}
}
ppp->last_xmit = sys_jiffies();
pppos->last_xmit = sys_jiffies();
snmp_add_ifoutoctets(ppp->netif, nb->tot_len);
snmp_inc_ifoutucastpkts(ppp->netif);
LINK_STATS_INC(link.xmit);
@@ -982,7 +982,7 @@ pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb)
return ERR_OK;
failed:
ppp->last_xmit = 0; /* prepend PPP_FLAG to next packet */
pppos->last_xmit = 0; /* prepend PPP_FLAG to next packet */
LINK_STATS_INC(link.err);
LINK_STATS_INC(link.drop);
snmp_inc_ifoutdiscards(ppp->netif);