aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-erf.c
AgeCommit message (Collapse)AuthorFilesLines
2013-02-26it's ==> its & its ==> it's as needed.Bill Meier1-1/+1
svn path=/trunk/; revision=47891
2013-01-16From Stephen Donnelly via ↵Pascal Quantin1-9/+9
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8215 : Several ERF types are incorrectly calling downstream dissectors under the erf_tree instead of under the top level tree svn path=/trunk/; revision=47122
2012-12-26Fix a bunch of warnings.Guy Harris1-1/+1
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-11-29Make all enum_val_t's const.Jeff Morriss1-2/+2
svn path=/trunk/; revision=46292
2012-10-13Don't add FT_UINTn values with proto_tree_add_int(). (The fields inGuy Harris1-4/+4
question are 4-byte header fields containing bitfields, so "unsigned" is appropriate here.) svn path=/trunk/; revision=45521
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-08-10From Stephen Donnelly via ↵Jeff Morriss1-2/+0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 : Remove another invalid array write. svn path=/trunk/; revision=44419
2012-08-09From Stephen Donnelly: a better fix for the fuzz failure reported inJeff Morriss1-29/+29
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 : Previous patch solved the reported problem. This patch should cover input validation for the VC Id and Link Rate fields properly. Note link_rate==0 (unknown) is supported, as some hardware/firmware may not set this field, but vc_size==0 is defined invalid. From me: also initialize m_sdh_line_rate when the input is garbage. svn path=/trunk/; revision=44377
2012-08-07Fix fuzz failure reported in ↵Jeff Morriss1-12/+21
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 : Don't overflow in_fmt->m_vc_index_array: verify that speed is less than or equal to DECHAN_MAX_AUG_INDEX before using it. Also add a comment: there are comments here that indicate that this array should have 5 entries but there are only 4. svn path=/trunk/; revision=44306
2012-07-31From Stephen Donnelly:Anders Broman1-246/+240
ERF dissector cleanup https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7547 svn path=/trunk/; revision=44152
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-06-05From Andrew Kampjes:Anders Broman1-1/+10
SDH support for wireshark. - Added GPL license. - Removed not needed includes. - Skipped th .h file as it wasn't used. svn path=/trunk/; revision=43106
2012-05-31g_snprintf → ep_strbuf. I can't find an ERF file with a virtualGerald Combs1-20/+9
container but the conversion seemed be straightforward enough. svn path=/trunk/; revision=42951
2012-03-16FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;Bill Meier1-2/+2
In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-13From Stephen Donnelly via ↵Jeff Morriss1-20/+20
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6943 : The ERF extension header 'New BFS' is poorly named, it is not descriptive. Rename the ERF 'New BFS' extension header to 'Signature' which is more descriptive, more easily distinguished, and consistent with the internal naming. svn path=/trunk/; revision=41515
2012-03-05Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=41354
2012-03-05Cleanup:Bill Meier1-426/+712
- packet-erf.h not used elsewhere; move to packet-erf.c; - reformat long lines; - minor code re-arrangement; - whitespace cleanup. svn path=/trunk/; revision=41345
2012-03-04Fix bugs in buffer overflow checking used with calls to g_snprintf();Bill Meier1-15/+30
svn path=/trunk/; revision=41344
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-4/+4
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-09-30Add a few more raw link types to be up to date with the current ERF format ↵Chris Maynard1-2/+11
spec. Patch provided by Andrew Kampjes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6410. svn path=/trunk/; revision=39203
2011-08-30Endace ERF channelisation and "New BFS" extension header support, fromGuy Harris1-0/+216
Andrew Kampjes. svn path=/trunk/; revision=38788
2011-03-31Delete unused header fields found by running tools/checkhf.pl.Chris Maynard1-4/+0
svn path=/trunk/; revision=36418
2011-03-31From Yair via bug 5779: Add option to leave AAL5 in unspecified format.Chris Maynard1-1/+15
(... with whitepsace changes by me.) svn path=/trunk/; revision=36416
2011-03-26Don't assign to a proto_item* if the value won't be used: Coverity 895-897Bill Meier1-28/+28
Also: Fix some indentation & whitespace. svn path=/trunk/; revision=36355
2011-02-23From Stephen Donnelly via ↵Jeff Morriss1-21/+62
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5708 : The ERF record format defines several error flags. This patch exposes ERF error flags using 'Expert Infos' for highlighting and counting. svn path=/trunk/; revision=36035
2011-02-07Remove unneeded #includes (stdio.h,stdlib.h);Bill Meier1-164/+162
Whitespace cleanup: trailing, indentation, "4-space tabs" svn path=/trunk/; revision=35850
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-1/+1
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-08-16From Stephen Donnelly:Anders Broman1-6/+39
Add BFS extension header decoding to ERF dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5113 svn path=/trunk/; revision=33806
2010-04-08From Stephen Donnelly:Anders Broman1-1/+10
InfiniBand Link Packet (flow control) dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4656 svn path=/trunk/; revision=32425
2010-04-03Remove unneeded #include <stdio.h>Bill Meier1-1/+0
svn path=/trunk/; revision=32367
2010-02-02From Stephen Donnelly:Anders Broman1-7/+94
Endace ATM and AAL2 enhancements. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4447 svn path=/trunk/; revision=31766
2009-08-21Sanitize epan includesKovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29499
2009-08-16Switch a bunch of dissectors over to using tvb_new_subset_remaining()Kovarththanan Rajaratnam1-3/+3
svn path=/trunk/; revision=29446
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-2/+1
svn path=/trunk/; revision=29340
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-92/+92
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2008-12-18Fix various typos and spelling errors (mostly in text strings)Bill Meier1-1/+1
svn path=/trunk/; revision=27050
2008-12-02Trivial warning fixesJörg Mayer1-1/+1
svn path=/trunk/; revision=26899
2008-09-30Add a cast to avoid a warning.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=26315
2008-09-30Minor proto_reg_handoff cleanup: use find_dissector when appropriate.Bill Meier1-1/+1
svn path=/trunk/; revision=26308
2008-09-29From Francesco Fusco:Anders Broman1-6/+273
Endace ERFII (extension header) support. svn path=/trunk/; revision=26287
2008-07-14Just have a scalar handle_t for the Infiniband handle, for now. (TheGuy Harris1-20/+17
old code had the type value past the end of the array.) Rename the handle variables. svn path=/trunk/; revision=25739
2008-07-14Rename the ERF "erfhdlc" preference to "hdlc_type" ("erf" is redundant,Guy Harris1-25/+42
and "hdlc" doesn't indicate that it's a protocol type), and, instead of a "raw" option, have a "try to guess the traffic type" option - for now, if the first byte is 0x0f or 0x8f, treat it as Cisco HDLC, otherwise treat it as PPP. svn path=/trunk/; revision=25737
2008-07-14Replace the old "erfatm" preference for the ERF dissector with anGuy Harris1-47/+77
"aal5_type" dissector, which offers only "guess the traffic type" and "LLC multiplexed" as options, defaulting to "guess the type". Add a separate preference to control whether to treat single ATM cells as raw data or as the first cell of an AAL5 PDU (and dissecting them as short AAL5 PDUs). Don't reach inside the tvbuff to get the data and the length; use tvb_length() and tvb_get_ptr(). Pass the data *after* the AAL5 header to the "guess the traffic type" routine. svn path=/trunk/; revision=25736
2008-07-12Make erf.ethfcs a Boolean, with "FCS present" and "FCS not present" theGuy Harris1-32/+12
only options, and default to "FCS present". svn path=/trunk/; revision=25724
2008-07-12Rename the preference values to something that leaves out the "eth" (asGuy Harris1-3/+3
it's redundant). svn path=/trunk/; revision=25720
2008-07-12ERF Ethernet records always contain Ethernet packets, as the nameGuy Harris1-20/+20
indicates; replace the "erf.eth" preference with an "erf.ethfcs" preference, specifying whether the FCS is present in Ethernet frames, and offer the options "present", "not present", and "maybe present" - for "maybe present", call the regular Ethernet dissector, which tries to figure out whether there's an FCS at the end of the packet or not. svn path=/trunk/; revision=25719
2008-06-26Make the default for HDLC traffic "Raw data", just as it is for otherGuy Harris1-1/+1
record types, so that people know they have to set the preference. svn path=/trunk/; revision=25609
2008-06-26Make the preference settings for the dissector to use for various ERFGuy Harris1-68/+52
link-layer types static. If the preference is set to "raw data" for any of those types, display the raw data with an indication that the preference in question has been set to "raw data", so people don't just wonder why ERF files aren't working right any more. (See bug 2641; I had the same surprise when I tried it on some ERF captures I have.) Pull the dissect_erf_header() code into dissect_erf() - it's dissecting the *payload*, not the *header*. Fill in the Info column with the record type. When using tvb_new_subset() to chop a header off of a tvbuff, just specify lengths of -1, so we go all the way to the end. Clean up the Infiniband dissector call. svn path=/trunk/; revision=25608
2008-05-11Convert C++ style comments ...Bill Meier1-3/+5
svn path=/trunk/; revision=25273
2008-03-14From Stephen Donnelly via bug 2235:Gerald Combs1-0/+27
This plugin implements a dissector for Infiniband. It is released under the GPL v2. Rather than using say libpcap to capture raw (unframed) IP packets from near the top of an IPoIB stack, this plugin dissects link level Infiniband frames. Infiniband trace files can be read from Endace ERF format trace files, or from libpcap DLT_ERF files containing ERF TYPE_INFINIBAND records. There is currently no native DLT_INFINIBAND in libpcap. Each record contains a hardware timestamp, capture metadata such as port Id, and a complete link level Infiniband frame starting from the Local Route Header. svn path=/trunk/; revision=24628