386BSD 0.1 development

[unix-history] / usr / src / usr.bin / telnet / ring.h

diff --git a/usr/src/usr.bin/telnet/ring.h b/usr/src/usr.bin/telnet/ring.h
index 5d7bdd2..59c5fde 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.h
+++ b/usr/src/usr.bin/telnet/ring.h
@@ -2,16 +2,47 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)ring.h      1.7 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)ring.h      5.2 (Berkeley) 3/1/91

  */
 
  */
 

+#if defined(P)
+# undef P
+#endif
+
+#if defined(__STDC__) || defined(LINT_ARGS)
+# define       P(x)    x
+#else
+# define       P(x)    ()
+#endif
+

 /*
  * This defines a structure for a ring buffer.
  *
 /*
  * This defines a structure for a ring buffer.
  *


@@ -23,11 +54,15 @@
  *
  */
 typedef struct {
  *
  */
 typedef struct {

-    char       *consume,       /* where data comes out of */
-               *supply,        /* where data comes in to */
-               *bottom,        /* lowest address in buffer */
-               *top,           /* highest address+1 in buffer */
-               *mark;          /* marker (user defined) */
+    unsigned char      *consume,       /* where data comes out of */
+                       *supply,        /* where data comes in to */
+                       *bottom,        /* lowest address in buffer */
+                       *top,           /* highest address+1 in buffer */
+                       *mark;          /* marker (user defined) */
+#if    defined(ENCRYPT)
+    unsigned char      *clearto;       /* Data to this point is clear text */
+    unsigned char      *encryyptedto;  /* Data is encrypted to here */
+#endif

     int                size;           /* size in bytes of buffer */
     u_long     consumetime,    /* help us keep straight full, empty, etc. */
                supplytime;
     int                size;           /* size in bytes of buffer */
     u_long     consumetime,    /* help us keep straight full, empty, etc. */
                supplytime;


@@ -35,49 +70,36 @@ typedef struct {
 
 /* Here are some functions and macros to deal with the ring buffer */
 
 
 /* Here are some functions and macros to deal with the ring buffer */
 

-
-#if    defined(LINT_ARGS)
-

 /* Initialization routine */
 extern int
 /* Initialization routine */
 extern int

-       ring_init(Ring *ring, char *buffer, int count);
+       ring_init P((Ring *ring, unsigned char *buffer, int count));

 
 /* Data movement routines */
 extern void
 
 /* Data movement routines */
 extern void

-       ring_supply_data(Ring *ring, char *buffer, int count),
-       ring_consume_data(Ring *ring, char *buffer, int count);
+       ring_supply_data P((Ring *ring, unsigned char *buffer, int count));
+#ifdef notdef
+extern void
+       ring_consume_data P((Ring *ring, unsigned char *buffer, int count));
+#endif

 
 /* Buffer state transition routines */
 extern void
 
 /* Buffer state transition routines */
 extern void

-       ring_supplied(Ring *ring, int count),
-       ring_consumed(Ring *ring, int count);
+       ring_supplied P((Ring *ring, int count)),
+       ring_consumed P((Ring *ring, int count));

 
 /* Buffer state query routines */
 extern int
 
 /* Buffer state query routines */
 extern int

-       ring_empty_count(Ring *ring),
-       ring_empty_consecutive(Ring *ring),
-       ring_full_count(Ring *ring),
-       ring_full_consecutive(Ring *ring);
-
-#else /* LINT_ARGS */
-extern int
-       ring_init();
-
-extern void
-    ring_supply_data(),
-    ring_consume_data();
+       ring_empty_count P((Ring *ring)),
+       ring_empty_consecutive P((Ring *ring)),
+       ring_full_count P((Ring *ring)),
+       ring_full_consecutive P((Ring *ring));

 
 

+#if    defined(ENCRYPT)

 extern void
 extern void

-    ring_supplied(),
-    ring_consumed();
+       ring_encrypt P((Ring *ring, void (*func)())),
+       ring_clearto P((Ring *ring));
+#endif

 
 extern void
     ring_clear_mark(),
     ring_mark();
 
 extern void
     ring_clear_mark(),
     ring_mark();

-
-extern int
-    ring_empty_count(),
-    ring_empty_consecutive(),
-    ring_full_count(),
-    ring_full_consecutive();
-#endif /* defined(LINT_ARGS) */