X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fif_ppp.c;h=e150923306400646794e96cd0752a7858e79bb62;hp=852fd242e6cea0052b975965f358537044b311f7;hb=f1a34da3b2f5336e4993a729e5ac2130d0e0595a;hpb=2e48f1e822cd5154d9a818d461b9381c349e1971 diff --git a/modules/if_ppp.c b/modules/if_ppp.c index 852fd24..e150923 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.11 1999/03/02 05:37:32 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 $ */ /* @@ -72,10 +80,10 @@ #define ifr_mtu ifr_metric -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 *)); -static int if_ppp_rput __P((queue_t *, mblk_t *)); +static int if_ppp_open(queue_t *, int, int, int); +static int if_ppp_close(queue_t *, int); +static int if_ppp_wput(queue_t *, mblk_t *); +static int if_ppp_rput(queue_t *, mblk_t *); #define PPP_IF_ID 0x8021 static struct module_info minfo = { @@ -109,11 +117,11 @@ static int ppp_nalloc; /* Number of elements of ifs and states */ static struct ifnet **ifs; /* Array of pointers to interface structs */ static if_ppp_t **states; /* Array of pointers to state structs */ -static int if_ppp_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *)); -static int if_ppp_ioctl __P((struct ifnet *, u_int, caddr_t)); -static struct mbuf *make_mbufs __P((mblk_t *, int)); -static mblk_t *make_message __P((struct mbuf *, int)); +static int if_ppp_output(struct ifnet *, struct mbuf *, + struct sockaddr *); +static int if_ppp_ioctl(struct ifnet *, u_int, caddr_t); +static struct mbuf *make_mbufs(mblk_t *, int); +static mblk_t *make_message(struct mbuf *, int); #ifdef SNIT_SUPPORT /* Fake ether header for SNIT */ @@ -121,7 +129,7 @@ static struct ether_header snit_ehdr = {{0}, {0}, ETHERTYPE_IP}; #endif #ifndef __osf__ -static void ppp_if_detach __P((struct ifnet *)); +static void ppp_if_detach(struct ifnet *); /* * Detach all the interfaces before unloading. @@ -290,12 +298,14 @@ if_ppp_wput(q, mp) ifp->if_unit = unit; 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.6"; + 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; @@ -584,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(); @@ -606,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;