install correct aliases file

[unix-history] / usr / src / usr.sbin / trsp / trsp.c

diff --git a/usr/src/usr.sbin/trsp/trsp.c b/usr/src/usr.sbin/trsp/trsp.c
index 6636be3..c00796f 100644 (file)
--- a/usr/src/usr.sbin/trsp/trsp.c
+++ b/usr/src/usr.sbin/trsp/trsp.c
@@ -3,19 +3,30 @@ the Xerox NS Sequenced packet protocol layer.  It is adapted from
 the Internet equivalent trpt(8c).
 /*
  * Copyright (c) 1985 Regents of the University of California.
 the Internet equivalent trpt(8c).
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1985 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)trsp.c     6.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)trsp.c     6.3 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/param.h>
 #include <sys/socket.h>
 
 #include <sys/param.h>
 #include <sys/socket.h>


@@ -37,6 +48,7 @@ static char sccsid[] = "@(#)trsp.c    6.1 (Berkeley) %G%";
 #include <netns/idp_var.h>
 #include <netns/sp.h>
 #include <netns/spidp.h>
 #include <netns/idp_var.h>
 #include <netns/sp.h>
 #include <netns/spidp.h>

+#include <netns/spp_timer.h>

 #include <netns/spp_var.h>
 #define SANAMES
 #include <netns/spp_debug.h>
 #include <netns/spp_var.h>
 #define SANAMES
 #include <netns/spp_debug.h>


@@ -310,13 +322,14 @@ spp_trace(act, ostate, asp, sp, si, req)
                return;
 #define p3(f)  { printf("%s = %x, ", "f", sp->s_/**/f); }
        if(sflag) {
                return;
 #define p3(f)  { printf("%s = %x, ", "f", sp->s_/**/f); }
        if(sflag) {

-               printf("\t"); p3(rack); p3(ralo); p3(snt); p3(flags);
+               printf("\t"); p3(rack); p3(ralo); p3(smax); p3(snxt); p3(flags);

 #undef pf
 #define pf(f) { if (flags&SF_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                flags = sp->s_flags;
                if (flags || sp->s_oobflags) {
                        char *cp = "<";
 #undef pf
 #define pf(f) { if (flags&SF_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                flags = sp->s_flags;
                if (flags || sp->s_oobflags) {
                        char *cp = "<";

-                       pf(AK); pf(DELACK); pf(HI); pf(HO);
+                       pf(ACKNOW); pf(DELACK); pf(HI); pf(HO);
+                       pf(PI); pf(WIN); pf(RXT); pf(RVD);

                        flags = sp->s_oobflags;
                        pf(SOOB); pf(IOOB);
                        printf(">");
                        flags = sp->s_oobflags;
                        pf(SOOB); pf(IOOB);
                        printf(">");