Commit Graph

27192 Commits

Author SHA1 Message Date
Pascal Quantin 14b75d838d ETSI CAT: fix a typo and remove deprecated API call
Change-Id: I7df02d6a605ca0912c179caa04a405c5c18eb552
Reviewed-on: https://code.wireshark.org/review/4727
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-16 16:01:48 +00:00
Michael Mann 371e4ae1c7 Eliminate some proto_tree_add_text from GSM dissectors (so now there are no dissectors with 100+ proto_tree_add_text calls).
Add tfs_allocated_by_receiver_sender to tfs.h because it seems "popular" enough.

Change-Id: I478461d9b951a2c3e3aec6aaf996d95ba2c0feee
Reviewed-on: https://code.wireshark.org/review/4708
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-10-15 19:16:37 +00:00
Alexis La Goutte 0444c473b7 IPv6: Calipso option length is not used properly
This field indeed indicates the length of the Compartment Bitmap but *in 32-bit words*, which means that the value of 12 means the compartment bitmap is 48 bytes long.

Issue found by boaz
Bug:10561

Change-Id: I6c6ac25d0680837594d7cc6d2e4807a60a523b80
Reviewed-on: https://code.wireshark.org/review/4697
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-15 14:09:48 +00:00
Evan Huus 5cdb032304 smb2: fully initialize dummy session
A few fields weren't being zeroed and were causing valgrind warnings.

Bug: 10569
Change-Id: I30e1e70c9445376806f385f3578b65bf6e320f8b
Reviewed-on: https://code.wireshark.org/review/4702
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-15 12:24:04 +00:00
AndersBroman 1a652bd78d GTPv2: Fully dissect Presence Reporting Area Action.
Change-Id: If38f639049bd897587ed61cc2d94f974131ccd20
Reviewed-on: https://code.wireshark.org/review/4700
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-15 11:14:49 +00:00
Stig Bjørlykke a25ae55c92 LDAP: Improved a if-check to avoid a analyzis warning.
Change-Id: Iceeaa94a80543570a720281ac39d3ccd9ac924fa
Reviewed-on: https://code.wireshark.org/review/4699
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-15 10:53:59 +00:00
Bill Meier 6206fa5a19 raknet: fix two checkfiltername errors; mcpe,raknet: minor cleanup;
Change-Id: Ieac370d232c6349f7acc45f4817637a80915e315
Reviewed-on: https://code.wireshark.org/review/4695
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-15 01:29:09 +00:00
Bill Meier 60e738cd20 packet-raknet.c: value_string array (created at runtime) must be terminated with {0, NULL}.
This should fix crash in 'tshark -G values' seen on 64 bit tshark.

Change-Id: Ia183fc5d5604f71b824cf4f758c18ff1ccd4540f
Reviewed-on: https://code.wireshark.org/review/4694
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-15 00:16:45 +00:00
Bill Meier bfe3706035 Always put editor-modelines at the end of the file ...
... to ensure that there are no potential issues with respect to
editors limiting the number of lines scanned at the end of the file
when checking for editor modelines.

Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4
Reviewed-on: https://code.wireshark.org/review/4688
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:08:29 +00:00
Bill Meier 71c5ac03e2 packet-assa_r3.c: Use editor modelines from http://www.wireshark.org/tools/modelines.html
Change-Id: I2d9accd2336448ced30dca1878a3e27cdba29566
Reviewed-on: https://code.wireshark.org/review/4687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:07:51 +00:00
Nick Carter 0ce5b8cdac Add RakNet protocol dissector
Bug: 10534
Change-Id: Id56008da0c21a5f3a0309cdf21aff287c7820dcf
Reviewed-on: https://code.wireshark.org/review/4372
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-10-14 19:38:17 +00:00
Bill Meier 87ea03bf37 packet-gvsp.c: removed an unused #define
Change-Id: If330124cdc459867b33e1bbbe960c969deb85b10
Reviewed-on: https://code.wireshark.org/review/4684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 16:56:25 +00:00
AndersBroman 2359e67f9c GTPv2 Dissect more bits in IE Indication.
Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95
Reviewed-on: https://code.wireshark.org/review/4682
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:33 +00:00
Stig Bjørlykke 3ec9ddc14e PIM: Disable unused pimbdirdfvals.
Change-Id: I2b023868d9f84e891e36f2cfcfd4ad25e1e43592
Reviewed-on: https://code.wireshark.org/review/4681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:18 +00:00
Bill Meier 9cba3b6eb6 packet-gvsp.c: sort pixeltypenames[] for extended value-string use.
Change-Id: Iaf753d432603422922ad7ef4ba7a2c2b3cd84136
Reviewed-on: https://code.wireshark.org/review/4678
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 07:35:52 +00:00
Bill Meier 0149015b6e packet-gvsp.c: Fix license; Remove unneeded code from proto_reg_handoff..(); adjust whitespace.
Change-Id: I24a9033bbed3d50daf886f3d00239c1580894c35
Reviewed-on: https://code.wireshark.org/review/4670
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 06:14:17 +00:00
warrenm ea1137881a Adding GigEVision GVSP dissector
Bug: 8673
Change-Id: I4e8270c76291d6ea0e0187f00a342804275f2c11
Reviewed-on: https://code.wireshark.org/review/4547
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-10-14 04:08:55 +00:00
Pascal Quantin fb27a682a1 NCP: cast to guint instead of gulong
Change-Id: Idc8f8f3177703ce5546b8a472034705cb6070707
Reviewed-on: https://code.wireshark.org/review/4666
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 21:16:03 +00:00
Martin Kaiser 8342eb891d smartcard descriptor: bitmask for pin support field
Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550
Reviewed-on: https://code.wireshark.org/review/4664
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:29:03 +00:00
Martin Kaiser 9dd515cbd7 smartcard descriptor:
dissect number of lines, characters per line in the lcd layout

Change-Id: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b
Reviewed-on: https://code.wireshark.org/review/4663
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:28:38 +00:00
Martin Kaiser 15f23c735b smartcard descriptor: the lcd layout is two bytes long
Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d
Reviewed-on: https://code.wireshark.org/review/4662
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:25:51 +00:00
Pascal Quantin 89a95f2205 Add Kerberos 3.2.2 package for Win64
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
Reviewed-on: https://code.wireshark.org/review/4661
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 20:15:27 +00:00
Stig Bjørlykke ab7f9aa164 BER: Code cleanup in call functions
Change-Id: I0ba958485dffd3cc1e419fb27cf7f2bc492d05fe
Reviewed-on: https://code.wireshark.org/review/4643
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-10-13 19:18:48 +00:00
Pascal Quantin 63faad686b NCP: add a missing cast following g6ca40c5
Change-Id: I0b93c4faab52d830b8160d89b9bb8026ab2a216e
Reviewed-on: https://code.wireshark.org/review/4657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 19:07:07 +00:00
Stig Bjørlykke b653564fe2 Lua: luaL_checkstring does not return NULL
Removed all checks for NULL strings to cleanup the code.

Change-Id: Ia890cd9b206296f586e85214f07765f14984580b
Reviewed-on: https://code.wireshark.org/review/4632
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 19:06:40 +00:00
Alexis La Goutte 631834ff51 IPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length
Like other header (Fragment, Hop by Hop...)

