Default to first interface from pcap_findalldevs()

[tcpdump] / print-udld.c

diff --git a/print-udld.c b/print-udld.c
index a5488dda451ff3f56f70b6614d927e9b2bc29138..9d6c19bd8a3ef8d468a0aa898c73e35ae4911234 100644 (file)
--- a/print-udld.c
+++ b/print-udld.c
@@ -12,7 +12,7 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * UNIDIRECTIONAL LINK DETECTION (UDLD) as per 
+ * UNIDIRECTIONAL LINK DETECTION (UDLD) as per

  * http://www.ietf.org/internet-drafts/draft-foschiano-udld-02.txt
  *
  * Original code by Carles Kishimoto <[email protected]>
  * http://www.ietf.org/internet-drafts/draft-foschiano-udld-02.txt
  *
  * Original code by Carles Kishimoto <[email protected]>


@@ -22,15 +22,10 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"           
-#include "nlpid.h"
+#include "netdissect.h"
+#include "extract.h"

 
 #define UDLD_HEADER_LEN                        4
 #define UDLD_DEVICE_ID_TLV             0x0001
 
 #define UDLD_HEADER_LEN                        4
 #define UDLD_DEVICE_ID_TLV             0x0001


@@ -41,7 +36,7 @@
 #define UDLD_DEVICE_NAME_TLV           0x0006
 #define UDLD_SEQ_NUMBER_TLV            0x0007
 
 #define UDLD_DEVICE_NAME_TLV           0x0006
 #define UDLD_SEQ_NUMBER_TLV            0x0007
 

