gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index be7849c40ea487d9effe4a8e3112f73f6210a582..c5fa33beb4a8c3496e0164021bc14d62de23d486 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -1,6 +1,6 @@
 /*
 /*

- * Marko Kiiskila [email protected] 
- * 
+ * Marko Kiiskila [email protected]
+ *

  * Tampere University of Technology - Telecommunications Laboratory
  *
  * Permission to use, copy, modify and distribute this
  * Tampere University of Technology - Telecommunications Laboratory
  *
  * Permission to use, copy, modify and distribute this


@@ -12,133 +12,99 @@
  * documentation, and that the use of this software is
  * acknowledged in any publications resulting from using
  * the software.
  * documentation, and that the use of this software is
  * acknowledged in any publications resulting from using
  * the software.

- * 
+ *

  * TUT ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS
  * SOFTWARE.
  * TUT ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS
  * SOFTWARE.

- * 
+ *

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.5 2000-09-23 08:03:37 guy Exp $ (LBL)";
-#endif
+/* \summary: ATM LANE printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-
-#include <stdio.h>
-#include <pcap.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "ether.h"
-#include "lane.h"
-
-static inline void
-lane_print(register const u_char *bp, int length)
+#include "netdissect-stdinc.h"
+
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
+
+struct lecdatahdr_8023 {
+  nd_uint16_t le_header;
+  nd_mac_addr h_dest;
+  nd_mac_addr h_source;
+  nd_uint16_t h_type;
+};
+
+struct lane_controlhdr {
+  nd_uint16_t lec_header;
+  nd_uint8_t  lec_proto;
+  nd_uint8_t  lec_vers;
+  nd_uint16_t lec_opcode;
+};
+
+static const struct tok lecop2str[] = {
+       { 0x0001,       "configure request" },
+       { 0x0101,       "configure response" },
+       { 0x0002,       "join request" },
+       { 0x0102,       "join response" },
+       { 0x0003,       "ready query" },
+       { 0x0103,       "ready indication" },
+       { 0x0004,       "register request" },
+       { 0x0104,       "register response" },
+       { 0x0005,       "unregister request" },
+       { 0x0105,       "unregister response" },
+       { 0x0006,       "ARP request" },
+       { 0x0106,       "ARP response" },
+       { 0x0007,       "flush request" },
+       { 0x0107,       "flush response" },
+       { 0x0008,       "NARP request" },
+       { 0x0009,       "topology request" },
+       { 0,            NULL }
+};
+
+static void
+lane_hdr_print(netdissect_options *ndo, const u_char *bp)

 {
 {

-       register const struct lecdatahdr_8023 *ep;
-
-       ep = (const struct lecdatahdr_8023 *)bp;
-       if (qflag)
-               (void)printf("lecid:%d %s %s %d: ",
-                            ntohs(ep->le_header),
-                            etheraddr_string(ep->h_source),
-                            etheraddr_string(ep->h_dest),
-                            length);
-       else
-               (void)printf("lecid:%d %s %s %s %d: ",
-                            ntohs(ep->le_header),
-                            etheraddr_string(ep->h_source),
-                            etheraddr_string(ep->h_dest),
-                            etherproto_string(ep->h_type),
-                            length);
+       ND_PRINT("lecid:%x ", GET_BE_U_2(bp));

 }
 
 /*
 }
 
 /*

- * This is the top level routine of the printer.  'p' is the points
- * to the ether header of the packet, 'h->tv' is the timestamp,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
+ * This assumes 802.3, not 802.5, LAN emulation.

  */
 void
  */
 void

-lane_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)

 {
 {

-       int caplen = h->caplen;
-       int length = h->len;
-       struct lecdatahdr_8023 *ep;
-       u_short ether_type;
-       u_short extracted_ethertype;
-
-       ts_print(&h->ts);
-
-       if (caplen < sizeof(struct lecdatahdr_8023)) {
-               printf("[|lane]");
-               goto out;
+       const struct lane_controlhdr *lec;
+
+       ndo->ndo_protocol = "lane";
+
+       lec = (const struct lane_controlhdr *)p;
+       if (GET_BE_U_2(lec->lec_header) == 0xff00) {
+               /*
+                * LE Control.
+                */
+               ND_PRINT("lec: proto %x vers %x %s",
+                        GET_U_1(lec->lec_proto),
+                        GET_U_1(lec->lec_vers),
+                        tok2str(lecop2str, "opcode-#%u", GET_BE_U_2(lec->lec_opcode)));
+               return;

        }
 
        }
 

-       if (eflag)
-               lane_print(p, length);
-

        /*
        /*

-        * Some printers want to get back at the ethernet addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
+        * Go past the LE header.

         */
         */

-       packetp = p;
-       snapend = p + caplen;
-
-       length -= sizeof(struct lecdatahdr_8023);
-       caplen -= sizeof(struct lecdatahdr_8023);
-       ep = (struct lecdatahdr_8023 *)p;
-       p += sizeof(struct lecdatahdr_8023);
-
-       ether_type = ntohs(ep->h_type);
+       ND_TCHECK_2(p); /* Needed */
+       length -= 2;
+       caplen -= 2;
+       p += 2;

 
        /*
 
        /*

-        * Is it (gag) an 802.3 encapsulation?
+        * Now print the encapsulated frame, under the assumption
+        * that it's an Ethernet frame.

         */
         */

-       extracted_ethertype = 0;
-       if (ether_type < ETHERMTU) {
-               /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, ep->h_source,ep->h_dest)==0) {
-                       /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               lane_print((u_char *)ep, length);
-                       if (extracted_ethertype) {
-                               printf("(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!xflag && !qflag)
-                               default_print(p, caplen);
-               }
-       } else if (ether_encap_print(ether_type, p, length, caplen) == 0) {
-               /* ether_type not known, print raw packet */
-               if (!eflag)
-                       lane_print((u_char *)ep, length + sizeof(*ep));
-               if (!xflag && !qflag)
-                       default_print(p, caplen);
-       }
-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
+       ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2);

 }
 }