localize header files

[unix-history] / usr / src / sys / netinet / tcp_debug.c

diff --git a/usr/src/sys/netinet/tcp_debug.c b/usr/src/sys/netinet/tcp_debug.c
index 3724f6c..b323f34 100644 (file)
--- a/usr/src/sys/netinet/tcp_debug.c
+++ b/usr/src/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*     tcp_debug.c     4.1     81/12/22        */
+/*     tcp_debug.c     4.5     82/10/09        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -7,23 +7,24 @@
 #include "../h/socketvar.h"
 #define PRUREQUESTS
 #include "../h/protosw.h"
 #include "../h/socketvar.h"
 #define PRUREQUESTS
 #include "../h/protosw.h"

-#include "../net/in.h"
-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+#include "../netinet/in.h"
+#include "../net/route.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"

 #include "../net/if.h"
 #include "../net/if.h"

-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"

 #define TCPSTATES
 #define TCPSTATES

-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"

 #define        TCPTIMERS
 #define        TCPTIMERS

-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"

 #define        TANAMES
 #define        TANAMES

-#include "../net/tcp_debug.h"
-#include "../errno.h"
+#include "../netinet/tcp_debug.h"
+#include <errno.h>

 
 int    tcpconsdebug = 0;
 /*
 
 int    tcpconsdebug = 0;
 /*


@@ -37,7 +38,6 @@ tcp_trace(act, ostate, tp, ti, req)
 {
        tcp_seq seq, ack;
        int len, flags;
 {
        tcp_seq seq, ack;
        int len, flags;

-       char *cp;

        struct tcp_debug *td = &tcp_debug[tcp_debx++];
 
        if (tcp_debx == TCP_NDEBUG)
        struct tcp_debug *td = &tcp_debug[tcp_debx++];
 
        if (tcp_debx == TCP_NDEBUG)


@@ -73,7 +73,7 @@ tcp_trace(act, ostate, tp, ti, req)
                if (act == TA_OUTPUT) {
                        seq = ntohl(seq);
                        ack = ntohl(ack);
                if (act == TA_OUTPUT) {
                        seq = ntohl(seq);
                        ack = ntohl(ack);

-                       len = ntohs(len);
+                       len = ntohs((u_short)len);

                }
 #endif
                if (act == TA_OUTPUT)
                }
 #endif
                if (act == TA_OUTPUT)


@@ -85,9 +85,11 @@ tcp_trace(act, ostate, tp, ti, req)
                printf("@%x", ack);
                flags = ti->ti_flags;
                if (flags) {
                printf("@%x", ack);
                flags = ti->ti_flags;
                if (flags) {

+#ifndef lint

                        char *cp = "<";
 #define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                        pf(SYN); pf(ACK); pf(FIN); pf(RST);
                        char *cp = "<";
 #define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
                        pf(SYN); pf(ACK); pf(FIN); pf(RST);

+#endif

                        printf(">");
                }
                break;
                        printf(">");
                }
                break;