Commit Graph

103 Commits

Author SHA1 Message Date
Michael Mann 30c2f23f05 Eliminate proto_tree_add_text from some dissectors.
Change-Id: I066b70cfd58f5fb3ffbcb2e238416747d9e7dd57
Reviewed-on: https://code.wireshark.org/review/10269
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>
2015-08-27 19:29:31 +00:00
Alexis La Goutte 167f9b7aab IS-IS (LSP): Remove proto_tree_add_text call
Part 2 !

Change-Id: Iaa46f3d785cbff6b397edf5bd54c0c3cf65a7264
Reviewed-on: https://code.wireshark.org/review/8822
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-23 04:59:42 +00:00
Alexis La Goutte ee5166185e IS-IS (LSP) Add Shared Risk Link Group (SRLG) clv (138)
Bug:11246
Change-Id: I303de72cda8e667dcd3ccd1af3f2989123718544
Reviewed-on: https://code.wireshark.org/review/8743
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03 13:52:19 +00:00
Matthieu Texier de1b3c6a0d ISIS: Add TLV 149 support (SID/Label Binding)
Also fixing indentation problem


Bug: 10304
Change-Id: I560db0e8cce9fdf796a47e387f2d681abe54a653
Reviewed-on: https://code.wireshark.org/review/8192
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27 04:49:02 +00:00
Michael Mann 8d6324f759 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 2 of a few

Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4
Reviewed-on: https://code.wireshark.org/review/8165
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 23:24:45 +00:00
Michael Mann 14697b8aee Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using.
Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db
Reviewed-on: https://code.wireshark.org/review/7422
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>
2015-02-27 07:37:40 +00:00
Alexis La Goutte 29e1b45775 IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97
Reviewed-on: https://code.wireshark.org/review/7129
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-15 13:05:33 +00:00
Anish Bhatt 34acb73df1 [IS-IS-LSP] Add support for Prefix-SID subTLV
Bug: 10679
Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e
Reviewed-on: https://code.wireshark.org/review/7048
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-12 12:49:07 +00:00
Anish Bhatt 5b2a05ce5c [IS-IS LSP] Add support for Adj-SID & LAN-Adj-SID subTLV
Bug: 10677
Change-Id: Ia936ee4af6779b2b7dde61f33c490f545060dbe8
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/6980
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-09 13:03:16 +00:00
Alexis La Goutte 9d7f5c7611 ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800
Reviewed-on: https://code.wireshark.org/review/6921
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-03 01:13:34 +00:00
Alexis La Goutte 0ba51cc0b2 IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability
Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b
Reviewed-on: https://code.wireshark.org/review/6585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-29 19:53:50 +00:00
Matthieu Texier 11e557a794 ISIS: Making a segregated function for sub-tlv used by multiple tlv
Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
Reviewed-on: https://code.wireshark.org/review/6550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 05:43:22 +00:00
Alexis La Goutte b6ec25f0b2 IS-IS: Add missing i variable for subclv loop (IS Reachability)
Issue found by Alexander Okonnikov

Change-Id: I4eacab63a685b84c0d75811b96dc452471244337
Reviewed-on: https://code.wireshark.org/review/6573
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:49 +00:00
Alexis La Goutte 22543d3cec IS-IS: wrong length for SubTLV 18 (TE default Metric)
Issue found by Alexander Okonnikov

Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d
Reviewed-on: https://code.wireshark.org/review/6572
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:51:17 +00:00
Alexis La Goutte 706c625e2a ISIS: Add code and length for SubTLV Extended IS Reachability
* remove some proto_tree_add_text call

Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e
Reviewed-on: https://code.wireshark.org/review/6468
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 05:24:01 +00:00
Alexis La Goutte c93d0ab880 IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV
Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS.

Wrong offset for some Sub-TLV

Issue found by Alexander Okonnikov

Bug: 10837
Change-Id: I81d083722da72115e1905237352650d380e9d0ac
Reviewed-on: https://code.wireshark.org/review/6453
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 13:41:20 +00:00
Michael Mann 1d598bbff7 Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 14:09:27 +00:00
Michael Mann 3d3f97320b Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 21:17:10 +00:00
Bill Meier b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Alexis La Goutte c11085a351 ISIS: Fix warning: '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e
Reviewed-on: https://code.wireshark.org/review/5850
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-19 11:58:43 +00:00
Yann Lejeune 8d1a555901 ISIS LSP: Add Segment Routing Algorithm Sub TLV dissection
This commit implements a part of draft-ietf-isis-segment-routing-extensions:
 - 3.2. SR-Algorithm Sub-TLV

