Commit Graph

54899 Commits

Author SHA1 Message Date
Evan Huus 433a444d14 ses: initialize pres_ctx_id in session struct
Bug: 10454
Change-Id: Ib381646cad0a039514117735c48b461c9950f705
Reviewed-on: https://code.wireshark.org/review/4033
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08 14:50:19 +00:00
Martin Mathieson 3f0483022b Try to fix build error by giving function a return type
Change-Id: I157b6309bc8cb0bef6fc0cd213fd4ec7e4c375ef
Reviewed-on: https://code.wireshark.org/review/4035
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08 14:38:57 +00:00
Martin Mathieson 806981d156 Show band info for inter-freq entries in UE capabilities. Addresses Pascal's comments.
Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797
Reviewed-on: https://code.wireshark.org/review/4032
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08 14:12:28 +00:00
Evan Huus c1bc1b6a83 Convert some deprecated tvb_length calls
Change-Id: I6337f8e02a41106a363b9bf767bc4b3697442d41
Reviewed-on: https://code.wireshark.org/review/4027
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08 14:11:44 +00:00
AndersBroman 64cabe9ed2 Use dissect_e164_msisdn() for MSISDN.
Change-Id: I297241cafee8ec504b46044cacba457c5f261d6e
Reviewed-on: https://code.wireshark.org/review/4034
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08 12:45:26 +00:00
Pascal Quantin 3a4b3e1d1b ZigBee: fix compilation when building without libgcrypt
Change-Id: I4e60cbdaa7c56eca8f95945066dd31660fba045b
Reviewed-on: https://code.wireshark.org/review/4031
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-08 08:07:42 +00:00
Bill Meier 95c3f06d16 packet-gnm.h: remove: (should have been part of 07b003a "Remove obsolete dissectors")
Change-Id: I80455f69c2830609fe34ee79492d37dc4103de10
Reviewed-on: https://code.wireshark.org/review/4030
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-08 04:08:59 +00:00
Ronnie Sahlberg 79d7e5d488 SCSI: fix dissection of ElementAddress... mode page for SMC devices
Change-Id: If16ad422ab851f538af309fbf7d567bd2a13cace
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Reviewed-on: https://code.wireshark.org/review/4029
2014-09-08 01:15:37 +00:00
Guy Harris aebd9d3c7b Remove blank line, add newline at the end of the file.
Change-Id: I26bed6f3493ee7bb52439af9d72790a0133485c9
Reviewed-on: https://code.wireshark.org/review/4028
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-07 21:02:41 +00:00
Michael Mann 2b27d91f26 Eliminate proto_tree_add_text from some of the dissectors.
Other minor cleanups while in the area.

Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48
Reviewed-on: https://code.wireshark.org/review/4022
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-07 17:08:29 +00:00
Gerald Combs f76b4d9346 [Automatic manuf, services and enterprise-numbers update for 2014-09-07]
Change-Id: I35bc2282b41810cc9644ded0b5c4036f4508264b
Reviewed-on: https://code.wireshark.org/review/4024
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-07 15:06:35 +00:00
Guy Harris ef444d33fa Squelch a compiler warning and get rid of an unnecessary variable.
Just use "sizeof line" for the size of that array; don't have a separate
variable with the number of elements of the array (which at least is
equal to the size of the array, as it's an array of char), as that means
that you have to remember to change both of them.

Then cast "sizeof line" to int, as the second argument to fgets() is an
int, not a size_t (fgets(), as I remember, existed before size_t).

Change-Id: I3c65774527f4fcd824d7ae39208ab6e8e33eb9b4
Reviewed-on: https://code.wireshark.org/review/4023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-07 09:16:24 +00:00
Michael Mann 419de19c1d Create subdissector table for RTAC Serial and have dissectors register with it, rather than have the RTAC Serial dissector go find all of the dissectors its interested in.
Change-Id: I6b6a05ec242e4798fb56ffa43c661ec277aca955
Reviewed-on: https://code.wireshark.org/review/3984
Reviewed-by: Chris Bontje <cbontje@gmail.com>
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-07 01:45:12 +00:00
Alexis La Goutte 0d6fb098d0 GTK (conversations table): Fix Dereference of null pointer found by Clang analyzer
Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1
Reviewed-on: https://code.wireshark.org/review/4012
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-07 01:39:22 +00:00
Guy Harris 24d1295720 Don't give names to parameters you don't use.
C++, unlike C, lets you do that.  This squelches warnings from MSVC++.

Change-Id: Id7127392b7690769111afdb951951d743f1d5e63
Reviewed-on: https://code.wireshark.org/review/4019
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 22:59:21 +00:00
Guy Harris d853e92b75 Convert all the other function-defining macros.
(Perhaps C2099 will finally deprecate old-style function definitions and
allow you to declare parameters without names, just as C++ does, and
compilers will - obviously - not warn about those parameters being
unreferenced, obviating the need for __attribute((unused))__ and the
like.  And perhaps monkeys will fly out of....)

Change-Id: Iff295c1854e66eb4f9e02cdd5761e0191d371365
Reviewed-on: https://code.wireshark.org/review/4018
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 22:37:50 +00:00
Guy Harris 746a265f99 Try to suppress MSVC++ unused parameter warnings.
I haven't found a way to with MSVC to mark parameters in the argument
list as unused.  MSVC doesn't give warnings about them in C code, but
does appear to give them with C++ code.  An answer to

	http://stackoverflow.com/questions/3020584/avoid-warning-unreferenced-formal-parameter

suggests not giving the formal parameter a name in C++.

Have a macro UNUSED_PARAMETER(), which takes as an argument a variable
name, and expands to nothing in C++ and to the variable name followed by
_U_ in C, and use that for some unused parameters.  If it works, we'll
use it for all of them.

Change-Id: I76107bed037f1f0d94615adb42234c9faf83b4db
Reviewed-on: https://code.wireshark.org/review/4016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 20:09:16 +00:00
Guy Harris afb939b5f4 Make the count of bytes read from the file 64 bits.
We probably won't get files that big, but let's at least be prepared;
that squelches some compiler warnings.

Change-Id: Ia43ff78af7df63c7204c41d8331fea946de63116
Reviewed-on: https://code.wireshark.org/review/4015
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 18:52:47 +00:00
Guy Harris 8482173e5a Make some variables size_t, as values of that width are assigned to it.
(I'd say "as values of that *type* are assigned to it", but the "len"
field of a GString is of type "gsize", and, for some unknown reason, the
GLib folks, rather than just using size_t, which is required by C89 to
be available, invented their own "gsize" type, defined as "long", which
happens to be narrower than "size_t" on LLP64 platforms such as 64-bit
Windows.  Sigh....)

This squelches some compiler warnings.

Change-Id: Ifca1300297b2e9b777fb2c426dda822ba157cfe5
Reviewed-on: https://code.wireshark.org/review/4014
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 18:45:53 +00:00
Guy Harris 0bafffb28d Put asn1 back as a distributed subdirectory.
If it's not there, "make distcheck" fails.  In addition, 1) "make
distclean" doesn't clean out the Makefile.in files under asn1 and 2) you
don't get to see the source from which the ASN.1 dissectors were built
if you have a source tarball.

Change-Id: Ied59d42950373476a535fcf9cfccece46de92599
Reviewed-on: https://code.wireshark.org/review/4013
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06 11:16:29 +00:00
AndersBroman 07b003a98f Remove obsolete dissectors.
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4
Reviewed-on: https://code.wireshark.org/review/4006
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-09-06 09:52:01 +00:00
Michael Mann ceef7eba75 Eliminate proto_tree_add_text from some of the dissectors.
Other minor cleanups while in the area.

Change-Id: I8ea59205cfe6fab643d8fe01b75ce91532004fd9
Reviewed-on: https://code.wireshark.org/review/4004
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-06 07:44:46 +00:00
Alexis La Goutte f1ad9eb212 MySQL : Eliminate proto_tree_add_text (use proto_tree_add_debug...)
Change-Id: I2e14328715cd11bc1ce31dad91b1cc5ef4091130
Reviewed-on: https://code.wireshark.org/review/4005
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-06 07:43:35 +00:00
Alexis La Goutte 914169f97e MySQL: add decode connattrs when use COM_CHANGE_USER
Change-Id: I5c24f0bf3d756abed0db17bf2ae8ab0dbf695c43
Ping-Bug:10351
Reviewed-on: https://code.wireshark.org/review/4000
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-05 22:57:45 +00:00
Pascal Quantin b515cd3aec 6LoWPAN: fix storage of contexts coming from ICMPv6 Router Advertisement messages
Bug: 10443
Change-Id: I1a74b4d3036c61f0c8e1fca6373845ea40d87808
Reviewed-on: https://code.wireshark.org/review/4008
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-05 22:39:02 +00:00
Jeff Morriss 56ae87a3dd Fix compilation when we don't HAVE_GEOIP.
Change-Id: Ib72178aab69c266cb903ef5ad5587cc0b80eb1fd
Reviewed-on: https://code.wireshark.org/review/4007
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-05 18:13:48 +00:00
Guy Harris 8df622bc18 Fix compiler warnings.
In our build environment, some UN*Xes define the historic index()
routine in addition to the standard strchr() routine.

Change-Id: Id39ad42a60def6af4c5b3625528207e9d2948392
Reviewed-on: https://code.wireshark.org/review/4002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-05 08:14:24 +00:00
Martin Kaiser 63d7f7fc4c adjust the path to the translation files
they were renamed from qtshark_... to wireshark_...

Change-Id: I97b245a9028b4ed99812204114ba8f59357d49e8
Reviewed-on: https://code.wireshark.org/review/3995
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-05 06:35:53 +00:00
Gerald Combs f4e28192b2 Fix compiler warnings from g30f3d52.
Change-Id: I76fa088f72f0e31da9be105919d56fd8db1ea7b5
Reviewed-on: https://code.wireshark.org/review/3999
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 04:03:56 +00:00
Alexis La Goutte 97b073810b CAPWAP: Add some new Message Element Type (RFC5415)
* AC Timestamp (6)
* Add Station (6)
* CAPWAP Local IPv4 Address (30)
* CAPWAP Local IPv6 Address (50)
* CAPWAP Transport Protocol (51)
* MTU Discovery Padding (52)
* ECN Support (53)

Change-Id: Ib8b2768d5df4b0e1b5b8b5bd28ae66e825020205
Reviewed-on: https://code.wireshark.org/review/3986
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-05 03:36:05 +00:00
Gerald Combs 00cc4c7a8b Fix the GeoIP include path.
Change-Id: Ib4b3264a4da5b54b01061153e383f21e1bcf00b2
Reviewed-on: https://code.wireshark.org/review/3998
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 02:58:54 +00:00
Gerald Combs 74ca94b808 Add the GeoIP include path to the Windows qmake build.
It looks like we need to install and/or configure Qt on the Windows
petri dish builder.

Change-Id: I2bdde7cd9216e311d6402116d6c67b37d37e182d
Reviewed-on: https://code.wireshark.org/review/3997
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 01:49:33 +00:00
Gerald Combs 30f3d52441 Qt: Refactor ConversationDialog for endpoints.
Create a TrafficTableDialog (for lack of a better name) parent class
from the general parts of ConversationDialog. Use it to create
EndpointsDialog.

Move the contents of conversation_tree_widget.{cpp,h} to
conversation_dialog.{cpp,h} to match endpoint_dialog and
traffic_table_dialog.

Fill in GeoIP columns dynamically instead of using a hard-coded limit.

Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and
defines.

Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust.

Clean up some includes. Fix a shadowed variable.

Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d
Reviewed-on: https://code.wireshark.org/review/3462
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 01:06:53 +00:00
Bill Meier 382815d6bd packet-netflow.c: Update "Information Elements" dissected based upon 08/13/2014 IANA IPFIX assignments document
Change-Id: Icfabdf5b77cdeef686620b75e649fc5bc270197a
Reviewed-on: https://code.wireshark.org/review/3996
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-04 22:21:55 +00:00
Martin Kaiser 4147b4545e another lupdate + lrelease for Japanese
this fixed the line numbers, marked some items as obsolete and added new
items

corrected some minor problems

Promiscious Mode was changed to Monitor Mode, update the translation
accordingly

Change-Id: I63b3ef0fb3488d941d6d1170b911026281f94a0a
Reviewed-on: https://code.wireshark.org/review/3994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-04 21:27:09 +00:00
Martin Kaiser 3b60797429 From 竹下 恵 (Megumi Takeshita)
japanese language update

Change-Id: I92a68f389a7ac1e07eb11c970d5e37c31fde22c1
Reviewed-on: https://code.wireshark.org/review/3993
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-04 21:26:37 +00:00
Alexis La Goutte 82f5bdf1e1 ICMPv6: Remove soft deprecated API (tvb_length -> tvb_captured_length)
Change-Id: Ib6161f778d902430f0903f5aef2df40c8166c5aa
Reviewed-on: https://code.wireshark.org/review/3992
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-04 20:21:22 +00:00
Alexis La Goutte 5ec1ab4101 tvbuff composite: add modelines infos (tabs)
Change-Id: I9ea2160b550243b45f6798ad3339f6a45b34a4ef
Reviewed-on: https://code.wireshark.org/review/3991
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-04 19:31:57 +00:00
Alexis La Goutte 67bff64ad7 tvbuff composite: fix Dereference of null pointer found by Clang Analyzer
Change-Id: Ia43cb2e1cab99e4b769c8dfa0805d8e38e225a1c
Reviewed-on: https://code.wireshark.org/review/3990
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-04 19:31:47 +00:00
Jeff Morriss cccc9275ca Update NEWS: Add S7 Communication dissector and the extcap interface.
Also add the S7 Communication dissector's author to AUTHORS.
Mention that the Qt UI is now the default.

Change-Id: Ie2629333fd48bbe1ce95052292336a4f8608ea17
Reviewed-on: https://code.wireshark.org/review/3988
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-04 18:07:48 +00:00
Alexis La Goutte 3b20e02266 Fix Mac OS X buildbot
packet-s7comm.c:962: warning: declaration of 'time' shadows a global declaration

Change-Id: I4020b780e787a91c42f08f7b7b1c7feabcabdc62
Reviewed-on: https://code.wireshark.org/review/3987
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04 14:18:02 +00:00
Roland Knall 2c9af798f2 openSAFETY: Add datafield for preload
- Block Up-/Download will be removed from the protocol
   It has never been implemented => no impact
 - Preload will be added in future versions of the
   openSAFETY specification
 - Better definition of SSDO ACMD sets to ensure correct
   protocol dissection
 - Use TFS.h t/f strings where applicable, remaining
   strings are referenced directly from specification

Change-Id: I9c809098938333c914e1f8ba67d100b994fd33f4
Reviewed-on: https://code.wireshark.org/review/2647
Reviewed-by: Roland Knall <rknall@gmail.com>
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-04 13:42:26 +00:00
Thomas Wiens 1c1f187989 s7comm: Add dissector for S7 Communication
S7 Communication is a Siemens proprietary protocol that runs between
programmable logic controllers (PLC) of the Siemens S7-300/400 family.

Dissector T.125 has to be disabled to let this dissector work.

Change-Id: I578cf270a4ae567f8e20dbabec1ce1e13fc08e6e
Reviewed-on: https://code.wireshark.org/review/3777
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-04 12:55:45 +00:00
Evan Huus 27d1b6addf Bump the time limit for valgrind fuzzing
Some captures are still hitting the limit as a false positive.

Bug: 10122
Change-Id: I12dd26ba0f96f44799f5ae642b1f9b0487f86a8a
Reviewed-on: https://code.wireshark.org/review/3982
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-04 12:54:16 +00:00
Jeff Morriss 2497482e34 Don't print non-printable characters in AX.25 addresses.
Add a new routine to wsutil to make this easy: printable_char_or_period().

Bug: 10439
Change-Id: I0eb2bb6bc0676a1035c3d845b5e20276fa04de60
Reviewed-on: https://code.wireshark.org/review/3981
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: 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-04 12:46:06 +00:00
Alexis La Goutte 1192606e88 Fix Mac OS X buildbot
packet-cp2179.c:719: warning: declaration of 'index' shadows a global declaration

Change-Id: Ic622b4f90f9816a43bc62bcb3ce438fbfab3d8a5
Reviewed-on: https://code.wireshark.org/review/3983
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04 11:55:50 +00:00
Stig Bjørlykke b4045ba7c3 Fix unused variable... [-Werror,-Wunused-const-variable]
Use DATA_FRAG_FLAGS, disabled unused NACK_FLAGS

Change-Id: I2d3dda2c3ab1ebbd66e32bf5ec1b62b521a7140d
Reviewed-on: https://code.wireshark.org/review/3968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04 06:23:04 +00:00
Qiaoyin Yang 23adc871f4 Add dissector for CP "Cooper" 2179 Protocol
All credit for development should go Qiaoyin Yang

CP2179 protocol is a serial based protocol. The 2179 protocol is implemented with minor variations between vendors.
The RTAC implemented the 2179 client supporting a limited function codes and command codes. The RTAC doesn't support
multiple function codes in a single request and the dissector also doesn't support decoding these or corresponding responses.


Bug:10285
Change-Id: I217bf4185c52b0b183f69b3b5aa84613340d3944
Reviewed-on: https://code.wireshark.org/review/3089
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04 06:17:27 +00:00
Jeff Morriss 511e1fbf3e Fix up some formatting.
Change-Id: Ib38561ad5cf0f532e43ae3e10bbb857bb24ab9b6
Reviewed-on: https://code.wireshark.org/review/3980
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-04 01:40:37 +00:00
Gerald Combs 5e3a8fa852 Work around an apparent bug in GtkFileChooserButton.
It looks like some versions of GTK+ intialize GtkFileChooserButton with a
location set to NULL and crash when you select an item from the dropdown
menu. Make sure we have a valid location set in that case.

Change-Id: If2556ef939b95d8af12581a7116a48fb46586f57
Bug: 10434
Reviewed-on: https://code.wireshark.org/review/3977
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 21:57:57 +00:00