Change-Id: I5d0a85bf285b37eed38345d659439400c5f50d06
Reviewed-on: https://code.wireshark.org/review/4634
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-10-13 18:16:39 +00:00
Evan Huus b9988e2bbf ncp2222: don't overflow buffer constructing string
Fixes stack-smashing vuln.

Somehow there was already an XXX in the code about this, but nobody realized at
the time it was worth fixing... really?

Bug: 10552
Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2
Reviewed-on: https://code.wireshark.org/review/4653
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:59:51 +00:00
Stig Bjørlykke 4f37f554f1 RTSE: Return dissected length from call_rtse_oid_callback
Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794
Reviewed-on: https://code.wireshark.org/review/4642
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:36 +00:00
Stig Bjørlykke 748e522815 ROS: Return dissected length from call_ros_oid_callback
Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede
Reviewed-on: https://code.wireshark.org/review/4641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:19 +00:00
Alexis La Goutte 24b6a1141a IPv6 RPL option is read as less bytes than it is
Add check if the opt len equal to the "calculcate" length
and display expert info if not.. also replace offset by the opt len

Bug:10559
Bug:10561
Change-Id: I6e80e4055b6d0c5ef3f030c544cd1629e6b9abec
Reviewed-on: https://code.wireshark.org/review/4627
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:47:05 +00:00
Tim (Thanh) Nguyen a9497befeb RoCE and CM dissector fixes
- fixed cm.req cm.rep bit fields
- fixed packetLength and CRC length for RoCE
- use "RoCE" or "RRoCE" instead of "InfiniBand" in COL_PROTOCOL where appropriate

Change-Id: Id491658f9368034bb2267922fa5618e1c259cd56
Reviewed-on: https://code.wireshark.org/review/4614
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:45:33 +00:00
Pascal Quantin b3ad51db7c Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
- use G_GINT64_MODIFIER instead of "%ll"
- use G_GUINT64_CONSTANT instead of ULL
- add some missing explicit casts

Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7
Reviewed-on: https://code.wireshark.org/review/4644
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 15:34:09 +00:00
Alexis La Goutte e8a63a5a46 SPDY: Add Slot field for SYN_STREAM (and also unused field...)
Ping-Bug: 10566
Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6
Reviewed-on: https://code.wireshark.org/review/4645
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 15:07:59 +00:00
Alexis La Goutte 017fc82d74 SPDY: Fix bitmask for priority bit
Found by yurui ming

Ping-Bug: 10566

Change-Id: I92e784eb91dc6c88af409e2936671b0ea473fba9
Reviewed-on: https://code.wireshark.org/review/4637
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:25:56 +00:00
Alexis La Goutte 2c23c7e79d SPDY: Fix the display of COL_INFO...
Clear the COL_INFO before start to dissect SPDY PDU

Change-Id: I7a22515f1c2c89b5647003320ff455a74fbce42a
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4636
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:24:10 +00:00
Stig Bjørlykke ebbe70b335 ASN1: Register BER syntaxes as NEW
Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986
Reviewed-on: https://code.wireshark.org/review/4639
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 12:22:13 +00:00
Alexis La Goutte 71ae57e38d IPv6: Fix typo for Fragment nxt (Next Header)
Change-Id: Id7d6cd4a4c09238890394d5dc887ec840dc2d2af
Reviewed-on: https://code.wireshark.org/review/4633
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:18:30 +00:00
Stig Bjørlykke 313c4005f9 P1: Added ORAddress and ORName syntax.
Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f
Reviewed-on: https://code.wireshark.org/review/4640
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 11:40:00 +00:00
Stig Bjørlykke 4e1b5ea866 ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 11:24:07 +00:00
Alexis La Goutte 94d35481b7 SPDY: Fix typo about length for Control bit
Found by yurui ming

Change-Id: Ibef07fa13af0de8357bdf98a038460706d0972f7
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:49:12 +00:00
Alexis La Goutte 749832a35c USB Mass Storage: Display target number for SCM USB-SCSI converters
The USB Mass Storage Class (Bulk Only Transport) has the LUN in bits [3:0] of byte 13 of the command block wrapper. Bits [7:4] of that byte are undefined/reserved.

USB-SCSI converters based on a chipset from SCM Microsystems can work with multiple SCSI devices. After enabling multi-target mode (which the vendor driver and Linux do), the target number is given in bits [6:4] of CBW byte 13.

Request from Mark

Bug:10563
Change-Id: I8e6d9b7d47ff4296d41e8b9b15f4bd44c89238c9
Reviewed-on: https://code.wireshark.org/review/4625
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:43:49 +00:00
Joseph Huffman 8cc7b0d6cf Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.
There was no tree items for padding in the many instances where there were
bytes added to make certain data types align on even boundaries of 2, 4, or
8 bytes. These instances now show up as "Padding" in the display.

There were many instances where ENC_NA was used for fields of more than one
byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for
historical reasons and all these fields are big endian fields.

Change-Id: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0
Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
Reviewed-on: https://code.wireshark.org/review/4413
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:37:09 +00:00
Matthieu Texier 8d0becd821 Aliging PIM hello message type to IANA in order to fix BUG 10231
Change-Id: Ie9a126d106c08935eb385fd93d011e481913ab3c
Reviewed-on: https://code.wireshark.org/review/4448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 08:57:00 +00:00
Michael Mann b563a84db6 Eliminate proto_tree_add_text from IP dissectors
Change-Id: I81fc364cbff3c5b305d61b2d444bf8599fbd19e7
Reviewed-on: https://code.wireshark.org/review/4631
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-10-13 06:45:13 +00:00
Alexis La Goutte 5518513eef IPv6 RPL: Display RPL flag on HEX
Change-Id: I0b3bb9e1a0de388135a71bc6a97602d6abf6a9dc
Reviewed-on: https://code.wireshark.org/review/4628
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 02:13:04 +00:00
Alexis La Goutte 73613d414a Remove DIRTY_DISSECTOR_SRC
x11 dissector don't have longer warning !
and fix different between Autotools and CMake (about gsm_a_common dissector)

Change-Id: Id9da62d84b8b0bb4b0ed5d8fc62abba4e2442ed2
Reviewed-on: https://code.wireshark.org/review/4621
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-10-13 02:06:12 +00:00
Pascal Quantin 38c9ac870a GlusterFS: fix OSX compilation failure
ged0b19b introduced support for 64 bits bitmask. Make use of it and add an explicit cast to fix a compilation error

Change-Id: I9f2202d851aedc0dc78655c505b5a0b26b224c0e
Reviewed-on: https://code.wireshark.org/review/4630
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 21:44:36 +00:00
Alexis La Goutte 4e328e4709 DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
Now mapi and drsuapi build without warning !

Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58
Reviewed-on: https://code.wireshark.org/review/4619
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>
2014-10-12 17:46:58 +00:00
Alexis La Goutte d62b323c5e PIDL (DCERPC misc): enhance dissector
* Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function)
* Remove dissector DCERPC misc from DIRTY list

Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf
Reviewed-on: https://code.wireshark.org/review/4345
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:46:26 +00:00
Alexis La Goutte 148136c9a5 ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d
Reviewed-on: https://code.wireshark.org/review/4624
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:43:12 +00:00
Alexis La Goutte 44208b98d1 LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968
Reviewed-on: https://code.wireshark.org/review/4623
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:42:18 +00:00
Stig Bjørlykke 1b65cb646d Add back get_uinteger for boolean_type.
This was removed in ed0b19b94b

