metze/wireshark/wip.git
9 years agoAdd Kerberos 3.2.2 package for Win64
Pascal Quantin [Mon, 13 Oct 2014 19:37:01 +0000 (21:37 +0200)]
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>
9 years agoUpgrade Win64 GTK2 package to 2.24.23-3.39
Pascal Quantin [Mon, 13 Oct 2014 19:01:11 +0000 (21:01 +0200)]
Upgrade Win64 GTK2 package to 2.24.23-3.39

Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7
Reviewed-on: https://code.wireshark.org/review/4656
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoextcap: Remove single-space argument for boolflags
Roland Knall [Mon, 13 Oct 2014 14:18:28 +0000 (16:18 +0200)]
extcap: Remove single-space argument for boolflags

 Boolflags will be added with a NULL argument to the
 list and therefore the original fix will work.

 Note: extcap_get_complex_as_string will convert any NULL
 value into a single character argument (' '). Therefore
 any argument type, where NULL is a special value should
 be handled seperately here. For now, the only datatype
 will be BOOLFLAG

Change-Id: Icfc9b573214e05ea713a3b70ea37953d470dafae
Reviewed-on: https://code.wireshark.org/review/4649
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoSplit ws80211_get_phys callback handler
Mikael Kanstrup [Sat, 11 Oct 2014 20:41:10 +0000 (22:41 +0200)]
Split ws80211_get_phys callback handler

Split up the ws80211_get_phys parser callback handler function into
separate functions for each attribute parsed. This is done in
preparation for supporting split wiphy dump feature where the function
logics will need modications.

Change-Id: Ic0b497fc628f0e7453cd62eb8199f17f9a308a7f
Reviewed-on: https://code.wireshark.org/review/4610
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>
9 years agoBER: Code cleanup in call functions
Stig Bjørlykke [Mon, 13 Oct 2014 12:05:29 +0000 (14:05 +0200)]
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>
9 years agoAdd editor modelines and/or adjust whilespace.
Bill Meier [Mon, 13 Oct 2014 19:04:21 +0000 (15:04 -0400)]
Add editor modelines and/or adjust whilespace.

Change-Id: I626b7bd8ac6e4b91c57cc9152e7ce038754e7278
Reviewed-on: https://code.wireshark.org/review/4658
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoNCP: add a missing cast following g6ca40c5
Pascal Quantin [Mon, 13 Oct 2014 19:04:09 +0000 (21:04 +0200)]
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>
9 years agoLua: luaL_checkstring does not return NULL
Stig Bjørlykke [Sun, 12 Oct 2014 20:27:54 +0000 (22:27 +0200)]
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>
9 years agoextcap: Catch unknown arguments to fix spaces
Roland Knall [Mon, 13 Oct 2014 11:26:21 +0000 (13:26 +0200)]
extcap: Catch unknown arguments to fix spaces

 - If boolflags are being used, an extra space is added
   to the call of the extcap filter. This leads to the
   argumentparser of python to exit with an error-code,
   and the extcap filter will not start. This patch instead
   catches the unknown arguments and prints them on stdout,
   as well as running the dissection with the rest of the
   arguments list.

   Basically this is a work-around, for a behaviour not
   yet fixed in extcap, but it stabilizes the usage of the demo

Change-Id: I7589292692b0b3c839909fd09d62a4714cbe869e
Reviewed-on: https://code.wireshark.org/review/4638
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoIPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length
Alexis La Goutte [Mon, 13 Oct 2014 08:21:39 +0000 (10:21 +0200)]
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>
9 years agoncp2222: don't overflow buffer constructing string
Evan Huus [Mon, 13 Oct 2014 16:55:40 +0000 (12:55 -0400)]
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>
9 years agoextcap: remove use of g_list_free_full
Evan Huus [Mon, 13 Oct 2014 16:08:43 +0000 (12:08 -0400)]
extcap: remove use of g_list_free_full

It requires a newer glib than we support

