X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fppp_ahdlc.c;h=68e090785782c888a3395e3a90274015b26d8cec;hb=7adcfc961d3ccb051da87cc95d76cd3344f00fb8;hp=a55b173ad4f67a58633d1b4b234d82944ed1d183;hpb=c40c90533a0576e1a391966319b3b1332565b89c;p=ppp.git diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c index a55b173..68e0907 100644 --- a/modules/ppp_ahdlc.c +++ b/modules/ppp_ahdlc.c @@ -18,21 +18,36 @@ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES * - * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 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. + * + * 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. * - * 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. + * 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. * * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY @@ -40,8 +55,6 @@ * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. - * - * $Id: ppp_ahdlc.c,v 1.12 2000/01/21 01:04:56 masputra Exp $ */ /* @@ -75,13 +88,28 @@ #define USE_MUTEX #endif /* SOL2 */ +/* + * intpointer_t and uintpointer_t are signed and unsigned integer types + * large enough to hold any data pointer; that is, data pointers can be + * assigned into or from these integer types without losing precision. + * On recent Solaris releases, these types are defined in sys/int_types.h, + * but not on SunOS 4.x or the earlier Solaris versions. + */ +#if defined(_LP64) || defined(_I32LPx) +typedef long intpointer_t; +typedef unsigned long uintpointer_t; +#else +typedef int intpointer_t; +typedef unsigned int uintpointer_t; +#endif + MOD_OPEN_DECL(ahdlc_open); MOD_CLOSE_DECL(ahdlc_close); -static int ahdlc_wput __P((queue_t *, mblk_t *)); -static int ahdlc_rput __P((queue_t *, mblk_t *)); -static void ahdlc_encode __P((queue_t *, mblk_t *)); -static void ahdlc_decode __P((queue_t *, mblk_t *)); -static int msg_byte __P((mblk_t *, unsigned int)); +static int ahdlc_wput(queue_t *, mblk_t *); +static int ahdlc_rput(queue_t *, mblk_t *); +static void ahdlc_encode(queue_t *, mblk_t *); +static void ahdlc_decode(queue_t *, mblk_t *); +static int msg_byte(mblk_t *, unsigned int); #if defined(SOL2) /* @@ -128,11 +156,15 @@ struct streamtab ppp_ahdlcinfo = { &winit, /* ptr to st_wrinit */ NULL, /* ptr to st_muxrinit */ NULL, /* ptr to st_muxwinit */ -#ifdef _SunOS4 +#if defined(SUNOS4) NULL /* ptr to ptr to st_modlist */ -#endif /* _SunOS4 */ +#endif /* SUNOS4 */ }; +#if defined(SUNOS4) +int ppp_ahdlc_count = 0; /* open counter */ +#endif /* SUNOS4 */ + /* * Per-stream state structure */ @@ -256,6 +288,10 @@ MOD_OPEN(ahdlc_open) mutex_exit(&state->lock); #endif /* USE_MUTEX */ +#if defined(SUNOS4) + ppp_ahdlc_count++; +#endif /* SUNOS4 */ + qprocson(q); return 0; @@ -294,6 +330,11 @@ MOD_CLOSE(ahdlc_close) FREE(q->q_ptr, sizeof(ahdlc_state_t)); q->q_ptr = NULL; OTHERQ(q)->q_ptr = NULL; + +#if defined(SUNOS4) + if (ppp_ahdlc_count) + ppp_ahdlc_count--; +#endif /* SUNOS4 */ return 0; } @@ -499,7 +540,6 @@ ahdlc_rput(q, mp) switch (mp->b_datap->db_type) { case M_DATA: ahdlc_decode(q, mp); - freemsg(mp); break; case M_HANGUP: @@ -578,7 +618,7 @@ ahdlc_encode(q, mp) * the system's LBOLT value in clock ticks */ if (drv_getparm(LBOLT, &lbolt) != -1) { - if (ABS((clock32_t)lbolt - state->lbolt) > state->flag_time) { + if (ABS((clock_t)lbolt - state->lbolt) > state->flag_time) { *outmp->b_wptr++ = PPP_FLAG; } state->lbolt = lbolt; @@ -675,6 +715,7 @@ ahdlc_encode(q, mp) #define IN_RX_MAP(c, m) ((((unsigned int) (uchar_t) (c)) < 0x20) && \ (m) & (1 << (c))) + /* * Process received characters. */ @@ -684,23 +725,8 @@ ahdlc_decode(q, mp) mblk_t *mp; { ahdlc_state_t *state; - mblk_t *om, *zmp; + mblk_t *om; uchar_t *dp; - ushort_t fcs; - - /* - * In case the driver (or something below) doesn't send - * data upstream in one message block, concatenate everything - */ - if (!((mp->b_wptr - mp->b_rptr == msgdsize(mp)) && - ((intptr_t)mp->b_rptr % sizeof(intptr_t) == 0))) { - - zmp = msgpullup(mp, -1); - freemsg(mp); - mp = zmp; - if (mp == 0) - return; - } state = (ahdlc_state_t *) q->q_ptr; @@ -710,6 +736,7 @@ ahdlc_decode(q, mp) state->stats.ppp_ibytes += msgdsize(mp); + for (; mp != 0; om = mp->b_cont, freeb(mp), mp = om) for (dp = mp->b_rptr; dp < mp->b_wptr; dp++) { /*