d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement timestamps so i4b/driver/i4b_isppp.c can derive the idle

Browse Source 
time from the PPP packets sent.  This effectively merges rev 1.2 of
the old i4b_ispppsubr.c, with the exception that i eventually ended up
in debugging and fixing it so the idle time is now really
detected. ;-)  (The version in i4b simply doesn't work right since it
still accounts for incoming LCP echo packets which it is supposed to
ignore for idle time considerations...)

Obtained from:	i4b
MFC after:	1 month
This commit is contained in:
Joerg Wunsch 2001-12-28 15:59:54 +00:00
parent 0f958c273a
commit 5450aa1239
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/if_sppp.h
View File

@ -145,6 +145,8 @@ struct sppp {
int rst_counter[IDX_COUNT]; /* restart counter */
int fail_counter[IDX_COUNT]; /* negotiation failure counter */
int enable_vj; /* VJ header compression enabled */
time_t pp_last_recv; /* time last packet has been received */
time_t pp_last_sent; /* time last packet has been sent */
struct callout_handle ch[IDX_COUNT]; /* per-proto and if callouts */
struct callout_handle pap_my_to_ch; /* PAP needs one more... */
struct slcp lcp; /* LCP params */

29
sys/net/if_spppsubr.c
View File

@ -508,7 +508,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
struct ppp_header *h;
struct ifqueue *inq = 0;
struct sppp *sp = (struct sppp *)ifp;
int len;
int len, do_account = 0;
int debug = ifp->if_flags & IFF_DEBUG;
if (ifp->if_flags & IFF_UP)
@ -584,6 +584,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
schednetisr (NETISR_IP);
inq = &ipintrq;
}
do_account++;
break;
#endif
#ifdef INET6
@ -598,6 +599,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
schednetisr (NETISR_IPV6);
inq = &ip6intrq;
}
do_account++;
break;
case PPP_VJ_COMP:
if (sp->state[IDX_IPCP] == STATE_OPENED) {
@ -633,6 +635,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
schednetisr (NETISR_IPX);
inq = &ipxintrq;
}
do_account++;
break;
#endif
#ifdef NS
@ -642,6 +645,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
schednetisr (NETISR_NS);
inq = &nsintrq;
}
do_account++;
break;
#endif
}
@ -670,24 +674,28 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
case ETHERTYPE_IP:
schednetisr (NETISR_IP);
inq = &ipintrq;
do_account++;
break;
#endif
#ifdef INET6
case ETHERTYPE_IPV6:
schednetisr (NETISR_IPV6);
inq = &ip6intrq;
do_account++;
break;
#endif
#ifdef IPX
case ETHERTYPE_IPX:
schednetisr (NETISR_IPX);
inq = &ipxintrq;
do_account++;
break;
#endif
#ifdef NS
case ETHERTYPE_NS:
schednetisr (NETISR_NS);
inq = &nsintrq;
do_account++;
break;
#endif
}
@ -713,6 +721,13 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
SPP_ARGS(ifp));
goto drop;
}
if (do_account)
/*
* Do only account for network packets, not for control
* packets. This is used by some subsystems to detect
* idle lines.
*/
sp->pp_last_recv = time_second;
}
/*
@ -911,14 +926,19 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
/*
* Queue message on interface, and start output if interface
* not yet active. Also adjust output byte count.
* The packet length includes header, FCS and 1 flag,
* according to RFC 1333.
* not yet active.
*/
if (! IF_HANDOFF_ADJ(ifq, m, ifp, 3)) {
++ifp->if_oerrors;
return (rv? rv: ENOBUFS);
}
/*
* Unlike in sppp_input(), we can always bump the timestamp
* here since sppp_output() is only called on behalf of
* network-layer traffic; control-layer traffic is handled
* by sppp_cp_send().
*/
sp->pp_last_sent = time_second;
return (0);
}
@ -955,6 +975,7 @@ sppp_attach(struct ifnet *ifp)
mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", MTX_DEF);
mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", MTX_DEF);
sp->enable_vj = 1;
sp->pp_last_recv = sp->pp_last_sent = time_second;
sl_compress_init(&sp->pp_comp, -1);
sppp_lcp_init(sp);
sppp_ipcp_init(sp);