Commit graph

54837 commits

Author SHA1 Message Date
Alexis La Goutte
4f4c6ed3e9 CAPWAP: Add some news expert info
When it is the mininum wrong length for Message Element Type or
when the Message Element Type is not yet decoded by Wireshark

Change-Id: I49aca0df5ba5ec70d8fb764fef39c17c46ee22a0
Reviewed-on: https://code.wireshark.org/review/3956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03 08:05:35 +00:00
Alexis La Goutte
ee92864b02 CAPWAP: Add new ett variable
Avoid to have all subtree has expended

Only 2 ett actually and there is > 20 subtree...

Change-Id: Ia4af85345a6f1963d24d1fd589ff8ee09a8ef412
Reviewed-on: https://code.wireshark.org/review/3955
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03 08:02:57 +00:00
Alexis La Goutte
7a87447148 CAPWAP: Split CAPWAP Control and Data in 2 different protocol
Avoid to have 2 CAPWAP in Decode as (and more easy to use too...)

Change-Id: I3a332e9b4b069b9215c38b5c08872bd07ac4c2c3
Reviewed-on: https://code.wireshark.org/review/3954
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03 08:02:13 +00:00
Alexis La Goutte
653dc8bf17 CAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c)
For hf field, reindent code
Use 0x0 by default for bitmask
Remove also some "boilerplate" comment..

Change-Id: I552ccca2e444f3686ee9ecdad456f2ecfbaa5cba
Reviewed-on: https://code.wireshark.org/review/3953
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03 07:59:40 +00:00
Alexis La Goutte
ec2fe0faaa CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...
Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2
Reviewed-on: https://code.wireshark.org/review/3952
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03 07:39:33 +00:00
Gerald Combs
6b5669d545 Fix dist. Remove unused files.
Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee
Reviewed-on: https://code.wireshark.org/review/3967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 05:37:19 +00:00
Gerald Combs
cf3218df81 OS X packaging fix.
Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531
Reviewed-on: https://code.wireshark.org/review/3966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 01:05:49 +00:00
Gerald Combs
b03eeeb0aa Fix the PortableApps package name.
Remove Installer.nsi while we're here.

Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9
Reviewed-on: https://code.wireshark.org/review/3965
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 01:05:40 +00:00
Gerald Combs
d3e116466c PortableApps: Remove invalid makefile commands.
Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd
Reviewed-on: https://code.wireshark.org/review/3964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 00:20:50 +00:00
Sean O. Stalley
ccb0a88b18 Added name to AUTHORS
Change-Id: I7f65d22d4dd96908033c764461196a75716b298a
Reviewed-on: https://code.wireshark.org/review/3961
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-03 00:07:54 +00:00
Gerald Combs
aee3de9688 OS X packaging fix: wireshark-qt → wireshark.
Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47
Reviewed-on: https://code.wireshark.org/review/3963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 23:58:26 +00:00
Gerald Combs
85eec7f603 Fix PortableApps packaging.
Our Windows portable packaging environment has a lot of cruft which is
no longer relevant. We removed support for U3 packages and the method
we use to generate PortableApps packages has been deprecated for a while.

Create PortableApps packages using current file formats (AppInfo v3.0)
and tools. Generate the PA launcher using the PortableApps.com Launcher
generator. Copy files and directories from the top level instead of using
a manifest derived from the NSIS installer.

The manifest is a good idea, but we should create a central manifest
and use that to generate the NSIS and PortableApps packages instead of
trying to parse wireshark.nsi.

The new package still needs a bit of work but it installs and runs in
the current version of the PA Platform.

Remove the define for MAKENSIS_UNICODE. It doesn't look like we were
using it.

Start tearing down makefiles and scripts that we no longer use.

Ping-Bug: 4191
Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4
Reviewed-on: https://code.wireshark.org/review/3962
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 23:55:54 +00:00
Bill Meier
9555c24740 packet-netflow.c: netflow v9: Allow options template with zero-length scope section
Fixes Bug #10432

   Also: rework several comments.