Change-Id: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b
Reviewed-on: https://code.wireshark.org/review/4620
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-12 16:59:14 +00:00
Gerald Combs 6e3a2b450e [Automatic manuf, services and enterprise-numbers update for 2014-10-12]
Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e
Reviewed-on: https://code.wireshark.org/review/4615
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-12 15:06:08 +00:00
Pascal Quantin f7c5e3a5b9 E-LMI: add what seems to be a missing break (Coverity CID 1245648)
Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31
Reviewed-on: https://code.wireshark.org/review/4613
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 14:57:03 +00:00
Daniel Mack ed0b19b94b Make boolean bitmask type 64-bit wide
There are protocols out there that have 64-bit wide bit mask fields, so
make the internal representation and bitfield decoders 64-bit aware.

For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked
slightly.

Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233
Reviewed-on: https://code.wireshark.org/review/4158
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 14:15:12 +00:00
Matthieu Patou 29afac24a5 Add support for NTTIME_hyper and NTTIME_1sec
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution

Bug: 10541
Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9
Reviewed-on: https://code.wireshark.org/review/4606
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-10-12 14:08:44 +00:00
Stig Bjørlykke eb72d2a160 Use variable name 'len' when handling length.
Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9
Reviewed-on: https://code.wireshark.org/review/4609
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-11 20:41:58 +00:00
Matthieu Patou e331083812 Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols
Bug: 10540
Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2
Reviewed-on: https://code.wireshark.org/review/4604
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-10-11 04:04:36 +00:00
Michael Mann 6e42a72923 Dissection of sid28 needs null check.
Bug: 10542
Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a
Reviewed-on: https://code.wireshark.org/review/4603
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 23:24:18 +00:00
cbontje d330cd4ecb DNP3 Protocol Bugfix / Enhancement
- Fix for Single-bit Objects offset-pointer
- Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding

Bug: 10558
Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682
Reviewed-on: https://code.wireshark.org/review/4597
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 20:19:08 +00:00
Anish Bhatt f7588eaec2 [ELMI] Add missing information elements, add support for sub-information elements.
Bug 10532

Updated with Bandwidth Profile support

Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c
Reviewed-on: https://code.wireshark.org/review/4571
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>
2014-10-10 19:29:14 +00:00
Michael Mann a168c44fc0 Remove (almost all) proto_tree_add_text calls in ISUP dissector.
Change-Id: I57a01eacaa02e45c23bb4827ae982c897fb308ee
Reviewed-on: https://code.wireshark.org/review/4592
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-10-10 19:14:14 +00:00
Pascal Quantin a1933022f2 NCP: switch to wmem memory and ensure that all fields are initialized
Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26
Reviewed-on: https://code.wireshark.org/review/4589
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 19:02:36 +00:00
Pascal Quantin 6463d2a7e6 GSM MAP: fix detection of SMS direction when application context version is < 3
Bug: 10547
Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e
Reviewed-on: https://code.wireshark.org/review/4579
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 18:26:49 +00:00
Bill Meier 23e78cd6bd Add editor modelines; Adjust whitespace as needed.
Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50
Reviewed-on: https://code.wireshark.org/review/4594
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-10 14:50:08 +00:00
AndersBroman bdbc8e3a79 GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
and TAI.

Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123
Reviewed-on: https://code.wireshark.org/review/4593
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10 13:45:27 +00:00
Guy Harris f5b06c5630 Fix some more int-to-enum conversion complaint.
While we're at it, log a message if a Lua file format module lacks a
read or a seek-read routine, rather than completely silently ignoring
that module if it claims a file.

Change-Id: I9778f7835922439e2d3708614689280ef7b61d33
Reviewed-on: https://code.wireshark.org/review/4590
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 08:14:38 +00:00
Gerald Combs 3a4cab751e CMake: Bundle our libraries.
Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:45:55 +00:00
Gerald Combs 33d20c64dc Add back a value_string conversion lost in g58cc452.
I don't have a capture to check but this appears to be correct.

Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2
Reviewed-on: https://code.wireshark.org/review/4587
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:40:16 +00:00
Guy Harris 45e462985d Use an enum for the open-routine return value, as per Evan Huus's suggestion.
Clean up some things we ran across while making those changes.

Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
Reviewed-on: https://code.wireshark.org/review/4581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09 23:45:30 +00:00
Pascal Quantin 112c90a04b Kerberos: fix decryption of DCERPC with Kerberos encryption
Bug: 10538
Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c
Reviewed-on: https://code.wireshark.org/review/4566
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 21:45:18 +00:00
Pascal Quantin 7690afbc54 Kerberos: remove debug logs when loading a keytab
Bug: 10543
Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
Reviewed-on: https://code.wireshark.org/review/4567
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:57:56 +00:00
Pascal Quantin 40e6d764c5 GTPv2: fix an infinite loop
Bug: 10548
Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
Reviewed-on: https://code.wireshark.org/review/4578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:34:16 +00:00
Michael Mann 58cc452d6f Eliminate proto_tree_add_text from packet-lmp.c
Also "refactored" a few fields into proto_tree_add_bitmask calls.

Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78
Reviewed-on: https://code.wireshark.org/review/4575
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-10-09 19:47:38 +00:00
Sean O. Stalley 608207fcf6 Add Dissection of MA packets over UDP
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6
Reviewed-on: https://code.wireshark.org/review/4576
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 19:41:19 +00:00
Michael Mann 39b281461d Eliminate proto_tree_add_text from packet-nbns.c
Some other cleanup while in the neighborhood.  Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there.

Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a
Reviewed-on: https://code.wireshark.org/review/4574
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-10-09 17:13:39 +00:00
Anish Bhatt 1c51075376 [BACnet][trivial] change strings as per Bug 9640
Change-Id: I542b5a96bcff6c779359b80ddce513524852272c
Reviewed-on: https://code.wireshark.org/review/4572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-09 07:49:55 +00:00
Stig Bjørlykke 4edda1b2ce Lua: Improved TreeItem:add documentation.
The protofield is optional and can not be replaced with 'nil'
as with the other fields for this function.

Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456
Reviewed-on: https://code.wireshark.org/review/4549
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-09 05:42:13 +00:00
Gerald Combs c303a2ebf5 Make sure we don't dereference a null pointer.
Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123
Reviewed-on: https://code.wireshark.org/review/4561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 20:46:20 +00:00
Guy Harris ea5587a090 Fix a comment.
Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190
Reviewed-on: https://code.wireshark.org/review/4560
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:25:19 +00:00
Stig Bjørlykke 23286b7b14 ANSI 683: Removed unused assignments.
Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014
Reviewed-on: https://code.wireshark.org/review/4558
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 20:12:37 +00:00
Guy Harris 97e462d116 "long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER.
Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae
Reviewed-on: https://code.wireshark.org/review/4559
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:10:07 +00:00
Alexis La Goutte fb6e0430aa DCERPC (DRSUAPI) Fix typo found on idl file
Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de
Reviewed-on: https://code.wireshark.org/review/4554
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 17:59:41 +00:00
Johan Wahl 7207d2f8b0 SIP Enhance dissecion of PATH
Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8
Reviewed-on: https://code.wireshark.org/review/4543
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08 13:43:20 +00:00
Anish Bhatt 57a7aca8c3 elmi: Fix bug in message type coding
Bug: 10531
Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e
Reviewed-on: https://code.wireshark.org/review/4542
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-08 11:22:03 +00:00
Alexis La Goutte ceda0f9a40 Remove #pragma warning (MSVC) for PIDL generate dissector
Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
Reviewed-on: https://code.wireshark.org/review/4479
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 09:45:45 +00:00
Alexis La Goutte 41b8c6b519 DCERPC DFS: Remove from Dirty PIDL list
Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8
Reviewed-on: https://code.wireshark.org/review/4527
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-10-08 03:43:11 +00:00
Anish Bhatt f31836dbaf [bacnet] update vendors list, fix whitespace issues, all generated via script
Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744
Reviewed-on: https://code.wireshark.org/review/4519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 02:51:54 +00:00
Lorand Jakab 65321dfb87 Add support for LISP over TCP control messages
draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control
message types using TCP transport instead of UDP (which is used by all
existing messages).  These new messages are related to each other and
are used to exchange RLOC membership information between a tunnel router
and a map server.

