X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fif_ppp.c;h=85962d67df9f37e599770b5073be8ecd0d4510a7;hp=7b06f542ce84f123283eac63c6089a6a4ddb0f84;hb=d98ab3805c818bfb58e20ee18e6488a851c1a90d;hpb=23923dadc47f77481e5989bb981f24fb2c905e37 diff --git a/modules/if_ppp.c b/modules/if_ppp.c index 7b06f54..85962d6 100644 --- a/modules/if_ppp.c +++ b/modules/if_ppp.c @@ -1,30 +1,38 @@ /* * if_ppp.c - a network interface connected to a STREAMS module. * - * Copyright (c) 1994 The Australian National University. - * All rights reserved. + * Copyright (c) 1994 Paul Mackerras. All rights reserved. * - * Permission to use, copy, modify, and distribute this software and its - * documentation is hereby granted, provided that the above copyright - * notice appears in all copies. This software is provided without any - * warranty, express or implied. The Australian National University - * makes no representations about the suitability of this software for - * any purpose. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY - * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF - * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO - * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, - * OR MODIFICATIONS. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * - * $Id: if_ppp.c,v 1.3 1996/09/14 05:11:13 paulus Exp $ + * 3. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $Id: if_ppp.c,v 1.18 2002/12/06 09:49:15 paulus Exp $ */ /* @@ -37,7 +45,6 @@ #include #include -#include #include #include #include @@ -50,11 +57,12 @@ #ifdef __osf__ #include #include -#include "ppp_mod.h" #else #include -#include #endif +#include "ppp_mod.h" + +#include #ifdef SNIT_SUPPORT #include @@ -72,9 +80,6 @@ #define ifr_mtu ifr_metric -#define PPP_MINMTU 64 -#define PPP_MAXMTU 65536 - static int if_ppp_open __P((queue_t *, int, int, int)); static int if_ppp_close __P((queue_t *, int)); static int if_ppp_wput __P((queue_t *, mblk_t *)); @@ -140,8 +145,10 @@ if_ppp_unload() for (i = 0; i < ppp_nalloc; ++i) if (ifs[i] != 0) ppp_if_detach(ifs[i]); - FREE(ifs, ppp_nalloc * sizeof (struct ifnet *)); - FREE(states, ppp_nalloc * sizeof (struct if_ppp_t *)); + if (ifs) { + FREE(ifs, ppp_nalloc * sizeof (struct ifnet *)); + FREE(states, ppp_nalloc * sizeof (struct if_ppp_t *)); + } ppp_nalloc = 0; return 0; } @@ -270,8 +277,10 @@ if_ppp_wput(q, mp) bzero(newstates, newn * sizeof (struct if_ppp_t *)); bcopy(ifs, newifs, ppp_nalloc * sizeof(struct ifnet *)); bcopy(states, newstates, ppp_nalloc * sizeof(if_ppp_t *)); - FREE(ifs, ppp_nalloc * sizeof(struct ifnet *)); - FREE(states, ppp_nalloc * sizeof(if_ppp_t *)); + if (ifs) { + FREE(ifs, ppp_nalloc * sizeof(struct ifnet *)); + FREE(states, ppp_nalloc * sizeof(if_ppp_t *)); + } ifs = newifs; states = newstates; ppp_nalloc = newn; @@ -287,18 +296,24 @@ if_ppp_wput(q, mp) ifs[unit] = ifp; ifp->if_name = "ppp"; ifp->if_unit = unit; - ifp->if_mtu = PPP_MRU; + ifp->if_mtu = PPP_MTU; ifp->if_flags = IFF_POINTOPOINT | IFF_RUNNING; +#ifndef __osf__ #ifdef IFF_MULTICAST ifp->if_flags |= IFF_MULTICAST; #endif +#endif /* __osf__ */ ifp->if_output = if_ppp_output; #ifdef __osf__ - ifp->if_version = "Point-to-Point Protocol, version 2.3"; - ifp->if_mediamtu = 1500; + ifp->if_version = "Point-to-Point Protocol, version 2.3.11"; + ifp->if_mediamtu = PPP_MTU; ifp->if_type = IFT_PPP; ifp->if_hdrlen = PPP_HDRLEN; ifp->if_addrlen = 0; + ifp->if_flags |= IFF_NOARP | IFF_SIMPLEX | IFF_NOTRAILERS; +#ifdef IFF_VAR_MTU + ifp->if_flags |= IFF_VAR_MTU; +#endif #ifdef NETMASTERCPU ifp->if_affinity = NETMASTERCPU; #endif @@ -309,7 +324,7 @@ if_ppp_wput(q, mp) if (sp->flags & DBGLOG) printf("if_ppp: created unit %d\n", unit); } else { - ifp->if_mtu = PPP_MRU; + ifp->if_mtu = PPP_MTU; ifp->if_flags |= IFF_RUNNING; } @@ -579,6 +594,7 @@ if_ppp_ioctl(ifp, cmd, data) int s, error; struct ifreq *ifr = (struct ifreq *) data; struct ifaddr *ifa = (struct ifaddr *) data; + u_short mtu; error = 0; s = splimp(); @@ -601,6 +617,15 @@ if_ppp_ioctl(ifp, cmd, data) case SIOCSIFMTU: if ((error = NOTSUSER()) != 0) break; +#ifdef __osf__ + /* this hack is necessary because ifioctl checks ifr_data + * in 4.0 and 5.0, but ifr_data and ifr_metric overlay each + * other in the definition of struct ifreq so pppd can't set both. + */ + bcopy(ifr->ifr_data, &mtu, sizeof (u_short)); + ifr->ifr_mtu = mtu; +#endif + if (ifr->ifr_mtu < PPP_MINMTU || ifr->ifr_mtu > PPP_MAXMTU) { error = EINVAL; break;