Change-Id: I292829f6dffaf5f500cb089cc8a45e1203a2e731
Reviewed-on: https://code.wireshark.org/review/3959
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-02 18:50:27 +00:00
Jeff Morriss
1a446079d1 Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.
Rather than checking for all the "--with" arguments just use the "$have_xxx"
variables.

Don't allow rpmbuild's ./configure to decide to build a GUI just because it's
available: make it build only what was ./configure'd.

Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1
Reviewed-on: https://code.wireshark.org/review/3958
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-02 16:34:00 +00:00
Gerald Combs
b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Juanjo
b9e61becff RTPS: added new PIDs and included minor improvements
- (Updated) Fixed code review issues
- (Updated) Fixed whitespaces and code review issues
- Representing now some NTP times as duration (not as date)
- Added some vendor specific PIDs (RTI)
- Added dissect_APP_ACK_CONF, dissect_APP_ACK and
  dissect_HEARTBEAT_VIRTUAL
- Added is_discovery to dissect_serialize_data to avoid malformed
  packets when using mutable types (Wireshark assumes serialized
  data with CDR-PL encapsulation is always discovery data, what
  is not true when using Mutable types)

Change-Id: I491750d95b12f386c41d7de4ae7e280781efa375
Reviewed-on: https://code.wireshark.org/review/3836
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-02 02:43:21 +00:00
Roland Knall
db6f197c96 openSAFETY: Adapt CRC for false-positives
- There are rare false-positives, where the entire
   frame consists of 0 except the addr and id field,
   which will lead to a correct crc#1 calculation,
   but still to a false-positive detection. This
   patch fixes that

 - Two undefinite-loop errors are corrected as well

Change-Id: Ibe5e56e0172ad3a3046bdc024da3711987116e8e
Reviewed-on: https://code.wireshark.org/review/3918
Reviewed-by: Roland Knall <rknall@gmail.com>
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-01 20:34:02 +00:00
Alexis La Goutte
9ee7c3860c NDMP: Fix Dereference of null pointer found by Clang analyzer
Change-Id: I314e7e00633f93dead6a092e059336a304e4a946
Reviewed-on: https://code.wireshark.org/review/3940
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-01 16:16:06 +00:00
Alexis La Goutte
53dbc0ee82 NDMP: Fix indent (use tab)
Change-Id: I00f4d206e9c27801f8557414b8cd1b5c52752b44
Reviewed-on: https://code.wireshark.org/review/3941
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-01 16:15:28 +00:00
Graham Bloice
906f6b0483 Removed unnecessary chmod commands
Change-Id: Ia6e3f8c567159fc2cf19a8d427a29c5c6dcdf038
Reviewed-on: https://code.wireshark.org/review/3942
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01 15:50:13 +00:00
Michael Mann
b95e6e3a61 Escape double quotes when printing ABSOLUTE_TIME field
This regression was introduced by the commit e5353bf119 done for bug 10081

Bug: 10213
Change-Id: I3925a47ef13055f10f49fa9fefd022731746fbb8
Reviewed-on: https://code.wireshark.org/review/2572
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01 15:47:29 +00:00
Jamil Nimeh
f2a7a6d503 TLS: fix dissection of status_request_v2 hello extension
Bug: 10416
Change-Id: I58a3faef227f7eafd61942cafa6e38a17557ee61
Reviewed-on: https://code.wireshark.org/review/3865
Reviewed-by: Evan Huus <eapache@gmail.com>
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-01 15:00:22 +00:00
Gerald Combs
f20d5d7bd3 WSUG: Convert ``Telephony'' to AsciiDoc.
Leave most of the content intact for now.

