X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fppp.c;h=f5fb71f1aa4696d07da7ea025d7cd6afa433c568;hb=75870d7b55e36af526a0786fff94912989c73fd1;hp=22c3b3aebc8128ba5ba8a49eb3793574ddfdde53;hpb=3cac7df410a12aa81b5deff3fde9ccaabcb4561c;p=ppp.git diff --git a/modules/ppp.c b/modules/ppp.c index 22c3b3a..f5fb71f 100644 --- a/modules/ppp.c +++ b/modules/ppp.c @@ -1,30 +1,36 @@ /* * ppp.c - STREAMS multiplexing pseudo-device driver for PPP. * - * 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 HAS 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: ppp.c,v 1.24 1999/10/06 23:00:43 masputra 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. */ /* @@ -73,14 +79,9 @@ * interactive traffic, and are due to Marko Zec . */ #ifdef PRIOQ -#include #endif /* PRIOQ */ -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif +#include /* leave this outside of PRIOQ for htons */ /* * The IP module may use this SAP value for IP packets. @@ -245,43 +246,43 @@ static upperstr_t *minor_devs = NULL; static upperstr_t *ppas = NULL; #ifdef SVR4 -static int pppopen __P((queue_t *, dev_t *, int, int, cred_t *)); -static int pppclose __P((queue_t *, int, cred_t *)); +static int pppopen(queue_t *, dev_t *, int, int, cred_t *); +static int pppclose(queue_t *, int, cred_t *); #else -static int pppopen __P((queue_t *, int, int, int)); -static int pppclose __P((queue_t *, int)); +static int pppopen(queue_t *, int, int, int); +static int pppclose(queue_t *, int); #endif /* SVR4 */ -static int pppurput __P((queue_t *, mblk_t *)); -static int pppuwput __P((queue_t *, mblk_t *)); -static int pppursrv __P((queue_t *)); -static int pppuwsrv __P((queue_t *)); -static int ppplrput __P((queue_t *, mblk_t *)); -static int ppplwput __P((queue_t *, mblk_t *)); -static int ppplrsrv __P((queue_t *)); -static int ppplwsrv __P((queue_t *)); +static int pppurput(queue_t *, mblk_t *); +static int pppuwput(queue_t *, mblk_t *); +static int pppursrv(queue_t *); +static int pppuwsrv(queue_t *); +static int ppplrput(queue_t *, mblk_t *); +static int ppplwput(queue_t *, mblk_t *); +static int ppplrsrv(queue_t *); +static int ppplwsrv(queue_t *); #ifndef NO_DLPI -static void dlpi_request __P((queue_t *, mblk_t *, upperstr_t *)); -static void dlpi_error __P((queue_t *, upperstr_t *, int, int, int)); -static void dlpi_ok __P((queue_t *, int)); +static void dlpi_request(queue_t *, mblk_t *, upperstr_t *); +static void dlpi_error(queue_t *, upperstr_t *, int, int, int); +static void dlpi_ok(queue_t *, int); #endif -static int send_data __P((mblk_t *, upperstr_t *)); -static void new_ppa __P((queue_t *, mblk_t *)); -static void attach_ppa __P((queue_t *, mblk_t *)); -static void detach_ppa __P((queue_t *, mblk_t *)); -static void detach_lower __P((queue_t *, mblk_t *)); -static void debug_dump __P((queue_t *, mblk_t *)); -static upperstr_t *find_dest __P((upperstr_t *, int)); +static int send_data(mblk_t *, upperstr_t *); +static void new_ppa(queue_t *, mblk_t *); +static void attach_ppa(queue_t *, mblk_t *); +static void detach_ppa(queue_t *, mblk_t *); +static void detach_lower(queue_t *, mblk_t *); +static void debug_dump(queue_t *, mblk_t *); +static upperstr_t *find_dest(upperstr_t *, int); #if defined(SOL2) -static upperstr_t *find_promisc __P((upperstr_t *, int)); -static mblk_t *prepend_ether __P((upperstr_t *, mblk_t *, int)); -static mblk_t *prepend_udind __P((upperstr_t *, mblk_t *, int)); -static void promisc_sendup __P((upperstr_t *, mblk_t *, int, int)); +static upperstr_t *find_promisc(upperstr_t *, int); +static mblk_t *prepend_ether(upperstr_t *, mblk_t *, int); +static mblk_t *prepend_udind(upperstr_t *, mblk_t *, int); +static void promisc_sendup(upperstr_t *, mblk_t *, int, int); #endif /* defined(SOL2) */ -static int putctl2 __P((queue_t *, int, int, int)); -static int putctl4 __P((queue_t *, int, int, int)); -static int pass_packet __P((upperstr_t *ppa, mblk_t *mp, int outbound)); +static int putctl2(queue_t *, int, int, int); +static int putctl4(queue_t *, int, int, int); +static int pass_packet(upperstr_t *ppa, mblk_t *mp, int outbound); #ifdef FILTER_PACKETS -static int ip_hard_filter __P((upperstr_t *ppa, mblk_t *mp, int outbound)); +static int ip_hard_filter(upperstr_t *ppa, mblk_t *mp, int outbound); #endif /* FILTER_PACKETS */ #define PPP_ID 0xb1a6