More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 0a08ef9daa7835035f0663783f6c27dec34a209d..7546543bce9d456e505b2a5b129284c93be5fd72 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,11 +21,6 @@
  * Format and print AppleTalk packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.81 2004-05-01 09:41:50 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -43,7 +38,9 @@ static const char rcsid[] _U_ =
 #include "extract.h"                   /* must come after interface.h */
 #include "appletalk.h"
 
-static struct tok type2str[] = {
+static const char tstr[] = "[|atalk]";
+
+static const struct tok type2str[] = {
        { ddpRTMP,              "rtmp" },
        { ddpRTMPrequest,       "rtmpReq" },
        { ddpECHO,              "echo" },
@@ -63,8 +60,6 @@ struct aarp {
        u_int8_t        pdaddr[4];
 };
 
-static char tstr[] = "[|atalk]";
-
 static void atp_print(const struct atATP *, u_int);
 static void atp_bitmap_print(u_char);
 static void nbp_print(const struct atNBP *, u_int, u_short, u_char, u_char);
@@ -540,7 +535,7 @@ ataddr_string(u_short atnet, u_char athost)
 {
        register struct hnamemem *tp, *tp2;
        register int i = (atnet << 8) | athost;
-       char nambuf[MAXHOSTNAMELEN + 20];
+       char nambuf[256+1];
        static int first = 1;
        FILE *fp;
 
@@ -602,7 +597,7 @@ ataddr_string(u_short atnet, u_char athost)
        return (tp->name);
 }
 
-static struct tok skt2str[] = {
+static const struct tok skt2str[] = {
        { rtmpSkt,      "rtmp" },       /* routing table maintenance */
        { nbpSkt,       "nis" },        /* name info socket */
        { echoSkt,      "echo" },       /* AppleTalk echo protocol */