Change-Id: I21aad681194d1bb1841e29f4ac41be4677fcb909
Reviewed-on: https://code.wireshark.org/review/3939
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-01 14:44:26 +00:00
AndersBroman
f0ce0d7ecd Add CMake stuff for custom plugins.
Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4
Reviewed-on: https://code.wireshark.org/review/3946
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01 14:37:30 +00:00
AndersBroman
c3439329fd Add abillity to add custom crypto files.
Change-Id: I6c5b1cdb0a90f7604bdde088332c171332b43dcc
Reviewed-on: https://code.wireshark.org/review/3945
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01 13:56:53 +00:00
AndersBroman
85734de534 Make it possible to build builtin custom dissectors and GUI files with cmake too.
Change-Id: I28eee44f7c3a7e44da89f8b71cdacbe78115c7e3
Reviewed-on: https://code.wireshark.org/review/3943
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-01 11:40:27 +00:00
Gerald Combs
af3e2dbdc6 WSUG: Convert ``Advanced Topics'' to AsciiDoc.
Leave most of the content intact for now.

Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0
Reviewed-on: https://code.wireshark.org/review/3938
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-01 05:16:14 +00:00
AndersBroman
a11b7bfc34 Use a common hf for international E164 numbers (MSISDN).
Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b
Reviewed-on: https://code.wireshark.org/review/3863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-01 05:07:20 +00:00
Gerald Combs
5e6e0600c5 WSUG: Convert ``Working with captured packets'' to AsciiDoc.
Leave most of the content intact for now.

Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9
Reviewed-on: https://code.wireshark.org/review/3937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01 02:38:16 +00:00
Gerald Combs
eb14a1f932 WSUG: Convert the ``File I/O'' chapter to AsciiDoc.
Leave most of the content intact for now. Remove images for
no-longer-supported versions of GTK+. Add an example for building the
Guides to README.cmake.

Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b
Reviewed-on: https://code.wireshark.org/review/3931
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-01 01:07:08 +00:00
Роман Донченко
4a3e62cd54 Don't show the echo/python command lines when making plugin.c
For consistency with epan/dissectors/Makefile.am. Also, remove the
"with python" parts, since that's the only option now.

Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1
Reviewed-on: https://code.wireshark.org/review/3925
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: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31 22:14:54 +00:00
Роман Донченко
95cd6b76bd Remove make-tapreg-dotc and its uses, since Python is now mandatory
Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa
Reviewed-on: https://code.wireshark.org/review/3926
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: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31 22:14:15 +00:00
Alexis La Goutte
4f95327eb9 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I0593b659dcd28929cf51a8b1147392f070574c9e
Reviewed-on: https://code.wireshark.org/review/3934
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31 20:21:11 +00:00
Alexis La Goutte
6c93cc4edb Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I32ca31b879ccc458f12f37375c32bc089978b114
Reviewed-on: https://code.wireshark.org/review/3933
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31 20:20:38 +00:00
Alexis La Goutte
eaaa35fc4d conv is always used, remove _U_ (unused) flag
Change-Id: I648b365b662bd902e26e0c61f6d3499e8543e504
Reviewed-on: https://code.wireshark.org/review/3935
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31 18:47:01 +00:00
Gerald Combs
37c23fc910 WSUG: Fix URLs
Fix broken download URLs in the introduction. Update some macros to use
https:// URLs.

Change-Id: I145e74e14ec04ce5fcf94a65cd5623059875c6e1
Reviewed-on: https://code.wireshark.org/review/3932
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31 18:32:15 +00:00
Alexis La Goutte
446125aa25 DNS: Add OpenPGP KEY (61) RRtype (draft-ietf-dane-openpgpkey-00)
Not yet tested on real dns traffic

Update also last updated DNS parameters (2014-08-12)

