Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 78485a3f83fdaec080356dbdd2cc5b4bb10fe64a..1f298d4d9e3947636b5346fbbe29af10cc9a5cf8 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -77,7 +77,7 @@
 #define DIRECTION(trp)         ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0080) >> 7)
 #define LARGEST_FRAME(trp)     ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0070) >> 4)
 #define RING_NUMBER(trp, x)    ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0xfff0) >> 4)
 #define DIRECTION(trp)         ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0080) >> 7)
 #define LARGEST_FRAME(trp)     ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0070) >> 4)
 #define RING_NUMBER(trp, x)    ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0xfff0) >> 4)

-#define BRIDGE_NUMBER(trp, x)  ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0x000f))
+#define BRIDGE_NUMBER(trp, x)  (EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0x000f)

 #define SEGMENT_COUNT(trp)     ((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {
 #define SEGMENT_COUNT(trp)     ((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {


@@ -89,10 +89,9 @@ struct token_header {
        nd_uint16_t  token_rseg[ROUTING_SEGMENT_MAX];
 };
 
        nd_uint16_t  token_rseg[ROUTING_SEGMENT_MAX];
 };
 

-static const char tstr[] = "[|token-ring]";

 
 /* Extract src, dst addresses */
 
 /* Extract src, dst addresses */

-static inline void
+static void

 extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 {
        memcpy(fdst, (const char *)trp->token_dhost, 6);
 extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 {
        memcpy(fdst, (const char *)trp->token_dhost, 6);


@@ -102,7 +101,7 @@ extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 /*
  * Print the TR MAC header
  */
 /*
  * Print the TR MAC header
  */

-static inline void
+static void

 token_hdr_print(netdissect_options *ndo,
                 const struct token_header *trp, u_int length,
                 const u_char *fsrc, const u_char *fdst)
 token_hdr_print(netdissect_options *ndo,
                 const struct token_header *trp, u_int length,
                 const u_char *fsrc, const u_char *fdst)


@@ -153,10 +152,11 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
        int seg;
 
        u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
        int seg;
 

+       ndo->ndo_protocol = "token";

        trp = (const struct token_header *)p;
 
        if (caplen < TOKEN_HDRLEN) {
        trp = (const struct token_header *)p;
 
        if (caplen < TOKEN_HDRLEN) {

-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);

                return hdr_len;
        }
 
                return hdr_len;
        }
 


@@ -174,13 +174,13 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        token_hdr_print(ndo, trp, length, srcmac, dstmac);
 
                if (caplen < TOKEN_HDRLEN + 2) {
                        token_hdr_print(ndo, trp, length, srcmac, dstmac);
 
                if (caplen < TOKEN_HDRLEN + 2) {

-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);

                        return hdr_len;
                }
                route_len = RIF_LENGTH(trp);
                hdr_len += route_len;
                if (caplen < hdr_len) {
                        return hdr_len;
                }
                route_len = RIF_LENGTH(trp);
                hdr_len += route_len;
                if (caplen < hdr_len) {

-                       ND_PRINT("%s", tstr);
+                       nd_print_trunc(ndo);

                        return hdr_len;
                }
                if (ndo->ndo_vflag) {
                        return hdr_len;
                }
                if (ndo->ndo_vflag) {


@@ -244,5 +244,6 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 u_int
 token_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 u_int
 token_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {

+       ndo->ndo_protocol = "token_if";

        return (token_print(ndo, p, h->len, h->caplen));
 }
        return (token_print(ndo, p, h->len, h->caplen));
 }