These are the current versions (actually already 2 years old).

[unix-history] / usr / src / sys / netns / spp_debug.c

diff --git a/usr/src/sys/netns/spp_debug.c b/usr/src/sys/netns/spp_debug.c
index 210c31e..78091fa 100644 (file)
--- a/usr/src/sys/netns/spp_debug.c
+++ b/usr/src/sys/netns/spp_debug.c
@@ -1,9 +1,20 @@
 /*
  * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
 /*
  * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)spp_debug.c 7.2 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)spp_debug.c 7.5 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -17,7 +28,6 @@
 #include "../net/route.h"
 #include "../net/if.h"
 #include "../netinet/tcp_fsm.h"
 #include "../net/route.h"
 #include "../net/if.h"
 #include "../netinet/tcp_fsm.h"

-#include "../netinet/tcp_timer.h"

 
 #include "ns.h"
 #include "ns_pcb.h"
 
 #include "ns.h"
 #include "ns_pcb.h"


@@ -25,6 +35,8 @@
 #include "idp_var.h"
 #include "sp.h"
 #include "spidp.h"
 #include "idp_var.h"
 #include "sp.h"
 #include "spidp.h"

+#define SPPTIMERS
+#include "spp_timer.h"

 #include "spp_var.h"
 #define        SANAMES
 #include "spp_debug.h"
 #include "spp_var.h"
 #define        SANAMES
 #include "spp_debug.h"


@@ -48,7 +60,7 @@ spp_trace(act, ostate, sp, si, req)
        extern char *prurequests[];
        extern char *sanames[];
        extern char *tcpstates[];
        extern char *prurequests[];
        extern char *sanames[];
        extern char *tcpstates[];

-       extern char *tcptimers[];
+       extern char *spptimers[];

 
        if (spp_debx == SPP_NDEBUG)
                spp_debx = 0;
 
        if (spp_debx == SPP_NDEBUG)
                spp_debx = 0;


@@ -123,7 +135,7 @@ spp_trace(act, ostate, sp, si, req)
        case SA_USER:
                printf("%s", prurequests[req&0xff]);
                if ((req & 0xff) == PRU_SLOWTIMO)
        case SA_USER:
                printf("%s", prurequests[req&0xff]);
                if ((req & 0xff) == PRU_SLOWTIMO)

-                       printf("<%s>", tcptimers[req>>8]);
+                       printf("<%s>", spptimers[req>>8]);

                break;
        }
        if (sp)
                break;
        }
        if (sp)