Change-Id: I6109d585584e5fca11c606a2230d8ef89cdbf7b6
Reviewed-on: https://code.wireshark.org/review/3870
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31 17:44:32 +00:00
Alexis La Goutte
5bec37f1f5 Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation)
Change-Id: I0a56fb79d2ac3d874a48695ad0499bda96b4b655
Reviewed-on: https://code.wireshark.org/review/3892
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-31 17:22:16 +00:00
Alexis La Goutte
caf73525f3 Fix parameter 'key' not found in the function declaration (-Wdocumentation)
Change-Id: Ie7f3e192d8980968da15921a8497153506df1fde
Reviewed-on: https://code.wireshark.org/review/3903
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-31 16:55:28 +00:00
Gerald Combs
c14cac7594 [Automatic manuf, services and enterprise-numbers update for 2014-08-31]
Change-Id: I35507fe1b4ac8ff3ec9391679769764656b9ff27
Reviewed-on: https://code.wireshark.org/review/3928
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31 15:06:07 +00:00
Jérôme LAFORGE
26731e8cc6 Check whether the hop-count exceeds the HOP_COUNT_LIMIT or not.
Change-Id: If1c089e069b93a7b90cb525cd642ac26c5efa2d0
Reviewed-on: https://code.wireshark.org/review/3924
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: Evan Huus <eapache@gmail.com>
2014-08-30 23:29:26 +00:00
Guy Harris
f415e1c348 Remove some unnecessary definitions.
text2pcap.c uses pcapio.c to write pcap files, so it doesn't itself need
to know what those files look like.

Change-Id: I013d0c094c27515af91f352b565bc9a8bad3e842
Reviewed-on: https://code.wireshark.org/review/3927
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-30 23:21:37 +00:00
Michael Tüxen
0d7c4fd5ee Fix char signess issue.
This bug was found by compiling wireshark on a Wandboard Quad
using FreeBSD.

Change-Id: I34ac8a04612a918782160947599245539d6e9427
Reviewed-on: https://code.wireshark.org/review/3923
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-08-30 18:42:17 +00:00
Pascal Quantin
2eced3689d 6LoWPAN: fix dissection when using multicast address compression
Also update the value_string arrays with the various SAM/DAM combinations

Bug: 10426
Change-Id: I87f13c29f42770ec655d85e2247b847bfe28e3ba
Reviewed-on: https://code.wireshark.org/review/3915
Petri-Dish: Pascal Quantin <pascal.quantin@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-08-30 09:55:27 +00:00
Stig Bjørlykke
437b448095 Mark Trap-PDU as obsolete for SNMP versions > 1
Change-Id: I967a1547eb97619042b620bb3d803a29cce9ebe1
Reviewed-on: https://code.wireshark.org/review/3920
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30 09:54:05 +00:00
Alexis La Goutte
26ab2e40e3 Qt Follow Stream Dialog : Add some missing text to translate
Fix also indent

Change-Id: I864cd785f3b17e6360be63922ca63e349ae13f25
Reviewed-on: https://code.wireshark.org/review/3913
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30 09:52:11 +00:00
Alexis La Goutte
021351f422 PROTOABBREV: minor fix
Fix typo PROTO_ABBREV -> PROTOABBREV
Uncomment FIELDCONVERT

Change-Id: I7b64c09ecf0c22a38042156d958e1c6c850c839a
Reviewed-on: https://code.wireshark.org/review/3914
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-30 09:51:36 +00:00
Diederik de Groot
0622e3439e Skinny:
Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal))
Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture
Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal)
Fix Merged PatchSet 8 (Pascal)

Bug: 10429
Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064
Reviewed-on: https://code.wireshark.org/review/3893
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-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: Evan Huus <eapache@gmail.com>
2014-08-29 17:44:41 +00:00
Pascal Quantin
47f96d974c 802.11: rename Control Frame Extension field to match the spec
As reported by Richard Sharpe on -dev: https://www.wireshark.org/lists/wireshark-dev/201408/msg00236.html

Change-Id: I16638982e14e566bb7e584a2d030c546d2223ebe
Reviewed-on: https://code.wireshark.org/review/3916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-29 12:07:51 +00:00
Jeff Morriss
8db01445c1 Consolidate several 3GPP Diameter xml files into one.
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b
Reviewed-on: https://code.wireshark.org/review/3911
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-29 01:39:01 +00:00