Attachment #7361 for bug #16023

Lines 88-95 Link Here

(-)src/sys/net/if_sppp.h.new Mon Jan 10 12:11:16 2000 (+2 lines)
88	u_short pp_alivecnt; /* keepalive packets counter */	88	u_short pp_alivecnt; /* keepalive packets counter */
89	u_short pp_loopcnt; /* loopback detection counter */	89	u_short pp_loopcnt; /* loopback detection counter */
90	u_long pp_seq; /* local sequence number */	90	u_long pp_seq; /* local sequence number */
91	u_long pp_rseq; /* remote sequence number */	91	u_long pp_rseq; /* remote sequence number */
		92	time_t pp_last_sent; /* time() when the last packet was sent */
		93	time_t pp_last_recv; /* time() when the last packet was received */
92	enum ppp_phase pp_phase; /* phase we're currently in */	94	enum ppp_phase pp_phase; /* phase we're currently in */
93	int state[IDX_COUNT]; /* state machine */	95	int state[IDX_COUNT]; /* state machine */
94	u_char confid[IDX_COUNT]; /* id of last configuration request */	96	u_char confid[IDX_COUNT]; /* id of last configuration request */
95	int rst_counter[IDX_COUNT]; /* restart counter */	97	int rst_counter[IDX_COUNT]; /* restart counter */




                               SPP_ARGS(ifp));
               goto drop;
       }
       IF_ENQUEUE(inq, m);
       sp->pp_last_recv = time_second;
       splx(s);
}

/*

        * The packet length includes header, FCS and 1 flag,
        * according to RFC 1333.
        */
       ifp->if_obytes += m->m_pkthdr.len + 3;
       sp->pp_last_sent = time_second;
       splx (s);
       return (0);
}


       sp->pp_rseq = 0;
       sp->pp_phase = PHASE_DEAD;
       sp->pp_up = lcp.Up;
       sp->pp_down = lcp.Down;
       sp->pp_last_recv = sp->pp_last_sent = time_second;

       sppp_lcp_init(sp);
       sppp_ipcp_init(sp);
       sppp_pap_init(sp);

Return to bug 16023

Lines 619-626 Link Here

(-)src/sys/net/if_spppsubr.c.new Mon Jan 10 12:16:38 2000 (+3 lines)
619	SPP_ARGS(ifp));	619	SPP_ARGS(ifp));
620	goto drop;	620	goto drop;
621	}	621	}
622	IF_ENQUEUE(inq, m);	622	IF_ENQUEUE(inq, m);
		623	sp->pp_last_recv = time_second;
623	splx(s);	624	splx(s);
624	}	625	}
625		626
626	/*	627	/*
Lines 805-812 Link Here
805	* The packet length includes header, FCS and 1 flag,	806	* The packet length includes header, FCS and 1 flag,
806	* according to RFC 1333.	807	* according to RFC 1333.
807	*/	808	*/
808	ifp->if_obytes += m->m_pkthdr.len + 3;	809	ifp->if_obytes += m->m_pkthdr.len + 3;
		810	sp->pp_last_sent = time_second;
809	splx (s);	811	splx (s);
810	return (0);	812	return (0);
811	}	813	}
812		814
Lines 838-845 Link Here
838	sp->pp_rseq = 0;	840	sp->pp_rseq = 0;
839	sp->pp_phase = PHASE_DEAD;	841	sp->pp_phase = PHASE_DEAD;
840	sp->pp_up = lcp.Up;	842	sp->pp_up = lcp.Up;
841	sp->pp_down = lcp.Down;	843	sp->pp_down = lcp.Down;
		844	sp->pp_last_recv = sp->pp_last_sent = time_second;
842		845
843	sppp_lcp_init(sp);	846	sppp_lcp_init(sp);
844	sppp_ipcp_init(sp);	847	sppp_ipcp_init(sp);
845	sppp_pap_init(sp);	848	sppp_pap_init(sp);