Commit Graph

81 Commits

Author SHA1 Message Date
Martin Mathieson 7e8a4b0927 Deleting unnecessary #includes from dissectors.
Fourth batch (packet-mac-lte.c -> packet-rtp.c).

Will look at cleaning up and committing script afterwards.

Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644
Reviewed-on: https://code.wireshark.org/review/6023
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 17:16:40 +00:00
Pascal Quantin 80d44af6b2 dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed
Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca
Reviewed-on: https://code.wireshark.org/review/5743
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13 16:36:13 +00:00
Guy Harris 58fc89a83b Fix copy-and-pasteo.
Change-Id: I181129595c7259f5c0af5308f0ca0190dce67eb7
Reviewed-on: https://code.wireshark.org/review/5687
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 08:55:23 +00:00
Michael Mann 301a5b7cea Eliminate proto_tree_add_text from some dissectors.
Change-Id: I44cc6b70ec4dfc565934da499f46fca60a4ded93
Reviewed-on: https://code.wireshark.org/review/5524
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-09 05:57:41 +00:00
Michael Mann d1ccc338d6 Add dissector table for sFlow header dissection.
Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252
Reviewed-on: https://code.wireshark.org/review/5262
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-13 05:21:52 +00:00
Guy Harris f598fa89eb Squelch a compiler warning.
Some compilers complain that we're casting a 16-bit integer to a
pointer; making it a standard-size integer squelches the warning.

Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
Reviewed-on: https://code.wireshark.org/review/5264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-13 02:11:33 +00:00
Michael Mann 6df5252c2c Add Decode As functionality for MPLS PW Associated Channel Type.
Add CFM and MPLS dissector as possible decoders.

Bug: 10574
Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
Reviewed-on: https://code.wireshark.org/review/4935
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-12 20:53:45 +00:00
Michael Mann 055e4768ec Add subdissector table for MPLS PW Associated Channel Type
Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
Reviewed-on: https://code.wireshark.org/review/5212
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-09 19:49:09 +00:00
Michael Mann f7ac077630 Create a subdissector table for juniper payload protocols.
Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee
Reviewed-on: https://code.wireshark.org/review/5204
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-09 13:56:37 +00:00
Guy Harris 4d1e1e7876 Sort the Ethernet pseudo-wire types so that they're together.
Separating the "try to guess whether there's a control word" type from
the "yes, there's a control word" and "no, there's not a control word"
types is just a huge UI botch.

Make it clearer that the default is "Ethernet pseudo-wire, try to guess
whether there's a control word".

Change-Id: I91cc526fc709ad102b22ca67f5a9d7c98fffa0cc
Reviewed-on: https://code.wireshark.org/review/2414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 21:26:04 +00:00
Guy Harris 6da6bf77b3 Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector.
Change-Id: If7bc620c19e9c6511a724847e38cf0776d26b444
Reviewed-on: https://code.wireshark.org/review/2410
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 20:55:01 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Bill Meier 93fe4d53e2 Remove trailing whitespace.
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6
Reviewed-on: https://code.wireshark.org/review/372
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 16:36:38 +00:00
Jakub Zawadzki 715e2d6699 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54095
2013-12-14 16:09:57 +00:00
Michael Mann 7ee8d48670 Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)
From Peter Paluch

svn path=/trunk/; revision=53694
2013-12-01 13:47:11 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Michael Mann eabaddaca9 Remove ethertype, mpls_label and ppids from packet_info structure.
The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".

svn path=/trunk/; revision=53489
2013-11-21 20:08:20 +00:00
Michael Mann 76ab93ea94 Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450)
The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table.  When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.

This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI)

svn path=/trunk/; revision=53445
2013-11-20 19:17:08 +00:00
Michael Mann df6594bbd2 Pass MPLS "private data" into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=52718
2013-10-20 18:00:05 +00:00
Chris Maynard f2c276ec21 Change the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol and change the UI name to match. It is by far much more common to name the tables after the field than to pick another name.
svn path=/trunk/; revision=51958
2013-09-11 21:37:58 +00:00
Martin Mathieson f78d7ed4d7 When calling IP and Ipv6 dissectors, they may reduce the new tvb we pass in.
MPLS needs to similarly shrink its own tvb so its caller can tell that
there were bytes left over (e.g. ethernet trailer).

svn path=/trunk/; revision=48994
2013-04-23 02:55:44 +00:00
Bill Meier 6fe0b4cf12 Init several hf... vars to -1.
(found by checkhf)

svn path=/trunk/; revision=47308
2013-01-26 20:41:55 +00:00
Pascal Quantin d6f2abcbfd Revert r46595
svn path=/trunk/; revision=46643
2012-12-20 21:17:23 +00:00
Pascal Quantin 8cbbff352e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Add dissection of GPRS-NS protocol inside MPLS

svn path=/trunk/; revision=46595
2012-12-18 20:36:21 +00:00
Evan Huus 99d5535cb1 From Krishnamurthy Mayya and Nikitha Malgi via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8019

Dissection support for PW-OAM messages (RFC 6478).

svn path=/trunk/; revision=46311
2012-12-01 15:39:14 +00:00
Jeff Morriss 0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Anders Broman 1c22a075a8 From Krishnamurthy Mayya:
Enhancement to support MPLS-TP FM and LI payloads as per RFC 6427 and RFC 6435

Fixed some errors found by checkapi, changed filter names to use
proto abbr.

