1998-10-10 03:32:20 +00:00
|
|
|
/* packet-fddi.c
|
|
|
|
* Routines for FDDI packet disassembly
|
|
|
|
*
|
|
|
|
* Laurent Deniel <deniel@worldnet.fr>
|
|
|
|
*
|
2000-03-20 22:22:45 +00:00
|
|
|
* $Id: packet-fddi.c,v 1.29 2000/03/20 22:22:45 gram Exp $
|
1998-10-10 03:32:20 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@zing.org>
|
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
1998-11-12 21:22:47 +00:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
1999-08-24 06:01:45 +00:00
|
|
|
#include <stdio.h>
|
1999-03-23 03:14:46 +00:00
|
|
|
#include <glib.h>
|
1998-10-10 03:32:20 +00:00
|
|
|
#include "packet.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-llc.h"
|
1998-10-10 03:32:20 +00:00
|
|
|
#include "resolv.h"
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_fddi = -1;
|
|
|
|
static int hf_fddi_fc = -1;
|
|
|
|
static int hf_fddi_dst = -1;
|
|
|
|
static int hf_fddi_src = -1;
|
2000-03-20 22:22:45 +00:00
|
|
|
static int hf_fddi_addr = -1;
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_fddi = -1;
|
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
/* FDDI Frame Control values */
|
|
|
|
|
|
|
|
#define FDDI_FC_VOID 0x00 /* Void frame */
|
|
|
|
#define FDDI_FC_NRT 0x80 /* Nonrestricted token */
|
|
|
|
#define FDDI_FC_RT 0xc0 /* Restricted token */
|
|
|
|
#define FDDI_FC_MAC 0xc0 /* MAC frame */
|
|
|
|
#define FDDI_FC_SMT 0x40 /* SMT frame */
|
|
|
|
#define FDDI_FC_SMT_INFO 0x41 /* SMT Info */
|
|
|
|
#define FDDI_FC_SMT_NSA 0x4F /* SMT Next station adrs */
|
|
|
|
#define FDDI_FC_SMT_MIN FDDI_FC_SMT_INFO
|
|
|
|
#define FDDI_FC_SMT_MAX FDDI_FC_SMT_NSA
|
|
|
|
#define FDDI_FC_MAC_MIN 0xc1
|
|
|
|
#define FDDI_FC_MAC_BEACON 0xc2 /* MAC Beacon frame */
|
|
|
|
#define FDDI_FC_MAC_CLAIM 0xc3 /* MAC Claim frame */
|
|
|
|
#define FDDI_FC_MAC_MAX 0xcf
|
|
|
|
#define FDDI_FC_LLC_ASYNC 0x50 /* Async. LLC frame */
|
|
|
|
#define FDDI_FC_LLC_ASYNC_MIN FDDI_FC_LLC_ASYNC
|
|
|
|
#define FDDI_FC_LLC_ASYNC_DEF 0x54
|
|
|
|
#define FDDI_FC_LLC_ASYNC_MAX 0x5f
|
|
|
|
#define FDDI_FC_LLC_SYNC 0xd0 /* Sync. LLC frame */
|
|
|
|
#define FDDI_FC_LLC_SYNC_MIN FDDI_FC_LLC_SYNC
|
|
|
|
#define FDDI_FC_LLC_SYNC_MAX 0xd7
|
|
|
|
#define FDDI_FC_IMP_ASYNC 0x60 /* Implementor Async. */
|
|
|
|
#define FDDI_FC_IMP_ASYNC_MIN FDDI_FC_IMP_ASYNC
|
|
|
|
#define FDDI_FC_IMP_ASYNC_MAX 0x6f
|
|
|
|
#define FDDI_FC_IMP_SYNC 0xe0 /* Implementor Synch. */
|
|
|
|
|
1999-08-24 06:01:45 +00:00
|
|
|
#define FDDI_FC_CLFF 0xF0 /* Class/Length/Format bits */
|
|
|
|
#define FDDI_FC_ZZZZ 0x0F /* Control bits */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Async frame ZZZZ bits:
|
|
|
|
*/
|
|
|
|
#define FDDI_FC_ASYNC_R 0x08 /* Reserved */
|
|
|
|
#define FDDI_FC_ASYNC_PRI 0x07 /* Priority */
|
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
#define FDDI_HEADER_SIZE 13
|
|
|
|
|
|
|
|
/* field positions */
|
|
|
|
|
|
|
|
#define FDDI_P_FC 0
|
|
|
|
#define FDDI_P_DHOST 1
|
|
|
|
#define FDDI_P_SHOST 7
|
|
|
|
|
1998-10-13 07:48:03 +00:00
|
|
|
/* "swaptab[i]" is the value of "i" with the bits reversed. */
|
|
|
|
static u_char swaptab[256] = {
|
|
|
|
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
|
|
|
|
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
|
|
|
|
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
|
|
|
|
0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
|
|
|
|
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
|
|
|
|
0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
|
|
|
|
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
|
|
|
|
0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
|
|
|
|
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
|
|
|
|
0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
|
|
|
|
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
|
|
|
|
0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
|
|
|
|
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
|
|
|
|
0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
|
|
|
|
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
|
|
|
|
0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
|
|
|
|
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
|
|
|
|
0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
|
|
|
|
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
|
|
|
|
0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
|
|
|
|
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
|
|
|
|
0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
|
|
|
|
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
|
|
|
|
0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
|
|
|
|
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
|
|
|
|
0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
|
|
|
|
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
|
|
|
|
0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
|
|
|
|
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
|
|
|
|
0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
|
|
|
|
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
|
|
|
|
0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
|
|
|
|
};
|
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
static void
|
|
|
|
swap_mac_addr(u_char *swapped_addr, const u_char *orig_addr)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
|
|
swapped_addr[i] = swaptab[orig_addr[i]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-02-09 00:35:38 +00:00
|
|
|
void
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_fddi(const u_char *pd, packet_counts *ld)
|
|
|
|
{
|
1999-02-09 00:35:38 +00:00
|
|
|
int offset = 0, fc;
|
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(0, FDDI_HEADER_SIZE)) {
|
1999-02-09 00:35:38 +00:00
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
offset = FDDI_HEADER_SIZE;
|
|
|
|
|
|
|
|
fc = (int) pd[FDDI_P_FC];
|
|
|
|
|
|
|
|
switch (fc) {
|
|
|
|
|
|
|
|
/* From now, only 802.2 SNAP (Async. LCC frame) is supported */
|
|
|
|
|
|
|
|
case FDDI_FC_LLC_ASYNC + 0 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 1 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 2 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 3 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 4 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 5 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 6 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 7 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 8 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 9 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 10 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 11 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 12 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 13 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 14 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 15 :
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_llc(pd, offset, ld);
|
1999-02-09 00:35:38 +00:00
|
|
|
return;
|
|
|
|
default :
|
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
|
|
|
|
} /* fc */
|
|
|
|
|
|
|
|
} /* capture_fddi */
|
|
|
|
|
1999-08-24 06:01:45 +00:00
|
|
|
static gchar *
|
|
|
|
fddifc_to_str(int fc)
|
|
|
|
{
|
|
|
|
static gchar strbuf[128+1];
|
|
|
|
|
|
|
|
switch (fc) {
|
|
|
|
|
|
|
|
case FDDI_FC_VOID: /* Void frame */
|
|
|
|
return "Void frame";
|
|
|
|
|
|
|
|
case FDDI_FC_NRT: /* Nonrestricted token */
|
|
|
|
return "Nonrestricted token";
|
|
|
|
|
|
|
|
case FDDI_FC_RT: /* Restricted token */
|
|
|
|
return "Restricted token";
|
|
|
|
|
|
|
|
case FDDI_FC_SMT_INFO: /* SMT Info */
|
|
|
|
return "SMT info";
|
|
|
|
|
|
|
|
case FDDI_FC_SMT_NSA: /* SMT Next station adrs */
|
|
|
|
return "SMT Next station address";
|
|
|
|
|
|
|
|
case FDDI_FC_MAC_BEACON: /* MAC Beacon frame */
|
|
|
|
return "MAC beacon";
|
|
|
|
|
|
|
|
case FDDI_FC_MAC_CLAIM: /* MAC Claim frame */
|
|
|
|
return "MAC claim token";
|
|
|
|
|
|
|
|
default:
|
|
|
|
switch (fc & FDDI_FC_CLFF) {
|
|
|
|
|
|
|
|
case FDDI_FC_MAC:
|
|
|
|
sprintf(strbuf, "MAC frame, control %x", fc & FDDI_FC_ZZZZ);
|
|
|
|
return strbuf;
|
|
|
|
|
|
|
|
case FDDI_FC_SMT:
|
|
|
|
sprintf(strbuf, "SMT frame, control %x", fc & FDDI_FC_ZZZZ);
|
|
|
|
return strbuf;
|
|
|
|
|
|
|
|
case FDDI_FC_LLC_ASYNC:
|
|
|
|
if (fc & FDDI_FC_ASYNC_R)
|
|
|
|
sprintf(strbuf, "Async LLC frame, control %x", fc & FDDI_FC_ZZZZ);
|
|
|
|
else
|
|
|
|
sprintf(strbuf, "Async LLC frame, priority %d",
|
|
|
|
fc & FDDI_FC_ASYNC_PRI);
|
|
|
|
return strbuf;
|
|
|
|
|
|
|
|
case FDDI_FC_LLC_SYNC:
|
|
|
|
if (fc & FDDI_FC_ZZZZ) {
|
|
|
|
sprintf(strbuf, "Sync LLC frame, control %x", fc & FDDI_FC_ZZZZ);
|
|
|
|
return strbuf;
|
|
|
|
} else
|
|
|
|
return "Sync LLC frame";
|
|
|
|
|
|
|
|
case FDDI_FC_IMP_ASYNC:
|
|
|
|
sprintf(strbuf, "Implementor async frame, control %x",
|
|
|
|
fc & FDDI_FC_ZZZZ);
|
|
|
|
return strbuf;
|
|
|
|
|
|
|
|
case FDDI_FC_IMP_SYNC:
|
|
|
|
sprintf(strbuf, "Implementor sync frame, control %x",
|
|
|
|
fc & FDDI_FC_ZZZZ);
|
|
|
|
return strbuf;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
1999-09-10 04:53:14 +00:00
|
|
|
return "Unknown frame type";
|
1999-08-24 06:01:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
void dissect_fddi(const u_char *pd, frame_data *fd, proto_tree *tree,
|
|
|
|
gboolean bitswapped)
|
1998-10-13 07:48:03 +00:00
|
|
|
{
|
1998-10-10 03:32:20 +00:00
|
|
|
int offset = 0, fc;
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *fh_tree;
|
|
|
|
proto_item *ti;
|
1999-08-24 06:01:45 +00:00
|
|
|
gchar *fc_str;
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
static u_char src[6], dst[6];
|
1999-07-07 22:52:57 +00:00
|
|
|
u_char src_swapped[6], dst_swapped[6];
|
1998-10-10 03:32:20 +00:00
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(0, FDDI_HEADER_SIZE)) {
|
1998-10-10 03:32:20 +00:00
|
|
|
dissect_data(pd, offset, fd, tree);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-10-13 07:48:03 +00:00
|
|
|
/* Extract the source and destination addresses, possibly bit-swapping
|
|
|
|
them. */
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
if (bitswapped) {
|
|
|
|
swap_mac_addr(dst, (u_char *)&pd[FDDI_P_DHOST]);
|
|
|
|
swap_mac_addr(src, (u_char *)&pd[FDDI_P_SHOST]);
|
|
|
|
} else {
|
|
|
|
memcpy(dst, (u_char *)&pd[FDDI_P_DHOST], sizeof dst);
|
|
|
|
memcpy(src, (u_char *)&pd[FDDI_P_SHOST], sizeof src);
|
|
|
|
}
|
1998-10-13 07:48:03 +00:00
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
fc = (int) pd[FDDI_P_FC];
|
1999-08-24 06:01:45 +00:00
|
|
|
fc_str = fddifc_to_str(fc);
|
1998-10-10 03:32:20 +00:00
|
|
|
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
/* XXX - copy them to some buffer associated with "pi", rather than
|
|
|
|
just making "src" and "dst" static? */
|
|
|
|
SET_ADDRESS(&pi.dl_src, AT_ETHER, 6, &src[0]);
|
|
|
|
SET_ADDRESS(&pi.src, AT_ETHER, 6, &src[0]);
|
|
|
|
SET_ADDRESS(&pi.dl_dst, AT_ETHER, 6, &dst[0]);
|
|
|
|
SET_ADDRESS(&pi.dst, AT_ETHER, 6, &dst[0]);
|
|
|
|
|
1998-11-17 04:29:13 +00:00
|
|
|
if (check_col(fd, COL_PROTOCOL))
|
1999-08-24 06:01:45 +00:00
|
|
|
col_add_str(fd, COL_PROTOCOL, "FDDI");
|
1998-11-17 04:29:13 +00:00
|
|
|
if (check_col(fd, COL_INFO))
|
1999-08-24 06:01:45 +00:00
|
|
|
col_add_str(fd, COL_INFO, fc_str);
|
1998-10-10 03:32:20 +00:00
|
|
|
|
1999-03-02 20:50:05 +00:00
|
|
|
offset = FDDI_HEADER_SIZE;
|
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
if (tree) {
|
2000-03-12 04:48:32 +00:00
|
|
|
ti = proto_tree_add_protocol_format(tree, proto_fddi, 0, offset,
|
1999-09-10 04:53:14 +00:00
|
|
|
"Fiber Distributed Data Interface, %s", fc_str);
|
1998-10-10 03:32:20 +00:00
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
swap_mac_addr(dst_swapped, (u_char*)&pd[FDDI_P_DHOST]);
|
|
|
|
swap_mac_addr(src_swapped, (u_char*)&pd[FDDI_P_SHOST]);
|
1998-10-10 03:32:20 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_fddi);
|
1999-07-07 22:52:57 +00:00
|
|
|
proto_tree_add_item(fh_tree, hf_fddi_fc, FDDI_P_FC, 1, fc);
|
|
|
|
proto_tree_add_item(fh_tree, hf_fddi_dst, FDDI_P_DHOST, 6, dst);
|
|
|
|
proto_tree_add_item(fh_tree, hf_fddi_src, FDDI_P_SHOST, 6, src);
|
2000-03-20 22:22:45 +00:00
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_addr, FDDI_P_DHOST, 6, dst);
|
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_addr, FDDI_P_SHOST, 6, src);
|
1999-07-07 22:52:57 +00:00
|
|
|
|
|
|
|
/* hide some bit-swapped mac address fields in the proto_tree, just in case */
|
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_dst, FDDI_P_DHOST, 6, dst_swapped);
|
1999-10-16 19:36:56 +00:00
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_src, FDDI_P_SHOST, 6, src_swapped);
|
2000-03-20 22:22:45 +00:00
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_addr, FDDI_P_DHOST, 6, dst_swapped);
|
|
|
|
proto_tree_add_item_hidden(fh_tree, hf_fddi_addr, FDDI_P_SHOST, 6, src_swapped);
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-08-24 06:01:45 +00:00
|
|
|
}
|
1998-10-10 03:32:20 +00:00
|
|
|
switch (fc) {
|
|
|
|
|
|
|
|
/* From now, only 802.2 SNAP (Async. LCC frame) is supported */
|
|
|
|
|
1998-10-10 18:23:43 +00:00
|
|
|
case FDDI_FC_LLC_ASYNC + 0 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 1 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 2 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 3 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 4 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 5 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 6 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 7 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 8 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 9 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 10 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 11 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 12 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 13 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 14 :
|
|
|
|
case FDDI_FC_LLC_ASYNC + 15 :
|
1998-10-10 03:32:20 +00:00
|
|
|
dissect_llc(pd, offset, fd, tree);
|
|
|
|
return;
|
|
|
|
|
|
|
|
default :
|
|
|
|
dissect_data(pd, offset, fd, tree);
|
|
|
|
return;
|
|
|
|
|
|
|
|
} /* fc */
|
|
|
|
} /* dissect_fddi */
|
1999-07-07 22:52:57 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_fddi(void)
|
|
|
|
{
|
1999-07-15 15:33:52 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
1999-08-24 06:01:45 +00:00
|
|
|
/*
|
|
|
|
* XXX - we want this guy to have his own private formatting
|
|
|
|
* routine, using "fc_to_str()"; if "fc_to_str()" returns
|
|
|
|
* NULL, just show the hex value, else show the string.
|
|
|
|
*/
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_fddi_fc,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Frame Control", "fddi.fc", FT_UINT8, BASE_HEX, NULL, 0x0,
|
|
|
|
"" }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_fddi_dst,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Destination", "fddi.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
|
|
"Destination Hardware Address" }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_fddi_src,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Source", "fddi.src", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }},
|
2000-03-20 22:22:45 +00:00
|
|
|
|
|
|
|
{ &hf_fddi_addr,
|
|
|
|
{ "Source or Destination Address", "fddi.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
|
|
"Source or Destination Hardware Address" }},
|
|
|
|
|
1999-07-08 03:18:20 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_fddi,
|
|
|
|
};
|
1999-07-08 03:18:20 +00:00
|
|
|
|
|
|
|
proto_fddi = proto_register_protocol ("Fiber Distributed Data Interface", "fddi" );
|
|
|
|
proto_register_field_array(proto_fddi, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|