Change-Id: Id8f14d4188a9ba55e0a5196bb877e2fe6a0c8d3f
Reviewed-on: https://code.wireshark.org/review/4652
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoRTSE: Return dissected length from call_rtse_oid_callback
Stig Bjørlykke [Mon, 13 Oct 2014 12:04:23 +0000 (14:04 +0200)]
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>
9 years agoROS: Return dissected length from call_ros_oid_callback
Stig Bjørlykke [Mon, 13 Oct 2014 11:59:38 +0000 (13:59 +0200)]
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>
9 years agoIPv6 RPL option is read as less bytes than it is
Alexis La Goutte [Sun, 12 Oct 2014 18:56:17 +0000 (20:56 +0200)]
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>
9 years agoRoCE and CM dissector fixes
Tim (Thanh) Nguyen [Sun, 12 Oct 2014 14:31:03 +0000 (10:31 -0400)]
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>
9 years agoextcap (GTK): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 12 Oct 2014 17:22:58 +0000 (19:22 +0200)]
extcap (GTK): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Ifdba972e3a12e01ac80bc920a2100bd7aa0f733c
Reviewed-on: https://code.wireshark.org/review/4622
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFollow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
Pascal Quantin [Mon, 13 Oct 2014 12:17:35 +0000 (14:17 +0200)]
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>
9 years agoSPDY: Add Slot field for SYN_STREAM (and also unused field...)
Alexis La Goutte [Mon, 13 Oct 2014 10:30:26 +0000 (12:30 +0200)]
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>
9 years agoSPDY: Fix bitmask for priority bit
Alexis La Goutte [Mon, 13 Oct 2014 09:55:34 +0000 (11:55 +0200)]
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>
9 years agoSPDY: Fix the display of COL_INFO...
Alexis La Goutte [Mon, 13 Oct 2014 08:50:50 +0000 (10:50 +0200)]
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>
9 years agoASN1: Register BER syntaxes as NEW
Stig Bjørlykke [Tue, 7 Oct 2014 20:41:47 +0000 (22:41 +0200)]
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>
9 years agoIPv6: Fix typo for Fragment nxt (Next Header)
Alexis La Goutte [Mon, 13 Oct 2014 07:50:46 +0000 (09:50 +0200)]
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>
9 years agoP1: Added ORAddress and ORName syntax.
Stig Bjørlykke [Mon, 13 Oct 2014 11:37:24 +0000 (13:37 +0200)]
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>
9 years agoASN1: Register PDU-dissectors as NEW
Stig Bjørlykke [Mon, 6 Oct 2014 13:31:47 +0000 (15:31 +0200)]
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>
9 years agoSPDY: Fix typo about length for Control bit
Alexis La Goutte [Mon, 13 Oct 2014 08:32:38 +0000 (10:32 +0200)]
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>
9 years agoUSB Mass Storage: Display target number for SCM USB-SCSI converters
Alexis La Goutte [Sun, 12 Oct 2014 17:37:02 +0000 (19:37 +0200)]
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>
9 years agoFixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.
Joseph Huffman [Thu, 25 Sep 2014 23:27:41 +0000 (16:27 -0700)]
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>
9 years agoAliging PIM hello message type to IANA in order to fix BUG 10231
Matthieu Texier [Mon, 15 Sep 2014 14:10:51 +0000 (16:10 +0200)]
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>
9 years agoEliminate proto_tree_add_text from IP dissectors
Michael Mann [Mon, 13 Oct 2014 02:09:35 +0000 (22:09 -0400)]
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>
9 years agoIPv6 RPL: Display RPL flag on HEX
Alexis La Goutte [Sun, 12 Oct 2014 18:58:59 +0000 (20:58 +0200)]
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>
9 years agoRemove DIRTY_DISSECTOR_SRC
Alexis La Goutte [Sun, 12 Oct 2014 15:51:29 +0000 (17:51 +0200)]
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>
9 years agoGlusterFS: fix OSX compilation failure
Pascal Quantin [Sun, 12 Oct 2014 20:56:19 +0000 (22:56 +0200)]
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>
9 years agoFix double free.
Tomasz Moń [Sun, 12 Oct 2014 19:07:48 +0000 (21:07 +0200)]
Fix double free.

