Deleted Added
full compact
lqr.c (96582) lqr.c (98243)
1/*-
2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
4 * Internet Initiative Japan, Inc (IIJ)
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
4 * Internet Initiative Japan, Inc (IIJ)
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/usr.sbin/ppp/lqr.c 96582 2002-05-14 12:55:39Z brian $
28 * $FreeBSD: head/usr.sbin/ppp/lqr.c 98243 2002-06-15 08:03:30Z brian $
29 */
30
31#include <sys/param.h>
32
33#ifdef __FreeBSD__
34#include <netinet/in.h>
35#endif
36#include <sys/un.h>

--- 198 unchanged lines hidden (view full) ---

235 /*
236 * Generate an LQR response if we're not running an LQR timer OR
237 * two successive LQR's PeerInLQRs are the same OR we're not going to
238 * send our next one before the peers max timeout.
239 */
240 if (p->hdlc.lqm.timer.load == 0 ||
241 !(p->hdlc.lqm.method & LQM_LQR) ||
242 (lastLQR && lastLQR == p->hdlc.lqm.lqr.peer.PeerInLQRs) ||
29 */
30
31#include <sys/param.h>
32
33#ifdef __FreeBSD__
34#include <netinet/in.h>
35#endif
36#include <sys/un.h>

--- 198 unchanged lines hidden (view full) ---

235 /*
236 * Generate an LQR response if we're not running an LQR timer OR
237 * two successive LQR's PeerInLQRs are the same OR we're not going to
238 * send our next one before the peers max timeout.
239 */
240 if (p->hdlc.lqm.timer.load == 0 ||
241 !(p->hdlc.lqm.method & LQM_LQR) ||
242 (lastLQR && lastLQR == p->hdlc.lqm.lqr.peer.PeerInLQRs) ||
243 (p->hdlc.lqm.lqr.peer_timeout &&
243 (p->hdlc.lqm.lqr.peer_timeout &&
244 p->hdlc.lqm.timer.rest * 100 / SECTICKS >
245 p->hdlc.lqm.lqr.peer_timeout))
246 SendLqrData(lcp);
247 }
248 }
249 m_freem(bp);
250 return NULL;
251}

--- 196 unchanged lines hidden ---
244 p->hdlc.lqm.timer.rest * 100 / SECTICKS >
245 p->hdlc.lqm.lqr.peer_timeout))
246 SendLqrData(lcp);
247 }
248 }
249 m_freem(bp);
250 return NULL;
251}

--- 196 unchanged lines hidden ---