Change-Id: Ibb419de234bf5a199f8067989b1321064fa93983
Ping-Bug: 10520
Reviewed-on: https://code.wireshark.org/review/5742
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-16 09:14:55 +00:00
Yann Lejeune 84c6c74041 ISIS LSP: Add Segment Routing Capabilities Sub-TLV dissection
This commit implements a part of draft-ietf-isis-segment-routing-extensions:
 - 3.1 Routing Capabilities Sub-TLV
 - 2.3 SID/Label Sub-TLV

Change-Id: I3ee5e6d949cc6add412da761ffc55ef3101ddb97
Ping-Bug: 10520
Reviewed-on: https://code.wireshark.org/review/5739
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-16 09:14:10 +00:00
Bill Meier f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +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
AndersBroman 3555c06265 Add dissection of IS-IS Router CAPABILITY TLV.
Bug 10520.

Change-Id: I8d8d56e36d90088af3cd7d2490f95c5f87c75423
Reviewed-on: https://code.wireshark.org/review/4420
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-02 20:18:46 +00:00
Bill Meier 18d72987cb Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN

Also:
- FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...)
- Change one case of incorrect '||' to '|'

Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0
Reviewed-on: https://code.wireshark.org/review/4184
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 01:38:08 +00:00
Bill Meier 36ce5e1b90 Fix encoding-arg mostly for FT_UINT_STRING; Also: Do misc as needed.
Misc: (as needed)
- Add editor modelines;
- Adjust whitespace.

Change-Id: I0e5d877a2a6273842ad8e771ac0c0acbfcb83200
Reviewed-on: https://code.wireshark.org/review/4173
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:07:58 +00:00
Marian Ďurkovič e784002650 TRILL ISIS: SubTLVs of Router Capability TLV are valid for MT-Capability TLV as well
Change-Id: Idf466c021b1b188d9c6d55ba73a25257ba352412
Reviewed-on: https://code.wireshark.org/review/3803
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25 04:25:15 +00:00
Marian Ďurkovič 28acde1333 Parse Capabilities & Flags section of TRILL Version Sub-TLV
Change-Id: Ic82a2368c865031eaeee291055b6a4f176cde759
Reviewed-on: https://code.wireshark.org/review/3792
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 11:00:35 +00:00
Marian Ďurkovič c2eb021db8 TRILL ISIS: Fix incorrectly equal ett variables for different subtrees
Change-Id: I38d886d50d74d75a900274df8bc24114e84926e7
Reviewed-on: https://code.wireshark.org/review/3744
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 07:11:12 +00:00
Marian Ďurkovič 8670d9fdfe TRILL ISIS: Unify MTID presentation in all cases
Change-Id: I66eb683d6b1f9dccae3e566ad4dd4cfd18b81ddb
Reviewed-on: https://code.wireshark.org/review/3713
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-19 18:34:19 +00:00
Marian Ďurkovič fc43a8c933 TRILL ISIS: Implement Group IPv4/IPv6 Address Sub-TLVs
Change-Id: If75925224fc487f583635d9a4346fa900cb0d1d1
Reviewed-on: https://code.wireshark.org/review/3703
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 08:52:46 +00:00
Marian Ďurkovič 8f0d81d332 TRILL TREE Sub-TLV fixes
1) Fix starting tree number
2) Display Nicknames both in hex and dec

Change-Id: If58d034e98429019d769ebe7be635a296e8ef18d
Reviewed-on: https://code.wireshark.org/review/3687
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-18 16:31:05 +00:00
Marian Ďurkovič 83ad0d063c Fix TRILL LSP display issues
1) Sub-TLVs unknown to wireshark are not necessarily invalid
2) Properly show Root Bridge ID
3) Unify Nickname format to HEX_DEC

Change-Id: Ib62f2e2a23f27221b303eaf544868746f56ff6df
Reviewed-on: https://code.wireshark.org/review/3686
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 06:16:49 +00:00
Alexis La Goutte e3779f135f BGP ISIS: Add TLV 14 (Originating LSP Buffer Size)
Need more work for TLV 149

