Mark the TCP header structure as unaligned.

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index c9e7a11efff518dd8761d81de6fc7808d646bf66..58fd02ddd421364e655c468f5b183f9df6157245 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -20,10 +20,6 @@
  *
  * Format and print bootp packets.
  */
  *
  * Format and print bootp packets.
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.89 2008-04-22 09:45:08 hannes Exp $ (LBL)";
-#endif

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"


@@ -40,12 +36,12 @@ static const char rcsid[] _U_ =
 #include "ether.h"
 #include "bootp.h"
 
 #include "ether.h"
 #include "bootp.h"
 

+static const char tstr[] = " [|bootp]";
+

 static void rfc1048_print(const u_char *);
 static void cmu_print(const u_char *);
 static char *client_fqdn_flags(u_int flags);
 
 static void rfc1048_print(const u_char *);
 static void cmu_print(const u_char *);
 static char *client_fqdn_flags(u_int flags);
 

-static char tstr[] = " [|bootp]";
-

 static const struct tok bootp_flag_values[] = {
     { 0x8000,                   "Broadcast" },
     { 0, NULL}
 static const struct tok bootp_flag_values[] = {
     { 0x8000,                   "Broadcast" },
     { 0, NULL}


@@ -691,7 +687,7 @@ rfc1048_print(register const u_char *bp)
                                                 break;
 
                                        default:
                                                 break;
 
                                        default:

-                                               print_unknown_data(bp, "\n\t\t", suboptlen);
+                                               print_unknown_data(gndo,bp, "\n\t\t", suboptlen);

                                        }
 
                                        len -= suboptlen;
                                        }
 
                                        len -= suboptlen;


@@ -701,7 +697,7 @@ rfc1048_print(register const u_char *bp)
 
                        case TAG_CLASSLESS_STATIC_RT:
                        case TAG_CLASSLESS_STA_RT_MS:
 
                        case TAG_CLASSLESS_STATIC_RT:
                        case TAG_CLASSLESS_STA_RT_MS:

-                       {       
+                       {

                                u_int mask_width, significant_octets, i;
 
                                /* this option should be at least 5 bytes long */
                                u_int mask_width, significant_octets, i;
 
                                /* this option should be at least 5 bytes long */