This double free involves damaging GHashTable internals (key and value).

Change-Id: I17c8a473b96ab28e611ccf79ddd2b3da56512184
Reviewed-on: https://code.wireshark.org/review/4629
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix handling of extcap boolflags which defaults to true.
Tomasz Moń [Sun, 12 Oct 2014 15:26:04 +0000 (17:26 +0200)]
Fix handling of extcap boolflags which defaults to true.

Example:
arg {number=0}{call=--test}{type=boolflag}{default=true}

Before this change --test was never added to argument list (no matter if
user left it selected or explicitly deselected it).

After this change --test will be added to argument list unless user
explicitly deselects it.

Change-Id: Ia5bc11f900b03e630aba882ef918dcb7f0b79291
Reviewed-on: https://code.wireshark.org/review/4618
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoAdd editor modelines; Adjust whitespace as needed.
Bill Meier [Sun, 12 Oct 2014 18:56:12 +0000 (14:56 -0400)]
Add editor modelines; Adjust whitespace as needed.

Change-Id: I4da7b335d905dbca10bbce03aa88e1cdeeb1f8ad
Reviewed-on: https://code.wireshark.org/review/4626
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoDCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
Alexis La Goutte [Sun, 12 Oct 2014 15:44:04 +0000 (17:44 +0200)]
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>
9 years agoPIDL (DCERPC misc): enhance dissector
Alexis La Goutte [Sun, 12 Oct 2014 15:24:35 +0000 (17:24 +0200)]
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>
9 years agoISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 12 Oct 2014 17:23:39 +0000 (19:23 +0200)]
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>
9 years agoLMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 12 Oct 2014 17:23:17 +0000 (19:23 +0200)]
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>
9 years agoAdd back get_uinteger for boolean_type.
Stig Bjørlykke [Sun, 12 Oct 2014 16:41:36 +0000 (18:41 +0200)]
Add back get_uinteger for boolean_type.

This was removed in ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a

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>
9 years ago[Automatic manuf, services and enterprise-numbers update for 2014-10-12]
Gerald Combs [Sun, 12 Oct 2014 15:06:04 +0000 (08:06 -0700)]
[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>
9 years agoE-LMI: add what seems to be a missing break (Coverity CID 1245648)
Pascal Quantin [Sun, 12 Oct 2014 13:47:11 +0000 (15:47 +0200)]
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>
9 years agoMake boolean bitmask type 64-bit wide
Daniel Mack [Wed, 17 Sep 2014 16:39:22 +0000 (18:39 +0200)]
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>
9 years agoAdd support for NTTIME_hyper and NTTIME_1sec
Matthieu Patou [Sat, 11 Oct 2014 00:30:59 +0000 (20:30 -0400)]
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>
9 years agoUse the wtap_read_bytes{_or_eof}() routines.
Guy Harris [Sat, 11 Oct 2014 23:06:57 +0000 (16:06 -0700)]
Use the wtap_read_bytes{_or_eof}() routines.

Change-Id: I4f707bc714b2643d0f6c568f3367e712ee635d8e
Reviewed-on: https://code.wireshark.org/review/4612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUse variable name 'len' when handling length.
Stig Bjørlykke [Sat, 11 Oct 2014 20:39:17 +0000 (22:39 +0200)]
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>
9 years agoUse the count-of-records fields to figure out how many records to read.
Guy Harris [Sat, 11 Oct 2014 20:10:14 +0000 (13:10 -0700)]
Use the count-of-records fields to figure out how many records to read.

Fetch the count of records from one of the locations where it appears to
be, and, currently, require that it be equal to the count at the other
location where it appears to be; if they ever differ, we'll need the
file in order to reverse-engineer some more.

Fix the way we *write* .rf5 files - it turns out that we were

1) not writing the full file size;

