fix for version 7.6 was wrong; do better and fix XNSrouted problems

[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 95e6372..a34bb47 100644 (file)
--- a/usr/src/sys/netns/spp_debug.c
+++ b/usr/src/sys/netns/spp_debug.c
@@ -1,9 +1,10 @@
 /*
 /*

- * Copyright (c) 1984, 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)spp_debug.c 6.6 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)spp_debug.c 7.7 (Berkeley) %G%

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


@@ -17,7 +18,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 +25,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"


@@ -41,14 +43,15 @@ spp_trace(act, ostate, sp, si, req)
        int req;
 {
 #ifdef INET
        int req;
 {
 #ifdef INET

+#ifdef TCPDEBUG

        u_short seq, ack, len, alo;
        unsigned long iptime();
        int flags;
        struct spp_debug *sd = &spp_debug[spp_debx++];
        extern char *prurequests[];
        u_short seq, ack, len, alo;
        unsigned long iptime();
        int flags;
        struct spp_debug *sd = &spp_debug[spp_debx++];
        extern char *prurequests[];

-       extern char *tanames[];
+       extern char *sanames[];

        extern char *tcpstates[];
        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;


@@ -73,7 +76,7 @@ spp_trace(act, ostate, sp, si, req)
                printf("%x %s:", sp, tcpstates[ostate]);
        else
                printf("???????? ");
                printf("%x %s:", sp, tcpstates[ostate]);
        else
                printf("???????? ");

-       printf("%s ", tanames[act]);
+       printf("%s ", sanames[act]);

        switch (act) {
 
        case SA_RESPOND:
        switch (act) {
 
        case SA_RESPOND:


@@ -123,7 +126,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)


@@ -134,7 +137,8 @@ spp_trace(act, ostate, sp, si, req)
                return;
 #ifndef lint
 #define p3(f)  { printf("%s = %x, ", "f", sp->s_/**/f); }
                return;
 #ifndef lint
 #define p3(f)  { printf("%s = %x, ", "f", sp->s_/**/f); }

-       printf("\t"); p3(rack);p3(ralo);p3(snt);p3(flags); printf("\n");
+       printf("\t"); p3(rack);p3(ralo);p3(smax);p3(flags); printf("\n");
+#endif

 #endif
 #endif
 }
 #endif
 #endif
 }