Bug: 10494
Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/4253
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-10-08 01:34:13 +00:00
Guy Harris a566f617d8 No need for WTAP_ERR_CANT_READ.
Unlike the standard I/O routines, the code we introduced that supports
fast random seeking on gzipped files will always supply some specific
error code for read errors, so we don't need WTAP_ERR_CANT_READ.

Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
I/O routines for that.  Set errno to WTAP_ERR_CANT_WRITE before calling
fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
without setting errno.

Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
Reviewed-on: https://code.wireshark.org/review/4540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 23:19:56 +00:00
Evan Huus cf4fc57966 ANSI683: Fix mobile country code base
Fixes error:
Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value
(FT_UINT16) but is being displayed as BASE_NONE

Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d
Reviewed-on: https://code.wireshark.org/review/4536
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 21:25:14 +00:00
Alexis La Goutte 43dffab8c8 GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10
Reviewed-on: https://code.wireshark.org/review/4526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 21:24:13 +00:00
Michael Mann a9e6c2c917 Overhaul the filterability of packet-ansi_683.c
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl.  Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector.  That started the cleanup, and I did more while in the neighborhood.

Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
Reviewed-on: https://code.wireshark.org/review/4521
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-10-07 21:14:28 +00:00
Anish Bhatt 12800157d6 [iSCSI] Fix incorrect heuristic.
The only valid check for Expected Data Transfer Length is :
R and W  MUST  NOT both be 0 when the Expected Data Transfer Length and/or
Bidirectional Read Expected Data Transfer Length are not 0

Bug #10469
Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172
Reviewed-on: https://code.wireshark.org/review/4514
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 20:53:27 +00:00
Stig Bjørlykke d89cc1cf9a ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()

This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).

Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4
Reviewed-on: https://code.wireshark.org/review/4531
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 20:27:35 +00:00
Michał Orynicz 47a1735ca1 Add proper decoding for type field in OBEX headers
Change type field type from byte sequence to string.

Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee
Reviewed-on: https://code.wireshark.org/review/4417
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 20:14:19 +00:00
Gerald Combs 9033f137a9 Revert "ASN1: Added support for using #.REGISTER_NEW"
This temporarily reverts commit
acc09c2aa2.

Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0
Reviewed-on: https://code.wireshark.org/review/4525
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 16:34:18 +00:00
Stig Bjørlykke acc09c2aa2 ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()

This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).

Change-Id: I8802a812bd484c1e8794c618b87e676003aea94a
Reviewed-on: https://code.wireshark.org/review/4493
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 16:23:55 +00:00
Richard Sharpe 15e89ecdfa Dissect an SVHDX Open Device Context that appears as an Extra Create Parameter
in a CREATE request. This helps understand HyperV over SMB 3.x stuff.

Bug: 10527
Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-on: https://code.wireshark.org/review/4477
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 15:10:35 +00:00
Martin Kaiser 8439fd5796 - Handle strings that have an opening but no closing quote
fixes the endless loop reported in

Bug: 10521

- Fix a typo.
Change-Id: I17b4a15e780d1d6122841a308348518063f82a59
Reviewed-on: https://code.wireshark.org/review/4467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 07:49:13 +00:00
Anish Bhatt 04bca658f9 [bacnet] update vendor list
Change-Id: I6b7bd3b3a110b8d393cd849c12890fff17446e54
Reviewed-on: https://code.wireshark.org/review/4515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-07 06:44:43 +00:00
Alexis La Goutte 683d657d49 PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer
packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined
packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined
packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined
packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined
packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value
packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f
Reviewed-on: https://code.wireshark.org/review/4478
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 01:13:06 +00:00
Alexis La Goutte de13887198 idl2wrs (DCERPC DRSUAPI): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Add a check if the struct is not empty

budb and butc are also regenerate but no change

Change-Id: I0d8cfc827f5451f1cdbd924628a263af9d483a7b
Reviewed-on: https://code.wireshark.org/review/4473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 01:12:22 +00:00
Gerald Combs 6397ad43c2 Revert "Qt: Try to fix a Visual C++ encoding warning."
Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch
Visual C++ instead.

Qt's rich text renderer doesn't handle "&apos;". Replace it with "&#x27;".
Remove a QDebug include.

Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b
Reviewed-on: https://code.wireshark.org/review/4511
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06 23:34:56 +00:00
Gerald Combs 798eb97053 Qt: Packet list column sorting.
Sorting behavior should be identical to GTK+.

Pass the correct position to beginInsertRows. Add a list of to-do items
to packet_list.cpp.

Change-Id: Ie6ab4b9f2d780a2af430d0f90529edca5485dada
Reviewed-on: https://code.wireshark.org/review/4481
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06 21:10:11 +00:00
Bill Meier 5051ae1cbe Convert "4 space tabs" to spaces; Adjust editor modelines.
Change-Id: I8d61d959c79e6aa9875c58680c54a331d18079cc
Reviewed-on: https://code.wireshark.org/review/4504
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 18:29:40 +00:00
Bill Meier 24d50bc290 Adjust indentation to match editor modelines; Do other minor whitespace changes.
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353
Reviewed-on: https://code.wireshark.org/review/4502
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:12:33 +00:00
Bill Meier c822eeabe4 packet-rpcap.c: Don't use mixed space/tab indentation;
Change-Id: I21409a02fabc28951d9c15be7a160295f5fb35ca
Reviewed-on: https://code.wireshark.org/review/4501
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:11:53 +00:00
Bill Meier 2d6621a6d2 Adjust editor modelines to match actual format of the file; Adjust some whiotespace.
Change-Id: If930f2c266b61c9348063eab0189af2582b0a331
Reviewed-on: https://code.wireshark.org/review/4500
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:59 +00:00
Bill Meier 2005fc6e78 Convert (what appear to be) "4 space tabs"; Adjust editor-modelines; Do some minor reformatting.
Change-Id: Ie078c826ed38a0d682f61fb3e95450b47a9d2c31
Reviewed-on: https://code.wireshark.org/review/4499
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:35 +00:00
Bill Meier 3377eca702 packet-g723.c: Remove some boilerplate comments.
Change-Id: Ib322b33c304674835170e1ae2006aabf0f44fd9d
Reviewed-on: https://code.wireshark.org/review/4498
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:13 +00:00
Bill Meier 3af9e3364c packet-hclnfsd.c: Reformat hf[] entries; Adjust some whitespace.
Change-Id: I84368080d12cb5001dd7847add0ec96608080604
Reviewed-on: https://code.wireshark.org/review/4497
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:09:48 +00:00
Bill Meier 97e6c59e3e packet-q931.c: Reformat hf[] entries; Convert apparent "4-space tabs" to spaces. Adjust editor modelines.
Change-Id: Iaeb321f0facfc6b3176677779e6cdf5c92226dec
Reviewed-on: https://code.wireshark.org/review/4496
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:09:22 +00:00
AndersBroman 4d930724ff Dissect 3GPP AVP Presence-Reporting-Area-Elements-List.
Change-Id: Ic7b99d41a275fb6f50758ea87763844f24be537c
Reviewed-on: https://code.wireshark.org/review/4495
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-10-06 17:04:39 +00:00
Evan Huus 9128e43745 tcp: default no-subdissector-on-error to TRUE
Dissectors that need this set break badly when it isn't. Dissectors which don't
need this set will still generally be understandable without it, since e.g.
retransmissions will link to the original packet at the TCP layer, and
presumably the subdissector payload is exactly the same in that case.