Ping-Bug: 10304
Change-Id: I3953b8d1fdee33253601aa7b443edd37417046e4
Reviewed-on: https://code.wireshark.org/review/3336
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18 04:42:34 +00:00
Marian Durkovic 2d2ecfbab2 Fix TRILL LSP dissector
- correctly compute length/offset in all SubTLVs
- initialize variable before while() loop
- fix VLAN_GROUP SubTLV according to RFC7176 sec. 2.3.7

Change-Id: Ib5cc4ce82f63ad39e83c8b1f4a630708f8a8aa88
Reviewed-on: https://code.wireshark.org/review/3667
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 19:08:38 +00:00
Marian Durkovic 95ddeeda0c Fix uninitialized variable and print VLAN numbers in decimal
Change-Id: Icf3b3ea4968d1ed94a11ce8eb4b4fdd09ed69012
Reviewed-on: https://code.wireshark.org/review/3660
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 14:04:00 +00:00
Marian Durkovic 9de7f5605a Fix incorrect SubTLV values and properly handle both old and new
variant of TRILL Version SubTLV

Note that the SubTLV values have not changed in RFC7176.

Bug: 10387
Change-Id: I452debb7165e70f31f1a3a19a44c488c5bbdb959
Reviewed-on: https://code.wireshark.org/review/3661
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17 12:43:55 +00:00
Alexis La Goutte 0a8a36ec7e ISIS:LSP : fix indent (remove last tab) and reindent hf
Change-Id: I615e777b4b6af073c174fe0c3554ed0e33f5e68e
Reviewed-on: https://code.wireshark.org/review/3645
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-16 21:55:45 +00:00
Alexis La Goutte 345a1d2242 ISIS: Fix reachability IPv4 Interface/Neighbor (wrong length)
Change-Id: I8903a097a59bf9bf1ec62b59e57cdc60e382bdb5
Reviewed-on: https://code.wireshark.org/review/3490
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-08 13:19:38 +00:00
Alexis La Goutte 143cdf12d3 ISIS: Add type and length to CLV
Change-Id: If6dc8e3a9328571ccdb106b0aabc617889c434c7
Reviewed-on: https://code.wireshark.org/review/3465
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-08 13:19:23 +00:00
Alexis La Goutte 53b209650b Add Modelines and fix indent
Change-Id: I7abb415bccff4de846ab273eed3e3b2a434d94b7
Reviewed-on: https://code.wireshark.org/review/3455
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-06 10:48:33 +00:00
Matthieu Texier 45f3deed0b Fixing indentation with tabs in isis dissector
Change-Id: I4f6296f1cb988dca8c94ca5089ff6aa03439da32
Reviewed-on: https://code.wireshark.org/review/3333
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-01 22:55:59 +00:00
Michael Mann e8a8d62dc3 proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 14:52:33 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Guy Harris 16b26b8e5f Put the system ID in the top-level items for neighbors.
Add a tvb_print_system_id() routine, and use that in various ISIS
dissectors, while we're at it.

Change-Id: I31b6b9ea8faf2b4849f974ec7ed27fbdd14b91ef
Reviewed-on: https://code.wireshark.org/review/1145
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-14 22:43:25 +00:00
Guy Harris d3ad27390c Call each item in the Extended IS Reachability CLV an "IS Neighbor".
This makes it a bit more like the (un-extended) Reachability CLVs.

Also, just make the top-level items just a text field, just like the
top-level items for neighbors in the (un-extended) Reachability CLVs.

Rename the system IDs to be "... neighbor ID", not just "neighbor"; the
top-level items hold all the information for the neighbor, and the
system ID for the neighbor is just one of those pieces of information.

Change-Id: I72182dea496f8cfa6048cff3b0d2474df8f31282
Reviewed-on: https://code.wireshark.org/review/1144
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-14 22:23:20 +00:00
Guy Harris a838f1083c You can't use proto_item_set_len() to make an item unknown-length.
You also shouldn't use an item for one *element* of a structure to
represent the entire structure.

Fix both of those.

Change-Id: Id1711238ebec02f135c404ac001aa51d783b3c69
Reviewed-on: https://code.wireshark.org/review/1142
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-14 21:53:12 +00:00
Alexis La Goutte abc6fb24fa Fix some code remove by 296591399f
(Copyright or info about file...)

Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1
Reviewed-on: https://code.wireshark.org/review/515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05 09:25:47 +00:00