Commit Graph

54489 Commits

Author SHA1 Message Date
Jeff Morriss 863b6646d6 Replace a couple of implementations of unpack_digits() with tvb_bcd_dig_to_wmem_packet_str().
Change-Id: Ic9e740345fb3a748f6df4f624441bb947bbd9429
Reviewed-on: https://code.wireshark.org/review/3797
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 20:24:47 +00:00
Jeff Morriss 2d74838e47 Decode the 3GPP MSISDN AVP using the E.164 routines.
Rename dissect_e164_utf8_number() to dissect_e164_msisdn() and give it an
'encoding' argument.

Change-Id: I49cf5d2b24b44a0e69427ceae331f378024391c5
Reviewed-on: https://code.wireshark.org/review/3796
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 19:17:25 +00:00
Jeff Morriss 923ba9d312 Fix a comment typo: tvb_bcd_dig_to_wmem_packet_str() returns a WMEM-allocated
string, not an EP-allocated one.

Change-Id: I3918ed66429c588d4503d98e10dc460b099e550e
Reviewed-on: https://code.wireshark.org/review/3795
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 18:40:50 +00:00
Marian Ďurkovič 28acde1333 Parse Capabilities & Flags section of TRILL Version Sub-TLV
Change-Id: Ic82a2368c865031eaeee291055b6a4f176cde759
Reviewed-on: https://code.wireshark.org/review/3792
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 11:00:35 +00:00
Marian Ďurkovič 76a674f0cf TRILL ISIS: Implement TRILL Neighbor TLV (145)
Change-Id: I1b17b0ef26150fdc68b966f4837953f9832883cb
Reviewed-on: https://code.wireshark.org/review/3717
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 10:56:19 +00:00
Joerg Mayer ff94a7fffb Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done with
other liberaries. Also: After set( variable 0 ) the variable is defined.

Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0
Reviewed-on: https://code.wireshark.org/review/3793
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-22 10:55:51 +00:00
Marian Ďurkovič d5ba8b4f44 TRILL updates
Update Version info
Update Nickname IDs
Add new multicast MAC addresses

Change-Id: I72647b5f98a48267340d51df428602e1c77cb206
Reviewed-on: https://code.wireshark.org/review/3714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 10:55:40 +00:00
Wasim Abu Moch b6cb2ad049 packet-infiniband: added support for Mellanox DC transport type
*marked parse_DCCETH() function's unesed parameters with _U_ macro instead of (void) */
*Added few whitespaces (new lines), were mistakenly removed"*