2) not writing the packet count in the right location.

Detect files written by the old code, and get the packet count from the
right location for those files.

Change-Id: I7ce83afbc9dbbd300c81c96ef8f7785a0aeefa7a
Reviewed-on: https://code.wireshark.org/review/4608
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols
Matthieu Patou [Fri, 10 Oct 2014 23:34:48 +0000 (19:34 -0400)]
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>
9 years agoCMake: Don't add Custom.make to the bundle.
Gerald Combs [Sat, 11 Oct 2014 00:19:55 +0000 (17:19 -0700)]
CMake: Don't add Custom.make to the bundle.

Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd
Reviewed-on: https://code.wireshark.org/review/4605
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoDissection of sid28 needs null check.
Michael Mann [Fri, 10 Oct 2014 23:22:45 +0000 (19:22 -0400)]
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>
9 years agoUpdate READMEs to reflect recent CMake environment changes.
Gerald Combs [Fri, 10 Oct 2014 22:03:26 +0000 (15:03 -0700)]
Update READMEs to reflect recent CMake environment changes.

Change-Id: Idbf879f20448eea0b69e793271439dec877832e9
Reviewed-on: https://code.wireshark.org/review/4602
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoUse names more like the other names in open_info.
Guy Harris [Fri, 10 Oct 2014 20:20:02 +0000 (13:20 -0700)]
Use names more like the other names in open_info.

For open_info, use names based on the names in other lists.

Also, in comments, indicate what the three count 'em three tables are
used for, and clean up the type/subtype table.