Change-Id: I2871c2a90c601637bdfb8cffaa34a7407995c603
Ping-Bug: 10525
Ping-Bug: 10289
Reviewed-on: https://code.wireshark.org/review/4487
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-06 15:22:45 +00:00
AndersBroman 47de5a1fa0 Expand dissection of 8.108 Presence Reporting Area Action.
Change-Id: I2ad57d8cdb6758f01146b37ac924e2d8f2141546
Reviewed-on: https://code.wireshark.org/review/4491
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-10-06 13:43:53 +00:00
Bill Meier 0784451200 Adjust some whitespace to match editor modelines.
Change-Id: I9fda7de49255857cc1cf270d6202c85573d91674
Reviewed-on: https://code.wireshark.org/review/4490
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 03:42:51 +00:00
Bill Meier 07698d536b Adjust some whitespace to match editor modelines.
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3
Reviewed-on: https://code.wireshark.org/review/4489
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 02:55:49 +00:00
Martin Kaiser 9e776a1ed1 mpeg-pes: don't modify source and destination address colums
the mpeg-pes dissector replaced source or destination address with
decoding timestamp, presentation timestamp or pack data rate
these values don't belong into address columns and erase the IP
addresses when mpeg-pes is transmitted over IP

the timestamps etc can be displayed in a user-defined column if required

this patch is part of
Bug: 10505

Change-Id: I1bf561648f848eb18818862edd138724abfc8e88
Reviewed-on: https://code.wireshark.org/review/4472
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-05 20:25:14 +00:00
Bill Meier 0b18d6cb77 Add editor modelines; Adjust whitespace as needed.
Change-Id: I6e70c933ae61a97377235d67b2f6a1b3d67dc155
Reviewed-on: https://code.wireshark.org/review/4484
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:19:02 +00:00
Bill Meier e2bdfa101b Reformat hfi entries; Add editor modelines; Adjust whitespace.
Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c
Reviewed-on: https://code.wireshark.org/review/4483
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:18:30 +00:00
Bill Meier 1e1d1deca5 packet-igap.c: Reformat hf[] entries; Add editor modelines.
Change-Id: I0ac4f2eb7f2b93aab864c6f43dee057774048165
Reviewed-on: https://code.wireshark.org/review/4482
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:18:07 +00:00
Gerald Combs 66d9ca3e5f [Automatic manuf, services and enterprise-numbers update for 2014-10-05]
Change-Id: Ib90638f6382b2112f0f49a2d8f5d2d10b4d3c520
Reviewed-on: https://code.wireshark.org/review/4474
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-05 15:06:11 +00:00
Pascal Quantin dbcd94d33a DLT User: add ability to export PDUs
It can be really useful to share hand crafted captures without the need to configure the DLT User table

Change-Id: Iefab00b741f95b1f3a3247cb28ed01a367fa4ff4
Reviewed-on: https://code.wireshark.org/review/4469
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-05 07:07:59 +00:00
Alexis La Goutte a13a2e6779 DSR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ifd694dc9a72cde787c00820ec5a02cc33d5157e0
Reviewed-on: https://code.wireshark.org/review/4466
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04 21:33:46 +00:00
Alexis La Goutte 5377deeef8 LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I616e57c84c5721213ee12a41b63595547ab15f72
Reviewed-on: https://code.wireshark.org/review/4465
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04 21:27:44 +00:00
Alexis La Goutte 249d075cdd EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I88b90302df0202d38b7c089cf243e7860766e653
Reviewed-on: https://code.wireshark.org/review/4464
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:34:39 +00:00
Alexis La Goutte 973e09c635 GSM-SMS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: If0700726bf9a7359313d0cb69d959471c0ea9580
Reviewed-on: https://code.wireshark.org/review/4463
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:33:37 +00:00
Alexis La Goutte 8e172773f4 Juniper: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9178a3de683dda661ed68ef6d743036a9f8aa39e
Reviewed-on: https://code.wireshark.org/review/4462
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:27:13 +00:00
Alexis La Goutte 4d6264201c RSVP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iccfeaa514cd60f02bb37e210c5f714bcb616521b
Reviewed-on: https://code.wireshark.org/review/4461
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:26:24 +00:00
Michael Mann 3d7e5a6b9d Eliminate proto_tree_add_text from packet-gsm_a_bssmap.c
Also remove other_decode_bitfield_value calls.

Change-Id: I056fe74fbd547b690cd5ed60e3e8777df9474704
Reviewed-on: https://code.wireshark.org/review/4468
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:23:08 +00:00
Alexis La Goutte bedad69641 CEPH: Fix comma at end of enumerator list [-Wpedantic]
Change-Id: I0c04a3d217e75986878b276a1ac82b427de38384
Reviewed-on: https://code.wireshark.org/review/4454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:15:33 +00:00
Alexis La Goutte ab6f9549f0 DCERPC (butc): fix warning: no previous prototype for ... [-Wmissing-prototypes]
Fix a typo in last patch and regenerate file

Change-Id: Id9083edd797af97d72a872187a0d0b5750e04547
Reviewed-on: https://code.wireshark.org/review/4453
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:14:28 +00:00
Alexis La Goutte f1ba16a2dc CP2179: Fix warning: no previous prototype for proto_register_cp2179 [-Wmissing-prototypes]
Move on top also prototype of proto_reg_handoff_cp2179

Change-Id: I00f23a88606426acd17d63104630a885682d3c02
Reviewed-on: https://code.wireshark.org/review/4452
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:13:05 +00:00
Bill Meier ebfe8f6d28 Add editor modelines; Reformat as appropriate.
Change-Id: I8e9c58b75eea85877d22024201e5d8d0e9a3dbfd
Reviewed-on: https://code.wireshark.org/review/4459
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-04 15:34:02 +00:00
Bill Meier bb5daa6ae9 Add editor modelines; Adjust whitespace as needed.
Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a
Reviewed-on: https://code.wireshark.org/review/4442
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:28:42 +00:00
Bill Meier 451de17929 packet-aim-messaging.c: Add editor modelines; reformat various (including hf[] entries).
Change-Id: Ie5973a717a80ba75b82e817cb9e30c3529afbb0c
Reviewed-on: https://code.wireshark.org/review/4441
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:28:17 +00:00
Bill Meier b15914f5a1 packet-dcerpc-fileexp.c: Add editor modelines; reformat various (including hf[] entries).
Change-Id: I0d49f4c1c3a3960c3fdc9b1cd411c73097829c09
Reviewed-on: https://code.wireshark.org/review/4440
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:27:49 +00:00
AndersBroman 956cfa2cb8 LocationNumber digits is off by one(to many).
Bug 10522.