Adding minimal support for Mellanox DC transport type which
replaces RD (RD isn't implemented in any HW yet).
It's minimal in the sense of skipping new headers without
parsing/showing them, this allows at least to keep correct IB packet parsing
due to the new added header for this TS. (in this stage we can't expose
the protocol details including it's header layout)

Change-Id: I6cffa6497632ba19a6f9ec60a4f68da60b28e821
Reviewed-on: https://code.wireshark.org/review/3719
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: Anders Broman <a.broman58@gmail.com>
2014-08-22 10:54:40 +00:00
Masayuki Takemura 8b5ca59dca TGPPRx: Add AF-Signalling-Protocol AVP dissection support
The AVP is defined in 3GPP TS 29.214, Table 5.3.1: Rx specific Diameter AVPs.

Change-Id: Ib0a525f97206ff61bb0d390df81e3d6ebbef59bb
Reviewed-on: https://code.wireshark.org/review/3791
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 07:12:05 +00:00
Marian Ďurkovič c2eb021db8 TRILL ISIS: Fix incorrectly equal ett variables for different subtrees
Change-Id: I38d886d50d74d75a900274df8bc24114e84926e7
Reviewed-on: https://code.wireshark.org/review/3744
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22 07:11:12 +00:00
Jeff Morriss 50bb930685 Regenerate the X11 dissector with the latest mesa, xcb, and process-x11-xcb.pl
Change-Id: Ie05f9b780011b215ca3ad3293b3daefbcbee68ce
Reviewed-on: https://code.wireshark.org/review/3789
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 00:07:25 +00:00
Peter Harris 331d87e303 X11: Support xcb's new <case>
Change-Id: I32c6ab15d6dc7a67cdb50c4187e2752730315588
Reviewed-on: https://code.wireshark.org/review/3751
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 00:04:52 +00:00
Bill Meier 0c38cf3c7b plugins.c: cleanup plugins_scan_dir()
add_plugin() no longer returns ENOMEM. Remove code in
 plugins_scan_dir() which printed an error message
 if ENOMEM returned by add_plugin().

 Fix comment re add_plugin() return values.

Change-Id: Id5170c28e2a55884d41ceebc4e07f16389b75a2a
Reviewed-on: https://code.wireshark.org/review/3774
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-21 23:58:15 +00:00
Bill Meier f580ebe3a9 packet-gsm_cbch.c: various minor changes
- tvb_length() --> tvb_reported_length();
- Use -1 for length arg in proto_tree_add_protocol_format();
- Remove unused 'for' loop increment which caused Windows
  warning: "C4701: potentially uninitialized local variable";
- Add editor modelines.

Change-Id: I37833b750c100e333f4fa76d9465169be456d7c1
Reviewed-on: https://code.wireshark.org/review/3788
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-21 23:57:18 +00:00
Graham Bloice 5b5ef967d2 Fix CMake checks of PCap functions, along with AirPCap
Change-Id: If55498167d5e357258841f2194962749c0dfc81e
Reviewed-on: https://code.wireshark.org/review/3787
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 23:56:56 +00:00
Jeff Morriss 87b2364a84 Add a license to this new file (GPLv2+) so we pass the license check.
(This change needs to be approved Roland Knall--by the file's author--in
Gerrit.)

Change-Id: I58285cb1d773a57fe7d087799bf6d2ffbd962364
Reviewed-on: https://code.wireshark.org/review/3773
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 23:51:14 +00:00
Jeff Morriss 6edc166c14 Decode User-Name as an IMSI in S13/S13' and S7a/S7d.
Also move the application ID macros into the diameter header file.

Change-Id: Iaca5707c8476d81f50ecdb3aab76be293b5ccfe7
Reviewed-on: https://code.wireshark.org/review/3786
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 21:41:47 +00:00
Martin Kaiser b6df4a5695 usb_conv_info is no longer unused
Change-Id: I27e5c8686e7f7a907bdcec59e97ae93a090b7185
Reviewed-on: https://code.wireshark.org/review/3783
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:27:45 +00:00
Martin Kaiser c8d9d29818 remove trans_info parameter from dissect_usb_interface_assn_descriptor()
Change-Id: I9069835a824abcb004b05659a20b00a783a28ed6
Reviewed-on: https://code.wireshark.org/review/3782
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:27:29 +00:00
Martin Kaiser 3313e2d67a remove usb_trans_info from dissect_usb_interface_descriptor()
Change-Id: Ia1bfdd705021e784213e00b70cfabc42b524384d
Reviewed-on: https://code.wireshark.org/review/3781
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:27:09 +00:00
Martin Kaiser a87112fafc set usb_conv_info->endpoint to "no endpoint" for interface conversations
Change-Id: I625d20cc2c874f5b28c063590878077f8aa80196
Reviewed-on: https://code.wireshark.org/review/3780
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:26:46 +00:00
Martin Kaiser b72acf37d0 add component descriptor values for HEVC services
Change-Id: I28e55dc95a55ad80aa2ce59ab6c5d495d8eb7d99
Reviewed-on: https://code.wireshark.org/review/3779
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:11:11 +00:00
Martin Kaiser 5a3faf9e05 add service type for HEVC digital television service
Change-Id: I9aab67250d9fe7dc83243b55bbc2cb964c140e46
Reviewed-on: https://code.wireshark.org/review/3778
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-21 20:10:04 +00:00
Bill Meier 8fad63807a text2pcap-scanner.l: On Windows: #include <io.h> req'd for isatty()
Change-Id: I6464f11c3bc5f8dd671f6f36006fb74059d30b26
Reviewed-on: https://code.wireshark.org/review/3776
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-21 17:20:17 +00:00
Bill Meier 45a7b6c858 uat_load.l: Fix "unreachable code" warning (Windows 4702)
Change-Id: I0f50bc9f1970578a7a2a44a8a3149173f5935f14
Reviewed-on: https://code.wireshark.org/review/3775
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-21 17:19:14 +00:00
Jeff Morriss 14605754af Fix compilation when we don't HAVE_LIBSMI or HAVE_GEOIP.
Change-Id: I7523c183fd46a649947ad316518dfffaddb02dbe
Reviewed-on: https://code.wireshark.org/review/3772
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 14:35:25 +00:00
Jeff Morriss a3d8f31ad0 Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it
in the Diameter dissector.

This new API adds a filter for the MSISDN as well as a subtree and filter for
the Country Code.

Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7
Reviewed-on: https://code.wireshark.org/review/3760
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 13:01:22 +00:00
Michal Labedzki c7c4abaab0 Bluetooth: btle: Fix reserved field dissection
Also cosmetic changes:
1. Clear Info Column at start (fix garbages from previous protocols like Ubertooth)
2. Refactor a little all expert field definitions

Change-Id: Ie1cba8c1578597f2d896ec75f7d2af4987325bf3
Reviewed-on: https://code.wireshark.org/review/3768
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:27:15 +00:00
Michal Labedzki 6cae829602 Bluetooth: HCI_EVT fix fuzz failture
Fix possible "Conditional jump or move depends on uninitialised value"

Bug: 10396
Change-Id: I2c57f8310f88c68ae921d7e5bd1c060d0df27b8e
Reviewed-on: https://code.wireshark.org/review/3769
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:23:26 +00:00
Michal Labedzki 8a0d4564cb Bluetooth: Fix Delete opcode in Linux Monitor transport
-1 -> tvb_captured_length(tvb) fixed zero-length packet.

Change-Id: I0748fa4e29d91a098f6222d162bce3177b9306e7
Reviewed-on: https://code.wireshark.org/review/3767
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:22:20 +00:00
Michal Labedzki 98f16d5b70 Bluetooth: RFCOMM: Fix recognizing services
Add support for missing direction flag in dlci.

Change-Id: I1429eb65374014e7b840bb31ca1d6f2ab1959160
Reviewed-on: https://code.wireshark.org/review/3766
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:22:06 +00:00
Michal Labedzki 87550a6ab4 Bluetooth: L2CAP: Clear channel options if configure fails
On every configuration request clean options before setting anything.
Then if configuration will be rejected options will not be set to
something that is not set in next configure request.

Change-Id: I5acedde96f7ff720e916256d683937acbcd13a48
Reviewed-on: https://code.wireshark.org/review/3765
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:21:18 +00:00
Michal Labedzki 3d445dd8db Update AUTHORS
Thanks to Michał Orynicz for finish Logcat support.
Also update our hall of fame. One note:
my real name is Michał Łabędzki, but if you write
Michal Labedzki it will be ok too.

Change-Id: I81ae563fa1347f1fee316e0ff79a87722ff88d0b
Reviewed-on: https://code.wireshark.org/review/3764
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:20:48 +00:00
Guy Harris 7b9b881841 Float constants end with "f"; assign float constants to gfloats.
This squelches some compiler warnings about assigning double values to
floats (no, there's no precision in 0 to lose, but the compiler warns
anyway).

Change-Id: Ia49618cb8582c5afcdc5bdc5334fe20724b85eda
Reviewed-on: https://code.wireshark.org/review/3762
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-21 08:06:25 +00:00
Guy Harris 66318ad5eb Don't assert out on tvb_memcpy() with a null data pointer if the length is 0.
If the length is 0, there's nothing to copy, so it doesn't matter if
there's no data to copy from.  This fixes problems caused by allocating
a zero-length buffer and using that as the data for a tvbuff; the
allocation returns null, so the data pointer is null.

Change-Id: I8037ae4b96d30e90a716852bb7e22d3980444f83
Reviewed-on: https://code.wireshark.org/review/3761
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-21 07:39:58 +00:00
Roland Knall bed29af46d Extcap Capture Interface
Extcap is a plugin interface, which allows for the usage
 of external capture interfaces via pipes using a predefined
 configuration language which results in a graphical gui.

 This implementation seeks for a generic implementation,
 which results in a seamless integration with the current
 system, and does add all external interfaces as simple
 interfaces.

 Windows Note: Due to limitations with GTK and Windows,
 a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe
 is needed, which is part of any GTK windows installation.

 The default installation directory from the build is an extcap
 subdirectory underneath the run directory. The folder used by
 extcap may be viewed in the folders tab of the about dialog.

 The default installation directory for extcap plugins with
 a pre-build or installer version of wireshark is the extcap
 subdirectory underneath the main wireshark directory.

 For more information see:

  http://youtu.be/Nn84T506SwU
  bug #9009

 Also take a look in doc/extcap_example.py for a Python-example
 and in extcap.pod for the arguments grammer.

 Todo:
   - Integrate with Qt - currently no GUI is generated, but
     the interfaces are still usable

Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f
Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net>
Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net>
Signed-off-by: Roland Knall <rknall@gmail.com>
Reviewed-on: https://code.wireshark.org/review/359
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-08-21 03:34:02 +00:00
Wasim Abu Moch 401469880b packet-erf: added dissector table for "erf.types.type" type field.
1- removed unnecessary include <wiretap/erf.h>
2- used fall through in protocol switch case instead of calling same
function with same params.

fixes/changes after review with Evan Huus, changes ETH/IPv4/IPv6/Infiniband/InfinibandLink
to use dissector table instead of direct function calls.
other protocols should be called in the same way, we'll do it when have
the time.

instead of calling subdissector directly from packet-erf.c code it's
easier to declare this and each time we need to register a new
protocol over erf format we sould easily extend it from the protcol module
instead using "dissector_add_uint()" function.

the change is still backward compatible, if no upper protocol is
registered for the specifc type an old fasion direct function call
is performed.

Change-Id: I3ae1ccfdd49ab8f90667185296cc950dc2184475
Reviewed-on: https://code.wireshark.org/review/3670
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-21 02:20:17 +00:00
Guy Harris ca5fa539f5 Create an IE item for the "Apparent Address" IE.
Also, don't initialize ie_item, in the hopes that cases where we don't
set it will be caught at compile time rather than run time.

Change-Id: I768251d19a7508ec876af44b987a4ecfd04258f7
Reviewed-on: https://code.wireshark.org/review/3759
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-20 22:52:10 +00:00
Guy Harris ca1ac2cf69 9P2000.L also has the UID field in tattach.
See, for example:

	http://code.google.com/p/diod/wiki/protocol#attach,_auth_--_messages_to_establish_a_connection

and

	http://code.google.com/p/diod/wiki/protocol#Overview

where the latter says

	9P2000.L consists of a subset of the canonical 9P2000
	operations, the 9P2000.u attach and auth messages, plus new
	operations designed to map to the Linux VFS in a straightforward
	way.

so tattach and tauth are the same as 9P2000.u.

Don't throw a dissector assertion of there's data at the end of the
packet; in the particular case that found this bug, yes, it was a
dissector bug, but it could also be a malformed packet, and we should
not throw dissector assertions unless we know *for certain* that the
problem is a dissector bug rather than a malformed packet.

Change-Id: I5ef5d837bccb4e7c4844d31a138aa55a85ec1b60
Reviewed-on: https://code.wireshark.org/review/3758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-20 22:15:47 +00:00
Guy Harris 2afb736a43 Sort hfi[] to match the definitions, and add a missing entry that found.
Sorting them to match the definitions of the hfi variables makes it
easier to compare the two lists.

Comparing the lists found a missing entry; add it.

Change-Id: I3517667336b1355195c5a227f0d02f1740a7c4cd
Reviewed-on: https://code.wireshark.org/review/3757
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-20 21:47:02 +00:00
Guy Harris 74e75c5c5f Sort the fc_lctl_rjt_val values.
That avoids a warning printed when making a value_string_ext table out
of it.

Change-Id: I7874e6db9d6805abcc21f113f1de7c2cf687e624
Reviewed-on: https://code.wireshark.org/review/3756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-20 21:37:11 +00:00
Guy Harris c16db66083 Various dissection improvements.
In WCCP V2, check whether the length field runs past the end of the
packet (actual packet data, not captured data) and, if so, report an
error with expert info, otherwise use the length field to set the length
of the tvbuff.  That allows the dissector to just use the tvbuff checks
to do length checks, so eliminate manual length checks.

In find_wccp_address_table(), stop if we run past the reported length or
packet length; if we fail to find an address table because we run past
the captured length, we should probably note that if we're trying to
dissect addresses.

Don't do any other checks against the captured length, just throw the
BoundsError assertion, to report that the packet was cut short during
the capture process.

When creating a protocol subtree for an item, give it a "to the end"
initial length", and only set the length when we're finished dissecting
the item, based on the amount of data dissected.

Don't speak of dissectors in expert info - the user needn't know what a
dissector is; what matters is what the protocol specifies.

Properly report "item is too short" errors - those are indicated by item
dissectors returning a negative value, so show the negative of that
value.

Make the top level item for a capability element be a separate item from
the element type; use hf_capability_element_type for the type rather
than the entire element, and put the type and length into the protocol
tree in that order, as that's the order in which they appear in the
packet.

Don't do capability element length checks in the capability element
dissector, do it in the dissector for the particular capability element,
and don't fail with a dissector bug report, fail with an expert info.

Sort the ett[] array to match the list of ett_ definitions, to make it
easier to check that they're all registered.

Change-Id: I6545e000b6caf9824f89234602635668fa1d38d6
Reviewed-on: https://code.wireshark.org/review/3754
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-20 21:25:11 +00:00
Graham Bloice 4ac0438e46 In Visual Studio builds, enable the L4 warning
4189: Local variable is initialized but not referenced

Fix some variables found by this

Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0
Reviewed-on: https://code.wireshark.org/review/3748
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
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>
2014-08-20 19:25:28 +00:00
Jeff Morriss 8fc0ee4c89 Decode IMSIs found in Subscription-Id AVPs.
Move decode of the User-Name AVP out of the 3GPP-specific file.
Add a couple of macros for 3GPP AppIDs (rather than using the number directly)
in both files.

Change-Id: I496b4ae86b05264462167b6e41ce1451392de11b
Reviewed-on: https://code.wireshark.org/review/3753
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 19:11:58 +00:00
Jeff Morriss 61b01c37a9 If the user explicitly requested gnutls or libgcrypt generate an error if they
are not found.

Accurately describe the default behavior: Wireshark will use the libraries if
they are available.

May help avoid problems like that described in:
https://ask.wireshark.org/questions/35600/not-able-to-configure-wireshark-with-gnutls

Change-Id: I5f0b2ce87cb7c6b337de93609f13d8027e662263
Reviewed-on: https://code.wireshark.org/review/3750
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-20 19:11:42 +00:00
Bill Meier 3adaf99050 proto.h; (try to) fix bug in DISSECTOR_ASSERT_CMP... macros;
Also: re-enable use of DISSECTOR_ASSERT_CMP... macros in packet-ceph.c

Change-Id: Icee80381f5c8feb14cfc7e4033bdeb893018ce95
Reviewed-on: https://code.wireshark.org/review/3749
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-20 15:12:59 +00:00
AndersBroman ca390efcad Remove now unused code, do API changes missed in previous commit.
Change-Id: Ibc814fb56f34b6c74cb7751e790978748ea8b1db
Reviewed-on: https://code.wireshark.org/review/3747
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-20 11:38:31 +00:00
AndersBroman 9f43bbd01a Use dissect_e212_imsi() to dissect IMSI.
Fix deprecated APIs
Restore delted hf.

Change-Id: I5c08dd8e702a6fadd0409cec608d9a7b153f8164
Reviewed-on: https://code.wireshark.org/review/3746
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-20 11:27:56 +00:00
AndersBroman 0685380e39 Use dissect_e212_mcc_mnc_wmem_packet_str() to dissect PLMN(id).
Fix a few deprecated APIs

Change-Id: I8a535417234a6e739eeb0835e524d6e367150340
Reviewed-on: https://code.wireshark.org/review/3745
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-20 11:04:23 +00:00
Graham Bloice 1c10c7b6ed Modified script to not use PS 3.0 constructs
Change-Id: I0a4a738a410f0aece9459852a51d6c96f11aae76
Reviewed-on: https://code.wireshark.org/review/3739
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-20 06:24:44 +00:00