Regenerate config files.

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 6d07f80edfe21cb08ba75eab9390295347b51579..b8a08e9626e733225888c388f37825b290e42cf6 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,23 +19,23 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: IP over Fibre Channel printer */
+
+/* specification: RFC 2625 */
+

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

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

 
 #include <string.h>
 
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 
 #include "ether.h"
 
 #include "addrtoname.h"
 
 #include "ether.h"
 

-/*
- * RFC 2625 IP-over-Fibre Channel.
- */
-

 struct ipfc_header {
        u_char  ipfc_dhost[8];
        u_char  ipfc_shost[8];
 struct ipfc_header {
        u_char  ipfc_dhost[8];
        u_char  ipfc_shost[8];


@@ -71,9 +71,21 @@ ipfc_hdr_print(netdissect_options *ndo,
        dstname = etheraddr_string(ndo, ipfcdst);
 
        /*
        dstname = etheraddr_string(ndo, ipfcdst);
 
        /*

-        * XXX - show the upper 16 bits?  Do so only if "vflag" is set?
+        * XXX - should we show the upper 16 bits of the addresses?
+        * Do so only if "vflag" is set?
+        * Section 3.3 "FC Port and Node Network Addresses" says that
+        *
+        *    In this specification, both the Source and Destination
+        *    4-bit NAA identifiers SHALL be set to binary '0001'
+        *    indicating that an IEEE 48-bit MAC address is contained
+        *    in the lower 48 bits of the network address fields. The
+        *    high order 12 bits in the network address fields SHALL
+        *    be set to 0x0000.
+        *
+        * so, for captures following this specification, the upper 16
+        * bits should be 0x1000, followed by a MAC address.

         */
         */

-       ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
+       ND_PRINT((ndo, "%s > %s, length %u: ", srcname, dstname, length));

 }
 
 static u_int
 }
 
 static u_int


@@ -81,6 +93,7 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
        struct ether_header ehdr;
 {
        const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
        struct ether_header ehdr;

+       struct lladdr_info src, dst;

        int llc_hdrlen;
 
        if (caplen < IPFC_HDRLEN) {
        int llc_hdrlen;
 
        if (caplen < IPFC_HDRLEN) {


@@ -95,13 +108,18 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        if (ndo->ndo_eflag)
                ipfc_hdr_print(ndo, ipfcp, length, ESRC(&ehdr), EDST(&ehdr));
 
        if (ndo->ndo_eflag)
                ipfc_hdr_print(ndo, ipfcp, length, ESRC(&ehdr), EDST(&ehdr));
 

+       src.addr = ESRC(&ehdr);
+       src.addr_string = etheraddr_string;
+       dst.addr = EDST(&ehdr);
+       dst.addr_string = etheraddr_string;
+

        /* Skip over Network_Header */
        length -= IPFC_HDRLEN;
        p += IPFC_HDRLEN;
        caplen -= IPFC_HDRLEN;
 
        /* Try to print the LLC-layer header & higher layers */
        /* Skip over Network_Header */
        length -= IPFC_HDRLEN;
        p += IPFC_HDRLEN;
        caplen -= IPFC_HDRLEN;
 
        /* Try to print the LLC-layer header & higher layers */

-       llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(&ehdr), EDST(&ehdr));
+       llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);

        if (llc_hdrlen < 0) {
                /*
                 * Some kinds of LLC packet we cannot
        if (llc_hdrlen < 0) {
                /*
                 * Some kinds of LLC packet we cannot