Commit Graph

48019 Commits

Author SHA1 Message Date
Jeff Morriss 56d05bfd4b It's not necessary to call epan_free() in cf_open(): cf_close() (which is
called by cf_open()) already calls epan_free().

svn path=/trunk/; revision=51188
2013-08-07 16:14:44 +00:00
Alexis La Goutte c617a6a64b Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

(the end of my original commit...)

svn path=/trunk/; revision=51187
2013-08-07 13:44:44 +00:00
Jeff Morriss 0995eb9edd Remove some set-but-no-longer-used variables.
svn path=/trunk/; revision=51186
2013-08-07 13:26:05 +00:00
Martin Mathieson 9b85c5b17f Try to fix build by removing proto_tree_add_text() call replaced by items
svn path=/trunk/; revision=51185
2013-08-07 12:56:39 +00:00
Alexis La Goutte 90e273cb91 Enhance BGP Update
Step 4 : Convert proto_tree_add_text calls to proto_tree_add_item and use new name of RFC4271 (  Withdrawn Routes Length ...)

svn path=/trunk/; revision=51184
2013-08-07 12:05:23 +00:00
Alexis La Goutte b4beea213f Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51183
2013-08-07 12:05:11 +00:00
Alexis La Goutte 8da9a76650 From Matt Texier
Enhance BGP Dissector

Step 3 :Variable consistency and renaming, adding RFC and draft as comments (Preperation for next enhance...)

From me :
Fix some typo/whitespace
Make checkhf happy...

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

svn path=/trunk/; revision=51182
2013-08-07 12:04:04 +00:00
Stig Bjørlykke aadc33fbab Do not use overlapping memory in g_snprintf.
Use consistent spacing between title and value.

svn path=/trunk/; revision=51181
2013-08-07 10:02:03 +00:00
Anders Broman 4317fade8c From Michael Mann:
the heuristics of NDMP require 28 bytes to be present in order for it to be dissected as NDMP.  NDMP is purely a heuristic dissector because TCPENCAP shares the same TCP port.
Since NDMP officially registered port 10000 with IANA, allow it to use dissector_add_uint() instead of packet-ipsec-tcp.c, and by default have TCPENCAP only rely on its heuristics.

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

svn path=/trunk/; revision=51180
2013-08-07 04:39:32 +00:00
Anders Broman 907e735f60 From Javier Godoy:
Dissect SCSI OSD attribute identification sense data descriptor.

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

svn path=/trunk/; revision=51179
2013-08-07 04:28:35 +00:00
Gerald Combs 79713e0ce7 Add a Python version of make-services.pl. Instead of trying to parse the
plain text version of the registry it parses the CSV version (which
should hopefully be more reliable). Tested with Pythons 2.5, 2.6, 2.7,
and 3.3.

Update the services file.

svn path=/trunk/; revision=51178
2013-08-06 23:45:51 +00:00
Jeff Morriss a1c6c09f8f Get rid of a set-but-unused variable.
Replace tabs with spaces (for consistency).

svn path=/trunk/; revision=51177
2013-08-06 21:44:21 +00:00
Jakub Zawadzki 97bddef1a2 Try to fix compilation under MSVC
__builtin_ctz() with bitmask == 0 is UB, so only do g_assert there.

svn path=/trunk/; revision=51176
2013-08-06 21:06:56 +00:00
Jakub Zawadzki 9cfac1227d Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
2013-08-06 20:53:47 +00:00
Jakub Zawadzki 72ea2f9c9c Remove hfinfo->bitshift member, add hfinfo_bitshift() to get it.
svn path=/trunk/; revision=51174
2013-08-06 20:10:59 +00:00
Jakub Zawadzki 93f56d8a77 Optimize wrs_count_bitshift()
- Use __builtin_ctz for GCC/clang
- Do multiply and lookup on other platforms

svn path=/trunk/; revision=51173
2013-08-06 19:53:54 +00:00
Anders Broman fcc3728630 From Chris Bontje:
RTAC Serial Dissector Improvement for INFO Column Display.

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

svn path=/trunk/; revision=51172
2013-08-06 17:18:40 +00:00
Anders Broman 06c37f8665 Add code and a preference to use GSM SAPI to call sub dissectors.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9017

