Deleted Added
full compact
if_spppsubr.c (70199) if_spppsubr.c (71959)
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
20 * $FreeBSD: head/sys/net/if_spppsubr.c 70199 2000-12-19 19:08:11Z jhay $
20 * $FreeBSD: head/sys/net/if_spppsubr.c 71959 2001-02-03 11:46:35Z phk $
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

3839 /*
3840 * Pick the first AF_INET address from the list,
3841 * aliases don't make any sense on a p2p link anyway.
3842 */
3843 si = 0;
3844#if defined(__FreeBSD__) && __FreeBSD__ >= 3
3845 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
3846#elif defined(__NetBSD__) || defined (__OpenBSD__)
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

3839 /*
3840 * Pick the first AF_INET address from the list,
3841 * aliases don't make any sense on a p2p link anyway.
3842 */
3843 si = 0;
3844#if defined(__FreeBSD__) && __FreeBSD__ >= 3
3845 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
3846#elif defined(__NetBSD__) || defined (__OpenBSD__)
3847 for (ifa = ifp->if_addrlist.tqh_first;
3847 for (ifa = TAILQ_FIRST(&ifp->if_addrlist);
3848 ifa;
3848 ifa;
3849 ifa = ifa->ifa_list.tqe_next)
3849 ifa = TAILQ_NEXT(ifa, ifa_list))
3850#else
3851 for (ifa = ifp->if_addrlist;
3852 ifa;
3853 ifa = ifa->ifa_next)
3854#endif
3855 if (ifa->ifa_addr->sa_family == AF_INET) {
3856 si = (struct sockaddr_in *)ifa->ifa_addr;
3857 sm = (struct sockaddr_in *)ifa->ifa_netmask;

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

3887 /*
3888 * Pick the first AF_INET address from the list,
3889 * aliases don't make any sense on a p2p link anyway.
3890 */
3891 si = 0;
3892#if defined(__FreeBSD__) && __FreeBSD__ >= 3
3893 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
3894#elif defined(__NetBSD__) || defined (__OpenBSD__)
3850#else
3851 for (ifa = ifp->if_addrlist;
3852 ifa;
3853 ifa = ifa->ifa_next)
3854#endif
3855 if (ifa->ifa_addr->sa_family == AF_INET) {
3856 si = (struct sockaddr_in *)ifa->ifa_addr;
3857 sm = (struct sockaddr_in *)ifa->ifa_netmask;

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

3887 /*
3888 * Pick the first AF_INET address from the list,
3889 * aliases don't make any sense on a p2p link anyway.
3890 */
3891 si = 0;
3892#if defined(__FreeBSD__) && __FreeBSD__ >= 3
3893 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
3894#elif defined(__NetBSD__) || defined (__OpenBSD__)
3895 for (ifa = ifp->if_addrlist.tqh_first;
3895 for (ifa = TAILQ_FIRST(&ifp->if_addrlist);
3896 ifa;
3896 ifa;
3897 ifa = ifa->ifa_list.tqe_next)
3897 ifa = TAILQ_NEXT(ifa, ifa_list))
3898#else
3899 for (ifa = ifp->if_addrlist;
3900 ifa;
3901 ifa = ifa->ifa_next)
3902#endif
3903 {
3904 if (ifa->ifa_addr->sa_family == AF_INET)
3905 {

--- 345 unchanged lines hidden ---
3898#else
3899 for (ifa = ifp->if_addrlist;
3900 ifa;
3901 ifa = ifa->ifa_next)
3902#endif
3903 {
3904 if (ifa->ifa_addr->sa_family == AF_INET)
3905 {

--- 345 unchanged lines hidden ---