BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / telnet / utilities.c

diff --git a/usr/src/usr.bin/telnet/utilities.c b/usr/src/usr.bin/telnet/utilities.c
index 8eb30ba..0a6a882 100644 (file)
--- a/usr/src/usr.bin/telnet/utilities.c
+++ b/usr/src/usr.bin/telnet/utilities.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.
+ *
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c        5.3 (Berkeley) 3/22/91";

 #endif /* not lint */
 
 #define        TELOPTS
 #endif /* not lint */
 
 #define        TELOPTS


@@ -268,7 +294,7 @@ printsub(direction, pointer, length)
     int                  length;       /* length of suboption data */
 {
     register int i;
     int                  length;       /* length of suboption data */
 {
     register int i;

-    char buf[256];
+    char buf[512];

     extern int want_status_response;
 
     if (showoptions || direction == 0 ||
     extern int want_status_response;
 
     if (showoptions || direction == 0 ||


@@ -406,9 +432,9 @@ printsub(direction, pointer, length)
                    break;
                }
                fprintf(NetTrace, "%s|%s",
                    break;
                }
                fprintf(NetTrace, "%s|%s",

-                       (pointer[3] & AUTH_WHO_MASK == AUTH_WHO_CLIENT) ?
+                       ((pointer[3] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?

                        "CLIENT" : "SERVER",
                        "CLIENT" : "SERVER",

-                       (pointer[3] & AUTH_HOW_MASK == AUTH_HOW_MUTUAL) ?
+                       ((pointer[3] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?

                        "MUTUAL" : "ONE-WAY");
 
                auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));
                        "MUTUAL" : "ONE-WAY");
 
                auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));


@@ -428,14 +454,22 @@ printsub(direction, pointer, length)
                        break;
                    }
                    fprintf(NetTrace, "%s|%s ",
                        break;
                    }
                    fprintf(NetTrace, "%s|%s ",

-                       (pointer[i] & AUTH_WHO_MASK == AUTH_WHO_CLIENT) ?
+                       ((pointer[i] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?

                                                        "CLIENT" : "SERVER",
                                                        "CLIENT" : "SERVER",

-                       (pointer[i] & AUTH_HOW_MASK == AUTH_HOW_MUTUAL) ?
+                       ((pointer[i] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?

                                                        "MUTUAL" : "ONE-WAY");
                    ++i;
                }
                break;
 
                                                        "MUTUAL" : "ONE-WAY");
                    ++i;
                }
                break;
 

+           case TELQUAL_NAME:
+               i = 2;
+               fprintf(NetTrace, " NAME \"");
+               while (i < length)
+                   putc(pointer[i++], NetTrace);
+               putc('"', NetTrace);
+               break;
+

            default:
                    for (i = 2; i < length; i++)
                        fprintf(NetTrace, " ?%d?", pointer[i]);
            default:
                    for (i = 2; i < length; i++)
                        fprintf(NetTrace, " ?%d?", pointer[i]);


@@ -497,8 +531,17 @@ printsub(direction, pointer, length)
                }
                break;
 
                }
                break;
 

+           case ENCRYPT_ENC_KEYID:
+               fprintf(NetTrace, " ENC_KEYID ");
+               goto encommon;
+
+           case ENCRYPT_DEC_KEYID:
+               fprintf(NetTrace, " DEC_KEYID ");
+               goto encommon;
+

            default:
            default:

-               fprintf(NetTrace, "%d (unknown)", pointer[1]);
+               fprintf(NetTrace, " %d (unknown)", pointer[1]);
+           encommon:

                for (i = 2; i < length; i++)
                    fprintf(NetTrace, " %d", pointer[i]);
                break;
                for (i = 2; i < length; i++)
                    fprintf(NetTrace, " %d", pointer[i]);
                break;