Change-Id: I7887f3ee229ac22d2aa37a3d8900d76d8b814ed0
Reviewed-on: https://code.wireshark.org/review/4439
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03 13:28:51 +00:00
Michael Mann 6621b1f317 Create field filters for gsm_rr_csn_HL_flag() usages.
Change-Id: I74f110b477a3bf7e0c374db3147604d50018deba
Reviewed-on: https://code.wireshark.org/review/4435
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03 04:21:28 +00:00
Bill Meier 482e8e5651 Add editor modelines & adjust indentation/whitespace as needed.
Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc
Reviewed-on: https://code.wireshark.org/review/4433
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02 22:30:52 +00:00
Bill Meier 70abd39bb7 Reformat hf[] entries; Add editor modelines & adjust whitespace.
Change-Id: I30b25db89d3fbae5f3913ede8bf7bd66fd2516da
Reviewed-on: https://code.wireshark.org/review/4432
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02 22:30:27 +00:00
Bill Meier 0299aa3521 packet-nfs.c: (trivial) Add dropped/missing newline; Adjust some whitespace.
Change-Id: I2ef3af42a712ced6917d94e1dcf708b3f34d7e82
Reviewed-on: https://code.wireshark.org/review/4431
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02 22:29:51 +00:00
Lukas Emersberger 526259159a epl: FIX PDO_Mapping
The subindex of the R/TPDO frames was interpreted false.
  Now the subindex is correctly interpreted.

  ASend SDO Write Multiple Parameter by Index interpreted
  the mapping data false.

Change-Id: Icfb1896e96f5486c5479c1dd060eb1032695f9f6
Reviewed-on: https://code.wireshark.org/review/4397
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-02 21:09:46 +00:00
Michael Mann 5c8457ea68 Create field filters for gsm_rr_csn_flag() usages.
Change-Id: I77b0c33c054397666f978a9ae175fa386cb87b59
Reviewed-on: https://code.wireshark.org/review/4419
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-02 20:47:13 +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
Michele Baldessari 0efa992d33 Extend X11 response parsing
Add support to parse screens, depths, visual-types and
pixel-formats in the X11 connection initial response.

v1->v2:
- Do not show unused bytes when their length is 0
- Fix up tabs

Change-Id: If62f0eab65a18e050fb3f830a6bd7574ab1f2de6
Reviewed-on: https://code.wireshark.org/review/4249
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>
2014-10-02 04:43:12 +00:00
Pascal Quantin 2a2d75ef9a GSM SMS: follow-up of gd65b7d5
Change-Id: I221e1411501e7c15eafe43e109f478684fa5ef10
Reviewed-on: https://code.wireshark.org/review/4408
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-01 21:05:11 +00:00
Peter Wu 1318d4cfe7 http: ignore response body for HEAD requests
Responses to HEAD requests must not have a message body, so do not
attempt to use the Content-Length and similar headers that indicate a
non-empty message body in the response. Those point to the entity that
would be returned for non-HEAD requests.

Requests do not have request_method set, so do not limit desegmentation
by HEAD in that case. Verified by comparing the output of `tshark -O
http` and by looking in the Wireshark GTK UI.

Bug: 6064
Change-Id: I7f027a06d8480673ca9754037d080c3b25cc5816
Reviewed-on: https://code.wireshark.org/review/4357
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-01 19:14:53 +00:00
Michael Mann d65b7d5cd2 Eliminate proto_tree_add_text from GSM_SMS dissector.
Change-Id: Ibe189239735da2ebb1b0ce61a5af249975b38be3
Reviewed-on: https://code.wireshark.org/review/4402
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-10-01 13:37:51 +00:00
Anndy Ke 0ac441b3ec Dissect ext_capab and alt_mac_addr subelements of wifi display IE.
Support two subelements of WFD IE:
- WFD Extended Capability Bitmap
- Alternative MAC Address

Change-Id: Ic365fdd84a6db6cf7d21c6ea32924a094432f83a
Reviewed-on: https://code.wireshark.org/review/4380
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01 08:08:03 +00:00
Alexis La Goutte 39c51be8ce LLDP: TIA Network Policy Unknown Policy Flag Decode is not correct
Wrong length for field...

Bug:10512
Change-Id: I416a34d5f50cc0e842612a084c95d885eea68ef1
Reviewed-on: https://code.wireshark.org/review/4377
Petri-Dish: Alexis La Goutte <alexis.lagoutte@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-10-01 08:06:17 +00:00
Alexis La Goutte 41ef2b01cd idl2wrs (DCERPC): fix some warning
* Fix -Wmissing-prototypes in
* Fix unused variable for drusapi (using _U_)

Need to fix indent and some unused function/variable to remove from DIRTY list

Change-Id: Ib6f325f0b54e2eb254ec38a41199b4b60a4d90a1
Reviewed-on: https://code.wireshark.org/review/4398
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-10-01 08:05:25 +00:00
Pascal Quantin 214b127d1e GIF: add a missing hf registration
Change-Id: Ib90054ef8a87f40249f644e8c7065b755419a11c
Reviewed-on: https://code.wireshark.org/review/4396
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-01 05:56:35 +00:00
Bill Meier 01b093c24d Add editor modelines; Adjust whitespace as needed.
Change-Id: I434da226c842298f4fb2a4335d06d51e164af2af
Reviewed-on: https://code.wireshark.org/review/4394
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 23:17:01 +00:00
Guy Harris 0cc027cc26 Note why strlen(args) could be < linelen.
Change-Id: I8fb3c35be0aa80895b8a917af8a9fd2542fbd9d6
Reviewed-on: https://code.wireshark.org/review/4393
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-30 21:32:59 +00:00
Martin Kaiser 514c101cb1 correct the line length if it was longer than the actual string supplied
by the caller

Bug: 10516
Change-Id: Ib2c9ab449b95da92cc889d0992fad30f432a2836
Reviewed-on: https://code.wireshark.org/review/4386
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-30 21:13:14 +00:00
Bill Meier 9b181b97c6 Add editor modelines; Adjust whitespace; Remove boilerplate comments
Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a
Reviewed-on: https://code.wireshark.org/review/4392
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:06:37 +00:00
Bill Meier 6896c2648c packet-fp_umts_fp.c: various
- Use #if 0/#endif to comment out code instead of /* ... */
= Add editor modelines and adjust whitespace as needed.

Change-Id: I6f7e18a7955cd17d6d727090de802374a7cae0c4
Reviewed-on: https://code.wireshark.org/review/4391
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:06:04 +00:00
Bill Meier a585cd85c1 packet-ses.[hc], packet-pres.c: various:
- Create/use extended value-strings;
- Move proto-register...() to (near) the end of the file;
- Add editor modelines and adjust whitespace as needed.

Change-Id: I7ebe6dfd62b3fb190aa1cefc9b35d40f156f11ea
Reviewed-on: https://code.wireshark.org/review/4390
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:05:43 +00:00
Bill Meier f687d637e9 packet-simulcrypt.c: various
- Add/use several extended value strings;
- Add (what appear to be) 3 missing entries to a value-string array;
- Add editor mode-lines and adjust whitespace as needed.