svn path=/trunk/; revision=46084
2012-11-19 20:13:57 +00:00
Michael Mann ca6eea0923 Bug 7884 - replace proto_tree_add_text with expert_info for packet-mpls-echo.c (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7884)
svn path=/trunk/; revision=45703
2012-10-22 02:41:19 +00:00
Bill Meier f8a2fd3010 Fix another "set but unused" compiler warning...
svn path=/trunk/; revision=45197
2012-09-28 19:59:52 +00:00
Bill Meier daab50bc27 Fix "set but unused" compiler error.
svn path=/trunk/; revision=45196
2012-09-28 19:56:16 +00:00
Bill Meier 562c890560 Cleanup:
packet-mpls.c:
  - refactor dissect_pw_ach();
  - create/uer value_string_ext as appropriate;
  - use call_dissector() rather than direct dissector call in one cse;

 all:
  - use 'LABEL' prefix for a set of rather generic enum identifiers;
  - fix some cases of calling expert...() or sub-dissectors under 'if(tree)';
  - reformat some hf[] entries;
  - do some whitespace changes.

svn path=/trunk/; revision=45195
2012-09-28 19:50:49 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Anders Broman 7aa5527274 From Aditya Ambadkar and Diana Chris:
Enhancement to LDP dissector to support changes proposed in RFC6391 - flow aware transport of PW over an MPLS PSN.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046

svn path=/trunk/; revision=42894
2012-05-29 07:45:40 +00:00
Alexis La Goutte c16cd8f997 Enhance MPLS Dissector
* use proto_tree_add_item
 * start Header field by hf_mpls...


svn path=/trunk/; revision=42512
2012-05-08 17:41:23 +00:00
pascal dbd724e9ad From Francesco Fondelli: fix mpls "decode as" dialog
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7089

svn path=/trunk/; revision=42195
2012-04-22 17:54:13 +00:00
Anders Broman 3a95e4cd8b From Francesco Fondelli: fixes up issue 1) and 3) described in the bug report https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7089
svn path=/trunk/; revision=42112
2012-04-17 20:49:56 +00:00
Alexis La Goutte a256cb0c9d Remove unused hf variable
svn path=/trunk/; revision=41828
2012-03-29 18:08:16 +00:00
Alexis La Goutte c77146cc0d Fix indent (use space) and add Modelines info.
svn path=/trunk/; revision=41798
2012-03-27 13:53:29 +00:00
Alexis La Goutte 52594e8d9b From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6966
MPLS-TP Protection State Coordination (PSC) Protocol, RFC 6378

svn path=/trunk/; revision=41635
2012-03-18 11:41:18 +00:00
Alexis La Goutte 55ca59ffb9 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787
Move Y.1711 out of MPLS dissector

ITU-T Y.1711 code was "embedded" into the MPLS dissector in 2006. 
This patch moves it into its own dissector.

From me :
Fix a Clang warning

svn path=/trunk/; revision=41486
2012-03-11 19:05:32 +00:00
Alexis La Goutte af2910972a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41307
2012-03-02 11:05:50 +00:00
Alexis La Goutte b5efd24a00 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881
Support for MPLS Packet Loss and Delay Measurement, RFC 6374

Support for MPLS Packet Loss and Delay Measurement, RFC 6374.
Any packetformat is supported: DLM, ILM, DM, DLM+DM and ILM+DM.

From me :
* Prefer proto_tree_add_item when it is possible
* add Modelines information

svn path=/trunk/; revision=41260
2012-03-01 13:36:18 +00:00
Alexis La Goutte 86e2ba54d4 From Alexander Koeppe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6689
Avoid string.h in packet-mpls.c

svn path=/trunk/; revision=40261
2011-12-21 14:28:51 +00:00
Anders Broman e5fcc57d87 One more contributor...
svn path=/trunk/; revision=40100
2011-12-06 07:07:19 +00:00
Anders Broman 10c7707559 Add a contributor.
svn path=/trunk/; revision=40068
2011-12-02 05:46:11 +00:00
Anders Broman 3db35fc5f3 From Krishnamurthy Mayya:
Add Copyright.

svn path=/trunk/; revision=40055
2011-11-30 20:00:42 +00:00
Anders Broman 094e30816d Fix Checkapi found errors.
svn path=/trunk/; revision=40030
2011-11-28 18:10:57 +00:00
Anders Broman c610654cc8 From Krishnamurthy Mayya:
Part of patch:
2. BFD extension has been added as per RFC 6428, to decode the BFD packet with
ACH encapsulation(without IP/UDP header encapsulation). The channel type in ACH
header identifies the BFD payload as BFD CC or CV packet. Also decoding for
MPLS-TP source MEP-ID TLV in BFD CV packet has been added.

applied with a change to add packet-bfd.h

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

svn path=/trunk/; revision=40029
2011-11-28 17:59:54 +00:00
Anders Broman 947399180f from Shobhank Sharma:
- Removed some mpls preferences which are no longer relevant/needed like 
  decode PWAC payloads as PPP traffic and assume all channel types except 0x21
are raw BFD. 
- MPLS extension from PW-ACH to MPLS Generic Associated Channel as per RFC 5586 
- Updated Pseudowire Associated Channel Types as per
http://www.iana.org/assignments/pwe3-parameters
- Updated the VCCV bitmaps as per RFC 5885

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6574

svn path=/trunk/; revision=40026
2011-11-28 17:05:35 +00:00