Change-Id: I7a763119e790d5970f87dff05284f465eebfb7e7
Reviewed-on: https://code.wireshark.org/review/4599
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDNP3 Protocol Bugfix / Enhancement
cbontje [Fri, 10 Oct 2014 20:00:48 +0000 (14:00 -0600)]
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>
9 years ago[ELMI] Add missing information elements, add support for sub-information elements.
Anish Bhatt [Thu, 9 Oct 2014 05:02:31 +0000 (22:02 -0700)]
[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>
9 years agoRemove (almost all) proto_tree_add_text calls in ISUP dissector.
Michael Mann [Fri, 10 Oct 2014 12:44:13 +0000 (08:44 -0400)]
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>
9 years agoNCP: switch to wmem memory and ensure that all fields are initialized
Pascal Quantin [Fri, 10 Oct 2014 05:16:21 +0000 (07:16 +0200)]
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>
9 years agoVersion 3 has only absolute timestamps; don't set nsg_creltime.
Guy Harris [Fri, 10 Oct 2014 18:40:08 +0000 (11:40 -0700)]
Version 3 has only absolute timestamps; don't set nsg_creltime.

Version 3's time stamps are all absolute, so we can directly use the
value in the file; we don't need to keep track of the time in the
private data structure, and some compilers issue warnings due to setting
it and then not using the value to which we set it.

Change some names and indentation to match other file versions while
we're at it.

Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69
Reviewed-on: https://code.wireshark.org/review/4596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGSM MAP: fix detection of SMS direction when application context version is < 3
Pascal Quantin [Thu, 9 Oct 2014 20:48:59 +0000 (22:48 +0200)]
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>
9 years agoCMake: Bundle the "share" directory files and directories.
Gerald Combs [Fri, 10 Oct 2014 15:32:51 +0000 (08:32 -0700)]
CMake: Bundle the "share" directory files and directories.

Work around a CMake bug using file globbing.

Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f
Reviewed-on: https://code.wireshark.org/review/4595
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd editor modelines; Adjust whitespace as needed.
Bill Meier [Fri, 10 Oct 2014 14:41:10 +0000 (10:41 -0400)]
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>
9 years agoGTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
AndersBroman [Fri, 10 Oct 2014 13:41:53 +0000 (15:41 +0200)]
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>
9 years agowtap_file_read_till_separator() can return values other than 1 on success.
Guy Harris [Fri, 10 Oct 2014 10:21:57 +0000 (03:21 -0700)]
wtap_file_read_till_separator() can return values other than 1 on success.

It returns the length of the string it read, so only treat 0 and -1 as
errors.  (0 either means "EOF" or "string is zero length", but this is
only in the code that reads numbers, and a number needs at least 1
digit, so both EOF and "zero-length string" mean "this isn't a valid
Peek tagged file".)

Change-Id: Ib83eb2f1e53d912a2138be01480e2b464cf936db
Reviewed-on: https://code.wireshark.org/review/4591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix some more int-to-enum conversion complaint.
Guy Harris [Fri, 10 Oct 2014 08:14:06 +0000 (01:14 -0700)]
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>
9 years agoCMake: Bundle our libraries.
Gerald Combs [Fri, 10 Oct 2014 01:24:18 +0000 (18:24 -0700)]
CMake: Bundle our libraries.

Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd back a value_string conversion lost in g58cc452.
Gerald Combs [Fri, 10 Oct 2014 01:36:12 +0000 (18:36 -0700)]
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>
9 years agoOops, missed one.
Guy Harris [Fri, 10 Oct 2014 01:30:18 +0000 (18:30 -0700)]
Oops, missed one.

Change-Id: I0847846d50d6979f0f50a00438a834c7c7c2acc0
Reviewed-on: https://code.wireshark.org/review/4586
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDon't treat int return values as valid wtap_open_return_val values.
Guy Harris [Fri, 10 Oct 2014 01:14:12 +0000 (18:14 -0700)]
Don't treat int return values as valid wtap_open_return_val values.

They happen to be, at least now, but that's not valid in C++, and it's
probably unwise in any case.

Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff
Reviewed-on: https://code.wireshark.org/review/4585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCast size_t to to gulong as the length argument to g_snprintf().
Guy Harris [Fri, 10 Oct 2014 01:09:06 +0000 (18:09 -0700)]
Cast size_t to to gulong as the length argument to g_snprintf().

Sadly, the GTK+ folks decided not to use size_t for the size argument,
so it doesn't do the right thing on LLP64 platforms such as Windows.

Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f
Reviewed-on: https://code.wireshark.org/review/4584
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix declared types of open routines.
Guy Harris [Fri, 10 Oct 2014 01:04:16 +0000 (18:04 -0700)]
Fix declared types of open routines.

Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e
Reviewed-on: https://code.wireshark.org/review/4583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCMake: Bundle our plugins.
Gerald Combs [Thu, 9 Oct 2014 23:41:37 +0000 (16:41 -0700)]
CMake: Bundle our plugins.

plugins/*/CMakeLists.txt has a lot of repitition. We might want to
create a module or include file to simplify things.

Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852
Reviewed-on: https://code.wireshark.org/review/4582
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoUse an enum for the open-routine return value, as per Evan Huus's suggestion.
Guy Harris [Thu, 9 Oct 2014 23:44:15 +0000 (16:44 -0700)]
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>
9 years agoKerberos: fix decryption of DCERPC with Kerberos encryption
Pascal Quantin [Wed, 8 Oct 2014 21:58:18 +0000 (23:58 +0200)]
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>
9 years agoKerberos: remove debug logs when loading a keytab
Pascal Quantin [Wed, 8 Oct 2014 22:09:50 +0000 (00:09 +0200)]
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>
9 years agoGTPv2: fix an infinite loop
Pascal Quantin [Thu, 9 Oct 2014 20:14:01 +0000 (22:14 +0200)]
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>
9 years agoCMake: Build an application bundle (Wireshark.app) on OS X.
Gerald Combs [Thu, 9 Oct 2014 18:37:27 +0000 (11:37 -0700)]
CMake: Build an application bundle (Wireshark.app) on OS X.

Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on
OS X and disabled elsewhere. The bundle is currently bare-bones and only
contains the main executables, Info.plist, and application icon.

Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is
set and on Windows.

Start updating CPackConfig.txt for OS X packaging.

To do:

  - Add supporting libraries and frameworks.

  - Make the bundle standalone. I.e. call FIXUP_BUNDLE or
    replicate the relevant parts of osx-app.sh

Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb
Reviewed-on: https://code.wireshark.org/review/4577
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoEliminate proto_tree_add_text from packet-lmp.c
Michael Mann [Thu, 9 Oct 2014 13:09:58 +0000 (09:09 -0400)]
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>
9 years agoAdd Dissection of MA packets over UDP
Sean O. Stalley [Thu, 9 Oct 2014 18:27:17 +0000 (11:27 -0700)]
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>
9 years agoEliminate proto_tree_add_text from packet-nbns.c
Michael Mann [Wed, 8 Oct 2014 23:45:41 +0000 (19:45 -0400)]
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>
9 years ago[BACnet][trivial] change strings as per Bug 9640
Anish Bhatt [Thu, 9 Oct 2014 05:21:34 +0000 (22:21 -0700)]
[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>
9 years agoLua: Improved TreeItem:add documentation.
Stig Bjørlykke [Wed, 8 Oct 2014 17:32:55 +0000 (19:32 +0200)]
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>
9 years agoMake the OPEN_INFO_ values members of an enum.
Guy Harris [Thu, 9 Oct 2014 00:27:08 +0000 (17:27 -0700)]
Make the OPEN_INFO_ values members of an enum.

Change-Id: I93dbd14f81492764bf5854ee40eebcd1e04f3e01
Reviewed-on: https://code.wireshark.org/review/4570
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoBe less lazy about disabling a Visual C++ warning.
Gerald Combs [Wed, 8 Oct 2014 22:43:58 +0000 (15:43 -0700)]
Be less lazy about disabling a Visual C++ warning.

As Graham pointed out, "#pragma warning(disable..." affects the rest
of the file. Add a push+pop so that we only operate on the line in
question. Ideally we'd be able to use "suppress" but an "#endif"
prevents that.

Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef
Reviewed-on: https://code.wireshark.org/review/4569
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoUse WTAP_ERR_DECOMPRESS for decompression errors.
Guy Harris [Wed, 8 Oct 2014 22:48:37 +0000 (15:48 -0700)]
Use WTAP_ERR_DECOMPRESS for decompression errors.

Distringuish "the compression data has a problem" from "the capture file
(not compressed, or after decompression) data has a problem", with
WTAP_ERR_DECOMPRESS used for the former (whether it's the gzipping
decoded by our gunzip code or the Sniffer compression) and
WTAP_ERR_BAD_FILE used for the latter.

Change-Id: I8e6bff7edb480deba00c52a9e5afff607492e085
Reviewed-on: https://code.wireshark.org/review/4568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix --extcap-dlts call in extcap_example.py.
Tomasz Moń [Wed, 8 Oct 2014 17:45:11 +0000 (19:45 +0200)]
Fix --extcap-dlts call in extcap_example.py.

There is regular expression that extracts only the number from
--extcap-interface argument and only that number (as string) is being
passed to extcap_dlts().

Change-Id: I5159f9405a766c1edff792213b2aef72b9a29ba4
Reviewed-on: https://code.wireshark.org/review/4550
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoOnly set err_info on an error, and use g_strdup_printf().
Guy Harris [Wed, 8 Oct 2014 21:12:54 +0000 (14:12 -0700)]
Only set err_info on an error, and use g_strdup_printf().

If the goal is to look like a libwiretap routine, we only need to set
*err_info on an error, and we should set it to a g_mallocated string (or
NULL).

Handle WTAP_ERR_UNSUPPORTED while we're at it - we never return it, but
we never return WTAP_ERR_UNSUPPORTED_ENCAP, either, but we handle it.

Change-Id: I9d93c43278d22f0fa77ec1cf7f29b476c8dd0dd0
Reviewed-on: https://code.wireshark.org/review/4565
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoNo need to set *err_info if there's no error.
Guy Harris [Wed, 8 Oct 2014 21:04:45 +0000 (14:04 -0700)]
No need to set *err_info if there's no error.

Change-Id: I98ae9ec50e079d48b6247bb208528b7c5ad16027
Reviewed-on: https://code.wireshark.org/review/4564
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRobopatch and remove #MISSING comments.
Guy Harris [Wed, 8 Oct 2014 20:54:13 +0000 (13:54 -0700)]
Robopatch and remove #MISSING comments.

Change-Id: I611882a8b268046665488381be64aca89cdf3194
Reviewed-on: https://code.wireshark.org/review/4563
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUse WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files.
Guy Harris [Wed, 8 Oct 2014 20:50:17 +0000 (13:50 -0700)]
Use WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files.

Get rid of WTAP_ERR_UNC_TRUNCATED and WTAP_ERR_UNC_BAD_OFFSET, and lump
them under WTAP_ERR_BAD_FILE, with an error string; they're just another
form of "this file isn't a valid file of the type in question".

Change-Id: I0e9ac7c2ee66c8d789234a301c1dc2173aef1312
Reviewed-on: https://code.wireshark.org/review/4562
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMake sure we don't dereference a null pointer.
Gerald Combs [Wed, 8 Oct 2014 20:44:46 +0000 (13:44 -0700)]
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>
9 years agoFix a comment.
Guy Harris [Wed, 8 Oct 2014 20:24:57 +0000 (13:24 -0700)]
Fix a comment.

Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190
Reviewed-on: https://code.wireshark.org/review/4560
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoANSI 683: Removed unused assignments.
Stig Bjørlykke [Wed, 8 Oct 2014 19:50:15 +0000 (21:50 +0200)]
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>
9 years ago"long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER.
Guy Harris [Wed, 8 Oct 2014 20:09:46 +0000 (13:09 -0700)]
"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>
9 years agoTry to speed up ping-dependent capture tests.
Gerald Combs [Tue, 7 Oct 2014 17:11:45 +0000 (10:11 -0700)]
Try to speed up ping-dependent capture tests.

Ping four times a second for ~60 seconds. Save the subprocess PID so that
we can kill it when we're done with each test instead of waiting for it
to finish.

Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6
Reviewed-on: https://code.wireshark.org/review/4557
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoSet err_info to null for errors that don't have an informaton string.
Guy Harris [Wed, 8 Oct 2014 18:44:03 +0000 (11:44 -0700)]
Set err_info to null for errors that don't have an informaton string.

Change-Id: Ibbcf3496ebfb20c53b953db84b2ddb69083dcb86
Reviewed-on: https://code.wireshark.org/review/4556
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRemove redundant and erroneous debug log message.
Tomasz Moń [Wed, 8 Oct 2014 17:35:25 +0000 (19:35 +0200)]
Remove redundant and erroneous debug log message.

Change-Id: I91d6131b3b4b7ef670f0d188ebd6da3947c49bdc
Reviewed-on: https://code.wireshark.org/review/4548
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoDCERPC (DRSUAPI) Fix typo found on idl file
Alexis La Goutte [Wed, 8 Oct 2014 17:57:49 +0000 (19:57 +0200)]
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>
9 years agoSIP Enhance dissecion of PATH
Johan Wahl [Wed, 8 Oct 2014 08:55:57 +0000 (10:55 +0200)]
SIP Enhance dissecion of PATH

Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8
Reviewed-on: https://code.wireshark.org/review/4543
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoelmi: Fix bug in message type coding
Anish Bhatt [Wed, 8 Oct 2014 04:18:18 +0000 (21:18 -0700)]
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>
9 years ago[tools] Add missing GPL license to generate-bacnet-vendors.py
Anish Bhatt [Wed, 8 Oct 2014 10:42:55 +0000 (03:42 -0700)]
[tools] Add missing GPL license to generate-bacnet-vendors.py

Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa
Reviewed-on: https://code.wireshark.org/review/4544
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>