Change-Id: Ia3bea3c52130ae07d1f0c271659fb010abecb179
Reviewed-on: https://code.wireshark.org/review/4389
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:05:14 +00:00
Bill Meier b57a8bbefc packet-sscop.c: various:
- Add/use extended value-string;
- Add editor-modelines and adjust whitespace as needed.

Change-Id: I5e03d6bcaeb2f4beee37ad4778a87657ae82128d
Reviewed-on: https://code.wireshark.org/review/4388
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:04:56 +00:00
Bill Meier 22b5278b71 packet-mgcp.[hc]: Various changes:
- Add/use extended value-string;
- Move proto_register...() and proto_reg_handoff...() to the end of the file;
- Add editor modelines and adjust whitespace as appropriate.

Change-Id: Iede67c418d9f2b4e263113bb14e77d6a56a16225
Reviewed-on: https://code.wireshark.org/review/4387
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:04:12 +00:00
Michael Mann 0744558a35 Improve filterability of GTP dissector.
Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl)

Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3
Reviewed-on: https://code.wireshark.org/review/4378
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-09-29 21:09:57 +00:00
Michael Mann 1a50aee379 Improve filterability of RSVP dissector.
Eliminated many, but not all proto_tree_add_text calls.

Change-Id: Ic904a0019a9d5d64d47b562bd282f1e6fad617cb
Reviewed-on: https://code.wireshark.org/review/4366
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-09-29 19:25:47 +00:00
Guy Harris 4342d0f7a2 High Throughput is 11n, not 11g or 11a.
Change-Id: I86b6dac9cf3f1f524c1168d675bff4a04e361cee
Reviewed-on: https://code.wireshark.org/review/4374
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-29 18:59:57 +00:00
Bill Meier 3c0a6681e8 Add editor modelines and adjust indentation as needed.
Change-Id: I857700d685354b0bc9e0ca647c57faba981b520f
Reviewed-on: https://code.wireshark.org/review/4373
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29 18:50:46 +00:00
Bill Meier ff5a77256c Add editor modelines and adjust indentation as needed.
Change-Id: Id57d264299f2026d703c5b08bace4b24b32f184c
Reviewed-on: https://code.wireshark.org/review/4371
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29 18:21:50 +00:00
Hadriel Kaplan 97d2030cd5 Fix lua bindings for timestamp precision
The changes to the timestamp define names broke the init.lua file
generation.  Change-id Id0c27b31c5 tried to fix this, but would break
backwards compatibility of exisitng Lua scripts.  This commit fixes
that change by adding the timestamp variables in both a new Lua table
as well as the old filetypes table.

Change-Id: I74749acb51dc85094e8c63b240a1951bd4cc0330
Reviewed-on: https://code.wireshark.org/review/4370
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 15:50:18 +00:00
AndersBroman aef88f4959 Dissect more of the Presence Reporting Area Action IE.
Change-Id: I4bf0c7890fff4162e1cf5faad8dd0ca008e0dbe6
Reviewed-on: https://code.wireshark.org/review/4368
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 15:08:34 +00:00
Evan Huus ff87bc8ad1 Add missing use of a value_string definition
Change-Id: I865256633dbcc378b53eeabb62fcf84c617ea1b9
Reviewed-on: https://code.wireshark.org/review/4365
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 14:38:27 +00:00
AndersBroman 1b733e18f5 Fix a broken comment
Change-Id: I4358c118ec890456468d7aa8eda00fb0ddbaea20
Reviewed-on: https://code.wireshark.org/review/4364
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 14:28:32 +00:00
Bill Meier 10406870f5 Add editor modelines; fix indentation as needed.
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263
Reviewed-on: https://code.wireshark.org/review/4363
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29 13:47:02 +00:00
Guy Harris 768e36fc4f Remove duplicate packet-dcerpc-mapi.c.
Change-Id: If2ffd01c29777840db8e305bee9565efaa58d253
Reviewed-on: https://code.wireshark.org/review/4362
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-29 07:06:35 +00:00
Alexis La Goutte e976f68ff5 PIDL (DCERPC mapi): enhance dissector
Correctly regenerate mapi dissector (launch via make in pidl/mapi folder)

* Fix -Wunused-variable (fix in request/response.cnf files)
* Fix trailing whitespace

Not yet ready to remove from DIRTY list (there is always some warning about unused tree)

Change-Id: I9759202e320e90f0cb91db5c7dd9650ff62bbadd
Reviewed-on: https://code.wireshark.org/review/4347
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 06:27:09 +00:00
Alexis La Goutte cf3edd9eb7 PIDL (DCERPC mdssvc): enhance dissector
* Fix -Wunused-function (Add functions to mdssvc.cnf with NOEMIT)
    * Remove dissector DCERPC mdssvc from DIRTY list

Change-Id: Ic097b0067a44fcfd9298ace1abeb7ca8f0daf00b
Reviewed-on: https://code.wireshark.org/review/4346
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 06:24:41 +00:00
Michael Mann b2d81a2a8d Remove proto_tree_add_text_valist from dissectors.
The only remaining call to proto_tree_add_text_valist is in expert.c.  Suggestions welcome on how to make it "private" enough so dissectors can't use it.

Change-Id: I1b70789bd01a857c3ac06d198667aeb59c4d1be9
Reviewed-on: https://code.wireshark.org/review/4333
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-09-29 06:21:47 +00:00
Evan Huus 45fb37718e Fix lua bindings to handle timestamp precision changes
The recent wiretap changes broke the generation of init.lua among other things,
though it did coincidentally fix one of the "yuck" comments in the generator
regex.

(Note that this is entirely untested, because out-of-tree init.lua is and always
has been broken, but it should work)

Change-Id: Id0c27b31c596613997de4ba2f6088eb9d6c8fc53
Reviewed-on: https://code.wireshark.org/review/4361
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 02:35:29 +00:00
Evan Huus 94c47b12b0 mrcpv2: don't use an uninitialized buffer as a string
I have no idea what the original intent was with this magical
otherwise-totally-unused buffer, but it clearly serves no purpose now. Stop
reading garbage from it, and just read the data in the packet which is what the
field name suggests.

Bug: 10510
Change-Id: I05d0b98c04e59ea70247811168c4c8a64861f43d
Reviewed-on: https://code.wireshark.org/review/4352
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 00:12:32 +00:00
Alexis La Goutte f6b9e7a79e PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ibae478771b30d6e9ae07315985f1e71bc6b65423
Reviewed-on: https://code.wireshark.org/review/4350
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 19:16:17 +00:00
Pascal Quantin fdf3585c46 Stanag 4607: rename protocol abbreviation from 4607 to s4607 to avoid any collision with a frame number
Bug: 10509
Change-Id: I6b97c979ed05378a7d3495fe455bc36b82b19cc9
Reviewed-on: https://code.wireshark.org/review/4338
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-28 19:16:14 +00:00
Guy Harris 54b733ce9a Make the time stamp resolution per-packet.
Pcap-ng files don't have a per-file time stamp resolution, they have a
per-interface time stamp resolution.  Add new time stamp resolution
types of "unknown" and "per-packet", add the time stamp resolution to
struct wtap_pkthdr, have the libwiretap core initialize it to the
per-file time stamp resolution, and have pcap-ng do the same thing with
the resolution that it does with the packet encapsulation.