svn path=/trunk/; revision=51171
2013-08-06 17:11:42 +00:00
Anders Broman cc7c777f55 Store the port number as a string for the unresolved ports to avoid repeated calls to getservbyport() for all unresolved ports.
svn path=/trunk/; revision=51170
2013-08-06 17:07:20 +00:00
Jakub Zawadzki f6c55aa296 app_mem_usage fixes:
- Add missing feature test macro for pread()
- Fix $Id$ line

svn path=/trunk/; revision=51169
2013-08-06 16:38:36 +00:00
Martin Kaiser 1cfc59d2da remove unused variable numelem
this fixes
  CC     libdissectors_la-packet-scsi-smc.lo
packet-scsi-smc.c: In function 'dissect_smc_readelementstatus':
packet-scsi-smc.c:467:11: error: variable 'numelem' set but not used
[-Werror=unused-but-set-variable]


svn path=/trunk/; revision=51168
2013-08-06 07:33:49 +00:00
Jörg Mayer bde81de2c9 Improve loop a bit to reduce likelihood of dissector asserts
svn path=/trunk/; revision=51167
2013-08-06 04:55:48 +00:00
Michael Mann ac5ceb45fa Convert a few proto_tree_add_text to pacify checkAPIs.pl. Looks like the "proper" fix for the remaining calls would be to setup additional field types (to remove the tvb_get_ptr calls)
svn path=/trunk/; revision=51166
2013-08-06 01:11:55 +00:00
Michael Mann 1577a6992e Replace all proto_tree_add_text with filterable items.
svn path=/trunk/; revision=51165
2013-08-06 00:14:06 +00:00
Guy Harris 6a1626f907 Make sure serv_proto is set to the appropriate string value in all
cases; set it before we do the hash table lookup.  Don't initialize
serv_proto to null when we declare it - that covers up cases where we
fail to set it correctly.

Clean up indentation.

svn path=/trunk/; revision=51164
2013-08-05 20:23:45 +00:00
Jakub Zawadzki 518ac53e2c Make some global variables static
svn path=/trunk/; revision=51163
2013-08-05 20:15:06 +00:00
Martin Kaiser 5c813d0afe remove unnecessary if (tree) checks in packet-hdcp2.c,
which uses ptvcursor

svn path=/trunk/; revision=51162
2013-08-05 20:08:16 +00:00
Gerald Combs f22f8cc841 Fix the Python version check. Hopefully no one is running 1.5 or 1.6.
svn path=/trunk/; revision=51161
2013-08-05 20:08:11 +00:00
Martin Kaiser 0048fbc0d4 it's and, not or ;-)
this fixes
  CC     libwireshark_la-addr_resolv.lo
addr_resolv.c: In function 'serv_name_lookup':
addr_resolv.c:666:3: error: logical 'or' of collectively exhaustive tests is always true [-Werror=logical-op]

svn path=/trunk/; revision=51160
2013-08-05 19:40:22 +00:00
Jakub Zawadzki f4bcbeb9f2 Keep result of [new_]register_dissector in some dissectors. [2 of x]
(don't create new dissector handle if we can use already existing one)

svn path=/trunk/; revision=51159
2013-08-05 19:09:44 +00:00
Gerald Combs d3af98bb91 Don't force the use of Python 2.x, similar (but not identical to)
r51128. Print a warning if we're building with Python < 2.5.

svn path=/trunk/; revision=51158
2013-08-05 18:57:00 +00:00
Michael Mann 7207378cbd Replace global variable that was just used to pass data between dissectors with call_dissector_with_data.
svn path=/trunk/; revision=51157
2013-08-05 18:14:09 +00:00
Jakub Zawadzki 5fa2a99087 Keep result of [new_]register_dissector in some dissectors.
svn path=/trunk/; revision=51156
2013-08-05 18:09:43 +00:00
Anders Broman 9999016855 Try to make the OSX build bot happy.
svn path=/trunk/; revision=51155
2013-08-05 18:06:14 +00:00
Jakub Zawadzki b53052c6de Dissector handle after [new_]register_dissector can be get by find_dissector() so to avoid some extra calls just return it.
svn path=/trunk/; revision=51154
2013-08-05 17:23:47 +00:00
Anders Broman 21d5a76a68 Use a hastable for port resolution. Currently one table for the 4 protocols with resolution. SCTP and DCCP should perhaps be splited out to their own tables.
svn path=/trunk/; revision=51153
2013-08-05 16:36:24 +00:00
Michael Mann 86472b67df SCSI dissector does not parse PERSISTENT RESERVE commands correctly. Bug 9012 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9012).
From Bart Van Assche.