-static struct tok udld_tlv_values[] = {
+static const struct tok udld_tlv_values[] = {

     { UDLD_DEVICE_ID_TLV, "Device-ID TLV"},
     { UDLD_PORT_ID_TLV, "Port-ID TLV"},
     { UDLD_ECHO_TLV, "Echo TLV"},
     { UDLD_DEVICE_ID_TLV, "Device-ID TLV"},
     { UDLD_PORT_ID_TLV, "Port-ID TLV"},
     { UDLD_ECHO_TLV, "Echo TLV"},


@@ -52,7 +47,7 @@ static struct tok udld_tlv_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok udld_code_values[] = {
+static const struct tok udld_code_values[] = {

     { 0x00, "Reserved"},
     { 0x01, "Probe message"},
     { 0x02, "Echo message"},
     { 0x00, "Reserved"},
     { 0x01, "Probe message"},
     { 0x02, "Echo message"},


@@ -60,7 +55,7 @@ static struct tok udld_code_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok udld_flags_values[] = {
+static const struct tok udld_flags_values[] = {

     { 0x00, "RT"},
     { 0x01, "RSY"},
     { 0, NULL}
     { 0x00, "RT"},
     { 0x01, "RSY"},
     { 0, NULL}


@@ -68,22 +63,22 @@ static struct tok udld_flags_values[] = {
 
 /*
  *
 
 /*
  *

- * 0                   1                   2                   3 
- * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
- * | Ver | Opcode  |     Flags     |           Checksum            | 
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
- * |               List of TLVs (variable length list)             | 
- * |                              ...                              | 
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
+ * 0                   1                   2                   3
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Ver | Opcode  |     Flags     |           Checksum            |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |               List of TLVs (variable length list)             |
+ * |                              ...                              |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

  *
  */
 
  *
  */
 

-#define        UDLD_EXTRACT_VERSION(x) (((x)&0xe0)>>5) 
-#define        UDLD_EXTRACT_OPCODE(x) ((x)&0x1f) 
+#define        UDLD_EXTRACT_VERSION(x) (((x)&0xe0)>>5)
+#define        UDLD_EXTRACT_OPCODE(x) ((x)&0x1f)

 
 void
 
 void

-udld_print (const u_char *pptr, u_int length)
+udld_print (netdissect_options *ndo, const u_char *pptr, u_int length)

 {
     int code, type, len;
     const u_char *tptr;
 {
     int code, type, len;
     const u_char *tptr;


@@ -91,39 +86,37 @@ udld_print (const u_char *pptr, u_int length)
     if (length < UDLD_HEADER_LEN)
         goto trunc;
 
     if (length < UDLD_HEADER_LEN)
         goto trunc;
 

-    tptr = pptr; 
+    tptr = pptr;

 
 

-    if (!TTEST2(*tptr, UDLD_HEADER_LEN))       
-       goto trunc;
+    ND_TCHECK2(*tptr, UDLD_HEADER_LEN);

 
     code = UDLD_EXTRACT_OPCODE(*tptr);
 
 
     code = UDLD_EXTRACT_OPCODE(*tptr);
 

-    printf("UDLDv%u, Code %s (%x), Flags [%s] (0x%02x), length %u", 
+    ND_PRINT((ndo, "UDLDv%u, Code %s (%x), Flags [%s] (0x%02x), length %u",

            UDLD_EXTRACT_VERSION(*tptr),
            tok2str(udld_code_values, "Reserved", code),
            code,
            bittok2str(udld_flags_values, "none", *(tptr+1)),
            *(tptr+1),
            UDLD_EXTRACT_VERSION(*tptr),
            tok2str(udld_code_values, "Reserved", code),
            code,
            bittok2str(udld_flags_values, "none", *(tptr+1)),
            *(tptr+1),

-           length);
+           length));

 
     /*
      * In non-verbose mode, just print version and opcode type
      */
 
     /*
      * In non-verbose mode, just print version and opcode type
      */

-    if (vflag < 1) {
+    if (ndo->ndo_vflag < 1) {

        return;
     }
 
        return;
     }
 

-    printf("\n\tChecksum 0x%04x (unverified)", EXTRACT_16BITS(tptr+2));
+    ND_PRINT((ndo, "\n\tChecksum 0x%04x (unverified)", EXTRACT_16BITS(tptr+2)));

 
     tptr += UDLD_HEADER_LEN;
 
     while (tptr < (pptr+length)) {
 
 
     tptr += UDLD_HEADER_LEN;
 
     while (tptr < (pptr+length)) {
 

-        if (!TTEST2(*tptr, 4)) 
-            goto trunc;
+        ND_TCHECK2(*tptr, 4);

 
        type = EXTRACT_16BITS(tptr);
 
        type = EXTRACT_16BITS(tptr);

-        len  = EXTRACT_16BITS(tptr+2); 
+        len  = EXTRACT_16BITS(tptr+2);

         len -= 4;
         tptr += 4;
 
         len -= 4;
         tptr += 4;
 


@@ -132,37 +125,37 @@ udld_print (const u_char *pptr, u_int length)
             return;
         }
 
             return;
         }
 

-        printf("\n\t%s (0x%04x) TLV, length %u",
+        ND_PRINT((ndo, "\n\t%s (0x%04x) TLV, length %u",

                tok2str(udld_tlv_values, "Unknown", type),
                tok2str(udld_tlv_values, "Unknown", type),

-               type, len);
+               type, len));

 
         switch (type) {
         case UDLD_DEVICE_ID_TLV:
         case UDLD_PORT_ID_TLV:
         case UDLD_ECHO_TLV:
 
         switch (type) {
         case UDLD_DEVICE_ID_TLV:
         case UDLD_PORT_ID_TLV:
         case UDLD_ECHO_TLV:

-        case UDLD_DEVICE_NAME_TLV: 
-            printf(", %s", tptr);
+        case UDLD_DEVICE_NAME_TLV:
+            ND_PRINT((ndo, ", %s", tptr));

             break;
 
             break;
 

-        case UDLD_MESSAGE_INTERVAL_TLV: 
+        case UDLD_MESSAGE_INTERVAL_TLV:

         case UDLD_TIMEOUT_INTERVAL_TLV:
         case UDLD_TIMEOUT_INTERVAL_TLV:

-            printf(", %us", (*tptr));
+            ND_PRINT((ndo, ", %us", (*tptr)));

             break;
 
         case UDLD_SEQ_NUMBER_TLV:
             break;
 
         case UDLD_SEQ_NUMBER_TLV:

-            printf(", %u", EXTRACT_32BITS(tptr));
+            ND_PRINT((ndo, ", %u", EXTRACT_32BITS(tptr)));

             break;
 
         default:
             break;
             break;
 
         default:
             break;

-        }      
+        }

         tptr += len;
     }
 
     return;
 
  trunc:
         tptr += len;
     }
 
     return;
 
  trunc:

-    printf("[|udld]");
+    ND_PRINT((ndo, "[|udld]"));

 }
 
 /*
 }
 
 /*