Get rid of the TS_PREC_AUTO_XXX values; just have TS_PREC_AUTO, which
means "use the packet's resolution to determine how many significant
digits to display".  Rename all the WTAP_FILE_TSPREC_XXX values to
WTAP_TSPREC_XXX, as they're also used for per-packet values.

Change-Id: If9fd8f799b19836a5104aaa0870a951498886c69
Reviewed-on: https://code.wireshark.org/review/4349
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28 18:38:18 +00:00
Bill Meier 5517c42883 packet-netflow.c: Do various fixes and changes
- Allow integer & float fields to have "reduced size encoding";
   Fixes Bug #8846;
- Add a missing cflow field-type;
- Update the names of a few cflow field-types;
- Replace all-but-one use of proto_tree_add_text();
- Fix encoding-args as appropriate;
- Remove some obsolete comments;
- Adust whitespace/indentation/formatting.

Change-Id: I4271e3692288cef3ea0f1aa5eb44f5a0b05c29da
Reviewed-on: https://code.wireshark.org/review/4348
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-28 18:16:22 +00:00
Alexis La Goutte 938008eb89 PIDL (DCERPC lsa): enhance dissector
* Fix -Wunused-function (Add functions to lsa.cnf with NOEMIT)
* Remove also some MANUAL function (no unused too..)
* Remove dissector DCERPC lsa from DIRTY list

Change-Id: I7b7f924f244757207f378b8650b8dd30e739da08
Reviewed-on: https://code.wireshark.org/review/4325
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 16:45:32 +00:00
Alexis La Goutte 1633724997 PIDL (DCERPC eventlog): enhance dissector
* Fix -Wunused-function (Add functions to eventlog.cnf with NOEMIT)
* Remove dissector DCERPC eventlog from DIRTY list

Change-Id: I29710ce4f548a6e4d9bf1dd6e652acf1eeaddf2c
Reviewed-on: https://code.wireshark.org/review/4324
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 16:44:12 +00:00
Alexis La Goutte d572634e0a PIDL (DCERPC dnsserver): enhance dissector
* Fix -Wunused-function (Add functions to dnsserver.cnf with NOEMIT)
* Remove dissector DCERPC dnsserver from DIRTY list

Change-Id: Id1d4f43784bfbf417156353fd3254375365c35c8
Reviewed-on: https://code.wireshark.org/review/4323
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 16:43:12 +00:00
Alexis La Goutte 28ec9c29ea PIDL (DCERPC winreg): enhance dissector
* Fix PIDL generator for NOEMIT Element (fix -Wunused-function for DCERPC winreg dissector)
* Fix indent (use tabs)
* Remove DCERPC winreg dissector from DIRTY list

Change-Id: I5d16cbfe8481a5e5f7e5df9b51735c93ae4375a7
Reviewed-on: https://code.wireshark.org/review/4322
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 16:41:20 +00:00
Alexis La Goutte e759d8272b PIDL: fix -Wmissing-prototype
Change-Id: I4cae47450e8026b10bd373828f235184560e0a99
Reviewed-on: https://code.wireshark.org/review/4308
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>
2014-09-28 16:22:15 +00:00
Gerald Combs 2bd8f501e6 [Automatic manuf, services and enterprise-numbers update for 2014-09-28]
Change-Id: I7604c01a061f4832e53aa88903a53c1d6a50e4dc
Reviewed-on: https://code.wireshark.org/review/4339
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-28 15:05:52 +00:00
alage 5a16ae72ee New dissector for KNXnetIP protocol
Bug:10403

Change-Id: I8c733ce69e6d44d1bff0ebbe72995f06212d9d93
Reviewed-on: https://code.wireshark.org/review/3828
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-28 14:17:28 +00:00
Alexis La Goutte f0b5fb7a04 PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I7f6f974732b7905f4ea4686e1a79ca6fbef78fa8
Reviewed-on: https://code.wireshark.org/review/4319
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-27 20:07:11 +00:00
Guy Harris 006790927f Make get_column_longest_string() static.
It's not used outside epan/column.c, so don't export it.

Change-Id: I38e084946d92f3c31b06fc4fc1991c88e652f58a
Reviewed-on: https://code.wireshark.org/review/4334
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 18:29:31 +00:00
Pascal Quantin 6e83b38020 Get rid of g_hash_table_lookup asserts when loading an external host file
Only parse the host file syntax without trying to store the names in the hash tables (it will be done later in host_name_lookup_init())

Change-Id: I2b8c7b29220e6413c1b5c0a0fa238ecb5388c962
Reviewed-on: https://code.wireshark.org/review/4309
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-27 15:55:07 +00:00
Michael Mann 6fad7d19e7 Eliminate proto_tree_add_text from some dissectors.
Some other related cleanup.

Change-Id: I45f54032aa8318858f4ee784945b6f2ed163b6ea
Reviewed-on: https://code.wireshark.org/review/4328
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-09-27 15:44:53 +00:00
Simon Zhong 65437a7c52 Added support of
- "PCEP Extensions for Stateful PCE" (draft-ietf-pce-stateful-pce-09)
- "PCEP Extensions for PCE-initiated LSP Setup in a Stateful PCE Model" (draft-ietf-pce-pce-initiated-lsp-01)
- "Optimizations of Label Switched Path State Synchronization Procedures for a Stateful PCE" (draft-ietf-pce-stateful-sync-optimizations-01)

checkAPIs.pl executed, got "deprecated APIs tvb_length" warning, but I didn't modify them because I saw reverse operations.

Fuzz test executed, no error.

Can't submit pcap file because is captured during internal test.

Change-Id: I063a7f6bda57543017b546506f9f89eda387daf6
Reviewed-on: https://code.wireshark.org/review/4275
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>
2014-09-27 12:41:58 +00:00
Guy Harris 15569c6d1c Regenerate PIDL dissectors with our current PIDL.
Change-Id: I63a1874d157c55df6c3c3f69c68098528adbb384
Reviewed-on: https://code.wireshark.org/review/4330
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 01:28:05 +00:00
Guy Harris 8d0b793297 "declare" apparently isn't a valid keyword; use typedef instead.
These changes came from the versions of those files at the tip of the
Samba trunk, and fix the failures to compile with pidl.

Change-Id: Ifc3276d4bc2ff1cfdb19819811f5b8d1b91961b5
Reviewed-on: https://code.wireshark.org/review/4329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 01:26:38 +00:00
Guy Harris a2681cc199 Note that errors are generated for dnsserver.idl and eventlog.idl.
Also fix a typo.

Change-Id: Id0713fbb722e88a911cae4ef4371b528fe73e048
Reviewed-on: https://code.wireshark.org/review/4321
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 21:13:34 +00:00
Alexis La Goutte 69337f1fe8 Modbus: Add value 90 (0x5A) used by Unity (Schneider)
Change-Id: I205f77bccb8ca042da1a699d49844e305612aac2
Reviewed-on: https://code.wireshark.org/review/4307
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-26 14:58:54 +00:00
Alexis La Goutte 9c8f10e727 Modbus: fix indent and add modelines info
Change-Id: Idfcdaa13c24791cf2b765b02d8235e9b3a9cd775
Reviewed-on: https://code.wireshark.org/review/4306
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-26 14:58:33 +00:00