Mark the TCP header structure as unaligned.

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 010dcf54028e2c61f84852acefd99566314d7880..dbb40416b365ee6a60999c5c853e406278c1898e 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -24,8 +24,6 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.135 2008-11-09 23:35:03 mcr Exp $ (LBL)";

 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif


@@ -659,7 +657,7 @@ tcp_print(register const u_char *bp, register u_int length,
         if ((flags & TH_RST) && vflag) {
                 print_tcp_rst_data(bp, length);
                 return;
         if ((flags & TH_RST) && vflag) {
                 print_tcp_rst_data(bp, length);
                 return;

-        } 
+        }

 
         if (packettype) {
                 switch (packettype) {
 
         if (packettype) {
                 switch (packettype) {


@@ -722,12 +720,12 @@ tcp_print(register const u_char *bp, register u_int length,
                 if (TTEST(rp->rm_direction)) {
                         direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                 if (TTEST(rp->rm_direction)) {
                         direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
                         if (dport == NFS_PORT && direction == SUNRPC_CALL) {

-                                (void)printf(" | ");
+                                (void)printf(": NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid));

                                 nfsreq_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                 nfsreq_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

-                                (void)printf(" | ");
+                                (void)printf(": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid));

                                 nfsreply_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }
                                 nfsreply_print_noaddr((u_char *)rp, fraglen, (u_char *)ip);
                                 return;
                         }