osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/epan/dissectors/packet-ip.c

2662 lines
86 KiB
C
Raw Normal View History

Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
Set the svn:eol-style property on all text files to "native", so that they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
* $Id$
Added ID tags to the beginning of each source file. svn path=/trunk/; revision=7
1998-09-16 03:22:19 +00:00
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
* Monday, June 27, 2005
* Support for the ICMP extensions for MPLS
* (http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-mpls-icmp-02.txt)
* by Maria-Luiza Crivat <luizacri@gmail.com>
* & Brice Augustin <bricecotte@gmail.com>
*
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
* Wednesday, January 17, 2006
* Support for the CIPSO IPv4 option
* (http://sourceforge.net/docman/display_doc.php?docid=34650&group_id=174379)
* by Paul Moore <paul.moore@hp.com>
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* 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.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* 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.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* 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
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include <stdio.h>
#include <string.h>
#include <glib.h>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
#include <epan/addr_resolv.h>
Move various tables into the epan directory. svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
#include <epan/ipproto.h>
Move a pile of protocol-related headers from the top-level source directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
#include <epan/ip_opts.h>
Move prefs.c and prefs.h into the epan subdirectory. svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
#include <epan/prefs.h>
Move the following files from /trunk to /trunk/epan: asn1.[ch] follow.[ch] ptvcursor.[ch] reassemble.[ch] xmlstub.[ch] fix #include statements accordingly. svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
#include <epan/reassemble.h>
Move a pile of protocol-related headers from the top-level source directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
#include <epan/etypes.h>
#include <epan/greproto.h>
#include <epan/ppptypes.h>
#include <epan/llcsaps.h>
#include <epan/aftypes.h>
#include <epan/arcnet_pids.h>
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include "packet-ip.h"
Create a header file for every packet-*.c file. Prune the packet.h file. This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
2000-02-15 21:06:58 +00:00
#include "packet-ipsec.h"
Move various checksum routines and headers to epan. svn path=/trunk/; revision=12117
2004-09-28 00:06:32 +00:00
#include <epan/in_cksum.h>
Move a pile of protocol-related headers from the top-level source directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
#include <epan/nlpid.h>
Move the tap infrastructure to the epan directory. svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
#include <epan/tap.h>
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
#include <epan/emem.h>
from Stephen Fisher make icmp timestamps more readable svn path=/trunk/; revision=18406
2006-06-09 20:44:16 +00:00
#include <epan/nstime.h>
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
static int ip_tap = -1;
Create a header file for every packet-*.c file. Prune the packet.h file. This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
2000-02-15 21:06:58 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
static void dissect_icmp(tvbuff_t *, packet_info *, proto_tree *);
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
/* Decode the old IPv4 TOS field as the DiffServ DS Field (RFC2474/2475) */
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto =" statements. Move the setting of the Protocol column in various dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Make the IP dissector static, as it's called only via dissector tables or dissector handles. Also make the "dissect the TOS field as the DiffServ DS field" flag static, as it's not referred to outside of "packet-ip.c". In the NCP dissector, refer to the port type through "pinfo" rather than through the global "pi", as it's a tvbuffified dissector. svn path=/trunk/; revision=2929
2001-01-22 03:33:45 +00:00
static gboolean g_ip_dscp_actif = TRUE;
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
/* Defragment fragmented IP datagrams */
fix #480: Change defaults for all reassembling settings to ON I've changed all settings I could find to TRUE. It might be reasonable to change some protocol settings back to FALSE, if reassembling fails very often. svn path=/trunk/; revision=16048
2005-09-28 22:15:38 +00:00
static gboolean ip_defragment = TRUE;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
Add tree summary information similar to what's in packet-tcp.c. svn path=/trunk/; revision=3436
2001-05-23 03:33:59 +00:00
/* Place IP summary in proto tree */
static gboolean ip_summary_in_tree = TRUE;
ICMP MPLS updates and a new preference option from Brice Augustin and Maria-Luiza svn path=/trunk/; revision=15007
2005-07-23 00:46:14 +00:00
/* Decode the end of the ICMP payload as ICMP MPLS extensions
if the packet in the payload has more than 128 bytes */
static gboolean favor_icmp_mpls_ext = FALSE;
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
/* Perform IP checksum */
static gboolean ip_check_checksum = TRUE;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_ip = -1;
static int hf_ip_version = -1;
static int hf_ip_hdr_len = -1;
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
static int hf_ip_dsfield = -1;
static int hf_ip_dsfield_dscp = -1;
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
static int hf_ip_dsfield_ect = -1;
static int hf_ip_dsfield_ce = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int hf_ip_tos = -1;
static int hf_ip_tos_precedence = -1;
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
static int hf_ip_tos_delay = -1;
static int hf_ip_tos_throughput = -1;
static int hf_ip_tos_reliability = -1;
static int hf_ip_tos_cost = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int hf_ip_len = -1;
static int hf_ip_id = -1;
static int hf_ip_dst = -1;
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
static int hf_ip_dst_host = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int hf_ip_src = -1;
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
static int hf_ip_src_host = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int hf_ip_addr = -1;
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
static int hf_ip_host = -1;
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
static int hf_ip_flags = -1;
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
static int hf_ip_flags_rf = -1;
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
static int hf_ip_flags_df = -1;
static int hf_ip_flags_mf = -1;
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
static int hf_ip_frag_offset = -1;
static int hf_ip_ttl = -1;
static int hf_ip_proto = -1;
static int hf_ip_checksum = -1;
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
static int hf_ip_checksum_good = -1;
Initialize hf_ip_checksum_bad to -1 like all other fields. svn path=/trunk/; revision=3064
2001-02-21 19:42:37 +00:00
static int hf_ip_checksum_bad = -1;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
static int hf_ip_fragments = -1;
static int hf_ip_fragment = -1;
static int hf_ip_fragment_overlap = -1;
static int hf_ip_fragment_overlap_conflict = -1;
static int hf_ip_fragment_multiple_tails = -1;
static int hf_ip_fragment_too_long_fragment = -1;
static int hf_ip_fragment_error = -1;
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
static int hf_ip_reassembled_in = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_ip = -1;
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
static gint ett_ip_dsfield = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_ip_tos = -1;
static gint ett_ip_off = -1;
static gint ett_ip_options = -1;
static gint ett_ip_option_sec = -1;
static gint ett_ip_option_route = -1;
static gint ett_ip_option_timestamp = -1;
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
static gint ett_ip_option_cipso = -1;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
static gint ett_ip_fragments = -1;
static gint ett_ip_fragment = -1;
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
static gint ett_ip_checksum = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Add a "fragment_add_seq_next()" to reassemble fragments that don't have sequence numbers or offsets and are thus assumed to be received in order with no duplicates or dropped fragments (e.g., for NetBIOS Frame, where 802.2 LLC guarantees in-order delivery to NetBIOS with no duplicates or dropped fragments). "show_fragment_tree()' and "show_fragment_seq_tree()" don't modify the "fragment_items" to which the "fit" argument points, so make that argument a "const fragment_items *". Make all the "fragment_items" tables "static" (as they're not used outside the modules defining them) and "const" (as they're not modified). Add support for reassembly of NetBIOS fragmented requests and responses. Get rid of an unnecessary include of "packet-tr.c" in the NetBIOS dissector, and make its table of dissection function pointers static. Fix some typos in the AppleTalk and NetBIOS dissectors. svn path=/trunk/; revision=6491
2002-10-24 06:17:36 +00:00
static const fragment_items ip_frag_items = {
Added show_fragment_tree() to reassemble. This function will do the common task of creating a fregment tree for the fragmented packets. Having this identical code to create this tree in every dissector that does PDU reassembly is a huge waste and duplication of code. Updated IP, SMB and DCERPC to use the new function. svn path=/trunk/; revision=5626
2002-06-05 11:21:49 +00:00
&ett_ip_fragment,
&ett_ip_fragments,
&hf_ip_fragments,
&hf_ip_fragment,
&hf_ip_fragment_overlap,
&hf_ip_fragment_overlap_conflict,
&hf_ip_fragment_multiple_tails,
&hf_ip_fragment_too_long_fragment,
Add "show_fragment_seq_tree()", which is like "show_fragment_tree()", but for stuff reassembled with "fragment_add_seq()" or "fragment_add_seq_check()". Add a "fragment tag" string to the "fragment_items", so that packets with fragmentation errors can be properly flagged as having "Illegal fragments" or "Illegal segments" depending on the term used with the protocol in question. Make all the dissectors that can use "show_fragment_tree()" or "show_fragment_seq_tree()", and don't already use them, do so. svn path=/trunk/; revision=5644
2002-06-07 10:11:41 +00:00
&hf_ip_fragment_error,
Add a pointer to an hf_ value for a "reassembled_in" field (which can be null) to the "fragment_items" structure, and don't pass that value into "process_reassembled_data()", just have it use the value in the "fragment_items" structure passed to it. Make "process_reassembled_data()" capable of handling reassembly done by "fragment_add_seq_check()", and use it in the ATP and 802.11 dissectors; give them "reassembled_in" fields. Make "process_reassembled_data()" handle only the case of a completed reassembly (fd_head != NULL) so that we can use it in those dissectors without gunking the code up too much. svn path=/trunk/; revision=7513
2003-04-20 11:36:16 +00:00
&hf_ip_reassembled_in,
Add "show_fragment_seq_tree()", which is like "show_fragment_tree()", but for stuff reassembled with "fragment_add_seq()" or "fragment_add_seq_check()". Add a "fragment tag" string to the "fragment_items", so that packets with fragmentation errors can be properly flagged as having "Illegal fragments" or "Illegal segments" depending on the term used with the protocol in question. Make all the dissectors that can use "show_fragment_tree()" or "show_fragment_seq_tree()", and don't already use them, do so. svn path=/trunk/; revision=5644
2002-06-07 10:11:41 +00:00
"fragments"
Added show_fragment_tree() to reassemble. This function will do the common task of creating a fregment tree for the fragmented packets. Having this identical code to create this tree in every dissector that does PDU reassembly is a huge waste and duplication of code. Updated IP, SMB and DCERPC to use the new function. svn path=/trunk/; revision=5626
2002-06-05 11:21:49 +00:00
};
Don't export "ip_dissector_table" explicitly; now that we have "find_dissector_table()", have the IPv6 and IPSEC dissectors fetch the IP dissector table by name. svn path=/trunk/; revision=7600
2003-04-29 17:24:35 +00:00
static dissector_table_t ip_dissector_table;
Register an "ip.proto" dissector table for IPv4, and have dissectors for protocols that run inside IPv4 register themselves with it using "dissector_add()". Make various dissectors static if they can be, and get rid of any header files that no longer contain any information as a result of that change. svn path=/trunk/; revision=1870
2000-04-16 22:46:25 +00:00
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
static dissector_handle_t ip_handle;
If version is v6 let the IPv6 dissetor handle it. svn path=/trunk/; revision=17649
2006-03-16 20:14:47 +00:00
static dissector_handle_t ipv6_handle;
Moved from using dissect_data() to using call_dissector() svn path=/trunk/; revision=4269
2001-11-26 04:52:51 +00:00
static dissector_handle_t data_handle;
The beginnings of a TAPA dissector (Trapeze Access Point Access Protocol). Admittedly not much, so if you have any ideas what the rest means or where I'm wrong please provide feedback. As tapa uses udp 5000 and ip protocol 4, I needed to add a hack for the ip part to properly dispatch betweeen ipip and tapa-tunnel (actually I was unable to turn the ipip dissector into a heuristic dissector :-) svn path=/trunk/; revision=20971
2007-03-04 11:48:07 +00:00
static dissector_handle_t tapa_handle;
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_icmp = -1;
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
static int hf_icmp_type = -1;
static int hf_icmp_code = -1;
static int hf_icmp_checksum = -1;
Add hidden fields for bad checksums to various IP-family protocols. Initialize the "hf_" value for "icmp.checksum_bad" to -1, the way all other "hf_" values are initialized, and declare it and "ip.checksum_bad" to have base BASE_NONE, not 4. svn path=/trunk/; revision=3087
2001-02-28 19:33:49 +00:00
static int hf_icmp_checksum_bad = -1;
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
static int hf_icmp_ident = -1;
static int hf_icmp_seq_num = -1;
static int hf_icmp_mtu = -1;
static int hf_icmp_redir_gw = -1;
* Added Mike Hall's TCP reconstruction code. svn path=/trunk/; revision=10
1998-09-17 03:12:28 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
/* Mobile ip */
static int hf_icmp_mip_type = -1;
static int hf_icmp_mip_length = -1;
static int hf_icmp_mip_prefix_length = -1;
static int hf_icmp_mip_seq = -1;
static int hf_icmp_mip_life = -1;
static int hf_icmp_mip_flags = -1;
static int hf_icmp_mip_r = -1;
static int hf_icmp_mip_b = -1;
static int hf_icmp_mip_h = -1;
static int hf_icmp_mip_f = -1;
static int hf_icmp_mip_m = -1;
static int hf_icmp_mip_g = -1;
static int hf_icmp_mip_v = -1;
Fix Ethereal bug 994 in Wireshark: MIP Advertisement reverse tunneling flag not dissected svn path=/trunk/; revision=18520
2006-06-19 15:54:13 +00:00
static int hf_icmp_mip_rt = -1;
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
static int hf_icmp_mip_reserved = -1;
static int hf_icmp_mip_coa = -1;
static int hf_icmp_mip_challenge = -1;
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
/* MPLS extensions */
static int hf_icmp_mpls = -1;
static int hf_icmp_mpls_version = -1;
static int hf_icmp_mpls_reserved = -1;
static int hf_icmp_mpls_checksum = -1;
static int hf_icmp_mpls_checksum_bad = -1;
static int hf_icmp_mpls_length = -1;
static int hf_icmp_mpls_class = -1;
static int hf_icmp_mpls_c_type = -1;
static int hf_icmp_mpls_label = -1;
static int hf_icmp_mpls_exp = -1;
static int hf_icmp_mpls_s = -1;
static int hf_icmp_mpls_ttl = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_icmp = -1;
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
static gint ett_icmp_mip = -1;
static gint ett_icmp_mip_flags = -1;
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
/* MPLS extensions */
static gint ett_icmp_mpls = -1;
static gint ett_icmp_mpls_object = -1;
static gint ett_icmp_mpls_stack_object = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
/* ICMP definitions */
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define ICMP_ECHOREPLY 0
#define ICMP_UNREACH 3
#define ICMP_SOURCEQUENCH 4
#define ICMP_REDIRECT 5
#define ICMP_ECHO 8
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
#define ICMP_RTRADVERT 9
#define ICMP_RTRSOLICIT 10
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define ICMP_TIMXCEED 11
#define ICMP_PARAMPROB 12
#define ICMP_TSTAMP 13
#define ICMP_TSTAMPREPLY 14
#define ICMP_IREQ 15
#define ICMP_IREQREPLY 16
#define ICMP_MASKREQ 17
#define ICMP_MASKREPLY 18
Added John McDermott's patch for handling ICMP Unreachable|Fragmentation Required packets. svn path=/trunk/; revision=455
1999-08-09 18:18:38 +00:00
/* ICMP UNREACHABLE */
#define ICMP_NET_UNREACH 0 /* Network Unreachable */
#define ICMP_HOST_UNREACH 1 /* Host Unreachable */
#define ICMP_PROT_UNREACH 2 /* Protocol Unreachable */
#define ICMP_PORT_UNREACH 3 /* Port Unreachable */
#define ICMP_FRAG_NEEDED 4 /* Fragmentation Needed/DF set */
#define ICMP_SR_FAILED 5 /* Source Route failed */
#define ICMP_NET_UNKNOWN 6
#define ICMP_HOST_UNKNOWN 7
#define ICMP_HOST_ISOLATED 8
#define ICMP_NET_ANO 9
#define ICMP_HOST_ANO 10
#define ICMP_NET_UNR_TOS 11
#define ICMP_HOST_UNR_TOS 12
#define ICMP_PKT_FILTERED 13 /* Packet filtered */
#define ICMP_PREC_VIOLATION 14 /* Precedence violation */
#define ICMP_PREC_CUTOFF 15 /* Precedence cut off */
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
/* IP structs and definitions */
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
/* Offsets of fields within an IP header. */
#define IPH_V_HL 0
#define IPH_TOS 1
#define IPH_LEN 2
#define IPH_ID 4
#define IPH_TTL 6
#define IPH_OFF 8
#define IPH_P 9
#define IPH_SUM 10
#define IPH_SRC 12
#define IPH_DST 16
Check to make sure the header length is at least the minimum length for an IP header. svn path=/trunk/; revision=906
1999-10-22 03:52:06 +00:00
/* Minimum IP header length. */
#define IPH_MIN_LEN 20
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
/* IP flags. */
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
#define IP_RF 0x8000 /* Flag: "Reserved bit" */
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define IP_DF 0x4000 /* Flag: "Don't Fragment" */
#define IP_MF 0x2000 /* Flag: "More Fragments" */
#define IP_OFFSET 0x1FFF /* "Fragment Offset" part */
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
/* Differentiated Services Field. See RFCs 2474, 2597 and 2598. */
#define IPDSFIELD_DSCP_MASK 0xFC
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
#define IPDSFIELD_ECN_MASK 0x03
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
#define IPDSFIELD_DSCP_SHIFT 2
#define IPDSFIELD_DSCP(dsfield) (((dsfield)&IPDSFIELD_DSCP_MASK)>>IPDSFIELD_DSCP_SHIFT)
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
#define IPDSFIELD_ECN(dsfield) ((dsfield)&IPDSFIELD_ECN_MASK)
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
#define IPDSFIELD_DSCP_DEFAULT 0x00
#define IPDSFIELD_DSCP_CS1 0x08
#define IPDSFIELD_DSCP_CS2 0x10
#define IPDSFIELD_DSCP_CS3 0x18
#define IPDSFIELD_DSCP_CS4 0x20
#define IPDSFIELD_DSCP_CS5 0x28
#define IPDSFIELD_DSCP_CS6 0x30
#define IPDSFIELD_DSCP_CS7 0x38
#define IPDSFIELD_DSCP_AF11 0x0A
#define IPDSFIELD_DSCP_AF12 0x0C
#define IPDSFIELD_DSCP_AF13 0x0E
#define IPDSFIELD_DSCP_AF21 0x12
#define IPDSFIELD_DSCP_AF22 0x14
#define IPDSFIELD_DSCP_AF23 0x16
#define IPDSFIELD_DSCP_AF31 0x1A
#define IPDSFIELD_DSCP_AF32 0x1C
#define IPDSFIELD_DSCP_AF33 0x1E
#define IPDSFIELD_DSCP_AF41 0x22
#define IPDSFIELD_DSCP_AF42 0x24
#define IPDSFIELD_DSCP_AF43 0x26
#define IPDSFIELD_DSCP_EF 0x2E
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
#define IPDSFIELD_ECT_MASK 0x02
#define IPDSFIELD_CE_MASK 0x01
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
/* IP TOS, superseded by the DS Field, RFC 2474. */
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK)
#define IPTOS_NONE 0x00
#define IPTOS_LOWCOST 0x02
#define IPTOS_RELIABILITY 0x04
#define IPTOS_THROUGHPUT 0x08
#define IPTOS_LOWDELAY 0x10
#define IPTOS_SECURITY 0x1E
#define IPTOS_PREC_MASK 0xE0
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
#define IPTOS_PREC_SHIFT 5
#define IPTOS_PREC(tos) (((tos)&IPTOS_PREC_MASK)>>IPTOS_PREC_SHIFT)
#define IPTOS_PREC_NETCONTROL 7
#define IPTOS_PREC_INTERNETCONTROL 6
#define IPTOS_PREC_CRITIC_ECP 5
#define IPTOS_PREC_FLASHOVERRIDE 4
#define IPTOS_PREC_FLASH 3
#define IPTOS_PREC_IMMEDIATE 2
#define IPTOS_PREC_PRIORITY 1
#define IPTOS_PREC_ROUTINE 0
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
/* IP options */
#define IPOPT_COPY 0x80
#define IPOPT_CONTROL 0x00
#define IPOPT_RESERVED1 0x20
#define IPOPT_MEASUREMENT 0x40
#define IPOPT_RESERVED2 0x60
#define IPOPT_END (0 |IPOPT_CONTROL)
#define IPOPT_NOOP (1 |IPOPT_CONTROL)
#define IPOPT_SEC (2 |IPOPT_CONTROL|IPOPT_COPY)
#define IPOPT_LSRR (3 |IPOPT_CONTROL|IPOPT_COPY)
#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
#define IPOPT_CIPSO (6 |IPOPT_CONTROL|IPOPT_COPY)
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define IPOPT_RR (7 |IPOPT_CONTROL)
#define IPOPT_SID (8 |IPOPT_CONTROL|IPOPT_COPY)
#define IPOPT_SSRR (9 |IPOPT_CONTROL|IPOPT_COPY)
#define IPOPT_RA (20|IPOPT_CONTROL|IPOPT_COPY)
/* IP option lengths */
#define IPOLEN_SEC 11
#define IPOLEN_LSRR_MIN 3
#define IPOLEN_TIMESTAMP_MIN 5
#define IPOLEN_RR_MIN 3
#define IPOLEN_SID 4
#define IPOLEN_SSRR_MIN 3
Added support for Router-Alert IP option (RFC2113) svn path=/trunk/; revision=2753
2000-12-13 16:38:20 +00:00
#define IPOLEN_RA 4
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
#define IPOLEN_CIPSO_MIN 10
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#define IPSEC_UNCLASSIFIED 0x0000
#define IPSEC_CONFIDENTIAL 0xF135
#define IPSEC_EFTO 0x789A
#define IPSEC_MMMM 0xBC4D
#define IPSEC_RESTRICTED 0xAF13
#define IPSEC_SECRET 0xD788
#define IPSEC_TOPSECRET 0x6BC5
#define IPSEC_RESERVED1 0x35E2
#define IPSEC_RESERVED2 0x9AF1
#define IPSEC_RESERVED3 0x4D78
#define IPSEC_RESERVED4 0x24BD
#define IPSEC_RESERVED5 0x135E
#define IPSEC_RESERVED6 0x89AF
#define IPSEC_RESERVED7 0xC4D6
#define IPSEC_RESERVED8 0xE26B
#define IPOPT_TS_TSONLY 0 /* timestamps only */
#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
#define IPOPT_TS_PRESPEC 3 /* specified modules only */
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
/*
* defragmentation of IPv4
*/
Move the fragment reassembly code into "reassemble.c" and "reassemble.h", and remove IPv4 dependencies from it. Use it for OSI CLNP segment reassembly as well. svn path=/trunk/; revision=3525
2001-06-08 06:27:16 +00:00
static GHashTable *ip_fragment_table = NULL;
We can't use the frame_data structure as a key structure when looking for reassembled frames - in Tethereal, there's only one frame_data structure used for all frames. Instead, use the frame number itself as the key. Add a "fragment_add_check()" routine, for fragments where there's a fragment offset rather than a fragment sequence number, which does the same sort of thing as "fragment_add_seq_check()" - i.e., once reassembly is done, it puts the reassembled fragment into a separate hash table, so that there're only incomplete reassemblies in the fragment hash table. That's necessary in order to handle cases where the packet ID field can be reused. Use that routine for IPv4 fragment reassembly - IP IDs can be reused (in fact, RFC 791 suggests that doing so might be a feature: It is appropriate for some higher level protocols to choose the identifier. For example, TCP protocol modules may retransmit an identical TCP segment, and the probability for correct reception would be enhanced if the retransmission carried the same identifier as the original transmission since fragments of either datagram could be used to construct a correct TCP segment. and RFC 1122 says that it's permitted to do so, although it also says "we believe that retransmitting the same Identification field is not useful": 3.2.1.5 Identification: RFC-791 Section 3.2 When sending an identical copy of an earlier datagram, a host MAY optionally retain the same Identification field in the copy. DISCUSSION: Some Internet protocol experts have maintained that when a host sends an identical copy of an earlier datagram, the new copy should contain the same Identification value as the original. There are two suggested advantages: (1) if the datagrams are fragmented and some of the fragments are lost, the receiver may be able to reconstruct a complete datagram from fragments of the original and the copies; (2) a congested gateway might use the IP Identification field (and Fragment Offset) to discard duplicate datagrams from the queue. However, the observed patterns of datagram loss in the Internet do not favor the probability of retransmitted fragments filling reassembly gaps, while other mechanisms (e.g., TCP repacketizing upon retransmission) tend to prevent retransmission of an identical datagram [IP:9]. Therefore, we believe that retransmitting the same Identification field is not useful. Also, a connectionless transport protocol like UDP would require the cooperation of the application programs to retain the same Identification value in identical datagrams. and, in any case, I've seen that in at least one capture, and it confuses the current reassembly code). Unfortunately, that means that fragments other than the last fragment can't be tagged with the frame number in which the reassembly was done; see the comment in packet-ip.c for a discussion of that problem. svn path=/trunk/; revision=7506
2003-04-20 00:11:28 +00:00
static GHashTable *ip_reassembled_table = NULL;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
static void
ip_defragment_init(void)
{
Move the fragment reassembly code into "reassemble.c" and "reassemble.h", and remove IPv4 dependencies from it. Use it for OSI CLNP segment reassembly as well. svn path=/trunk/; revision=3525
2001-06-08 06:27:16 +00:00
fragment_table_init(&ip_fragment_table);
We can't use the frame_data structure as a key structure when looking for reassembled frames - in Tethereal, there's only one frame_data structure used for all frames. Instead, use the frame number itself as the key. Add a "fragment_add_check()" routine, for fragments where there's a fragment offset rather than a fragment sequence number, which does the same sort of thing as "fragment_add_seq_check()" - i.e., once reassembly is done, it puts the reassembled fragment into a separate hash table, so that there're only incomplete reassemblies in the fragment hash table. That's necessary in order to handle cases where the packet ID field can be reused. Use that routine for IPv4 fragment reassembly - IP IDs can be reused (in fact, RFC 791 suggests that doing so might be a feature: It is appropriate for some higher level protocols to choose the identifier. For example, TCP protocol modules may retransmit an identical TCP segment, and the probability for correct reception would be enhanced if the retransmission carried the same identifier as the original transmission since fragments of either datagram could be used to construct a correct TCP segment. and RFC 1122 says that it's permitted to do so, although it also says "we believe that retransmitting the same Identification field is not useful": 3.2.1.5 Identification: RFC-791 Section 3.2 When sending an identical copy of an earlier datagram, a host MAY optionally retain the same Identification field in the copy. DISCUSSION: Some Internet protocol experts have maintained that when a host sends an identical copy of an earlier datagram, the new copy should contain the same Identification value as the original. There are two suggested advantages: (1) if the datagrams are fragmented and some of the fragments are lost, the receiver may be able to reconstruct a complete datagram from fragments of the original and the copies; (2) a congested gateway might use the IP Identification field (and Fragment Offset) to discard duplicate datagrams from the queue. However, the observed patterns of datagram loss in the Internet do not favor the probability of retransmitted fragments filling reassembly gaps, while other mechanisms (e.g., TCP repacketizing upon retransmission) tend to prevent retransmission of an identical datagram [IP:9]. Therefore, we believe that retransmitting the same Identification field is not useful. Also, a connectionless transport protocol like UDP would require the cooperation of the application programs to retain the same Identification value in identical datagrams. and, in any case, I've seen that in at least one capture, and it confuses the current reassembly code). Unfortunately, that means that fragments other than the last fragment can't be tagged with the frame number in which the reassembly was done; see the comment in packet-ip.c for a discussion of that problem. svn path=/trunk/; revision=7506
2003-04-20 00:11:28 +00:00
reassembled_table_init(&ip_reassembled_table);
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
}
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
void
Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
capture_ip(const guchar *pd, int offset, int len, packet_counts *ld) {
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
if (!BYTES_ARE_IN_FRAME(offset, len, IPH_MIN_LEN)) {
In "dissect_eth()", update "pi.len" and "pi.captured_len" regardless of whether we're building a protocol tree or not. Make "dissect_eth()" use "BYTES_ARE_IN_FRAME()" to see if we have a full Ethernet header - it can be called with a non-zero offset, if Ethernet frames are encapsulated inside other frames (e.g., ATM LANE). Make capture routines take an "offset" argument if the corresponding dissect routine takes one (for symmetry, and for Cisco ISL or any other protocol that encapsulates Ethernet or Token-Ring frames inside other frames). Pass the frame lengths to capture routines via the "pi" structure, rather than as an in-line argument, so that they can macros such as "BYTES_ARE_IN_FRAME()" the way the corresponding dissect routines do. Make capture routines update "pi.len" and "pi.captured_len" the same way the corresponding diseect routines do, if the capture routines then call other capture routines. Make "capture_vlan()" count as "other" frames that are too short, the way other capture routines do. svn path=/trunk/; revision=1525
2000-01-23 08:55:37 +00:00
ld->other++;
return;
}
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
switch (pd[offset + 9]) {
case IP_PROTO_TCP:
ld->tcp++;
break;
case IP_PROTO_UDP:
Add UDP-Lite packets to the UDP statistics svn path=/trunk/; revision=16983
2006-01-09 23:00:20 +00:00
case IP_PROTO_UDPLITE:
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
ld->udp++;
break;
Add ICMP to the set of packet types counted in the window shown while a capture is in progress. svn path=/trunk/; revision=491
1999-08-14 23:47:20 +00:00
case IP_PROTO_ICMP:
Count ICMPv6 packets as ICMP when capturing. Check the next header type - properly handling extension headers - in "capture_ipv6()". Get rid of the count of IPv6 packets - we break that down in "capture_ipv6()" now. Fix a typo. svn path=/trunk/; revision=6510
2002-10-25 23:23:28 +00:00
case IP_PROTO_ICMPV6: /* XXX - separate counters? */
Add ICMP to the set of packet types counted in the window shown while a capture is in progress. svn path=/trunk/; revision=491
1999-08-14 23:47:20 +00:00
ld->icmp++;
break;
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
case IP_PROTO_SCTP:
ld->sctp++;
break;
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
case IP_PROTO_OSPF:
ld->ospf++;
break;
Added PPPoE, PPTP, GRE, and ISAKMP dissectors. svn path=/trunk/; revision=303
1999-06-11 15:30:55 +00:00
case IP_PROTO_GRE:
ld->gre++;
break;
Joerg Mayer's updates to the VINES dissector and to protocol layers above VINES. svn path=/trunk/; revision=1514
2000-01-20 21:34:16 +00:00
case IP_PROTO_VINES:
Fix a typo in the packet counter. svn path=/trunk/; revision=1934
2000-05-10 21:36:55 +00:00
ld->vines++;
Joerg Mayer's updates to the VINES dissector and to protocol layers above VINES. svn path=/trunk/; revision=1514
2000-01-20 21:34:16 +00:00
break;
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
default:
ld->other++;
}
}
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
static void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ipopt_security(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *field_tree = NULL;
proto_item *tf;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
guint val;
Add the "Maximize security" type of service for IP, from RFC 1455. Make the arguments to "val_to_str()" and "match_strval()" that point to things those routines don't modify pointers to "const", and make the "value_string" tables passed into those routines in "packet-ip.c" "const". svn path=/trunk/; revision=72
1998-10-28 01:16:49 +00:00
static const value_string secl_vals[] = {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{IPSEC_UNCLASSIFIED, "Unclassified"},
{IPSEC_CONFIDENTIAL, "Confidential"},
{IPSEC_EFTO, "EFTO" },
{IPSEC_MMMM, "MMMM" },
{IPSEC_RESTRICTED, "Restricted" },
{IPSEC_SECRET, "Secret" },
{IPSEC_TOPSECRET, "Top secret" },
{IPSEC_RESERVED1, "Reserved" },
{IPSEC_RESERVED2, "Reserved" },
{IPSEC_RESERVED3, "Reserved" },
{IPSEC_RESERVED4, "Reserved" },
{IPSEC_RESERVED5, "Reserved" },
{IPSEC_RESERVED6, "Reserved" },
{IPSEC_RESERVED7, "Reserved" },
* Copied in the correct GNU license (I'm such a goober) * Hacks to the filter interface (Gerald) * About box (Laurent) * AppleTalk support (Simon) * Mods to the match_strval routine (Gerald) svn path=/trunk/; revision=61
1998-10-16 01:18:35 +00:00
{IPSEC_RESERVED8, "Reserved" },
{0, NULL } };
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s:", optp->name);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += 2;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
val = tvb_get_ntohs(tvb, offset);
proto_tree_add_text(field_tree, tvb, offset, 2,
Add a "val_to_str()" routine that calls "match_strval()" and, if it returns NULL, formats the value with the format passed in as an argument, and returns a pointer to that static buffer. Change several "match_strval()" calls to use "val_to_str()". In "dissect_ospf()", use "match_strval()" to look up the packet type, and use "Unknown" if it doesn't find a match. svn path=/trunk/; revision=66
1998-10-20 05:31:03 +00:00
"Security: %s", val_to_str(val, secl_vals, "Unknown (0x%x)"));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += 2;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
val = tvb_get_ntohs(tvb, offset);
proto_tree_add_text(field_tree, tvb, offset, 2,
Fix some "proto_tree_add_text()" calls. svn path=/trunk/; revision=1696
2000-03-07 05:28:39 +00:00
"Compartments: %u", val);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += 2;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset, 2,
"Handling restrictions: %c%c",
tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset + 1));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += 2;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset, 3,
"Transmission control code: %c%c%c",
tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset + 1),
tvb_get_guint8(tvb, offset + 2));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
}
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
/* USHRT_MAX can hold at most 5 (base 10) digits (6 for the NULL byte) */
#define USHRT_MAX_STRLEN 6
/* Maximum CIPSO tag length:
* (IP hdr max)60 - (IPv4 hdr std)20 - (CIPSO base)6 = 34 */
#define CIPSO_TAG_LEN_MAX 34
/* The Commercial IP Security Option (CIPSO) is defined in IETF draft
* draft-ietf-cipso-ipsecurity-01.txt and FIPS 188, a copy of both documents
* can be found at the NetLabel project page, http://netlabel.sf.net. */
static void
dissect_ipopt_cipso(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree)
{
proto_tree *field_tree = NULL;
proto_item *tf;
guint tagtype, taglen;
int offset_max = offset + optlen;
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s", optp->name);
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
offset += 2;
proto_tree_add_text(field_tree, tvb, offset, 4, "DOI: %u",
tvb_get_ntohl(tvb, offset));
offset += 4;
/* loop through all of the tags in the CIPSO option */
while (offset < offset_max) {
tagtype = tvb_get_guint8(tvb, offset);
if ((offset + 1) < offset_max)
taglen = tvb_get_guint8(tvb, offset + 1);
else
taglen = 1;
switch (tagtype) {
case 0:
/* padding - skip this tag */
offset += 1;
continue;
break;
case 1:
/* restrictive bitmap, see CIPSO draft section 3.4.2 for tag format */
if ((taglen < 4) || (taglen > CIPSO_TAG_LEN_MAX) ||
((offset + (int)taglen - 1) > offset_max)) {
proto_tree_add_text(field_tree, tvb, offset, offset_max - offset,
"Malformed CIPSO tag");
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Restrictive Category Bitmap (%u)",
tagtype);
/* skip past alignment octet */
offset += 3;
proto_tree_add_text(field_tree, tvb, offset, 1, "Sensitivity Level: %u",
tvb_get_guint8(tvb, offset));
offset += 1;
if (taglen > 4) {
guint bit_spot = 0;
guint byte_spot = 0;
unsigned char bitmask;
char *cat_str;
char *cat_str_tmp = ep_alloc(USHRT_MAX_STRLEN);
size_t cat_str_len;
const guint8 *val_ptr = tvb_get_ptr(tvb, offset, taglen - 4);
/* this is just a guess regarding string size, but we grow it below
* if needed */
cat_str_len = 256;
cat_str = ep_alloc0(cat_str_len);
/* we checked the length above so the highest category value
* possibile here is 240 */
while (byte_spot < (taglen - 4)) {
bitmask = 0x80;
bit_spot = 0;
while (bit_spot < 8) {
if (val_ptr[byte_spot] & bitmask) {
g_snprintf(cat_str_tmp, USHRT_MAX_STRLEN, "%u",
byte_spot * 8 + bit_spot);
cat_str_tmp[USHRT_MAX_STRLEN - 1] = '\0';
if (cat_str_len < (strlen(cat_str) + 2 + USHRT_MAX_STRLEN)) {
char *cat_str_new;
while (cat_str_len < (strlen(cat_str) + 2 + USHRT_MAX_STRLEN))
cat_str_len += cat_str_len;
cat_str_new = ep_alloc(cat_str_len);
strncpy(cat_str_new, cat_str, cat_str_len);
cat_str_new[cat_str_len - 1] = '\0';
cat_str = cat_str_new;
}
if (cat_str[0] != '\0')
strncat(cat_str, ",", cat_str_len - 1);
strncat(cat_str, cat_str_tmp, cat_str_len - 1);
}
bit_spot++;
bitmask >>= 1;
}
byte_spot++;
}
if (cat_str)
proto_tree_add_text(field_tree, tvb, offset, taglen - 4,
"Categories: %s", cat_str);
else
proto_tree_add_text(field_tree, tvb, offset, taglen - 4,
"Categories: ERROR PARSING CATEGORIES");
offset += taglen - 4;
}
break;
case 2:
/* enumerated categories, see CIPSO draft section 3.4.3 for tag format */
if ((taglen < 4) || (taglen > CIPSO_TAG_LEN_MAX) ||
((offset + (int)taglen - 1) > offset_max)) {
proto_tree_add_text(field_tree, tvb, offset, offset_max - offset,
"Malformed CIPSO tag");
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Enumerated Categories (%u)", tagtype);
/* skip past alignment octet */
offset += 3;
/* sensitvity level */
proto_tree_add_text(field_tree, tvb, offset, 1, "Sensitivity Level: %u",
tvb_get_guint8(tvb, offset));
offset += 1;
if (taglen > 4) {
int offset_max_cat = offset + taglen - 4;
char *cat_str = ep_alloc0(USHRT_MAX_STRLEN * 15);
char *cat_str_tmp = ep_alloc(USHRT_MAX_STRLEN);
while ((offset + 2) <= offset_max_cat) {
g_snprintf(cat_str_tmp, USHRT_MAX_STRLEN, "%u",
tvb_get_ntohs(tvb, offset));
offset += 2;
cat_str_tmp[USHRT_MAX_STRLEN - 1] = '\0';
if (cat_str[0] != '\0')
strncat(cat_str, ",", USHRT_MAX_STRLEN * 15 - 1);
strncat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 15 - 1);
}
proto_tree_add_text(field_tree, tvb, offset - taglen + 4, taglen - 4,
"Categories: %s", cat_str);
}
break;
case 5:
/* ranged categories, see CIPSO draft section 3.4.4 for tag format */
if ((taglen < 4) || (taglen > CIPSO_TAG_LEN_MAX) ||
((offset + (int)taglen - 1) > offset_max)) {
proto_tree_add_text(field_tree, tvb, offset, offset_max - offset,
"Malformed CIPSO tag");
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Ranged Categories (%u)", tagtype);
/* skip past alignment octet */
offset += 3;
/* sensitvity level */
proto_tree_add_text(field_tree, tvb, offset, 1, "Sensitivity Level: %u",
tvb_get_guint8(tvb, offset));
offset += 1;
if (taglen > 4) {
guint16 cat_low, cat_high;
int offset_max_cat = offset + taglen - 4;
char *cat_str = ep_alloc0(USHRT_MAX_STRLEN * 16);
char *cat_str_tmp = ep_alloc(USHRT_MAX_STRLEN * 2);
while ((offset + 2) <= offset_max_cat) {
cat_high = tvb_get_ntohs(tvb, offset);
if ((offset + 4) <= offset_max_cat) {
cat_low = tvb_get_ntohs(tvb, offset + 2);
offset += 4;
} else {
cat_low = 0;
offset += 2;
}
if (cat_low != cat_high)
g_snprintf(cat_str_tmp, USHRT_MAX_STRLEN * 2, "%u-%u",
cat_high, cat_low);
else
g_snprintf(cat_str_tmp, USHRT_MAX_STRLEN * 2, "%u", cat_high);
if (cat_str[0] != '\0')
strncat(cat_str, ",", USHRT_MAX_STRLEN * 16 - 1);
strncat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 16 - 1);
}
proto_tree_add_text(field_tree, tvb, offset - taglen + 4, taglen - 4,
"Categories: %s", cat_str);
}
break;
case 6:
/* permissive categories, see FIPS 188 section 6.9 for tag format */
if ((taglen < 4) || (taglen > CIPSO_TAG_LEN_MAX) ||
((offset + (int)taglen - 1) > offset_max)) {
proto_tree_add_text(field_tree, tvb, offset, offset_max - offset,
"Malformed CIPSO tag");
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Permissive Categories (%u)", tagtype);
proto_tree_add_text(field_tree, tvb, offset + 2, taglen - 2, "Tag data");
offset += taglen;
break;
case 7:
/* free form, see FIPS 188 section 6.10 for tag format */
if ((taglen < 2) || (taglen > CIPSO_TAG_LEN_MAX) ||
((offset + (int)taglen - 1) > offset_max)) {
proto_tree_add_text(field_tree, tvb, offset, offset_max - offset,
"Malformed CIPSO tag");
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Free Form (%u)", tagtype);
proto_tree_add_text(field_tree, tvb, offset + 2, taglen - 2, "Tag data");
offset += taglen;
break;
default:
/* unknown tag - stop parsing this IPv4 option */
if ((offset + 1) <= offset_max) {
taglen = tvb_get_guint8(tvb, offset + 1);
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Unknown (%u) (%u bytes)",
tagtype, taglen);
return;
}
proto_tree_add_text(field_tree, tvb, offset, 1,
"Tag Type: Unknown (%u) (invalid format)",
tagtype);
return;
}
}
}
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
static void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ipopt_route(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *field_tree = NULL;
proto_item *tf;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
int ptr;
int optoffset = 0;
From Joerg Mayer: Change struct addr to guint32 which is the way it is used anyway. Use the GLib macros to convert from network to host byte order. svn path=/trunk/; revision=5878
2002-07-15 20:54:45 +00:00
guint32 addr;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s (%u bytes)",
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
optp->name, optlen);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
optoffset += 2; /* skip past type and length */
optlen -= 2; /* subtract size of type and length */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ptr = tvb_get_guint8(tvb, offset + optoffset);
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"Pointer: %d%s", ptr,
((ptr < 4) ? " (points before first address)" :
((ptr & 3) ? " (points to middle of address)" : "")));
optoffset++;
optlen--;
ptr--; /* ptr is 1-origin */
while (optlen > 0) {
if (optlen < 4) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset, optlen,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"(suboption would go past end of option)");
break;
}
Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32, and that extract IPv6 addresses into a "struct e_in6_addr", with tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we remove, by using proto_tree_add_item(), rather than replacing. Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct e_in6_addr" (not necessary to declare the tvbuff routines, but including it there means "struct e_in6_addr" is guaranteed to be defined before those declarations, so we don't get compiler complaints if we define it *after* those declarations). svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
addr = tvb_get_ipv4(tvb, offset + optoffset);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, 4,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"%s%s",
From Joerg Mayer: Change struct addr to guint32 which is the way it is used anyway. Use the GLib macros to convert from network to host byte order. svn path=/trunk/; revision=5878
2002-07-15 20:54:45 +00:00
((addr == 0) ? "-" : (char *)get_hostname(addr)),
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
((optoffset == ptr) ? " <- (current)" : ""));
optoffset += 4;
optlen -= 4;
}
}
static void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ipopt_sid(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
guint optlen, packet_info *pinfo _U_,
proto_tree *opt_tree)
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, optlen,
"%s: %u", optp->name, tvb_get_ntohs(tvb, offset + 2));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
}
static void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ipopt_timestamp(const ip_tcp_opt *optp, tvbuff_t *tvb,
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
int offset, guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree)
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *field_tree = NULL;
proto_item *tf;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
int ptr;
int optoffset = 0;
int flg;
Add the "Maximize security" type of service for IP, from RFC 1455. Make the arguments to "val_to_str()" and "match_strval()" that point to things those routines don't modify pointers to "const", and make the "value_string" tables passed into those routines in "packet-ip.c" "const". svn path=/trunk/; revision=72
1998-10-28 01:16:49 +00:00
static const value_string flag_vals[] = {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{IPOPT_TS_TSONLY, "Time stamps only" },
{IPOPT_TS_TSANDADDR, "Time stamp and address" },
* Copied in the correct GNU license (I'm such a goober) * Hacks to the filter interface (Gerald) * About box (Laurent) * AppleTalk support (Simon) * Mods to the match_strval routine (Gerald) svn path=/trunk/; revision=61
1998-10-16 01:18:35 +00:00
{IPOPT_TS_PRESPEC, "Time stamps for prespecified addresses"},
{0, NULL } };
From Joerg Mayer: Change struct addr to guint32 which is the way it is used anyway. Use the GLib macros to convert from network to host byte order. svn path=/trunk/; revision=5878
2002-07-15 20:54:45 +00:00
guint32 addr;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
guint ts;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s:", optp->name);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
optoffset += 2; /* skip past type and length */
optlen -= 2; /* subtract size of type and length */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ptr = tvb_get_guint8(tvb, offset + optoffset);
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"Pointer: %d%s", ptr,
((ptr < 5) ? " (points before first address)" :
(((ptr - 1) & 3) ? " (points to middle of address)" : "")));
optoffset++;
optlen--;
ptr--; /* ptr is 1-origin */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
flg = tvb_get_guint8(tvb, offset + optoffset);
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
"Overflow: %u", flg >> 4);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
flg &= 0xF;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
Add a "val_to_str()" routine that calls "match_strval()" and, if it returns NULL, formats the value with the format passed in as an argument, and returns a pointer to that static buffer. Change several "match_strval()" calls to use "val_to_str()". In "dissect_ospf()", use "match_strval()" to look up the packet type, and use "Unknown" if it doesn't find a match. svn path=/trunk/; revision=66
1998-10-20 05:31:03 +00:00
"Flag: %s", val_to_str(flg, flag_vals, "Unknown (0x%x)"));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
optoffset++;
optlen--;
while (optlen > 0) {
if (flg == IPOPT_TS_TSANDADDR) {
In dissect_ipopt_timestamp() : Correct a bug reported by Paul Ionescu when dissecting a timestamp IP option. The offsets where not correct. svn path=/trunk/; revision=1596
2000-02-02 22:07:38 +00:00
if (optlen < 8) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, optlen,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"(suboption would go past end of option)");
break;
}
Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32, and that extract IPv6 addresses into a "struct e_in6_addr", with tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we remove, by using proto_tree_add_item(), rather than replacing. Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct e_in6_addr" (not necessary to declare the tvbuff routines, but including it there means "struct e_in6_addr" is guaranteed to be defined before those declarations, so we don't get compiler complaints if we define it *after* those declarations). svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
addr = tvb_get_ipv4(tvb, offset + optoffset);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ts = tvb_get_ntohl(tvb, offset + optoffset + 4);
In dissect_ipopt_timestamp() : Correct a bug reported by Paul Ionescu when dissecting a timestamp IP option. The offsets where not correct. svn path=/trunk/; revision=1596
2000-02-02 22:07:38 +00:00
optlen -= 8;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, 8,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"Address = %s, time stamp = %u",
From Joerg Mayer: Change struct addr to guint32 which is the way it is used anyway. Use the GLib macros to convert from network to host byte order. svn path=/trunk/; revision=5878
2002-07-15 20:54:45 +00:00
((addr == 0) ? "-" : (char *)get_hostname(addr)),
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
ts);
optoffset += 8;
} else {
if (optlen < 4) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, optlen,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"(suboption would go past end of option)");
break;
}
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ts = tvb_get_ntohl(tvb, offset + optoffset);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
optlen -= 4;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(field_tree, tvb, offset + optoffset, 4,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
"Time stamp = %u", ts);
optoffset += 4;
}
}
}
Added support for Router-Alert IP option (RFC2113) svn path=/trunk/; revision=2753
2000-12-13 16:38:20 +00:00
static void
dissect_ipopt_ra(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree)
Added support for Router-Alert IP option (RFC2113) svn path=/trunk/; revision=2753
2000-12-13 16:38:20 +00:00
{
/* Router-Alert, as defined by RFC2113 */
int opt = tvb_get_ntohs(tvb, offset + 2);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
static const value_string ra_opts[] = {
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{0, "Every router examines packet"},
{0, NULL}
};
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Added support for Router-Alert IP option (RFC2113) svn path=/trunk/; revision=2753
2000-12-13 16:38:20 +00:00
proto_tree_add_text(opt_tree, tvb, offset, optlen,
"%s: %s", optp->name, val_to_str(opt, ra_opts, "Unknown (%d)"));
return;
}
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
static const ip_tcp_opt ipopts[] = {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
IPOPT_END,
"EOL",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
NULL,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
NO_LENGTH,
0,
NULL,
},
{
IPOPT_NOOP,
"NOP",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
NULL,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
NO_LENGTH,
0,
NULL,
},
{
IPOPT_SEC,
"Security",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_option_sec,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
FIXED_LENGTH,
IPOLEN_SEC,
dissect_ipopt_security
},
{
IPOPT_SSRR,
"Strict source route",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_option_route,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
VARIABLE_LENGTH,
IPOLEN_SSRR_MIN,
dissect_ipopt_route
},
{
IPOPT_LSRR,
"Loose source route",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_option_route,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
VARIABLE_LENGTH,
IPOLEN_LSRR_MIN,
dissect_ipopt_route
},
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
{
IPOPT_CIPSO,
"Commercial IP security option",
&ett_ip_option_cipso,
VARIABLE_LENGTH,
IPOLEN_CIPSO_MIN,
dissect_ipopt_cipso
},
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
IPOPT_RR,
"Record route",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_option_route,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
VARIABLE_LENGTH,
IPOLEN_RR_MIN,
dissect_ipopt_route
},
{
IPOPT_SID,
"Stream identifier",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
NULL,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
FIXED_LENGTH,
IPOLEN_SID,
dissect_ipopt_sid
},
{
IPOPT_TIMESTAMP,
"Time stamp",
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_option_timestamp,
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
VARIABLE_LENGTH,
IPOLEN_TIMESTAMP_MIN,
dissect_ipopt_timestamp
Added support for Router-Alert IP option (RFC2113) svn path=/trunk/; revision=2753
2000-12-13 16:38:20 +00:00
},
{
IPOPT_RA,
"Router Alert",
NULL,
FIXED_LENGTH,
IPOLEN_RA,
dissect_ipopt_ra
},
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
};
#define N_IP_OPTS (sizeof ipopts / sizeof ipopts[0])
/* Dissect the IP or TCP options in a packet. */
void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ip_tcp_options(tvbuff_t *tvb, int offset, guint length,
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
const ip_tcp_opt *opttab, int nopts, int eol,
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
packet_info *pinfo, proto_tree *opt_tree)
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
{
Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
guchar opt;
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
const ip_tcp_opt *optp;
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
opt_len_type len_type;
More signed vs. unsigned cleanups, and initialization cleanups, from Joerg Mayer. svn path=/trunk/; revision=3578
2001-06-19 23:08:57 +00:00
unsigned int optlen;
Squelch another const warning. svn path=/trunk/; revision=15111
2005-07-27 01:12:44 +00:00
const char *name;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *,
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
int, guint, packet_info *, proto_tree *);
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
guint len;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
while (length > 0) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
opt = tvb_get_guint8(tvb, offset);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
for (optp = &opttab[0]; optp < &opttab[nopts]; optp++) {
if (optp->optcode == opt)
break;
}
if (optp == &opttab[nopts]) {
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
/* We assume that the only NO_LENGTH options are EOL and NOP options,
so that we can treat unknown options as VARIABLE_LENGTH with a
minimum of 2, and at least be able to move on to the next option
by using the length in the option. */
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
optp = NULL; /* indicate that we don't know this option */
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
len_type = VARIABLE_LENGTH;
optlen = 2;
taking a look at it the name_str var is unnecessary svn path=/trunk/; revision=20428
2007-01-14 20:19:00 +00:00
name = ep_strdup_printf("Unknown (0x%02x)", opt);
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
dissect = NULL;
} else {
len_type = optp->len_type;
optlen = optp->optlen;
name = optp->name;
dissect = optp->dissect;
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
}
--length; /* account for type byte */
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
if (len_type != NO_LENGTH) {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
/* Option has a length. Is it in the packet? */
if (length == 0) {
/* Bogus - packet must at least include option code byte and
length byte! */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, 1,
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
"%s (length byte past end of options)", name);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
}
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
len = tvb_get_guint8(tvb, offset + 1); /* total including type, len */
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
--length; /* account for length byte */
if (len < 2) {
/* Bogus - option length is too short to include option code and
option length. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, 2,
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
"%s (with too-short option length = %u byte%s)", name,
Fix problem with number of format args for "option length too short". Problem reported by James Coe <jammer@cin.net> svn path=/trunk/; revision=1309
1999-12-13 05:09:05 +00:00
len, plurality(len, "", "s"));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
} else if (len - 2 > length) {
/* Bogus - option goes past the end of the header. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, length,
PPP options in LCP, IPCP, etc. are like IP and TCP options - one octet of option code, one octet of length (which includes the two option code and length bytes), followed by 0 or more octets of option data, with some options being fixed-length and some being variable-length. Put some stuff from the PPP control protocol option parsing code into the IP-and-TCP option parsing code, and use the latter instead of the former. (That code might also be usable for CDP as well, with some stuff added to it.) Shuffle the arguments to "dissect_ip_tcp_options()" to resemble those of various other dissectors (i.e., with the "proto_tree *" at the end). Add in code to dissect a pile of PPP options documented in various RFCs. svn path=/trunk/; revision=601
1999-08-28 08:31:28 +00:00
"%s (option length = %u byte%s says option goes past end of options)",
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
name, len, plurality(len, "", "s"));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
} else if (len_type == FIXED_LENGTH && len != optlen) {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
/* Bogus - option length isn't what it's supposed to be for this
option. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, len,
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
"%s (with option length = %u byte%s; should be %u)", name,
len, plurality(len, "", "s"), optlen);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
} else if (len_type == VARIABLE_LENGTH && len < optlen) {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
/* Bogus - option length is less than what it's supposed to be for
this option. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, len,
Handle unknown options in "dissect_ip_tcp_options()" better; we assume that the only options that contain *no* length byte are the IP and TCP EOL and NOP options so that we can treat unknown options as VARIABLE_LENGTH with a minimum of 2, and at least be able to move on to the next option by using the length in the option, rather than just reporting the unknown option and processing no options after it. svn path=/trunk/; revision=604
1999-08-28 19:17:17 +00:00
"%s (with option length = %u byte%s; should be >= %u)", name,
len, plurality(len, "", "s"), optlen);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
return;
} else {
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
if (optp == NULL) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, len, "%s (%u byte%s)",
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
name, len, plurality(len, "", "s"));
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
} else {
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
if (dissect != NULL) {
/* Option has a dissector. */
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
(*dissect)(optp, tvb, offset, len, pinfo, opt_tree);
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
} else {
/* Option has no data, hence no dissector. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, len, "%s", name);
For unknown options without "syntax" errors, show the length in bytes. svn path=/trunk/; revision=605
1999-08-28 19:38:37 +00:00
}
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
}
len -= 2; /* subtract size of type and length */
offset += 2 + len;
}
length -= len;
} else {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(opt_tree, tvb, offset, 1, "%s", name);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += 1;
}
if (opt == eol)
break;
}
}
Make "dscp_vals[]" a "const" array again. svn path=/trunk/; revision=4460
2001-12-29 22:01:11 +00:00
const value_string dscp_vals[] = {
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
{ IPDSFIELD_DSCP_DEFAULT, "Default" },
{ IPDSFIELD_DSCP_CS1, "Class Selector 1" },
{ IPDSFIELD_DSCP_CS2, "Class Selector 2" },
{ IPDSFIELD_DSCP_CS3, "Class Selector 3" },
{ IPDSFIELD_DSCP_CS4, "Class Selector 4" },
{ IPDSFIELD_DSCP_CS5, "Class Selector 5" },
{ IPDSFIELD_DSCP_CS6, "Class Selector 6" },
{ IPDSFIELD_DSCP_CS7, "Class Selector 7" },
{ IPDSFIELD_DSCP_AF11, "Assured Forwarding 11" },
{ IPDSFIELD_DSCP_AF12, "Assured Forwarding 12" },
{ IPDSFIELD_DSCP_AF13, "Assured Forwarding 13" },
{ IPDSFIELD_DSCP_AF21, "Assured Forwarding 21" },
{ IPDSFIELD_DSCP_AF22, "Assured Forwarding 22" },
{ IPDSFIELD_DSCP_AF23, "Assured Forwarding 23" },
{ IPDSFIELD_DSCP_AF31, "Assured Forwarding 31" },
{ IPDSFIELD_DSCP_AF32, "Assured Forwarding 32" },
{ IPDSFIELD_DSCP_AF33, "Assured Forwarding 33" },
{ IPDSFIELD_DSCP_AF41, "Assured Forwarding 41" },
{ IPDSFIELD_DSCP_AF42, "Assured Forwarding 42" },
{ IPDSFIELD_DSCP_AF43, "Assured Forwarding 43" },
{ IPDSFIELD_DSCP_EF, "Expedited Forwarding" },
{ 0, NULL } };
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
static const value_string precedence_vals[] = {
* Added Joerg Mayer's Vines patch * Added Joerg to the AUTHORS file * Added Guy's bitfield decode patch * Fixed time output svn path=/trunk/; revision=142
1998-12-29 04:05:38 +00:00
{ IPTOS_PREC_ROUTINE, "routine" },
{ IPTOS_PREC_PRIORITY, "priority" },
{ IPTOS_PREC_IMMEDIATE, "immediate" },
{ IPTOS_PREC_FLASH, "flash" },
{ IPTOS_PREC_FLASHOVERRIDE, "flash override" },
{ IPTOS_PREC_CRITIC_ECP, "CRITIC/ECP" },
{ IPTOS_PREC_INTERNETCONTROL, "internetwork control" },
{ IPTOS_PREC_NETCONTROL, "network control" },
{ 0, NULL } };
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
static const value_string iptos_vals[] = {
{ IPTOS_NONE, "None" },
{ IPTOS_LOWCOST, "Minimize cost" },
{ IPTOS_RELIABILITY, "Maximize reliability" },
{ IPTOS_THROUGHPUT, "Maximize throughput" },
{ IPTOS_LOWDELAY, "Minimize delay" },
{ IPTOS_SECURITY, "Maximize security" },
{ 0, NULL }
};
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
static const true_false_string tos_set_low = {
"Low",
"Normal"
};
static const true_false_string tos_set_high = {
"High",
"Normal"
};
Make "ip_checksum()" take just pointer and length arguments, and make "ip_checksum_shouldbe()" compute the correct checksum given the computed whole-packet checksum and the value of the checksum field; that scheme can be better extended in the future to handle checksums other than the IP header checksum, e.g. ICMP, UDP, and TCP checksums (although we'd want a somewhat more optimized checksumming routine for that, and perhaps have an option to control whether to do checksum checking on TCP and UDP packets, as that could be expensive). That requires that we remember the value of the computed checksum, not just check it against 0; that renders "ip_checksum_state()" uninteresting, as we can just compare the value against 0 in line. svn path=/trunk/; revision=2210
2000-08-05 05:08:21 +00:00
static guint16 ip_checksum(const guint8 *ptr, int len)
Added Philip Gladstone <philip@raptor.com>'s patch to check IP header checksum, and noted the need for user-selectable lines in the GUI tree. svn path=/trunk/; revision=1242
1999-12-08 17:54:41 +00:00
{
Add code to check the checksums of TCP segments and UDP datagrams; replace the existing checksummer with a modified version of the BSD checksumming code. Add a flag to the "packet_info" structure to indicate that a packet is the first fragment of a fragmented datagram, so that the checksummers won't try to checksum those. (It doesn't seem to add a lot of CPU overhead, so we don't introduce a flag to disable it, yet. Further checks may be necessary to see whether the overhead is just swamped by other overheads when scanning through a capture dissecting all frames, or if it truly is negligible.) Make the Boolean preference option controlling whether to make the top-level protocol tree item for TCP display a packet summary static to the TCP dissector (it doesn't need to be accessible outside the TCP dissector). svn path=/trunk/; revision=2751
2000-12-13 02:24:23 +00:00
vec_t cksum_vec[1];
Clean up the checksumming stuff a bit: have "ip_checksum()" compute the checksum of the IP header; have "ip_checksum_state()" call "ip_checksum()" and then return TRUE if the result is 0 and FALSE otherwise; have "ip_checksum_shouldbe()" save the current value of the checksum field in the header, set that field to 0, call "ip_checksum()" to get the checksum, restore the value of the checksum field in the header to the saved value, and then return what "ip_checksum()" returned; rather than having duplicated code to compute checksums. svn path=/trunk/; revision=2206
2000-08-04 22:43:45 +00:00
Add code to check the checksums of TCP segments and UDP datagrams; replace the existing checksummer with a modified version of the BSD checksumming code. Add a flag to the "packet_info" structure to indicate that a packet is the first fragment of a fragmented datagram, so that the checksummers won't try to checksum those. (It doesn't seem to add a lot of CPU overhead, so we don't introduce a flag to disable it, yet. Further checks may be necessary to see whether the overhead is just swamped by other overheads when scanning through a capture dissecting all frames, or if it truly is negligible.) Make the Boolean preference option controlling whether to make the top-level protocol tree item for TCP display a packet summary static to the TCP dissector (it doesn't need to be accessible outside the TCP dissector). svn path=/trunk/; revision=2751
2000-12-13 02:24:23 +00:00
cksum_vec[0].ptr = ptr;
cksum_vec[0].len = len;
return in_cksum(&cksum_vec[0], 1);
If IP checksum is incorrect, show what correct value should be. From "Johannes Hennecke" <Johannes.Hennecke@elsa.de> svn path=/trunk/; revision=2202
2000-08-04 04:54:22 +00:00
}
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto =" statements. Move the setting of the Protocol column in various dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Make the IP dissector static, as it's called only via dissector tables or dissector handles. Also make the "dissect the TOS field as the DiffServ DS field" flag static, as it's not referred to outside of "packet-ip.c". In the NCP dissector, refer to the port type through "pinfo" rather than through the global "pi", as it's a tvbuffified dissector. svn path=/trunk/; revision=2929
2001-01-22 03:33:45 +00:00
static void
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
{
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
proto_tree *ip_tree = NULL, *field_tree;
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
proto_item *ti = NULL, *tf;
Copy the source and destination addresses into a guint32, so that we don't bus error on RISC systems. svn path=/trunk/; revision=8304
2003-08-29 01:57:37 +00:00
guint32 addr;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
int offset = 0;
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
guint hlen, optlen;
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
guint16 flags;
Declare the "packet_info" structure "pi" in "packet.h", rather than in a bunch of source files. Replace the "payload" field of a "packet_info" structure with "len" and "captured_len" fields, which contain the total packet length and total captured packet length (including all headers) at the current protocol layer (i.e., if a given layer has a length field, and that length field says its shorter than the length we got from the capture, reduce the "pi.len" and "pi.captured_len" values appropriately). Those fields can be used in the future if we add checks to make sure a field we're extracting from a packet doesn't go past the end of the packet, or past the captured part of the packet. Get rid of the additional payload argument to some dissection functions; use "pi.captured_len - offset" instead. Have the END_OF_FRAME macro use "pi.captured_len" rather than "fd->cap_len", so that "dissect the rest of the frame" becomes "dissect the rest of the packet", and doesn't dissect end-of-frame padding such as padding added to make an Ethernet frame 60 or more octets long. (We might want to rename it END_OF_PACKET; if we ever want to label the end-of-frame padding for the benefit of people curious what that extra gunk is, we could have a separate END_OF_FRAME macro that uses "fd->cap_len".) svn path=/trunk/; revision=506
1999-08-18 00:57:54 +00:00
guint8 nxt;
Make "ip_checksum()" take just pointer and length arguments, and make "ip_checksum_shouldbe()" compute the correct checksum given the computed whole-packet checksum and the value of the checksum field; that scheme can be better extended in the future to handle checksums other than the IP header checksum, e.g. ICMP, UDP, and TCP checksums (although we'd want a somewhat more optimized checksumming routine for that, and perhaps have an option to control whether to do checksum checking on TCP and UDP packets, as that could be expensive). That requires that we remember the value of the computed checksum, not just check it against 0; that renders "ip_checksum_state()" uninteresting, as we can just compare the value against 0 in line. svn path=/trunk/; revision=2210
2000-08-05 05:08:21 +00:00
guint16 ipsum;
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
fragment_data *ipfd_head=NULL;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
tvbuff_t *next_tvb;
Use the "fragmented" field of the "packet_info" structure in "dissect_frame()" to indicate whether a ReportedBoundsError was due to the packet being malformed (i.e., the packet was shorter than it's supposed to be, so the dissector went past the end trying to extract fields that were supposed to be there) or due to it not being reassembled (i.e., the packet was fragmented, and we didn't reassemble it, but just treated the first fragment as the entire packet, so the dissector went past the end trying to extract fields that were partially or completely in fragments after that). Mark the latter as being unreasembled rather than malformed. Properly initialize, save, and restore that field, and properly set it, so that works. svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
gboolean update_col_info = TRUE;
gboolean save_fragmented;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
static e_ip eip_arr[4];
static int eip_current=0;
e_ip *iph;
Yaniv Kaul: Attached please find a small performance optimization to packet-ip.c, which removes multiple redundant calls to tvb_get_ptr(). Changed srt_addr and dst_addr from char to guchar svn path=/trunk/; revision=13272
2005-02-03 23:35:57 +00:00
const guchar *src_addr, *dst_addr;
make the ip ip field we use as the reassembly key a bit more "unique" by mixing in the source and destination address. svn path=/trunk/; revision=14024
2005-04-07 09:44:58 +00:00
guint32 src32, dst32;
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
proto_tree *tree;
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
proto_item *item;
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
proto_tree *checksum_tree;
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
tree=parent_tree;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
eip_current++;
if(eip_current==4){
eip_current=0;
}
iph=&eip_arr[eip_current];
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
If we get an exception when dissecting a packet, append "[Short Frame]" or "[Malformed Frame]" to the Info column. Make some dissectors set the Protocol column and clear the Info column before fetching anything from the tvbuff they were handed, so that if the frame is short or malformed, it'll be marked as being the right top-level protocol, and the Info column won't have cruft left over from the previous protocol. svn path=/trunk/; revision=2800
2000-12-29 04:16:57 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_v_hl = tvb_get_guint8(tvb, offset);
If version is v6 let the IPv6 dissetor handle it. svn path=/trunk/; revision=17649
2006-03-16 20:14:47 +00:00
if ( hi_nibble(iph->ip_v_hl) == 6){
call_dissector(ipv6_handle, tvb, pinfo, parent_tree);
return;
}
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
hlen = lo_nibble(iph->ip_v_hl) * 4; /* IP header length, in bytes */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (tree) {
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
ti = proto_tree_add_item(tree, proto_ip, tvb, offset, hlen, FALSE);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
ip_tree = proto_item_add_subtree(ti, ett_ip);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
proto_tree_add_uint(ip_tree, hf_ip_version, tvb, offset, 1,
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
hi_nibble(iph->ip_v_hl));
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
/* if IP is not referenced from any filters we dont need to worry about
generating any tree items. We must do this after we created the actual
protocol above so that proto hier stat still works though.
*/
if(!proto_field_is_referenced(parent_tree, proto_ip)){
tree=NULL;
}
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
if (hlen < IPH_MIN_LEN) {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Bogus IP header length (%u, must be at least %u)",
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
hlen, IPH_MIN_LEN);
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
if (tree) {
proto_tree_add_uint_format(ip_tree, hf_ip_hdr_len, tvb, offset, 1, hlen,
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
"Header length: %u bytes (bogus, must be at least %u)", hlen,
IPH_MIN_LEN);
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
}
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
goto end_of_ip;
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
}
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
If the IP header length is < 20, don't try to dissect the header (other than, well, dissecting the header length field), just show the packet has having a bogus IP header length. svn path=/trunk/; revision=3198
2001-03-28 06:20:22 +00:00
if (tree) {
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
proto_tree_add_uint_format(ip_tree, hf_ip_hdr_len, tvb, offset, 1, hlen,
Format the IP header length as an unsigned quantity. svn path=/trunk/; revision=965
1999-11-02 07:06:07 +00:00
"Header length: %u bytes", hlen);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_tos = tvb_get_guint8(tvb, offset + 1);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
From Thomas Sillaber: Create two new columns: IP DSCP and L2 COS (802.1p) svn path=/trunk/; revision=20118
2006-12-11 20:24:51 +00:00
if (check_col(pinfo->cinfo, COL_DSCP_VALUE)) {
col_add_fstr(pinfo->cinfo, COL_DSCP_VALUE, "%u", IPDSFIELD_DSCP(iph->ip_tos));
}
if (g_ip_dscp_actif) {
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
tf = proto_tree_add_uint_format(ip_tree, hf_ip_dsfield, tvb, offset + 1, 1, iph->ip_tos,
"Differentiated Services Field: 0x%02x (DSCP 0x%02x: %s; ECN: 0x%02x)", iph->ip_tos,
IPDSFIELD_DSCP(iph->ip_tos), val_to_str(IPDSFIELD_DSCP(iph->ip_tos), dscp_vals,
"Unknown DSCP"),IPDSFIELD_ECN(iph->ip_tos));
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
field_tree = proto_item_add_subtree(tf, ett_ip_dsfield);
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
proto_tree_add_uint(field_tree, hf_ip_dsfield_dscp, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_uint(field_tree, hf_ip_dsfield_ect, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_uint(field_tree, hf_ip_dsfield_ce, tvb, offset + 1, 1, iph->ip_tos);
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
} else {
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
tf = proto_tree_add_uint_format(ip_tree, hf_ip_tos, tvb, offset + 1, 1, iph->ip_tos,
"Type of service: 0x%02x (%s)", iph->ip_tos,
val_to_str( IPTOS_TOS(iph->ip_tos), iptos_vals, "Unknown") );
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
field_tree = proto_item_add_subtree(tf, ett_ip_tos);
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
proto_tree_add_uint(field_tree, hf_ip_tos_precedence, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_boolean(field_tree, hf_ip_tos_delay, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_boolean(field_tree, hf_ip_tos_throughput, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_boolean(field_tree, hf_ip_tos_reliability, tvb, offset + 1, 1, iph->ip_tos);
proto_tree_add_boolean(field_tree, hf_ip_tos_cost, tvb, offset + 1, 1, iph->ip_tos);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
}
/* Length of IP datagram.
XXX - what if this is greater than the reported length of the
tvbuff? This could happen, for example, in an IP datagram
inside an ICMP datagram; we need to somehow let the
dissector we call know that, as it might want to avoid
doing its checksumming. */
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_len = tvb_get_ntohs(tvb, offset + 2);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
/* Adjust the length of this tvbuff to include only the IP datagram. */
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
set_actual_length(tvb, iph->ip_len);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
if (iph->ip_len < hlen) {
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Bogus IP length (%u, less than header length %u)",
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_len, hlen);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
proto_tree_add_uint_format(ip_tree, hf_ip_len, tvb, offset + 2, 2, iph->ip_len,
"Total length: %u bytes (bogus, less than header length %u)", iph->ip_len,
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
hlen);
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
}
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
goto end_of_ip;
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
if (tree)
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
proto_tree_add_uint(ip_tree, hf_ip_len, tvb, offset + 2, 2, iph->ip_len);
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_id = tvb_get_ntohs(tvb, offset + 4);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree)
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
proto_tree_add_uint(ip_tree, hf_ip_id, tvb, offset + 4, 2, iph->ip_id);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_off = tvb_get_ntohs(tvb, offset + 6);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
flags = (iph->ip_off & (IP_RF | IP_DF | IP_MF)) >> 12;
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
tf = proto_tree_add_uint(ip_tree, hf_ip_flags, tvb, offset + 6, 1, flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
field_tree = proto_item_add_subtree(tf, ett_ip_off);
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
proto_tree_add_boolean(field_tree, hf_ip_flags_rf, tvb, offset + 6, 1, flags);
Add a textual "(Dont Fragment)" and "(More Fragments)" to the ip.flags line in case the DF bit or the MF bit is set. svn path=/trunk/; revision=10644
2004-04-19 23:36:46 +00:00
if (flags & (IP_DF>>12)) proto_item_append_text(tf, " (Don't Fragment)");
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
proto_tree_add_boolean(field_tree, hf_ip_flags_df, tvb, offset + 6, 1, flags);
Add a textual "(Dont Fragment)" and "(More Fragments)" to the ip.flags line in case the DF bit or the MF bit is set. svn path=/trunk/; revision=10644
2004-04-19 23:36:46 +00:00
if (flags & (IP_MF>>12)) proto_item_append_text(tf, " (More Fragments)");
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
proto_tree_add_boolean(field_tree, hf_ip_flags_mf, tvb, offset + 6, 1, flags);
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
proto_tree_add_uint(ip_tree, hf_ip_frag_offset, tvb, offset + 6, 2,
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
(iph->ip_off & IP_OFFSET)*8);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree)
proto_tree_add_item(ip_tree, hf_ip_ttl, tvb, offset + 8, 1, FALSE);
If IP checksum is incorrect, show what correct value should be. From "Johannes Hennecke" <Johannes.Hennecke@elsa.de> svn path=/trunk/; revision=2202
2000-08-04 04:54:22 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_p = tvb_get_guint8(tvb, offset + 9);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
proto_tree_add_uint_format(ip_tree, hf_ip_proto, tvb, offset + 9, 1, iph->ip_p,
"Protocol: %s (0x%02x)", ipprotostr(iph->ip_p), iph->ip_p);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_sum = tvb_get_ntohs(tvb, offset + 10);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
/*
* If we have the entire IP header available, check the checksum.
*/
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
if (ip_check_checksum && tvb_bytes_exist(tvb, offset, hlen)) {
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
ipsum = ip_checksum(tvb_get_ptr(tvb, offset, hlen), hlen);
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
if (tree) {
if (ipsum == 0) {
item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum,
"Header checksum: 0x%04x [correct]", iph->ip_sum);
checksum_tree = proto_item_add_subtree(item, ett_ip_checksum);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_good, tvb, offset + 10, 2, TRUE);
PROTO_ITEM_SET_GENERATED(item);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_bad, tvb, offset + 10, 2, FALSE);
PROTO_ITEM_SET_GENERATED(item);
} else {
item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum,
"Header checksum: 0x%04x [incorrect, should be 0x%04x]", iph->ip_sum,
in_cksum_shouldbe(iph->ip_sum, ipsum));
checksum_tree = proto_item_add_subtree(item, ett_ip_checksum);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_good, tvb, offset + 10, 2, FALSE);
PROTO_ITEM_SET_GENERATED(item);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_bad, tvb, offset + 10, 2, TRUE);
PROTO_ITEM_SET_GENERATED(item);
}
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
} else {
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
ipsum = 0;
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
if (tree) {
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum,
"Header checksum: 0x%04x [%s]", iph->ip_sum,
ip_check_checksum ? "not all data available" : "validation disabled");
checksum_tree = proto_item_add_subtree(item, ett_ip_checksum);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_good, tvb, offset + 10, 2, FALSE);
PROTO_ITEM_SET_GENERATED(item);
item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_bad, tvb, offset + 10, 2, FALSE);
PROTO_ITEM_SET_GENERATED(item);
}
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Yaniv Kaul: Attached please find a small performance optimization to packet-ip.c, which removes multiple redundant calls to tvb_get_ptr(). Changed srt_addr and dst_addr from char to guchar svn path=/trunk/; revision=13272
2005-02-03 23:35:57 +00:00
src_addr = tvb_get_ptr(tvb, offset + IPH_SRC, 4);
make the ip ip field we use as the reassembly key a bit more "unique" by mixing in the source and destination address. svn path=/trunk/; revision=14024
2005-04-07 09:44:58 +00:00
src32 = tvb_get_ntohl(tvb, offset + IPH_SRC);
Yaniv Kaul: Attached please find a small performance optimization to packet-ip.c, which removes multiple redundant calls to tvb_get_ptr(). Changed srt_addr and dst_addr from char to guchar svn path=/trunk/; revision=13272
2005-02-03 23:35:57 +00:00
SET_ADDRESS(&pinfo->net_src, AT_IPv4, 4, src_addr);
SET_ADDRESS(&pinfo->src, AT_IPv4, 4, src_addr);
SET_ADDRESS(&iph->ip_src, AT_IPv4, 4, src_addr);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
Set "addr" before using it, regardless of whether "ip_summary_in_tree" is set or not. Copy the destination address, not the source address, when processing the destination address. svn path=/trunk/; revision=8314
2003-08-29 22:15:19 +00:00
memcpy(&addr, iph->ip_src.data, 4);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (ip_summary_in_tree) {
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
proto_item_append_text(ti, ", Src: %s (%s)",
Don't cast away the constness of pointers passed to "ip_to_str()" - "ip_to_str()" takes a "const guint8 *" argument. svn path=/trunk/; revision=12897
2004-12-31 03:12:51 +00:00
get_hostname(addr), ip_to_str(iph->ip_src.data));
If IP checksum is incorrect, show what correct value should be. From "Johannes Hennecke" <Johannes.Hennecke@elsa.de> svn path=/trunk/; revision=2202
2000-08-04 04:54:22 +00:00
}
Copy the source and destination addresses into a guint32, so that we don't bus error on RISC systems. svn path=/trunk/; revision=8304
2003-08-29 01:57:37 +00:00
proto_tree_add_ipv4(ip_tree, hf_ip_src, tvb, offset + 12, 4, addr);
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 12, 4, addr);
PROTO_ITEM_SET_HIDDEN(item);
item = proto_tree_add_string(ip_tree, hf_ip_src_host, tvb, offset + 12, 4, get_hostname(addr));
PROTO_ITEM_SET_GENERATED(item);
PROTO_ITEM_SET_HIDDEN(item);
item = proto_tree_add_string(ip_tree, hf_ip_host, tvb, offset + 12, 4, get_hostname(addr));
PROTO_ITEM_SET_GENERATED(item);
PROTO_ITEM_SET_HIDDEN(item);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Yaniv Kaul: Attached please find a small performance optimization to packet-ip.c, which removes multiple redundant calls to tvb_get_ptr(). Changed srt_addr and dst_addr from char to guchar svn path=/trunk/; revision=13272
2005-02-03 23:35:57 +00:00
dst_addr = tvb_get_ptr(tvb, offset + IPH_DST, 4);
make the ip ip field we use as the reassembly key a bit more "unique" by mixing in the source and destination address. svn path=/trunk/; revision=14024
2005-04-07 09:44:58 +00:00
dst32 = tvb_get_ntohl(tvb, offset + IPH_DST);
Yaniv Kaul: Attached please find a small performance optimization to packet-ip.c, which removes multiple redundant calls to tvb_get_ptr(). Changed srt_addr and dst_addr from char to guchar svn path=/trunk/; revision=13272
2005-02-03 23:35:57 +00:00
SET_ADDRESS(&pinfo->net_dst, AT_IPv4, 4, dst_addr);
SET_ADDRESS(&pinfo->dst, AT_IPv4, 4, dst_addr);
SET_ADDRESS(&iph->ip_dst, AT_IPv4, 4, dst_addr);
New feature. Statistics/EndpointTalkjers can now present a sortable table with a list of all seen conversations of a certain type. Supported types are Ethernet/TokenRing/IP/UDP and TCP. Will add FibreChannel soon. The framework for this feature needs to be enhanced in the future so that by selecting one entry and click the right mousebutton, this will bring up a menu with Prepare/Match options with suboptions for AnyDirection, ForwardOnly or ReverseOnly which updates the display filter accordingly. Had to update some of the taps as well to change them to use a proper address structure for the address fields. We should now be able to to these stats correctly even for ip tunneled over ip tunnelled over ip ... svn path=/trunk/; revision=8222
2003-08-23 09:09:35 +00:00
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
Set "addr" before using it, regardless of whether "ip_summary_in_tree" is set or not. Copy the destination address, not the source address, when processing the destination address. svn path=/trunk/; revision=8314
2003-08-29 22:15:19 +00:00
memcpy(&addr, iph->ip_dst.data, 4);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (ip_summary_in_tree) {
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
proto_item_append_text(ti, ", Dst: %s (%s)",
Don't cast away the constness of pointers passed to "ip_to_str()" - "ip_to_str()" takes a "const guint8 *" argument. svn path=/trunk/; revision=12897
2004-12-31 03:12:51 +00:00
get_hostname(addr), ip_to_str(iph->ip_dst.data));
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Copy the source and destination addresses into a guint32, so that we don't bus error on RISC systems. svn path=/trunk/; revision=8304
2003-08-29 01:57:37 +00:00
proto_tree_add_ipv4(ip_tree, hf_ip_dst, tvb, offset + 16, 4, addr);
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 16, 4, addr);
PROTO_ITEM_SET_HIDDEN(item);
item = proto_tree_add_string(ip_tree, hf_ip_dst_host, tvb, offset + 16, 4, get_hostname(addr));
PROTO_ITEM_SET_GENERATED(item);
PROTO_ITEM_SET_HIDDEN(item);
item = proto_tree_add_string(ip_tree, hf_ip_host, tvb, offset + 16, 4, get_hostname(addr));
PROTO_ITEM_SET_GENERATED(item);
PROTO_ITEM_SET_HIDDEN(item);
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
}
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (tree) {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
/* Decode IP options, if any. */
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
if (hlen > IPH_MIN_LEN) {
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
/* There's more than just the fixed-length header. Decode the
options. */
Don't copy the entire IP header into a structure, extract stuff from it as you dissect it, so we can dissect packets that are cut short before the end of an IP header. Check for an IP total length less than the header length. svn path=/trunk/; revision=6921
2003-01-14 18:54:29 +00:00
optlen = hlen - IPH_MIN_LEN; /* length of options, in bytes */
tf = proto_tree_add_text(ip_tree, tvb, offset + 20, optlen,
Fix some "proto_tree_add_text()" calls. svn path=/trunk/; revision=1696
2000-03-07 05:28:39 +00:00
"Options: (%u bytes)", optlen);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
field_tree = proto_item_add_subtree(tf, ett_ip_options);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_ip_tcp_options(tvb, offset + 20, optlen,
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
ipopts, N_IP_OPTS, IPOPT_END, pinfo, field_tree);
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
pinfo->ipproto = iph->ip_p;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
pinfo->iplen = iph->ip_len;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
When deciding whether we have enough data in a lower-level packet to attempt reassembly of a higher-level packet that includes the lower-level packet, use "tvb_bytes_exist()" to check whether all the data that's to be included in the reassembly is available, rather than by checking whether the packet is short. Add some checks of that sort that were missing. Use the reported length of the packet when doing reassembly. Make the "iphdrlen" field of a "packet_info" structure be the length of the IP header in bytes, not in 4-byte words. svn path=/trunk/; revision=7274
2003-03-04 06:47:10 +00:00
pinfo->iphdrlen = hlen;
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
Declare the "packet_info" structure "pi" in "packet.h", rather than in a bunch of source files. Replace the "payload" field of a "packet_info" structure with "len" and "captured_len" fields, which contain the total packet length and total captured packet length (including all headers) at the current protocol layer (i.e., if a given layer has a length field, and that length field says its shorter than the length we got from the capture, reduce the "pi.len" and "pi.captured_len" values appropriately). Those fields can be used in the future if we add checks to make sure a field we're extracting from a packet doesn't go past the end of the packet, or past the captured part of the packet. Get rid of the additional payload argument to some dissection functions; use "pi.captured_len - offset" instead. Have the END_OF_FRAME macro use "pi.captured_len" rather than "fd->cap_len", so that "dissect the rest of the frame" becomes "dissect the rest of the packet", and doesn't dissect end-of-frame padding such as padding added to make an Ethernet frame 60 or more octets long. (We might want to rename it END_OF_PACKET; if we ever want to label the end-of-frame padding for the benefit of people curious what that extra gunk is, we could have a separate END_OF_FRAME macro that uses "fd->cap_len".) svn path=/trunk/; revision=506
1999-08-18 00:57:54 +00:00
/* Skip over header + options */
Add a routine to dissect IP or TCP options (and, from a look at RFC 1883, it should, perhaps with some additions, be able to handle IPv6 options as well). Make the IPv4 and TCP dissectors use it. Fix a typo in the IP dissector ("Unknon" for "Unknown"). Show the IP and TCP header lengths as byte counts rather than 4-byte-word counts. Show the protocol field value of an IP header as a name if it's a protocol we know about. List the acknowledgment and urgent pointer values in a TCP header only if the corresponding flag is set. Make the ETT_ values members of an enum, so that the compiler automatically assigns them sequential integer values (at least if said compiler conforms to the ANSI C standard). svn path=/trunk/; revision=45
1998-10-13 05:40:04 +00:00
offset += hlen;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
nxt = iph->ip_p; /* XXX - what if this isn't the same for all fragments? */
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
If reassembly is enabled, don't try to do any reassembly work at all on a fragment unless we've captured all the data in the fragment and (in IPv4 and CLNP) it has a valid checksum, so that if the first fragment is a short frame or a frame with an invalid checksum, we'll treat it as if reassembly weren't enabled, and will dissect what data we have in it, rather than not dissecting *any* of the fragments above the IP/CLNP layer. svn path=/trunk/; revision=4575
2002-01-20 01:04:18 +00:00
/* If ip_defragment is on, this is a fragment, we have all the data
* in the fragment, and the header checksum is valid, then just add
* the fragment to the hashtable.
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
*/
Use the "fragmented" field of the "packet_info" structure in "dissect_frame()" to indicate whether a ReportedBoundsError was due to the packet being malformed (i.e., the packet was shorter than it's supposed to be, so the dissector went past the end trying to extract fields that were supposed to be there) or due to it not being reassembled (i.e., the packet was fragmented, and we didn't reassemble it, but just treated the first fragment as the entire packet, so the dissector went past the end trying to extract fields that were partially or completely in fragments after that). Mark the latter as being unreasembled rather than malformed. Properly initialize, save, and restore that field, and properly set it, so that works. svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
save_fragmented = pinfo->fragmented;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
if (ip_defragment && (iph->ip_off & (IP_MF|IP_OFFSET)) &&
When deciding whether we have enough data in a lower-level packet to attempt reassembly of a higher-level packet that includes the lower-level packet, use "tvb_bytes_exist()" to check whether all the data that's to be included in the reassembly is available, rather than by checking whether the packet is short. Add some checks of that sort that were missing. Use the reported length of the packet when doing reassembly. Make the "iphdrlen" field of a "packet_info" structure be the length of the IP header in bytes, not in 4-byte words. svn path=/trunk/; revision=7274
2003-03-04 06:47:10 +00:00
tvb_bytes_exist(tvb, offset, pinfo->iplen - pinfo->iphdrlen) &&
ipsum == 0) {
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
ipfd_head = fragment_add_check(tvb, offset, pinfo,
Jon Oberheide: Ethereal does not take into account the protocol field of the IP header when reassembling fragmented packets as specified in RFC791. This can lead to incorrect reassembly of packets with an identical src address, dst address, and identification number, but with differing protocols. The attached patch includes the protocol in the generation of the id used to index into the reassembly table. svn path=/trunk/; revision=16937
2006-01-03 23:23:46 +00:00
iph->ip_p ^ iph->ip_id ^ src32 ^ dst32,
If reassembly is enabled, don't try to do any reassembly work at all on a fragment unless we've captured all the data in the fragment and (in IPv4 and CLNP) it has a valid checksum, so that if the first fragment is a short frame or a frame with an invalid checksum, we'll treat it as if reassembly weren't enabled, and will dissect what data we have in it, rather than not dissecting *any* of the fragments above the IP/CLNP layer. svn path=/trunk/; revision=4575
2002-01-20 01:04:18 +00:00
ip_fragment_table,
We can't use the frame_data structure as a key structure when looking for reassembled frames - in Tethereal, there's only one frame_data structure used for all frames. Instead, use the frame number itself as the key. Add a "fragment_add_check()" routine, for fragments where there's a fragment offset rather than a fragment sequence number, which does the same sort of thing as "fragment_add_seq_check()" - i.e., once reassembly is done, it puts the reassembled fragment into a separate hash table, so that there're only incomplete reassemblies in the fragment hash table. That's necessary in order to handle cases where the packet ID field can be reused. Use that routine for IPv4 fragment reassembly - IP IDs can be reused (in fact, RFC 791 suggests that doing so might be a feature: It is appropriate for some higher level protocols to choose the identifier. For example, TCP protocol modules may retransmit an identical TCP segment, and the probability for correct reception would be enhanced if the retransmission carried the same identifier as the original transmission since fragments of either datagram could be used to construct a correct TCP segment. and RFC 1122 says that it's permitted to do so, although it also says "we believe that retransmitting the same Identification field is not useful": 3.2.1.5 Identification: RFC-791 Section 3.2 When sending an identical copy of an earlier datagram, a host MAY optionally retain the same Identification field in the copy. DISCUSSION: Some Internet protocol experts have maintained that when a host sends an identical copy of an earlier datagram, the new copy should contain the same Identification value as the original. There are two suggested advantages: (1) if the datagrams are fragmented and some of the fragments are lost, the receiver may be able to reconstruct a complete datagram from fragments of the original and the copies; (2) a congested gateway might use the IP Identification field (and Fragment Offset) to discard duplicate datagrams from the queue. However, the observed patterns of datagram loss in the Internet do not favor the probability of retransmitted fragments filling reassembly gaps, while other mechanisms (e.g., TCP repacketizing upon retransmission) tend to prevent retransmission of an identical datagram [IP:9]. Therefore, we believe that retransmitting the same Identification field is not useful. Also, a connectionless transport protocol like UDP would require the cooperation of the application programs to retain the same Identification value in identical datagrams. and, in any case, I've seen that in at least one capture, and it confuses the current reassembly code). Unfortunately, that means that fragments other than the last fragment can't be tagged with the frame number in which the reassembly was done; see the comment in packet-ip.c for a discussion of that problem. svn path=/trunk/; revision=7506
2003-04-20 00:11:28 +00:00
ip_reassembled_table,
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
(iph->ip_off & IP_OFFSET)*8,
When deciding whether we have enough data in a lower-level packet to attempt reassembly of a higher-level packet that includes the lower-level packet, use "tvb_bytes_exist()" to check whether all the data that's to be included in the reassembly is available, rather than by checking whether the packet is short. Add some checks of that sort that were missing. Use the reported length of the packet when doing reassembly. Make the "iphdrlen" field of a "packet_info" structure be the length of the IP header in bytes, not in 4-byte words. svn path=/trunk/; revision=7274
2003-03-04 06:47:10 +00:00
pinfo->iplen - pinfo->iphdrlen,
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
iph->ip_off & IP_MF);
Add a pointer to an hf_ value for a "reassembled_in" field (which can be null) to the "fragment_items" structure, and don't pass that value into "process_reassembled_data()", just have it use the value in the "fragment_items" structure passed to it. Make "process_reassembled_data()" capable of handling reassembly done by "fragment_add_seq_check()", and use it in the ATP and 802.11 dissectors; give them "reassembled_in" fields. Make "process_reassembled_data()" handle only the case of a completed reassembly (fd_head != NULL) so that we can use it in those dissectors without gunking the code up too much. svn path=/trunk/; revision=7513
2003-04-20 11:36:16 +00:00
Make "process_reassembled_data()" do the check for fragmentation not being complete and for fragmentation being trivial (i.e., the packet in question is both the first and last fragment). Have its callers *not* do that check - this lets "process_reassembled_data()" put in the "Reassembled in" item for fragments other than the last fragment. Add a "Reassembled in" field to TDS. svn path=/trunk/; revision=8295
2003-08-28 04:19:29 +00:00
next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled IPv4",
ipfd_head, &ip_frag_items, &update_col_info, ip_tree);
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
} else {
/* If this is the first fragment, dissect its contents, otherwise
just show it as a fragment.
XXX - if we eventually don't save the reassembled contents of all
fragmented datagrams, we may want to always reassemble. */
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
if (iph->ip_off & IP_OFFSET) {
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
/* Not the first fragment - don't dissect it. */
next_tvb = NULL;
} else {
/* First fragment, or not fragmented. Dissect what we have here. */
/* Get a tvbuff for the payload. */
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
/*
* If this is the first fragment, but not the only fragment,
* tell the next protocol that.
*/
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
if (iph->ip_off & IP_MF)
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
pinfo->fragmented = TRUE;
else
pinfo->fragmented = FALSE;
}
}
if (next_tvb == NULL) {
/* Just show this as a fragment. */
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
if (check_col(pinfo->cinfo, COL_INFO)) {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)",
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
ipprotostr(iph->ip_p), iph->ip_p, (iph->ip_off & IP_OFFSET) * 8);
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
}
if( ipfd_head && ipfd_head->reassembled_in != pinfo->fd->num ){
if (check_col(pinfo->cinfo, COL_INFO)) {
Frame numbers are unsigned. svn path=/trunk/; revision=7794
2003-06-05 22:23:57 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, " [Reassembled in #%u]",
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
ipfd_head->reassembled_in);
}
}
Don't pass "tvb_reported_length_remaining(tvb, offset)" as the fourth argument to "tvb_new_subset()" - just use -1 if the subset tvbuff is to run to the end of the parent tvbuff. svn path=/trunk/; revision=5597
2002-05-30 01:56:55 +00:00
call_dissector(data_handle, tvb_new_subset(tvb, offset, -1, -1), pinfo,
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
parent_tree);
Use the "fragmented" field of the "packet_info" structure in "dissect_frame()" to indicate whether a ReportedBoundsError was due to the packet being malformed (i.e., the packet was shorter than it's supposed to be, so the dissector went past the end trying to extract fields that were supposed to be there) or due to it not being reassembled (i.e., the packet was fragmented, and we didn't reassemble it, but just treated the first fragment as the entire packet, so the dissector went past the end trying to extract fields that were partially or completely in fragments after that). Mark the latter as being unreasembled rather than malformed. Properly initialize, save, and restore that field, and properly set it, so that works. svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
pinfo->fragmented = save_fragmented;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
goto end_of_ip;
Jun-ichiro's IPv6 patch is merged in with ethereal and now uses the new proto*() functions. The configure script tries to use ipv6 name resolution if it knows the type of ipv6 stack the user has (this can be avoided with the --disable-ipv6 switch) Additionally, the configure script now deals with wiretap better. If the user doesn't want to compile wiretap, the wiretap is never visited. A few unnecessary #includes were removed from some wiretap files, and a CPP macro was moved from bpf.c to wtap.h. svn path=/trunk/; revision=229
1999-03-28 18:32:03 +00:00
}
The beginnings of a TAPA dissector (Trapeze Access Point Access Protocol). Admittedly not much, so if you have any ideas what the rest means or where I'm wrong please provide feedback. As tapa uses udp 5000 and ip protocol 4, I needed to add a hack for the ip part to properly dispatch betweeen ipip and tapa-tunnel (actually I was unable to turn the ipip dissector into a heuristic dissector :-) svn path=/trunk/; revision=20971
2007-03-04 11:48:07 +00:00
/* XXX This is an ugly hack because I didn't manage to make the IPIP
* dissector a heuristic one [JMayer]
* The TAPA protocol also uses IP protocol number 4 but it isn't really
* IPIP, so try to detect it first and call it explicitly before calling
* the generic ip.proto dispatcher
*/
if (nxt == IP_PROTO_IPIP &&
(tvb_get_guint8(next_tvb, 0) & 0xF0) != 40 &&
tvb_get_ntohs(next_tvb, 2) < 20) {
call_dissector(tapa_handle,next_tvb, pinfo, parent_tree);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
/* Hand off to the next protocol.
XXX - setting the columns only after trying various dissectors means
that if one of those dissectors throws an exception, the frame won't
even be labelled as an IP frame; ideally, if a frame being dissected
throws an exception, it'll be labelled as a mangled frame of the
type in question. */
The beginnings of a TAPA dissector (Trapeze Access Point Access Protocol). Admittedly not much, so if you have any ideas what the rest means or where I'm wrong please provide feedback. As tapa uses udp 5000 and ip protocol 4, I needed to add a hack for the ip part to properly dispatch betweeen ipip and tapa-tunnel (actually I was unable to turn the ipip dissector into a heuristic dissector :-) svn path=/trunk/; revision=20971
2007-03-04 11:48:07 +00:00
} else if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, parent_tree)) {
Have the IPv6 dissector use the same dissector table as the IPv4 dissector. Don't dissect the payload of any fragmented IPv6 packet unless it's the initial fragment (that's what we do for IPv4). svn path=/trunk/; revision=1882
2000-04-20 07:05:58 +00:00
/* Unknown protocol */
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
if (update_col_info) {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%02x)", ipprotostr(iph->ip_p), iph->ip_p);
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
}
Major speed improvement for filtering and dissection. It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-04-11 08:43:51 +00:00
call_dissector(data_handle,next_tvb, pinfo, parent_tree);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Use the "fragmented" field of the "packet_info" structure in "dissect_frame()" to indicate whether a ReportedBoundsError was due to the packet being malformed (i.e., the packet was shorter than it's supposed to be, so the dissector went past the end trying to extract fields that were supposed to be there) or due to it not being reassembled (i.e., the packet was fragmented, and we didn't reassemble it, but just treated the first fragment as the entire packet, so the dissector went past the end trying to extract fields that were partially or completely in fragments after that). Mark the latter as being unreasembled rather than malformed. Properly initialize, save, and restore that field, and properly set it, so that works. svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
pinfo->fragmented = save_fragmented;
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
end_of_ip:
tap_queue_packet(ip_tap, pinfo, iph);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
#define ICMP_MIP_EXTENSION_PAD 0
#define ICMP_MIP_MOB_AGENT_ADV 16
#define ICMP_MIP_PREFIX_LENGTHS 19
#define ICMP_MIP_CHALLENGE 24
static value_string mip_extensions[] = {
{ ICMP_MIP_EXTENSION_PAD, "One byte padding extension"}, /* RFC 2002 */
{ ICMP_MIP_MOB_AGENT_ADV, "Mobility Agent Advertisement Extension"},
/* RFC 2002 */
{ ICMP_MIP_PREFIX_LENGTHS, "Prefix Lengths Extension"}, /* RFC 2002 */
{ ICMP_MIP_CHALLENGE, "Challenge Extension"}, /* RFC 3012 */
{ 0, NULL}
};
/*
* Dissect the mobile ip advertisement extensions.
*/
static void
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
dissect_mip_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree)
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
{
guint8 type;
guint8 length;
guint8 flags;
proto_item *ti;
proto_tree *mip_tree=NULL;
proto_tree *flags_tree=NULL;
gint numCOAs;
gint i;
/* Not much to do if we're not parsing everything */
if (!tree) return;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
while (tvb_reported_length_remaining(tvb, offset) > 0) {
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
type = tvb_get_guint8(tvb, offset + 0);
if (type)
length = tvb_get_guint8(tvb, offset + 1);
else
length=0;
ti = proto_tree_add_text(tree, tvb, offset,
type?(length + 2):1,
"Ext: %s",
val_to_str(type, mip_extensions,
As per a comment from Ronnie Sahlberg, display TCP sequence numbers in the list of segments in a desegmented PDU as unsigned, rather than signed. Fix some other displays of unsigned quantities with "%d" while we're at it. svn path=/trunk/; revision=4516
2002-01-10 11:27:57 +00:00
"Unknown ext %u"));
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
mip_tree = proto_item_add_subtree(ti, ett_icmp_mip);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
switch (type) {
case ICMP_MIP_EXTENSION_PAD:
/* One byte padding extension */
/* Add our fields */
/* type */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
break;
case ICMP_MIP_MOB_AGENT_ADV:
/* Mobility Agent Advertisement Extension (RFC 2002)*/
/* Add our fields */
/* type */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* length */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* sequence number */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_seq, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
2, FALSE);
offset+=2;
/* Registration Lifetime */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_life, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
2, FALSE);
offset+=2;
/* flags */
flags = tvb_get_guint8(tvb, offset);
ti = proto_tree_add_item(mip_tree, hf_icmp_mip_flags, tvb, offset,
1, FALSE);
flags_tree = proto_item_add_subtree(ti, ett_icmp_mip_flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_r, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_b, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_h, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_f, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_m, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_g, tvb, offset, 1, flags);
proto_tree_add_boolean(flags_tree, hf_icmp_mip_v, tvb, offset, 1, flags);
Fix Ethereal bug 994 in Wireshark: MIP Advertisement reverse tunneling flag not dissected svn path=/trunk/; revision=18520
2006-06-19 15:54:13 +00:00
proto_tree_add_boolean(flags_tree, hf_icmp_mip_rt, tvb, offset, 1, flags);
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
offset++;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
/* Reserved */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_reserved, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
/* COAs */
numCOAs = (length - 6) / 4;
for (i=0; i<numCOAs; i++) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_coa, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
4, FALSE);
offset+=4;
}
break;
case ICMP_MIP_PREFIX_LENGTHS:
/* Prefix-Lengths Extension (RFC 2002)*/
/* Add our fields */
/* type */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* length */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* prefix lengths */
for(i=0; i<length; i++) {
proto_tree_add_item(mip_tree, hf_icmp_mip_prefix_length, tvb, offset,
1, FALSE);
offset++;
}
break;
case ICMP_MIP_CHALLENGE:
/* Challenge Extension (RFC 3012)*/
/* type */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_type, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* length */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_length, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
1, FALSE);
offset++;
/* challenge */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_item(mip_tree, hf_icmp_mip_challenge, tvb, offset,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
length, FALSE);
offset+=length;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
default:
As per a comment from Ronnie Sahlberg, display TCP sequence numbers in the list of segments in a desegmented PDU as unsigned, rather than signed. Fix some other displays of unsigned quantities with "%d" while we're at it. svn path=/trunk/; revision=4516
2002-01-10 11:27:57 +00:00
g_warning("Unknown type(%u)! I hope the length is right (%u)",
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
type, length);
From John Wells: Fix the default offset adjustment in dissect_mip_extentions. svn path=/trunk/; revision=5657
2002-06-09 01:03:19 +00:00
offset += length + 2;
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
} /* switch type */
} /* end while */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
} /* dissect_mip_extensions */
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
#define MPLS_STACK_ENTRY_OBJECT_CLASS 1
#define MPLS_EXTENDED_PAYLOAD_OBJECT_CLASS 2
#define MPLS_STACK_ENTRY_C_TYPE 1
#define MPLS_EXTENDED_PAYLOAD_C_TYPE 1
/* XXX no header defines these macros ??? */
#ifndef min
#define min(a,b) (((a)<(b))?(a):(b))
#endif
#ifndef max
#define max(a,b) (((a)>(b))?(a):(b))
#endif
/*
* Dissect the MPLS extensions
*/
static void
dissect_mpls_extensions(tvbuff_t *tvb, size_t offset, proto_tree *tree)
{
guint8 version;
guint8 class_num;
guint8 c_type;
guint8 ttl;
guint8 tmp;
guint16 reserved;
guint16 cksum, computed_cksum;
guint16 obj_length, obj_trunc_length;
proto_item *ti, *tf_object, *tf_entry;
proto_tree *mpls_tree=NULL, *mpls_object_tree, *mpls_stack_object_tree;
guint obj_end_offset;
guint reported_length;
guint label;
gboolean unknown_object;
if (!tree)
return;
reported_length = tvb_reported_length_remaining(tvb, offset);
if (reported_length < 4 /* Common header */)
{
proto_tree_add_text(tree, tvb, offset,
reported_length,
"MPLS Extensions (truncated)");
return;
}
/* Add a tree for the MPLS extensions */
ti = proto_tree_add_none_format(tree, hf_icmp_mpls, tvb,
offset, reported_length, "MPLS Extensions");
mpls_tree = proto_item_add_subtree(ti, ett_icmp_mpls);
/* Version */
version = hi_nibble(tvb_get_guint8(tvb, offset));
proto_tree_add_uint(mpls_tree, hf_icmp_mpls_version, tvb, offset, 1, version);
/* Reserved */
reserved = tvb_get_ntohs(tvb, offset) & 0x0fff;
proto_tree_add_uint_format(mpls_tree, hf_icmp_mpls_reserved,
tvb, offset, 2, reserved,
"Reserved: 0x%03x", reserved);
/* Checksum */
cksum = tvb_get_ntohs(tvb, offset + 2);
computed_cksum = ip_checksum(tvb_get_ptr(tvb, offset, reported_length),
reported_length);
if (computed_cksum == 0)
{
proto_tree_add_uint_format(mpls_tree, hf_icmp_mpls_checksum, tvb, offset + 2, 2,
checksum messages: use "[correct]" instead of "(correct)" and other "alike" messages svn path=/trunk/; revision=14880
2005-07-08 22:11:13 +00:00
cksum, "Checksum: 0x%04x [correct]", cksum);
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
}
else
{
proto_tree_add_boolean_hidden(mpls_tree, hf_icmp_mpls_checksum_bad, tvb,
offset + 2, 2, TRUE);
proto_tree_add_uint_format(mpls_tree, hf_icmp_mpls_checksum, tvb, offset + 2, 2,
cksum,
checksum messages: use "[correct]" instead of "(correct)" and other "alike" messages svn path=/trunk/; revision=14880
2005-07-08 22:11:13 +00:00
"Checksum: 0x%04x [incorrect, should be 0x%04x]",
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
cksum, in_cksum_shouldbe(cksum, computed_cksum));
}
if (version != 1 && version != 2)
{
/* Unsupported version */
proto_item_append_text(ti, " (unsupported version)");
return;
}
/* Skip the common header */
offset += 4;
/* While there is enough room to read an object */
while (tvb_reported_length_remaining(tvb, offset) >= 4 /* Object header */)
{
/* Object length */
obj_length = tvb_get_ntohs(tvb, offset);
obj_trunc_length = min(obj_length, tvb_reported_length_remaining(tvb, offset));
obj_end_offset = offset + obj_trunc_length;
/* Add a subtree for this object (the text will be reset later) */
tf_object = proto_tree_add_text(mpls_tree, tvb, offset,
max(obj_trunc_length, 4),
"Unknown object");
mpls_object_tree = proto_item_add_subtree(tf_object, ett_icmp_mpls_object);
proto_tree_add_uint(mpls_object_tree, hf_icmp_mpls_length, tvb, offset, 2, obj_length);
/* Class */
class_num = tvb_get_guint8(tvb, offset + 2);
proto_tree_add_uint(mpls_object_tree, hf_icmp_mpls_class, tvb, offset + 2, 1, class_num);
/* C-Type */
c_type = tvb_get_guint8(tvb, offset + 3);
proto_tree_add_uint(mpls_object_tree, hf_icmp_mpls_c_type, tvb, offset + 3, 1, c_type);
if (obj_length < 4 /* Object header */)
{
/* Thanks doc/README.developer :)) */
proto_item_set_text(tf_object, "Object with bad length");
break;
}
/* Skip the object header */
offset += 4;
/* Default cases will set this flag to TRUE */
unknown_object = FALSE;
switch (class_num)
{
case MPLS_STACK_ENTRY_OBJECT_CLASS:
switch (c_type)
{
case MPLS_STACK_ENTRY_C_TYPE:
proto_item_set_text(tf_object, "MPLS Stack Entry");
/* For each entry */
while (offset + 4 <= obj_end_offset)
{
if (tvb_reported_length_remaining(tvb, offset) < 4)
{
/* Not enough room in the packet ! */
break;
}
/* Create a subtree for each entry (the text will be set later) */
tf_entry = proto_tree_add_text(mpls_object_tree,
tvb, offset, 4, " ");
mpls_stack_object_tree = proto_item_add_subtree(tf_entry,
ett_icmp_mpls_stack_object);
/* Label */
label = (guint)tvb_get_ntohs(tvb, offset);
tmp = tvb_get_guint8(tvb, offset + 2);
label = (label << 4) + (tmp >> 4);
proto_tree_add_uint(mpls_stack_object_tree,
hf_icmp_mpls_label,
tvb,
offset,
3,
label << 4);
proto_item_set_text(tf_entry, "Label: %u", label);
/* Experimental field (also called "CoS") */
proto_tree_add_uint(mpls_stack_object_tree,
hf_icmp_mpls_exp,
tvb,
offset + 2,
1,
tmp);
proto_item_append_text(tf_entry, ", Exp: %u", (tmp >> 1) & 0x07);
/* Stack bit */
proto_tree_add_boolean(mpls_stack_object_tree,
hf_icmp_mpls_s,
tvb,
offset + 2,
1,
tmp);
proto_item_append_text(tf_entry, ", S: %u", tmp & 0x01);
/* TTL */
ttl = tvb_get_guint8(tvb, offset + 3);
proto_tree_add_item(mpls_stack_object_tree,
hf_icmp_mpls_ttl,
tvb,
offset + 3,
1,
FALSE);
proto_item_append_text(tf_entry, ", TTL: %u", ttl);
/* Skip the entry */
offset += 4;
} /* end while */
If only part of an entry in an object fits in the object, don't report the stuff that didn't fit as a negative number of junk bytes. The difference between two pointers isn't guaranteed to have a particular size; cast it to "long" and display it with "%ld". svn path=/trunk/; revision=14821
2005-06-29 23:19:21 +00:00
if (offset < obj_end_offset)
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
proto_tree_add_text(mpls_object_tree, tvb,
offset,
obj_end_offset - offset,
If only part of an entry in an object fits in the object, don't report the stuff that didn't fit as a negative number of junk bytes. The difference between two pointers isn't guaranteed to have a particular size; cast it to "long" and display it with "%ld". svn path=/trunk/; revision=14821
2005-06-29 23:19:21 +00:00
"%ld junk bytes",
(long)(obj_end_offset - offset));
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
break;
default:
unknown_object = TRUE;
break;
} /* end switch c_type */
break;
case MPLS_EXTENDED_PAYLOAD_OBJECT_CLASS:
switch (c_type)
{
case MPLS_EXTENDED_PAYLOAD_C_TYPE:
proto_item_set_text(tf_object, "Extended Payload");
/* This object contains some portion of the original packet
that could not fit in the 128 bytes of the ICMP payload */
if (obj_trunc_length > 4)
proto_tree_add_text(mpls_object_tree, tvb,
offset, obj_trunc_length - 4,
"Data (%d bytes)", obj_trunc_length - 4);
break;
default:
unknown_object = TRUE;
break;
} /* end switch c_type */
break;
default:
unknown_object = TRUE;
break;
} /* end switch class_num */
/* The switches couldn't decode the object */
if (unknown_object == TRUE)
{
proto_item_set_text(tf_object, "Unknown object (%d/%d)", class_num, c_type);
if (obj_trunc_length > 4)
proto_tree_add_text(mpls_object_tree, tvb,
offset, obj_trunc_length - 4,
"Data (%d bytes)", obj_trunc_length - 4);
}
/* */
if (obj_trunc_length < obj_length)
proto_item_append_text(tf_object, " (truncated)");
/* Go to the end of the object */
offset = obj_end_offset;
} /* end while */
} /* end dissect_mpls_extensions */
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
static const gchar *unreach_str[] = {"Network unreachable",
"Host unreachable",
"Protocol unreachable",
"Port unreachable",
"Fragmentation needed",
"Source route failed",
Fix the list of descriptions of codes in ICMP Unreachable messages. svn path=/trunk/; revision=458
1999-08-10 04:57:47 +00:00
"Destination network unknown",
"Destination host unknown",
"Source host isolated",
"Network administratively prohibited",
"Host administratively prohibited",
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
"Network unreachable for TOS",
"Host unreachable for TOS",
"Communication administratively filtered",
"Host precedence violation",
"Precedence cutoff in effect"};
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
#define N_UNREACH (sizeof unreach_str / sizeof unreach_str[0])
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
static const gchar *redir_str[] = {"Redirect for network",
"Redirect for host",
"Redirect for TOS and network",
"Redirect for TOS and host"};
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
#define N_REDIRECT (sizeof redir_str / sizeof redir_str[0])
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Change the strings shown for ICMP TTL exceeded to match the wording in the standard svn path=/trunk/; revision=8955
2003-11-13 08:16:52 +00:00
static const gchar *ttl_str[] = {"Time to live exceeded in transit",
"Fragment reassembly time exceeded"};
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
#define N_TIMXCEED (sizeof ttl_str / sizeof ttl_str[0])
static const gchar *par_str[] = {"IP header bad", "Required option missing"};
#define N_PARAMPROB (sizeof par_str / sizeof par_str[0])
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
/*
* RFC 792 for basic ICMP.
* RFC 1191 for ICMP_FRAG_NEEDED (with MTU of next hop).
* RFC 1256 for router discovery messages.
* RFC 2002 and 3012 for Mobile IP stuff.
*/
Create a header file for every packet-*.c file. Prune the packet.h file. This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
2000-02-15 21:06:58 +00:00
static void
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *icmp_tree;
proto_item *ti;
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
guint8 icmp_type;
guint8 icmp_code;
guint length, reported_length;
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
guint16 cksum, computed_cksum;
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
gchar *type_str, *code_str;
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
guint8 num_addrs = 0;
guint8 addr_entry_size = 0;
int i;
Have a flag in the "packet_info" structure, which indicates whether the stuff currently being dissected is part of a packet included in an error packet (e.g., an ICMP Unreachable packet). Have the TCP dissector not bother doing reassembly if the TCP segment is part of an error packet, rather than an actual TCP transmission; other dissectors might want to treat those packets specially as well. Add to the "tcpinfo" structure a flag indicating whether the URG flag was set, rather than having the zero or non-zero value of the urgent pointer indicate that. (Yes, at least as I read RFC 793, a zero urgent pointer value isn't useful, as it means "the stuff before this segment is urgent", but it's certainly possible to put onto the wire a TCP segment with URG set and a zero urgent pointer.) Don't dissect the TCP header by grabbing the entire header with "tvb_memcpy()" and then pulling stuff out of it - extract stuff with individual tvbuff calls, and put stuff into the protocol tree and the Info column as we extract it, so that we can dissect a partial header. This lets us, for example, get the source and destination ports from the TCP header of the part of a TCP segment included in a minimum-length ICMPv4 error packet. svn path=/trunk/; revision=3986
2001-10-01 08:29:37 +00:00
gboolean save_in_error_pkt;
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
tvbuff_t *next_tvb;
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
proto_item *item;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="";
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
code_str=ep_alloc(64);
code_str[0]=0;
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICMP");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
If we get an exception when dissecting a packet, append "[Short Frame]" or "[Malformed Frame]" to the Info column. Make some dissectors set the Protocol column and clear the Info column before fetching anything from the tvbuff they were handed, so that if the frame is short or malformed, it'll be marked as being the right top-level protocol, and the Info column won't have cruft left over from the previous protocol. svn path=/trunk/; revision=2800
2000-12-29 04:16:57 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* To do: check for runts, errs, etc. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
icmp_type = tvb_get_guint8(tvb, 0);
icmp_code = tvb_get_guint8(tvb, 1);
cksum = tvb_get_ntohs(tvb, 2);
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
switch (icmp_type) {
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
case ICMP_ECHOREPLY:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Echo (ping) reply";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case ICMP_UNREACH:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Destination unreachable";
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
if (icmp_code < N_UNREACH) {
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
g_snprintf(code_str, 64, "(%s)", unreach_str[icmp_code]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
} else {
get rid of some strcpy() svn path=/trunk/; revision=16211
2005-10-13 03:22:53 +00:00
g_snprintf(code_str, 64, "(Unknown - error?)");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
break;
case ICMP_SOURCEQUENCH:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Source quench (flow control)";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case ICMP_REDIRECT:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Redirect";
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
if (icmp_code < N_REDIRECT) {
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
g_snprintf(code_str, 64, "(%s)", redir_str[icmp_code]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
} else {
get rid of some strcpy() svn path=/trunk/; revision=16211
2005-10-13 03:22:53 +00:00
g_snprintf(code_str, 64, "(Unknown - error?)");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
break;
case ICMP_ECHO:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Echo (ping) request";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
case ICMP_RTRADVERT:
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
switch (icmp_code) {
from Jaap K fix for bug 306 svn path=/trunk/; revision=16812
2005-12-15 23:17:01 +00:00
case 0: /* Mobile-Ip */
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
case 16: /* Mobile-Ip */
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Mobile IP Advertisement";
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
default:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Router advertisement";
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
} /* switch icmp_code */
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
break;
case ICMP_RTRSOLICIT:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Router solicitation";
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
case ICMP_TIMXCEED:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Time-to-live exceeded";
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
if (icmp_code < N_TIMXCEED) {
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
g_snprintf(code_str, 64, "(%s)", ttl_str[icmp_code]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
} else {
get rid of some strcpy() svn path=/trunk/; revision=16211
2005-10-13 03:22:53 +00:00
g_snprintf(code_str, 64, "(Unknown - error?)");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
break;
case ICMP_PARAMPROB:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Parameter problem";
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
if (icmp_code < N_PARAMPROB) {
some sprintf removals svn path=/trunk/; revision=15548
2005-08-27 00:09:19 +00:00
g_snprintf(code_str, 64, "(%s)", par_str[icmp_code]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
} else {
get rid of some strcpy() svn path=/trunk/; revision=16211
2005-10-13 03:22:53 +00:00
g_snprintf(code_str, 64, "(Unknown - error?)");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
break;
case ICMP_TSTAMP:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Timestamp request";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case ICMP_TSTAMPREPLY:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Timestamp reply";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
case ICMP_IREQ:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Information request";
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
break;
case ICMP_IREQREPLY:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Information reply";
Make the arrays of pointers to strings for ICMP decoding static, as they're not used outside this file. Compute their sizes with the standard "number of elements in an array" C idiom, rather than hardcoding them as numbers. Add the "information request" and "information reply" ICMP packet types. svn path=/trunk/; revision=212
1999-03-09 01:45:06 +00:00
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
case ICMP_MASKREQ:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Address mask request";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case ICMP_MASKREPLY:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Address mask reply";
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
default:
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
type_str="Unknown ICMP (obsolete or malformed?)";
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
If the ICMP code is present, put it in the Info column. svn path=/trunk/; revision=12934
2005-01-03 00:08:40 +00:00
if (check_col(pinfo->cinfo, COL_INFO)) {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
col_add_str(pinfo->cinfo, COL_INFO, type_str);
remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
if (code_str[0] != '\0')
If the ICMP code is present, put it in the Info column. svn path=/trunk/; revision=12934
2005-01-03 00:08:40 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", code_str);
}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (tree) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
length = tvb_length(tvb);
reported_length = tvb_reported_length(tvb);
ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, FALSE);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
icmp_tree = proto_item_add_subtree(ti, ett_icmp);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_uint_format(icmp_tree, hf_icmp_type, tvb, 0, 1,
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
icmp_type,
Fix some "proto_tree_add_text()" calls. svn path=/trunk/; revision=1696
2000-03-07 05:28:39 +00:00
"Type: %u (%s)",
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
icmp_type, type_str);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_uint_format(icmp_tree, hf_icmp_code, tvb, 1, 1,
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
icmp_code,
Fix some "proto_tree_add_text()" calls. svn path=/trunk/; revision=1696
2000-03-07 05:28:39 +00:00
"Code: %u %s",
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
icmp_code, code_str);
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
Don't check the checksum of ICMP datagrams that are fragmented (unlikely, perhaps even forbidden, but not impossible). svn path=/trunk/; revision=2752
2000-12-13 02:43:32 +00:00
if (!pinfo->fragmented && length >= reported_length) {
Fix a typo in a comment. svn path=/trunk/; revision=2758
2000-12-14 21:44:01 +00:00
/* The packet isn't part of a fragmented datagram and isn't
Don't check the checksum of ICMP datagrams that are fragmented (unlikely, perhaps even forbidden, but not impossible). svn path=/trunk/; revision=2752
2000-12-13 02:43:32 +00:00
truncated, so we can checksum it. */
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
computed_cksum = ip_checksum(tvb_get_ptr(tvb, 0, reported_length),
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
reported_length);
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
if (computed_cksum == 0) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_uint_format(icmp_tree, hf_icmp_checksum, tvb, 2, 2,
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
cksum,
checksum messages: use "[correct]" instead of "(correct)" and other "alike" messages svn path=/trunk/; revision=14880
2005-07-08 22:11:13 +00:00
"Checksum: 0x%04x [correct]", cksum);
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
} else {
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
item = proto_tree_add_boolean(icmp_tree, hf_icmp_checksum_bad,
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
tvb, 2, 2, TRUE);
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
PROTO_ITEM_SET_HIDDEN(item);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_uint_format(icmp_tree, hf_icmp_checksum, tvb, 2, 2,
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
cksum,
checksum messages: use "[correct]" instead of "(correct)" and other "alike" messages svn path=/trunk/; revision=14880
2005-07-08 22:11:13 +00:00
"Checksum: 0x%04x [incorrect, should be 0x%04x]",
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
cksum, in_cksum_shouldbe(cksum, computed_cksum));
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
}
} else {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_uint(icmp_tree, hf_icmp_checksum, tvb, 2, 2, cksum);
Check ICMP checksum. XXX - won't work if the ICMP packet is inside a fragmented IP datagram, although that's probably extremely unlikely. svn path=/trunk/; revision=2522
2000-10-21 04:34:47 +00:00
}
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
/* Decode the second 4 bytes of the packet. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
switch (icmp_type) {
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
case ICMP_ECHOREPLY:
case ICMP_ECHO:
case ICMP_TSTAMP:
case ICMP_TSTAMPREPLY:
case ICMP_IREQ:
case ICMP_IREQREPLY:
case ICMP_MASKREQ:
case ICMP_MASKREPLY:
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
proto_tree_add_item(icmp_tree, hf_icmp_ident, tvb, 4, 2, FALSE);
proto_tree_add_item(icmp_tree, hf_icmp_seq_num, tvb, 6, 2, FALSE);
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
case ICMP_UNREACH:
switch (icmp_code) {
case ICMP_FRAG_NEEDED:
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
proto_tree_add_item(icmp_tree, hf_icmp_mtu, tvb, 6, 2, FALSE);
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
break;
}
break;
Added John McDermott's patch for handling ICMP Unreachable|Fragmentation Required packets. svn path=/trunk/; revision=455
1999-08-09 18:18:38 +00:00
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
case ICMP_RTRADVERT:
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
num_addrs = tvb_get_guint8(tvb, 4);
proto_tree_add_text(icmp_tree, tvb, 4, 1, "Number of addresses: %u",
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
num_addrs);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
addr_entry_size = tvb_get_guint8(tvb, 5);
proto_tree_add_text(icmp_tree, tvb, 5, 1, "Address entry size: %u",
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
addr_entry_size);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(icmp_tree, tvb, 6, 2, "Lifetime: %s",
time_secs_to_str(tvb_get_ntohs(tvb, 6)));
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
break;
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
case ICMP_PARAMPROB:
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(icmp_tree, tvb, 4, 1, "Pointer: %u",
tvb_get_guint8(tvb, 4));
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
case ICMP_REDIRECT:
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
proto_tree_add_item(icmp_tree, hf_icmp_redir_gw, tvb, 4, 4, FALSE);
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
}
/* Decode the additional information in the packet. */
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
switch (icmp_type) {
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
case ICMP_UNREACH:
case ICMP_TIMXCEED:
case ICMP_PARAMPROB:
case ICMP_SOURCEQUENCH:
case ICMP_REDIRECT:
Have a flag in the "packet_info" structure, which indicates whether the stuff currently being dissected is part of a packet included in an error packet (e.g., an ICMP Unreachable packet). Have the TCP dissector not bother doing reassembly if the TCP segment is part of an error packet, rather than an actual TCP transmission; other dissectors might want to treat those packets specially as well. Add to the "tcpinfo" structure a flag indicating whether the URG flag was set, rather than having the zero or non-zero value of the urgent pointer indicate that. (Yes, at least as I read RFC 793, a zero urgent pointer value isn't useful, as it means "the stuff before this segment is urgent", but it's certainly possible to put onto the wire a TCP segment with URG set and a zero urgent pointer.) Don't dissect the TCP header by grabbing the entire header with "tvb_memcpy()" and then pulling stuff out of it - extract stuff with individual tvbuff calls, and put stuff into the protocol tree and the Info column as we extract it, so that we can dissect a partial header. This lets us, for example, get the source and destination ports from the TCP header of the part of a TCP segment included in a minimum-length ICMPv4 error packet. svn path=/trunk/; revision=3986
2001-10-01 08:29:37 +00:00
/* Save the current value of the "we're inside an error packet"
flag, and set that flag; subdissectors may treat packets
that are the payload of error packets differently from
"real" packets. */
save_in_error_pkt = pinfo->in_error_pkt;
pinfo->in_error_pkt = TRUE;
Move into "call_dissector_work()" the stuff to handle dissecting, in error packets, the copy of the packet that got the error, rather than doing it in the CLNP dissector and the ICMP dissector and the ICMPv6 dissector and the PPP dissector for various control protocols; have it do that work iff "pinfo->in_error_pkt" is set. svn path=/trunk/; revision=6942
2003-01-20 05:42:37 +00:00
/* Decode the IP header and first 64 bits of data from the
original datagram. */
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
next_tvb = tvb_new_subset(tvb, 8, -1, -1);
ICMP MPLS updates and a new preference option from Brice Augustin and Maria-Luiza svn path=/trunk/; revision=15007
2005-07-23 00:46:14 +00:00
/* There is a collision between RFC 1812 and draft-ietf-mpls-icmp-02.
We don't know how to decode the 128th and following bytes of the ICMP payload.
According to draft-ietf-mpls-icmp-02, these bytes should be decoded as MPLS extensions
whereas RFC 1812 tells us to decode them as a portion of the original packet.
Let the user decide.
Here the user decided to favor MPLS extensions.
Force the IP dissector to decode only the first 128 bytes. */
if ((tvb_reported_length(tvb) > 8 + 128) &&
favor_icmp_mpls_ext && (tvb_get_ntohs(tvb, 8 + 2) > 128))
set_actual_length(next_tvb, 128);
Move into "call_dissector_work()" the stuff to handle dissecting, in error packets, the copy of the packet that got the error, rather than doing it in the CLNP dissector and the ICMP dissector and the ICMPv6 dissector and the PPP dissector for various control protocols; have it do that work iff "pinfo->in_error_pkt" is set. svn path=/trunk/; revision=6942
2003-01-20 05:42:37 +00:00
call_dissector(ip_handle, next_tvb, pinfo, icmp_tree);
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
Have a flag in the "packet_info" structure, which indicates whether the stuff currently being dissected is part of a packet included in an error packet (e.g., an ICMP Unreachable packet). Have the TCP dissector not bother doing reassembly if the TCP segment is part of an error packet, rather than an actual TCP transmission; other dissectors might want to treat those packets specially as well. Add to the "tcpinfo" structure a flag indicating whether the URG flag was set, rather than having the zero or non-zero value of the urgent pointer indicate that. (Yes, at least as I read RFC 793, a zero urgent pointer value isn't useful, as it means "the stuff before this segment is urgent", but it's certainly possible to put onto the wire a TCP segment with URG set and a zero urgent pointer.) Don't dissect the TCP header by grabbing the entire header with "tvb_memcpy()" and then pulling stuff out of it - extract stuff with individual tvbuff calls, and put stuff into the protocol tree and the Info column as we extract it, so that we can dissect a partial header. This lets us, for example, get the source and destination ports from the TCP header of the part of a TCP segment included in a minimum-length ICMPv4 error packet. svn path=/trunk/; revision=3986
2001-10-01 08:29:37 +00:00
/* Restore the "we're inside an error packet" flag. */
pinfo->in_error_pkt = save_in_error_pkt;
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
ICMP MPLS updates and a new preference option from Brice Augustin and Maria-Luiza svn path=/trunk/; revision=15007
2005-07-23 00:46:14 +00:00
/* Decode MPLS extensions if the payload has at least 128 bytes, and
- the original packet in the ICMP payload has less than 128 bytes, or
- the user favors the MPLS extensions analysis */
if ((tvb_reported_length(tvb) > 8 + 128)
&& (tvb_get_ntohs(tvb, 8 + 2) <= 128 || favor_icmp_mpls_ext))
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
dissect_mpls_extensions(tvb, 8 + 128, icmp_tree);
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
case ICMP_ECHOREPLY:
case ICMP_ECHO:
Don't pass "tvb_reported_length_remaining(tvb, offset)" as the fourth argument to "tvb_new_subset()" - just use -1 if the subset tvbuff is to run to the end of the parent tvbuff. svn path=/trunk/; revision=5597
2002-05-30 01:56:55 +00:00
call_dissector(data_handle, tvb_new_subset(tvb, 8, -1, -1), pinfo,
icmp_tree);
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
case ICMP_RTRADVERT:
if (addr_entry_size == 2) {
for (i = 0; i < num_addrs; i++) {
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
proto_tree_add_text(icmp_tree, tvb, 8 + (i*8), 4,
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
"Router address: %s",
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ip_to_str(tvb_get_ptr(tvb, 8 + (i*8), 4)));
proto_tree_add_text(icmp_tree, tvb, 12 + (i*8), 4,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
"Preference level: %d", tvb_get_ntohl(tvb, 12 + (i*8)));
}
from Jaap K fix for bug 306 svn path=/trunk/; revision=16812
2005-12-15 23:17:01 +00:00
if ((icmp_code == 0) || (icmp_code == 16)) {
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
/* Mobile-Ip */
Get rid of an unused argument. Use the reported length, not the captured length, of a tvbuff when scanning through it. Mark unused arguments that can't be eliminated as unused. svn path=/trunk/; revision=5058
2002-03-31 21:43:51 +00:00
dissect_mip_extensions(tvb, 8 + i*8, icmp_tree);
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
}
} else
Don't pass "tvb_reported_length_remaining(tvb, offset)" as the fourth argument to "tvb_new_subset()" - just use -1 if the subset tvbuff is to run to the end of the parent tvbuff. svn path=/trunk/; revision=5597
2002-05-30 01:56:55 +00:00
call_dissector(data_handle, tvb_new_subset(tvb, 8, -1, -1), pinfo,
icmp_tree);
Dissect ICMP Router Discovery packets (router advertisements and router solicitations). svn path=/trunk/; revision=295
1999-05-20 02:41:22 +00:00
break;
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
case ICMP_TSTAMP:
case ICMP_TSTAMPREPLY:
from Stephen Fisher make icmp timestamps more readable svn path=/trunk/; revision=18406
2006-06-09 20:44:16 +00:00
proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %s after midnight UTC",
time_msecs_to_str(tvb_get_ntohl(tvb, 8)));
proto_tree_add_text(icmp_tree, tvb, 12, 4, "Receive timestamp: %s after midnight UTC",
time_msecs_to_str(tvb_get_ntohl(tvb, 12)));
proto_tree_add_text(icmp_tree, tvb, 16, 4, "Transmit timestamp: %s after midnight UTC",
time_msecs_to_str(tvb_get_ntohl(tvb, 16)));
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
case ICMP_MASKREQ:
case ICMP_MASKREPLY:
When printing an address mask in hex, zero-pad it, don't blank-pad it. svn path=/trunk/; revision=2747
2000-12-08 22:53:08 +00:00
proto_tree_add_text(icmp_tree, tvb, 8, 4, "Address mask: %s (0x%08x)",
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
ip_to_str(tvb_get_ptr(tvb, 8, 4)), tvb_get_ntohl(tvb, 8));
Decode more stuff in an ICMP packet. svn path=/trunk/; revision=213
1999-03-09 02:52:37 +00:00
break;
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
void
proto_register_ip(void)
{
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
static hf_register_info hf[] = {
{ &hf_ip_version,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Version", "ip.version", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_hdr_len,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Header Length", "ip.hdr_len", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
{ &hf_ip_dsfield,
{ "Differentiated Services field", "ip.dsfield", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
{ &hf_ip_dsfield_dscp,
{ "Differentiated Services Codepoint", "ip.dsfield.dscp", FT_UINT8, BASE_HEX,
VALS(dscp_vals), IPDSFIELD_DSCP_MASK,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
{ &hf_ip_dsfield_ect,
{ "ECN-Capable Transport (ECT)", "ip.dsfield.ect", FT_UINT8, BASE_DEC, NULL,
IPDSFIELD_ECT_MASK,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Apply the patch for ECN in the IP header from Ulrich Kiermayr <kie@thp.univie.ac.at> svn path=/trunk/; revision=2441
2000-09-16 00:48:43 +00:00
{ &hf_ip_dsfield_ce,
{ "ECN-CE", "ip.dsfield.ce", FT_UINT8, BASE_DEC, NULL,
IPDSFIELD_CE_MASK,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_tos,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Type of Service", "ip.tos", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_tos_precedence,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Precedence", "ip.tos.precedence", FT_UINT8, BASE_DEC, VALS(precedence_vals),
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
IPTOS_PREC_MASK,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_tos_delay,
{ "Delay", "ip.tos.delay", FT_BOOLEAN, 8, TFS(&tos_set_low),
IPTOS_LOWDELAY,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_tos_throughput,
{ "Throughput", "ip.tos.throughput", FT_BOOLEAN, 8, TFS(&tos_set_high),
IPTOS_THROUGHPUT,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_tos_reliability,
{ "Reliability", "ip.tos.reliability", FT_BOOLEAN, 8, TFS(&tos_set_high),
IPTOS_RELIABILITY,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_tos_cost,
{ "Cost", "ip.tos.cost", FT_BOOLEAN, 8, TFS(&tos_set_low),
IPTOS_LOWCOST,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_len,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Total Length", "ip.len", FT_UINT16, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_id,
Use BASE_DEC_HEX for the identifier field; that means we don't have to use "proto_tree_add_uint_format()", we can just let the Ethereal core format it. svn path=/trunk/; revision=15922
2005-09-21 02:12:24 +00:00
{ "Identification", "ip.id", FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_dst,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Destination", "ip.dst", FT_IPv4, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
{ &hf_ip_dst_host,
{ "Destination Host", "ip.dst_host", FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_ip_src,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Source", "ip.src", FT_IPv4, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Added just enough fields to TCP to support "Follow TCP Stream". It works now. Added the protocol IDs for ipx and IGMP, but not their fields. svn path=/trunk/; revision=365
1999-07-17 04:19:15 +00:00
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
{ &hf_ip_src_host,
{ "Source Host", "ip.src_host", FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }},
Added just enough fields to TCP to support "Follow TCP Stream". It works now. Added the protocol IDs for ipx and IGMP, but not their fields. svn path=/trunk/; revision=365
1999-07-17 04:19:15 +00:00
{ &hf_ip_addr,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Source or Destination Address", "ip.addr", FT_IPv4, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
add some hidden fields to be able to filter on the resolved hostname "ip.host" / "ip.src_host" / "ip.dst_host", this was formerly not possible. replace some deprecated proto_tree_add_..._hidden() calls by seperate calls by proto_tree_add_...() and PROTO_ITEM_SET_HIDDEN() some other cosmetic changes svn path=/trunk/; revision=14518
2005-06-01 23:44:24 +00:00
{ &hf_ip_host,
{ "Source or Destination Host", "ip.host", FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
{ &hf_ip_flags,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Flags", "ip.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
{ &hf_ip_flags_rf,
{ "Reserved bit", "ip.flags.rb", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_RF >> 12,
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_flags_df,
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
{ "Don't fragment", "ip.flags.df", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_DF >> 12,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
{ &hf_ip_flags_mf,
From Nick Black: the 0x8000 bit in the flags field is *NOT* a "congestion" bit for ECN. Show it as a reserved bit. Put semicolons, not commas, at the end of the calls to put flags field bits into the protocol tree. svn path=/trunk/; revision=10087
2004-02-18 06:43:01 +00:00
{ "More fragments", "ip.flags.mf", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_MF >> 12,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Make a bunch of the bitfields in the IP header filterable items. svn path=/trunk/; revision=963
1999-11-02 05:38:51 +00:00
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
{ &hf_ip_frag_offset,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Fragment offset", "ip.frag_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
{ &hf_ip_ttl,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Time to live", "ip.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
{ &hf_ip_proto,
IPComp (RFC2393) decoding. svn path=/trunk/; revision=838
1999-10-15 05:30:43 +00:00
{ "Protocol", "ip.proto", FT_UINT8, BASE_HEX, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Converted more of the IP fields to filterable fields. svn path=/trunk/; revision=505
1999-08-17 03:09:39 +00:00
{ &hf_ip_checksum,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Header checksum", "ip.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Change from James E. Flemer to add hidden Boolean fields that are set if the IP or ICMP checksum is bad. svn path=/trunk/; revision=3063
2001-02-21 19:35:50 +00:00
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
{ &hf_ip_checksum_good,
{ "Good", "ip.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"True: checksum matches packet content; False: doesn't match content or not checked", HFILL }},
Change from James E. Flemer to add hidden Boolean fields that are set if the IP or ICMP checksum is bad. svn path=/trunk/; revision=3063
2001-02-21 19:35:50 +00:00
{ &hf_ip_checksum_bad,
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
{ "Bad ", "ip.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"True: checksum doesn't match packet content; False: matches content or not checked", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment_overlap,
{ "Fragment overlap", "ip.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"Fragment overlaps with other fragments", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment_overlap_conflict,
{ "Conflicting data in fragment overlap", "ip.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"Overlapping fragments contained conflicting data", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment_multiple_tails,
{ "Multiple tail fragments found", "ip.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"Several tails were found when defragmenting the packet", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment_too_long_fragment,
{ "Fragment too long", "ip.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"Fragment contained data past end of packet", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment_error,
Update reassemble.c/show_item and all callers to use FT_FRAMENUM for the list of packets corresponding to a reassembled pdu svn path=/trunk/; revision=6807
2002-12-19 11:22:38 +00:00
{ "Defragmentation error", "ip.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"Defragmentation error due to illegal fragments", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragment,
Update reassemble.c/show_item and all callers to use FT_FRAMENUM for the list of packets corresponding to a reassembled pdu svn path=/trunk/; revision=6807
2002-12-19 11:22:38 +00:00
{ "IP Fragment", "ip.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"IP Fragment", HFILL }},
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
{ &hf_ip_fragments,
There is no string value assigned to the "ip.fragment.error", "ip.fragment", and "ip.fragments" fields, so make them FT_NONE, not FT_STRING. (Otherwise, if you try to do a "Match Selected" on them, we dump core because the value is a null pointer and we try to dereference it.) svn path=/trunk/; revision=3512
2001-06-05 05:54:14 +00:00
{ "IP Fragments", "ip.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"IP Fragments", HFILL }},
Update the ip fragment reassembly so that the subdissector is only called from the frame where the ip packet was reassembled instead of from each fragment. For fragments, put [Reassembled in #xx] in the summary pane so it is easy to see which fragments are successfully reassembled and which are not. For fragments, add a "This fragment is reassembled in:xx" to the tree pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet. svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
{ &hf_ip_reassembled_in,
{ "Reassembled IP in frame", "ip.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This IP packet is reassembled in this frame", HFILL }}
Added Johan's RADIUS dissector, finally. I modified it to fit in with the new proto_tree routines. I also removed the check for lex and yacc from wiretap's configure script. The IP dissector now uses proto_register_field_array(). svn path=/trunk/; revision=348
1999-07-08 04:23:28 +00:00
};
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint *ett[] = {
&ett_ip,
Heikki Vatiainen's patch to add a flag to control whether to interpret the IPv4 TOS field as a TOS field or as a DiffServ field, and allow that field to be controlled by a command-line option or an option in the "Display:Options" dialog box. svn path=/trunk/; revision=1532
2000-01-24 04:44:58 +00:00
&ett_ip_dsfield,
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_ip_tos,
&ett_ip_off,
&ett_ip_options,
&ett_ip_option_sec,
&ett_ip_option_route,
&ett_ip_option_timestamp,
From Paul Moore: This patch adds support for the IPv4 Commercial IP Security Option (CIPSO) as defined in the IETF draft, draft-ietf-cipso-ipsecurity-01.txt. While this draft has long since expired, it has become a de-facto standard for labeled networking with support from several commercial Multi-Level Security (MLS) operating systems such as HP-UX CMW and Trusted Solaris; in addition, Linux Kernels 2.6.19 and later provide support for CIPSO in conjunction with SELinux. Copies of the expired CIPSO draft can be found at the NetLabel project page: * http://netlabel.sf.net svn path=/trunk/; revision=20506
2007-01-19 23:56:42 +00:00
&ett_ip_option_cipso,
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
&ett_ip_fragments,
&ett_ip_fragment,
as discussed some time ago: don't add bad checksum fields conditionally but use a subtree and use boolean flags instead svn path=/trunk/; revision=15498
2005-08-21 15:13:47 +00:00
&ett_ip_checksum,
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
};
Add support for a global "ethereal.conf" preferences file, stored in the same directory as the "manuf" file ("/etc" or "/usr/local/etc", most likely). Add a mechanism to allow modules (e.g., dissectors) to register preference values, which: can be put into the global or the user's preference file; can be set from the command line, with arguments to the "-o" flag; can be set from tabs in the "Preferences" dialog box. Use that mechanism to register the "Decode IPv4 TOS field as DiffServ field" variable for IP as a preference. Stuff that still needs to be done: documenting the API for registering preferences; documenting the "-o" values in the man page (probably needs a flag similar to "-G", and a Perl script to turn the output into documentation as is done with the list of field); handling error checking for numeric values (range checking, making sure that if the user changes the variable from the GUI they change it to a valid numeric value); using the callbacks to, for example, update the display when preferences are changed (could be expensive); panic if the user specifies a numeric value with a base other than 10, 8, or 16. We may also want to clean up the existing wired-in preferences not to take effect the instant you tweak the widget, and to add an "Apply" button to the "Preferences" dialog. svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
module_t *ip_module;
Added Johan's RADIUS dissector, finally. I modified it to fit in with the new proto_tree routines. I also removed the check for lex and yacc from wiretap's configure script. The IP dissector now uses proto_register_field_array(). svn path=/trunk/; revision=348
1999-07-08 04:23:28 +00:00
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
proto_ip = proto_register_protocol("Internet Protocol", "IP", "ip");
Added Johan's RADIUS dissector, finally. I modified it to fit in with the new proto_tree routines. I also removed the check for lex and yacc from wiretap's configure script. The IP dissector now uses proto_register_field_array(). svn path=/trunk/; revision=348
1999-07-08 04:23:28 +00:00
proto_register_field_array(proto_ip, hf, array_length(hf));
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
proto_register_subtree_array(ett, array_length(ett));
Register an "ip.proto" dissector table for IPv4, and have dissectors for protocols that run inside IPv4 register themselves with it using "dissector_add()". Make various dissectors static if they can be, and get rid of any header files that no longer contain any information as a result of that change. svn path=/trunk/; revision=1870
2000-04-16 22:46:25 +00:00
/* subdissector code */
Attach a descriptive name field type and base to dissector tables; that specifies how the selector values used as keys in those tables are to be displayed, and the title to use when displaying the table. Use that information in the code to display the initial and current entries of various dissector tables. Have the dissector for BACnet APDUs register itself by name, and have the BACnet NPDU dissector call it iff the BAC_CONTROL_NET bit isn't set, rather than doing it with a dissector table. svn path=/trunk/; revision=4358
2001-12-08 06:41:48 +00:00
ip_dissector_table = register_dissector_table("ip.proto",
"IP protocol", FT_UINT8, BASE_DEC);
Add support for a global "ethereal.conf" preferences file, stored in the same directory as the "manuf" file ("/etc" or "/usr/local/etc", most likely). Add a mechanism to allow modules (e.g., dissectors) to register preference values, which: can be put into the global or the user's preference file; can be set from the command line, with arguments to the "-o" flag; can be set from tabs in the "Preferences" dialog box. Use that mechanism to register the "Decode IPv4 TOS field as DiffServ field" variable for IP as a preference. Stuff that still needs to be done: documenting the API for registering preferences; documenting the "-o" values in the man page (probably needs a flag similar to "-G", and a Perl script to turn the output into documentation as is done with the list of field); handling error checking for numeric values (range checking, making sure that if the user changes the variable from the GUI they change it to a valid numeric value); using the callbacks to, for example, update the display when preferences are changed (could be expensive); panic if the user specifies a numeric value with a base other than 10, 8, or 16. We may also want to clean up the existing wired-in preferences not to take effect the instant you tweak the widget, and to add an "Apply" button to the "Preferences" dialog. svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
Don't display the data portion of an ER NPDU - we dissect it as a CLNP PDU. svn path=/trunk/; revision=3527
2001-06-08 08:29:15 +00:00
/* Register configuration options */
Add a new "prefs_register_protocol()" routine, which is like "prefs_register_module()" except that it takes a protocol index as returned by "proto_register_protocol()" as its first argument, rather than taking two character strings as arguments as its first two arguments, and uses the protocol's abbreviation as the name to use for preferences in the preferences file and the "-o" flag and uses the protocol's short name as the name to use in the tabs in the "Edit->Preferences" window. svn path=/trunk/; revision=2812
2001-01-03 07:53:48 +00:00
ip_module = prefs_register_protocol(proto_ip, NULL);
Add support for a global "ethereal.conf" preferences file, stored in the same directory as the "manuf" file ("/etc" or "/usr/local/etc", most likely). Add a mechanism to allow modules (e.g., dissectors) to register preference values, which: can be put into the global or the user's preference file; can be set from the command line, with arguments to the "-o" flag; can be set from tabs in the "Preferences" dialog box. Use that mechanism to register the "Decode IPv4 TOS field as DiffServ field" variable for IP as a preference. Stuff that still needs to be done: documenting the API for registering preferences; documenting the "-o" values in the man page (probably needs a flag similar to "-G", and a Perl script to turn the output into documentation as is done with the list of field); handling error checking for numeric values (range checking, making sure that if the user changes the variable from the GUI they change it to a valid numeric value); using the callbacks to, for example, update the display when preferences are changed (could be expensive); panic if the user specifies a numeric value with a base other than 10, 8, or 16. We may also want to clean up the existing wired-in preferences not to take effect the instant you tweak the widget, and to add an "Apply" button to the "Preferences" dialog. svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
prefs_register_bool_preference(ip_module, "decode_tos_as_diffserv",
"Decode IPv4 TOS field as DiffServ field",
add a reference to the corresponding RFC's of the Differentiated Services field pref setting svn path=/trunk/; revision=14519
2005-06-01 23:47:55 +00:00
"Whether the IPv4 type-of-service field should be decoded as a Differentiated Services field (see RFC2474/RFC2475)",
Add support for a global "ethereal.conf" preferences file, stored in the same directory as the "manuf" file ("/etc" or "/usr/local/etc", most likely). Add a mechanism to allow modules (e.g., dissectors) to register preference values, which: can be put into the global or the user's preference file; can be set from the command line, with arguments to the "-o" flag; can be set from tabs in the "Preferences" dialog box. Use that mechanism to register the "Decode IPv4 TOS field as DiffServ field" variable for IP as a preference. Stuff that still needs to be done: documenting the API for registering preferences; documenting the "-o" values in the man page (probably needs a flag similar to "-G", and a Perl script to turn the output into documentation as is done with the list of field); handling error checking for numeric values (range checking, making sure that if the user changes the variable from the GUI they change it to a valid numeric value); using the callbacks to, for example, update the display when preferences are changed (could be expensive); panic if the user specifies a numeric value with a base other than 10, 8, or 16. We may also want to clean up the existing wired-in preferences not to take effect the instant you tweak the widget, and to add an "Apply" button to the "Preferences" dialog. svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
&g_ip_dscp_actif);
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
prefs_register_bool_preference(ip_module, "defragment",
"Reassemble fragmented IP datagrams",
"Whether fragmented IP datagrams should be reassembled",
&ip_defragment);
Panic if a preference starts with the name of the module to which it belongs, as that's redundant. Fix a bunch of cases where that was done, and map the old name to the new name. Instead of marking "mtp3.mtp3_standard" as obsolete, map it to "mtp3.standard". svn path=/trunk/; revision=7030
2003-01-28 23:56:40 +00:00
prefs_register_bool_preference(ip_module, "summary_in_tree",
Add tree summary information similar to what's in packet-tcp.c. svn path=/trunk/; revision=3436
2001-05-23 03:33:59 +00:00
"Show IP summary in protocol tree",
"Whether the IP summary line should be shown in the protocol tree",
&ip_summary_in_tree);
from Yaniv Kaul: add a Preference setting for IP checksum validation svn path=/trunk/; revision=16080
2005-10-03 16:24:43 +00:00
prefs_register_bool_preference(ip_module, "check_checksum" ,
"Validate the IP checksum if possible",
"Whether to validate the IP checksum",
&ip_check_checksum);
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
Add an additional "protocol index" argument to "{old_}dissector_add()", "{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
2001-01-09 06:32:10 +00:00
register_dissector("ip", dissect_ip, proto_ip);
IP fragment reassembly, from Ronnie Sahlberg. svn path=/trunk/; revision=3324
2001-04-18 04:53:51 +00:00
register_init_routine(ip_defragment_init);
Patch for packet-ip to make it TAPable svn path=/trunk/; revision=6969
2003-01-22 01:16:33 +00:00
ip_tap=register_tap("ip");
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Change the sub-dissector handoff registration routines so that the sub-dissector table is not stored in the header_field_info struct, but in a separate namespace. Dissector tables are now registered by name and not by field ID. For example: udp_dissector_table = register_dissector_table("udp.port"); Because of this different namespace, dissector tables can have names that are not field names. This is useful for ethertype, since multiple fields are "ethertypes". packet-ethertype.c replaces ethertype.c (the name was changed so that it would be named in the same fashion as all the filenames passed to make-reg-dotc) Although it registers no protocol or field, it registers one dissector table: ethertype_dissector_table = register_dissector_table("ethertype"); All protocols that can be called because of an ethertype field now register that fact with dissector_add() calls. In this way, one dissector_table services all ethertype fields (hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype) Furthermore, the code allows for names of protocols to exist in the etype_vals, yet a dissector for that protocol doesn't exist. The name of the dissector is printed in COL_INFO. You're welcome, Richard. :-) svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
void
proto_reg_handoff_ip(void)
{
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
dissector_handle_t ip_handle;
Moved from using dissect_data() to using call_dissector() svn path=/trunk/; revision=4269
2001-11-26 04:52:51 +00:00
data_handle = find_dissector("data");
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
ip_handle = find_dissector("ip");
The beginnings of a TAPA dissector (Trapeze Access Point Access Protocol). Admittedly not much, so if you have any ideas what the rest means or where I'm wrong please provide feedback. As tapa uses udp 5000 and ip protocol 4, I needed to add a hack for the ip part to properly dispatch betweeen ipip and tapa-tunnel (actually I was unable to turn the ipip dissector into a heuristic dissector :-) svn path=/trunk/; revision=20971
2007-03-04 11:48:07 +00:00
tapa_handle = find_dissector("tapa");
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
dissector_add("ethertype", ETHERTYPE_IP, ip_handle);
dissector_add("ppp.protocol", PPP_IP, ip_handle);
dissector_add("ppp.protocol", ETHERTYPE_IP, ip_handle);
dissector_add("gre.proto", ETHERTYPE_IP, ip_handle);
dissector_add("gre.proto", GRE_WCCP, ip_handle);
dissector_add("llc.dsap", SAP_IP, ip_handle);
dissector_add("ip.proto", IP_PROTO_IPIP, ip_handle);
dissector_add("null.type", BSD_AF_INET, ip_handle);
dissector_add("chdlctype", ETHERTYPE_IP, ip_handle);
From Hannes Gredler: support for Juniper's DLT_JUNIPER_ATM{1,2} values. svn path=/trunk/; revision=13130
2005-01-20 05:40:56 +00:00
dissector_add("osinl.excl", NLPID_IP, ip_handle);
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
dissector_add("fr.ietf", NLPID_IP, ip_handle);
dissector_add("x.25.spi", NLPID_IP, ip_handle);
In the BSDs, ARCNET packets don't have an offset field between the addresses and the protocol type, as supplied by BPF; on Linux, they *do* have an offset field, as supplied by PF_PACKET sockets. Add a new WTAP_ENCAP_ARCNET_LINUX, with packets that include the offset field, and don't dissect an offset in WTAP_ENCAP_ARCNET packets. Map a libpcap link-layer type of 129 to WTAP_ENCAP_ARCNET_LINUX; that value was recently assigned to Linux-style ARCNET. Add some more ARCNET protocol IDs. For most protocol IDs, dissect an ATA 878.2 fragmentation header; don't do it for RFC 1051 IP and ARP, and Diagnose packets. Set the length of the ARCNET protocol tree item appropriately. Dissect both the RFC 1051 and RFC 1201 styles of IP and ARP over ARCNET, and dissect the RFC 1201 style of RARP as well. svn path=/trunk/; revision=6981
2003-01-23 04:04:01 +00:00
dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle);
dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle);
From Stefano Pettini 1) added _U_ tags in RMT dissectors to suppress "unused parameter" warnings. 2) added a dissector_add_handle("ip.udp", ip_handle) to IP dissector, to allow the following chain of protocols: IP over UDP over IP. It seems uncommon, but it's used by implementations of experimental protocols (e.g. TCP-XM) that run a userspace IP stack (e.g. lwIP) over UDP. The dissector of IP over UDP must be enabled explicitly using the "decode as..." window. svn path=/trunk/; revision=13540
2005-02-27 20:26:55 +00:00
dissector_add_handle("udp.port", ip_handle);
Change the sub-dissector handoff registration routines so that the sub-dissector table is not stored in the header_field_info struct, but in a separate namespace. Dissector tables are now registered by name and not by field ID. For example: udp_dissector_table = register_dissector_table("udp.port"); Because of this different namespace, dissector tables can have names that are not field names. This is useful for ethertype, since multiple fields are "ethertypes". packet-ethertype.c replaces ethertype.c (the name was changed so that it would be named in the same fashion as all the filenames passed to make-reg-dotc) Although it registers no protocol or field, it registers one dissector table: ethertype_dissector_table = register_dissector_table("ethertype"); All protocols that can be called because of an ethertype field now register that fact with dissector_add() calls. In this way, one dissector_table services all ethertype fields (hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype) Furthermore, the code allows for names of protocols to exist in the etype_vals, yet a dissector for that protocol doesn't exist. The name of the dissector is printed in COL_INFO. You're welcome, Richard. :-) svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
void
proto_register_icmp(void)
{
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
static hf_register_info hf[] = {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
{ &hf_icmp_type,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Type", "icmp.type", FT_UINT8, BASE_DEC, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
{ &hf_icmp_code,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Code", "icmp.code", FT_UINT8, BASE_HEX, NULL, 0x0,
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
"", HFILL }},
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
{ &hf_icmp_checksum,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Checksum", "icmp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Change from James E. Flemer to add hidden Boolean fields that are set if the IP or ICMP checksum is bad. svn path=/trunk/; revision=3063
2001-02-21 19:35:50 +00:00
Add hidden fields for bad checksums to various IP-family protocols. Initialize the "hf_" value for "icmp.checksum_bad" to -1, the way all other "hf_" values are initialized, and declare it and "ip.checksum_bad" to have base BASE_NONE, not 4. svn path=/trunk/; revision=3087
2001-02-28 19:33:49 +00:00
{ &hf_icmp_checksum_bad,
{ "Bad Checksum", "icmp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
"", HFILL }},
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
{ &hf_icmp_ident,
{"Identifier", "icmp.ident", FT_UINT16, BASE_HEX, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_seq_num,
Display icmp echo/echo reply sequence numbers in decimal in addition to hex, so that it is easier to match it with the output of a ping program. svn path=/trunk/; revision=20142
2006-12-17 05:44:32 +00:00
{"Sequence number", "icmp.seq", FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
From Giles Scott: make some items in the ICMP protocol tree named fields. svn path=/trunk/; revision=8710
2003-10-15 22:00:02 +00:00
"", HFILL }},
{ &hf_icmp_mtu,
{"MTU of next hop", "icmp.mtu", FT_UINT16, BASE_DEC, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_redir_gw,
{"Gateway address", "icmp.redir_gw", FT_IPv4, BASE_NONE, NULL, 0x0,
"", HFILL }},
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
{ &hf_icmp_mip_type,
{ "Extension Type", "icmp.mip.type", FT_UINT8, BASE_DEC,
VALS(mip_extensions), 0x0,"", HFILL}},
{ &hf_icmp_mip_length,
{ "Length", "icmp.mip.length", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_prefix_length,
{ "Prefix Length", "icmp.mip.prefixlength", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_seq,
{ "Sequence Number", "icmp.mip.seq", FT_UINT16, BASE_DEC, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_life,
{ "Registration Lifetime", "icmp.mip.life", FT_UINT16, BASE_DEC, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_flags,
{ "Flags", "icmp.mip.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_r,
{ "Registration Required", "icmp.mip.r", FT_BOOLEAN, 8, NULL, 128,
"Registration with this FA is required", HFILL }},
{ &hf_icmp_mip_b,
{ "Busy", "icmp.mip.b", FT_BOOLEAN, 8, NULL, 64,
"This FA will not accept requests at this time", HFILL }},
{ &hf_icmp_mip_h,
{ "Home Agent", "icmp.mip.h", FT_BOOLEAN, 8, NULL, 32,
"Home Agent Services Offered", HFILL }},
{ &hf_icmp_mip_f,
{ "Foreign Agent", "icmp.mip.f", FT_BOOLEAN, 8, NULL, 16,
"Foreign Agent Services Offered", HFILL }},
{ &hf_icmp_mip_m,
{ "Minimal Encapsulation", "icmp.mip.m", FT_BOOLEAN, 8, NULL, 8,
"Minimal encapsulation tunneled datagram support", HFILL }},
{ &hf_icmp_mip_g,
{ "GRE", "icmp.mip.g", FT_BOOLEAN, 8, NULL, 4,
"GRE encapsulated tunneled datagram support", HFILL }},
{ &hf_icmp_mip_v,
{ "VJ Comp", "icmp.mip.v", FT_BOOLEAN, 8, NULL, 2,
"Van Jacobson Header Compression Support", HFILL }},
Fix Ethereal bug 994 in Wireshark: MIP Advertisement reverse tunneling flag not dissected svn path=/trunk/; revision=18520
2006-06-19 15:54:13 +00:00
{ &hf_icmp_mip_rt,
{ "Reverse tunneling", "icmp.mip.rt", FT_BOOLEAN, 8, NULL, 1,
"Reverse tunneling support", HFILL }},
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
{ &hf_icmp_mip_reserved,
{ "Reserved", "icmp.mip.reserved", FT_UINT8, BASE_HEX, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_coa,
{ "Care-Of-Address", "icmp.mip.coa", FT_IPv4, BASE_NONE, NULL, 0x0,
"", HFILL}},
{ &hf_icmp_mip_challenge,
{ "Challenge", "icmp.mip.challenge", FT_BYTES, BASE_NONE, NULL, 0x0,
"", HFILL}},
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
{ &hf_icmp_mpls,
{ "ICMP Extensions for MPLS", "icmp.mpls", FT_NONE, BASE_NONE, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_version,
{ "Version", "icmp.mpls.version", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_reserved,
{ "Reserved", "icmp.mpls.res", FT_UINT16, BASE_HEX, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_checksum,
{ "Checksum", "icmp.mpls.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_checksum_bad,
{ "Bad Checksum", "icmp.mpls.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_length,
{ "Length", "icmp.mpls.length", FT_UINT16, BASE_HEX, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_class,
{ "Class", "icmp.mpls.class", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_c_type,
{ "C-Type", "icmp.mpls.ctype", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }},
{ &hf_icmp_mpls_label,
{ "Label", "icmp.mpls.label", FT_UINT24, BASE_DEC, NULL, 0x00fffff0,
"", HFILL }},
{ &hf_icmp_mpls_exp,
{ "Experimental", "icmp.mpls.exp", FT_UINT24, BASE_DEC,
NULL, 0x0e,
"", HFILL }},
{ &hf_icmp_mpls_s,
{ "Stack bit", "icmp.mpls.s", FT_BOOLEAN, 24, TFS(&flags_set_truth), 0x01,
"", HFILL }},
{ &hf_icmp_mpls_ttl,
{ "Time to live", "icmp.mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
"", HFILL }}
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
};
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint *ett[] = {
&ett_icmp,
Support for Mobile IP's use of ICMP Router Advertisements, from David Frascone. Small white-space fix. Display the preference level in router advertisements as signed, not unsigned, as per RFC 1256, which says it's a "signed, twos-complement value". svn path=/trunk/; revision=4118
2001-10-31 22:03:53 +00:00
&ett_icmp_mip,
from Maria-Luiza Crivat and Brice Augustin ICMP MPLS extensions svn path=/trunk/; revision=14818
2005-06-29 10:39:09 +00:00
&ett_icmp_mip_flags,
/* MPLS extensions */
&ett_icmp_mpls,
&ett_icmp_mpls_object,
&ett_icmp_mpls_stack_object
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
};
ICMP MPLS updates and a new preference option from Brice Augustin and Maria-Luiza svn path=/trunk/; revision=15007
2005-07-23 00:46:14 +00:00
module_t *icmp_module;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_icmp = proto_register_protocol("Internet Control Message Protocol",
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
"ICMP", "icmp");
Add ICMP display filters. svn path=/trunk/; revision=751
1999-10-02 16:21:07 +00:00
proto_register_field_array(proto_icmp, hf, array_length(hf));
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
proto_register_subtree_array(ett, array_length(ett));
ICMP MPLS updates and a new preference option from Brice Augustin and Maria-Luiza svn path=/trunk/; revision=15007
2005-07-23 00:46:14 +00:00
icmp_module = prefs_register_protocol(proto_icmp, NULL);
prefs_register_bool_preference(icmp_module, "favor_icmp_mpls",
"Favor ICMP extensions for MPLS",
"Whether the 128th and following bytes of the ICMP payload should be decoded as MPLS extensions or as a portion of the original packet",
&favor_icmp_mpls_ext);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
}
Don Lafontaine's IGRP/EIGRP dissector. svn path=/trunk/; revision=949
1999-10-30 06:10:32 +00:00
Register an "ip.proto" dissector table for IPv4, and have dissectors for protocols that run inside IPv4 register themselves with it using "dissector_add()". Make various dissectors static if they can be, and get rid of any header files that no longer contain any information as a result of that change. svn path=/trunk/; revision=1870
2000-04-16 22:46:25 +00:00
void
proto_reg_handoff_icmp(void)
{
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
dissector_handle_t icmp_handle;
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
/*
* Get handle for the IP dissector.
*/
ip_handle = find_dissector("ip");
If version is v6 let the IPv6 dissetor handle it. svn path=/trunk/; revision=17649
2006-03-16 20:14:47 +00:00
ipv6_handle = find_dissector("ipv6");
When dissecting an ICMP datagram that contains part of an IP datagram, hand the (possibly-partial) IP datagram to the IP dissector, as we do for IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs. When dissecting IPv6 datagrams inside ICMPv6 and CLNP datagrams inside CLNP ER PDUs, catch the ReportedLengthError exception and ignore it, as they don't guarantee that all of the original PDU is present. svn path=/trunk/; revision=3960
2001-09-27 10:35:40 +00:00
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
icmp_handle = create_dissector_handle(dissect_icmp, proto_icmp);
dissector_add("ip.proto", IP_PROTO_ICMP, icmp_handle);
Register an "ip.proto" dissector table for IPv4, and have dissectors for protocols that run inside IPv4 register themselves with it using "dissector_add()". Make various dissectors static if they can be, and get rid of any header files that no longer contain any information as a result of that change. svn path=/trunk/; revision=1870
2000-04-16 22:46:25 +00:00
}