Changes:
- Add REGISTER AND MOVE and REPLACE LOST RESERVATION service actions.
- Decode the PARAMETER LIST LENGTH field correctly - this is a four
  byte field instead of a two byte field.
- For the REGISTER AND MOVE service action, add support for decoding
  the RELATIVE TARGET PORT IDENTIFIER, TRANSPORT ID LENGTH and
  TransportID fields.
- Fix parsing of the SERVICE ACTION field - this field is five bits
  wide instead of four.
- Move the definition of the "scsi.persresv.control.unreg" field just
  below the other REGISTER AND MOVE service action parameter list fields.

See also http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc4r36h.pdf.

- Only display persistent reservation information in a PERSISTENT
  RESERVE IN response if the ALLOCATION LENGTH field in the request
  was not zero.
- Correct the offset of the (SPC-2) SCOPE-SPECIFIC ADDRESS field.
  This field starts at offset 16 and not at offset 8.
- Correct the offsets of the SCOPE and TYPE fields. These fields
  are both contained in the byte at offset 21.
- Correct the base of the TRANSPORTID LENGTH field from BASE_HEX
  into BASE_NONE since this is the base required by non-numeric types.

For more information, see also:
* http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc4r36h.pdf
* http://www.t10.org/cgi-bin/ac.pl?t=f&f=spc2r20.pdf

svn path=/trunk/; revision=51152
2013-08-05 15:55:10 +00:00
Jeff Morriss bb6004a017 From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9010 :
This patch fixes a bug where if the client identifies itself first, both of
the protocol version messages are misidentified as encrypted data.

svn path=/trunk/; revision=51151
2013-08-05 14:53:19 +00:00
Jeff Morriss 4b0a541c7c Get rid of some unused and set-but-unused variables.
Un-shadow a variable.

Ensure a (new) tree variable is initialized.

Clean up trailing white space.

svn path=/trunk/; revision=51150
2013-08-05 13:17:37 +00:00
Michael Mann 635d8d4f2c Add support for determining BASE_EXT_STRING.
svn path=/trunk/; revision=51149
2013-08-05 12:16:50 +00:00
Michael Mann ad1d32485c Massive conversion to filterable items. It started with convert_proto_tree_add_text.pl, but continued as with many other cases that couldn't be handled by it (like using emem_strbuf_t to create groups of field strings).
Should now pacify bug 6844 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6844)

svn path=/trunk/; revision=51148
2013-08-05 11:57:21 +00:00
Stig Bjørlykke 7861e5e426 Added gtk_adjustment_get_step_increment compat.
svn path=/trunk/; revision=51147
2013-08-05 11:53:05 +00:00
Jörg Mayer d9635daacc Fix some whitespace oddities
svn path=/trunk/; revision=51146
2013-08-05 11:31:41 +00:00
Stig Bjørlykke d4c0d96f1b From Øyvin Richardsen:
- Added up/down scrolling in Flow Graph window.
- Avoid segfault when mouse clicking below the last packet in the graph. 
- Fixed the Comment heading.

svn path=/trunk/; revision=51145
2013-08-05 11:16:12 +00:00
Michael Mann 81f3faf1e8 Completely remove support for proto_item_set_expert_flags.
svn path=/trunk/; revision=51144
2013-08-05 02:25:45 +00:00
Guy Harris 327f461190 Get rid of no-longer-used variables.
svn path=/trunk/; revision=51143
2013-08-05 02:14:39 +00:00
Michael Mann a22331bbd2 Convert remaining proto_item_set_expert_flags in dissector directory.
svn path=/trunk/; revision=51142
2013-08-05 01:54:15 +00:00
Jakub Zawadzki b67492bbc0 Cleanup tvb
- make tvb_ops->tvb_size a gsize field, not function call
- remove not needed forward declaration / forward line

svn path=/trunk/; revision=51141
2013-08-04 22:02:42 +00:00
Michael Mann af134c29ca Convert proto_item_set_expert_flags into filterable items.
svn path=/trunk/; revision=51140
2013-08-04 19:59:01 +00:00
Gerald Combs 1f9b980f00 [Automatic manuf, services and enterprise-numbers update for 2013-08-04]
svn path=/trunk/; revision=51137
2013-08-04 14:03:36 +00:00