The data contained in this repository can be downloaded to your computer using one of several clients.
Please see the documentation of your version control software client for more information.

Please select the desired protocol below to get the URL.

This URL has Read-Only access.

Statistics
| Branch: | Revision:

main_repo @ master

# Date Author Comment
62b8a3de 12/07/2014 09:34 PM Brandi

Time stamp finally fixed we can all die happy now

a03a3370 12/06/2014 12:26 PM Justin

Adds the header file changes I forgot to push

f8c103e5 12/04/2014 05:48 PM Justin

I noticed a particular bit of ambiguity on where one of the feature requests is. As such, here is the other possibility

baa88080 12/01/2014 11:16 PM Justin

Merge branch 'master' of https://cs.fit.edu/code/git/cse2410_fall2014_thepassiveaggressors

8abd27f7 12/01/2014 11:12 PM Justin

Adds a checkbox to toggle between ascii and unicode text in follow tcp stream, as well as a check box which, when checked, causes wireshark to generate an accompanying rtf file whenever a new capture is saved

0242623e 12/01/2014 09:44 PM Justin

Fixed the packet deselection crash bug

1aa7e586 11/28/2014 06:31 PM Anastasios Vidas

I fixed the newline bug, but not as expected. The way that Wireshark parses the Packet Comments is actually in the epan/dissectors folder. Fixing it in QT will break it in GTK. Fixing this so that it displays correctly in both GTK and QT will require a huge refactoring of Wireshark's core code. So, what I did was treat a newline as a sentence. This way, every newline is a period with 2 spaces. This way, packet comments are still organized neatly and without chopping off the full comment.

2b5741cc 11/25/2014 11:05 AM Anastasios Vidas

Commiting a fix for a bug I actually created. What happened was that whenever the Hide Main Window during capture checkbox was set to true, and no other windows were open, it would be impossible to close Wireshark via a GUI because all of the windows would disappear. I changed this so that Wireshark only minimizes the main Window. I think this makes more sense as the window is minimized and not destroyed.

210d8c6f 11/20/2014 09:43 PM Anastasios Vidas

Ok, I should explain the last commit. I added a QAction, or a tick mark, under the Edit menu. So If you click on Hide Main Window During Cpature under the Edit menu, it will add a checkbox. This commit I updated \\ui\qt\main_window_slots.cpp to hide the main Window if this option is checked. Looks like Bug 4291 is fixed! However,..I haven't tested it. So if someone could verify that this works I would think you're the best person ever.

954a144f 11/20/2014 08:30 PM Anastasios Vidas

Update QAction onto Edit Bar on QT Version

d04ec412 08/27/2014 05:17 PM Guy Harris

Use FreeRADIUS's warning pragma controls to suppress Apple complaints.

Apple would really rather that you use their Shiny Happy Frameworks
rather than those crufty old cross-platform APIs. We are a
cross-platform program, and will use platform-specific APIs only if...

1b3bc9b7 08/27/2014 12:18 PM Bill Meier

checkhf.pl: (Trivial) remove trailing whitespace.

Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33
Reviewed-on: https://code.wireshark.org/review/3879
Reviewed-by: Bill Meier <>

f4b135c1 08/27/2014 11:49 AM Bill Meier

packet-mausb.c: proto-reg-handoff() fixes

- proto_reg_handoff...():
Fix handling of tcp port pref change;
Rename 'gPORT_PREF' to 'mausb_tcp_port_pref';
Do 'dissector_add_uint("llc.mausb_pid",..)' only once;

Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b...

cac381b3 08/27/2014 11:42 AM Pascal Quantin

E.164: update list to Operational Bulletin No. 1057 (1.VIII.2014)

Change-Id: If1767dcf9a533d10e0ac946a2f31d7f58ea7b01c
Reviewed-on: https://code.wireshark.org/review/3875
Petri-Dish: Pascal Quantin <>
Tested-by: Petri Dish Buildbot <>...

41764ec2 08/27/2014 10:39 AM Pascal Quantin

E.212: update list to Operational Bulletin No. 1058 (15.VIII.2014)

Change-Id: I79d12c4699df01f3435fae5342aa5ec295316959
Reviewed-on: https://code.wireshark.org/review/3874
Petri-Dish: Pascal Quantin <>
Tested-by: Petri Dish Buildbot <>...

2263b73a 08/26/2014 03:40 PM Alexis La Goutte

CAPWAP : Fix wrong offset for AC Name with Priority

Thanks to Massimo Velluci for sample

Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae
Reviewed-on: https://code.wireshark.org/review/3871
Reviewed-by: Alexis La Goutte <>

c6120297 08/26/2014 03:37 PM Sean O. Stalley

Exclude MA USB TransferAck's from USB conversation

the usb_trans_info struct only understands Requests & Responses.
TransferAcks are currently treated as responses, which throws off
the Request/Response pairing & dissection.

This patch fixes tracking in the case when a TransferAck & TransferReq...

d6aa77d8 08/26/2014 02:58 PM Diederik de Groot

Skinny:

Do not try to create a wmem_strbuf whose size is bigger than the max size allowed -> using wmem_strbuf_new instead of wmem_strbuf_sized_new (Evan Huus)
While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized -> Did not get any, can you specify which errors ? (Pascal Quantin)...

efd95341 08/26/2014 11:22 AM Alexis La Goutte

Add custom_layer_chm.xsl to UNKNOWN (fix checklicence)

Change-Id: I4c336f21f721443e83eca7b9bf8d7a6138b367f4
Reviewed-on: https://code.wireshark.org/review/3827
Petri-Dish: Alexis La Goutte <>
Reviewed-by: Jeff Morriss <>

88a3b302 08/26/2014 10:58 AM Pascal Quantin

Extcap: prevent a GLib assert when interface_opts.extcap_args is NULL

I was able to trigger it when trying to change the options of extcap_example.py interface

Change-Id: I9ecff51d47b3ef6e178637b31d49af46a1928acd
Reviewed-on: https://code.wireshark.org/review/3822...

e28f4904 08/26/2014 10:57 AM Pascal Quantin

Extcap: restore compatibility with GLib 2.16.0

While we are at it, fix what seem to be a memory leak in extcaps_init_initerfaces()

Change-Id: I1bb9a1b44d16f986eedd192b15cce84c5881a917
Reviewed-on: https://code.wireshark.org/review/3820
Reviewed-by: Roland Knall <>...

8fee04ab 08/26/2014 09:50 AM Pascal Quantin

USB: fix dissection of non standard USB setup requests

Otherwise captures like the one found in bug 8161 do not dissect properly anymore (sub dissector is called twice)

While we are at it, reorganize functions order to void a forward declaration

Change-Id: Id02ef835ba24981902a1702f976db099fa07b0fd...

ff597225 08/26/2014 08:09 AM Pascal Quantin

USB: get rid of the remaining proto_tree_add_text instances

Change-Id: I6acaa32745e32ec5728874549e420468499d9b24
Reviewed-on: https://code.wireshark.org/review/3860
Reviewed-by: Pascal Quantin <>

7836a714 08/26/2014 08:07 AM Pascal Quantin

Skinny: do not try to create a wmem_strbuf whose size is bigger than the max size allowed

While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized

Bug: 10409
Change-Id: Ic84632e0563f801239603534121e3487cf0d6d24
Reviewed-on: https://code.wireshark.org/review/3861...

338f6aca 08/26/2014 04:06 AM Josip Medved

Added Authentication-Method and afew other AVPs that appear in the SIP-Auth-Data-Item grouped AVP.

Change-Id: Ie90ec71d8d574d38f32a5ff3de6ad5433b9e5e9f
Reviewed-on: https://code.wireshark.org/review/3823
Reviewed-by: Anders Broman <>

64cd8270 08/26/2014 02:10 AM Sean O. Stalley

Have dissect_usb_setup_request handle non-standard requests

Moved code for parsing non-standard setup requests from
dissect_usb_common() to dissect_usb_setup_request().

Also added header_info flag USB_HEADER_IS_MAUSB & updated mausb
dissector.

Change-Id: Ifa8abccbd57bf4dd3965f582872952383e6f737d...

3d4d0216 08/26/2014 02:09 AM Sean O. Stalley

Non-standard USB control requests now handled in own function

Change-Id: Icf56f3f5899d17908dac4783d2b3e30373186eba
Reviewed-on: https://code.wireshark.org/review/3850
Reviewed-by: Michael Mann <>
Petri-Dish: Michael Mann <>...

8d54f8a9 08/26/2014 02:08 AM Sean O. Stalley

further rearranged control URB request conditionals

combined 2 sections for dissecting non-standard requests into 1

Change-Id: I181346a69e2f96ff47b82f82d3aa69846c45614f
Reviewed-on: https://code.wireshark.org/review/3849
Reviewed-by: Michael Mann <>...

3439943d 08/26/2014 02:06 AM Sean O. Stalley

added try_dissect_linux_usb_pseudo_header_ext helper function

Change-Id: I05b0adaef2b979432e293bc26e2a122a0d3551fc
Reviewed-on: https://code.wireshark.org/review/3848
Petri-Dish: Michael Mann <>
Tested-by: Petri Dish Buildbot <>...

259e09e9 08/26/2014 02:05 AM Sean O. Stalley

rearranged control URB request conditionals

Rearranged conditionals for control URB request to limit variable scope.
Now there are 2 major branches based on weather the URB has setup data.

Change-Id: I67172c4e949bbda363ccf939d404957258b73840
Reviewed-on: https://code.wireshark.org/review/3847...

827d8995 08/26/2014 12:35 AM Joerg Mayer

The remaining build systems didn't know about the change of the
capture chapter from xml to asciidoc either.

Change-Id: Ia48d4e0e4b445aedabd29a8483bcc19f12c13b20
Reviewed-on: https://code.wireshark.org/review/3857
Reviewed-by: Jörg Mayer <>

1b420253 08/26/2014 12:30 AM Joerg Mayer

Whitespace fix

Change-Id: Ie42cc8df1066078d26966129fdd3e8b5643c722f
Reviewed-on: https://code.wireshark.org/review/3856
Reviewed-by: Jörg Mayer <>

0be336cf 08/26/2014 12:14 AM David Ameiss

Added missing name to AUTHORS file.

Change-Id: I674c60a39e9e85e441fdb28c14a0845e34115b53
Reviewed-on: https://code.wireshark.org/review/3853
Reviewed-by: Anders Broman <>

9f6afbc6 08/25/2014 08:45 PM Evan Huus

Fix typo

Change-Id: I8e3b3115191ca7a9c5388e866e9add12b7689039
Reviewed-on: https://code.wireshark.org/review/3852
Reviewed-by: Evan Huus <>

7749263b 08/25/2014 07:58 PM Diederik de Groot

Skinny Dissector:

Source Fix: Trailing Whitespace (Reported by Graham Bloice).
Dissection Fix: ProtocolVer needed to be split up into two fields to display the protocol version correct during device registration
Segfault Fix: Null Pointer Check required after returning from tvb_memdup, before calling strlen (Reported by Evan Huus)...

1c98a126 08/25/2014 06:42 PM Joerg Mayer

WSUG_chapter_capture is now an asciidoc file that gets converted
into an xml file.

Change-Id: I43ae59d14cbdcf460250cf62005aea4a2772d11f
Reviewed-on: https://code.wireshark.org/review/3846
Reviewed-by: Jörg Mayer <>

0f8e506f 08/25/2014 06:28 PM Joerg Mayer

The timezone for generating the NEWS file timestamp was changed to UTC

Change-Id: I77187bf4738a20bcebd899e2a01afd6077ae7e6c
Reviewed-on: https://code.wireshark.org/review/3845
Reviewed-by: Jörg Mayer <>

7f05ae67 08/25/2014 06:16 PM Joerg Mayer

As long as NEWS is still part of the git tree: At least don't differ
because of different timezones.

Change-Id: I93809447db29c2cc5f848edb438ee16372b57453
Reviewed-on: https://code.wireshark.org/review/3824
Reviewed-by: Jörg Mayer <>

a8493719 08/25/2014 06:15 PM Gerald Combs

WSUG: Convert the "Capturing" chapter to AsciiDoc.

Leave most of the content intact for now. Add a section on markup
conventions to README.txt. Remove the .mediaobject border.

Change-Id: I06cfd482a4c8ea63c90b9f59fcdf2afaf636a4a2
Reviewed-on: https://code.wireshark.org/review/3821...

d3728738 08/25/2014 06:00 PM Graham Bloice

Updates for docbook builds on Windows

In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1
In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows)
and not the Cygwin python used in asciidoc...

1aead575 08/25/2014 04:23 PM Martin Kaiser

reformat dissect_usb_setup_response()
make sure it can handle usb_conv_info==NULL

Change-Id: I5f53b26fd6fe22471906b07b5dad8f4c07dffa55
Reviewed-on: https://code.wireshark.org/review/3843
Reviewed-by: Martin Kaiser <>
Tested-by: Martin Kaiser <>

bfe9332f 08/25/2014 03:53 PM Diederik de Groot

SKINNY: Fix some warning

Fix: cog [END] in packet-skinny.h.in
Fix: error: expression which evaluates to zero treated as a null pointer constant of type 'const gchar *' (aka 'const char *') [-Werror,-Wnon-literal-null-conversion] (Reported by Alexis La Goutte and found by Clang 3.6)...

ab33c400 08/25/2014 12:39 PM Gerald Combs

More README.cmake updates.

Change-Id: I1c7e51ee397171af0703878e509665c8119b37ba
Reviewed-on: https://code.wireshark.org/review/3841
Reviewed-by: Gerald Combs <>

e2acc23e 08/25/2014 12:01 PM Gerald Combs

Use Segoe UI to render the HTML Help text.

Change-Id: I0ff717dda35a39f34c3140f920f8ac2fe74e24bc
Reviewed-on: https://code.wireshark.org/review/3840
Reviewed-by: Gerald Combs <>

cdc80af2 08/25/2014 11:46 AM Bill Meier

checkhf.pl: (Trivial) fix two typos

Change-Id: I2a63127dcf819d671a4c814dcbd82b2dca5022d3
Reviewed-on: https://code.wireshark.org/review/3838
Reviewed-by: Bill Meier <>

3ba56cad 08/25/2014 11:28 AM Bill Meier

packet-a21.c: Minor changes

- Comment out several "set but unused" lines of code;
- initialize 'gcsna_handle' only once.

Change-Id: I17a89ccff228b28d075d9db9289ad412892b2639
Reviewed-on: https://code.wireshark.org/review/3837
Reviewed-by: Bill Meier <>

d127b573 08/25/2014 11:00 AM Matthieu Texier

BPG : issue with BGP AS path heuristic (AS_CONFED_SET)

Add also a expert info when unable determine ASN length (2 or 4 bytes)

Bug: 10399
Change-Id: I24978e29e24f38c2e01e4b953a5a51496f0cf5a6
Reviewed-on: https://code.wireshark.org/review/3831
Petri-Dish: Alexis La Goutte <>...

f1dd9bc6 08/25/2014 10:43 AM Alexis La Goutte

Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I19df790d18e71d45df28dc6e8731cd2e1acb098b
Reviewed-on: https://code.wireshark.org/review/3826
Reviewed-by: Evan Huus <>

3eb37627 08/25/2014 10:43 AM Alexis La Goutte

Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I4a2ba6902acc0cbd224a8926eeb7bd0b62b4d29e
Reviewed-on: https://code.wireshark.org/review/3825
Reviewed-by: Evan Huus <>

d3c649b4 08/25/2014 10:31 AM Marian Durkovic

TRILL ISIS: Implement all RFC7176 section 2.2 SubTLVs

Bug:10391
Change-Id: Ibdf3e4964668a57362b6d25ef4ae106d368f0e69
Reviewed-on: https://code.wireshark.org/review/3668
Reviewed-by: Alexis La Goutte <>

f44e082f 08/25/2014 10:07 AM Alexis La Goutte

RPKI RTR: Wrong decoding of RPKI RTR End of Data PDU

The decoding of the End of Data PDU ignores the Serial Number, i.e., the last 32 bit of this PDU. Instead of that the current dissector implementation starts to decode a new RTR PDU.

Details of packet format see http://tools.ietf.org/html/rfc6810#section-5.8...

c697a86f 08/25/2014 10:00 AM Bill Meier

packet-a21.c: Fix a bug; Do some other misc cleanup.

- expert_...() and external dissectors shouldn't be called under 'if (tree)';
- Remove (what appear to be) some unneeded casts;
- (Misc cleanup)

Change-Id: I5ced313d3342125b918e179529b12d2f3bc4d87a
Reviewed-on: https://code.wireshark.org/review/3830...

b737e2e8 08/25/2014 09:59 AM Martin Kaiser

remove trans_info parameter from dissect_usb_endpoint_descriptor()
(remove it in the call from mausb as well)

add NULL checks for usb_conv_info, usb_trans_info

Change-Id: I95d52b85e3fa0d42b6a20047053259aaca8754fe
Reviewed-on: https://code.wireshark.org/review/3784...

c284e121 08/25/2014 09:48 AM Martin Kaiser

remove trans_info parameter from dissect_usb_unknown_descriptor()
remove now unused trans_info variable in mausb

Change-Id: I99df8a1ed039134c9448546d0f1a738f203f9610
Reviewed-on: https://code.wireshark.org/review/3785
Reviewed-by: Martin Kaiser <>...

d87fbc9a 08/25/2014 08:50 AM Martin Kaiser

an endpoint_descriptor may only be sent from a USB device to the host
as part of a GET DESCRIPTOR Response

therefore, pinfo->destport==NO_ENDPOINT is always true for valid USB
packets and we can remove the else branch

Change-Id: I2163e3000cafa27113ee0e6173fd69b7ef17b812...

a6cbcb1b 08/25/2014 07:29 AM AndersBroman

Fix a typo RELEASE_OTHER_REASON 4 -> RELEASE_OTHER_REASON 3
RFC 3057 3.3.1.2
RELEASE_OTHER 0x3 Other reasons

Change-Id: I5c2344600646cbfbef379aed5d3ffa9fc48da639
Reviewed-on: https://code.wireshark.org/review/3829
Reviewed-by: Anders Broman <>

e7840026 08/25/2014 12:25 AM Marian Ďurkovič

TRILL ISIS: SubTLVs of Router Capability TLV are valid for MT-Capability TLV as well

Change-Id: Idf466c021b1b188d9c6d55ba73a25257ba352412
Reviewed-on: https://code.wireshark.org/review/3803
Petri-Dish: Evan Huus <>
Reviewed-by: Evan Huus <>...

7fab56af 08/25/2014 12:23 AM Diederik de Groot

Skinny: packet-skinny
Add tools path to the python search path, fixing cog.py generation of package-skinny.c from packet-skinny.c.in
Add GPLv2 License to parse_xml2skinny_dissector.py

Change-Id: I91b76867b02d8cebc40bba35151db48bc2fcaeca
Reviewed-on: https://code.wireshark.org/review/3819...

549f5c40 08/24/2014 04:45 PM Роман Донченко

Remove obsolete comments regarding the shell version of make-dissector-reg

Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e
Reviewed-on: https://code.wireshark.org/review/3818
Reviewed-by: Pascal Quantin <>

7d81eabb 08/24/2014 02:25 PM Gerald Combs

Fix Autotools AsciiDoc configuration + CSS updates.

Fix --asciidoc-opts in Makefile.am.

Add borders around menu and keycap markup. I like the latter but the
former could probably use more work.

Change-Id: If02e3d00875106d6b8f8bcf01cd52b1df4f9b6c8
Reviewed-on: https://code.wireshark.org/review/3817...

7de88cc1 08/24/2014 01:47 PM Gerald Combs

Try to get HTML Help to render SVG.

Add a custom stylesheet that inserts

&lt;meta http-equiv="X-UA-Compatible" content="IE=9" &gt;

at the top of our HTML Help output. This should convince the
WebBrowser control to draw our new SVG images.

Change-Id: Iae491128195d3738951f3d19e2f82dd3fc73d1d8...

a68eab6a 08/24/2014 12:44 PM Peter Wu

Hack to fix RTP player progress line position

PortAudio seems to return 0 as value for Pa_GetStreamTime() on
a PulseAudio system using the ALSA host API. This is known for 3 years,
but still has not been fixed. As this function basically gives us a
monotonically increasing clock in seconds as double, just use the Glib...

ed090dda 08/24/2014 11:05 AM Gerald Combs

[Automatic manuf, services and enterprise-numbers update for 2014-08-24]

Change-Id: Ibe3e8e23f8ae5a136c1acb0eda4cfe03928616d2
Reviewed-on: https://code.wireshark.org/review/3811
Reviewed-by: Gerald Combs <>

276a697a 08/24/2014 08:55 AM Diederik de Groot

[RFC] Skinny: Rewrite using automatic code generation

Support: Protocolversion 0 - 22
Includes: Callmanager to/from Cisco Phones, Inter CallManager Messages and CallManager to/from Cisco ASA
Code Generator not included, because protocol does not evolve anymore / No newer versions to be expected...

cda5c166 08/24/2014 04:57 AM Guy Harris

Clean up capinfos output.

Make sure there's always a space between a number and "[TGMK]bytes",
"[TGMK]bits", and "[TGMK]packets".

Change-Id: I710385303e451e9aea6fc9bbea562f59ca0d22c9
Reviewed-on: https://code.wireshark.org/review/3810
Reviewed-by: Guy Harris <>

a52939ce 08/24/2014 04:12 AM Guy Harris

Fix trailing blank.

Change-Id: Ide4afb2fb78c80800f04a40031fa1f35804f6464
Reviewed-on: https://code.wireshark.org/review/3809
Reviewed-by: Guy Harris <>

bb0c1754 08/24/2014 04:07 AM Guy Harris

Strengthen the heuristics for pcap subtypes.

When trying to guess what type of capture a file is, look for as many
bogosities (caplen > len, microseconds >= 10^6/nanoseconds >= 10^9,
too-high caplen, too-high original len, caplen > snapshort length), to
increase the chances of guessing correctly....

28bea6f7 08/24/2014 04:05 AM Graham Bloice

Add captype to the CMake options so it gets built if required

Change-Id: I915a7caa32a1f644c30c1579a8ad15e39db9e02a
Reviewed-on: https://code.wireshark.org/review/3799
Petri-Dish: Graham Bloice <>
Tested-by: Petri Dish Buildbot <>...

97546165 08/24/2014 04:04 AM Graham Bloice

Modify includes of config.h so that out-of-tree builds, i.e. CMake
don't pick up the in-tree copy.

Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71
Reviewed-on: https://code.wireshark.org/review/3798
Petri-Dish: Graham Bloice <>...

f88eca47 08/24/2014 01:23 AM Gerald Combs

Fix admon.graphics.path.

Change-Id: I43d7d56f0fc2bd73efc54a685aea90f635b145ff
Reviewed-on: https://code.wireshark.org/review/3807
Reviewed-by: Gerald Combs <>

d3101157 08/23/2014 10:56 PM Gerald Combs

Convert admon graphics to SVG.

Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like...

7d035a12 08/23/2014 09:15 PM Gerald Combs

WSUG: Minor fixups for the statistics chapter.

Fix a quotation warning. Use the menu:[] and button:[] macros. Other
minor changes. Clean up whitespace.

Change-Id: I3ae98ddcbd90c8d22284a9ef467268dabee8f829
Reviewed-on: https://code.wireshark.org/review/3806...

a92c3fb2 08/23/2014 08:11 PM Gerald Combs

CMake: More a2x / asciidoc fixes.

Create graphics directories and copy files into them similar
to Autotools and Nmake. Adjust some xsltproc arguments. Fix the
--asciidoc-opts flag.

Note: Admon graphics are broken pending change 3206.

Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4...

40c367ec 08/23/2014 04:00 PM Gerald Combs

Windows: Fix AsciiDoc / DocBook builds.

The "quotes" section of the Asciidoctor compatibility file appears to
be incompatible with Cygwin's version of AsciiDoc (8.6.3).

Change-Id: Ifd08095effa07bc7277a2fff9de322dda51a8d47
Reviewed-on: https://code.wireshark.org/review/3804...

02c5a12e 08/23/2014 02:32 PM Gerald Combs

WSUG: Convert the "User Interface" chapter to AsciiDoc.

Add the "asciidoc.conf" compatibility configuration file from
Asciidoctor. Although we don't use Asciidoctor it gives us macros that
keep us from losing some useful DocBook elements. Update various CMake...

6854d898 08/23/2014 11:34 AM Pascal Quantin

USB: call USB control dissector table when recipient is "other"

Otherwise USB HUB dissector is no more called (see the capture in bug 8161 for an example)

Change-Id: Ie8ac1c8ca19bf292d8fc69d9b0b3729f696ffc07
Reviewed-on: https://code.wireshark.org/review/3802...

59b750c0 08/23/2014 08:09 AM Michael Tüxen

Update the SCTP PPIDs.

Change-Id: I0b34e544d4332f2b5d8dcc287861636db86ac1b9
Reviewed-on: https://code.wireshark.org/review/3801
Petri-Dish: Michael Tüxen <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Michael Tüxen <>

2068b317 08/22/2014 09:18 PM Jeff Morriss

Add the 3GPP2 Ty Application ID and a bunch of Ty AVPs.

Change-Id: If36c8a22c34a88bbb43afbc932cd0b8193dd9c7b
Reviewed-on: https://code.wireshark.org/review/3800
Reviewed-by: Jeff Morriss <>

df335d52 08/22/2014 07:24 PM Garming Sam

Cope with MIT being line wrapped when compiling with kerberos

The line "Massachusetts Institute of Technology" now appears
across two lines in the header file.

Change-Id: I618b520d6c15f51180b47d93c75e29a6f43b868b
Reviewed-on: https://code.wireshark.org/review/3790...

06565a74 08/22/2014 06:04 PM Graham Bloice

Add WinSparkle to the CMake build to bring it into line with
the nmake build

Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c
Reviewed-on: https://code.wireshark.org/review/3755
Reviewed-by: Graham Bloice <>

863b6646 08/22/2014 04:24 PM Jeff Morriss

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 <>

2d74838e 08/22/2014 03:17 PM Jeff Morriss

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 <>

923ba9d3 08/22/2014 02:40 PM Jeff Morriss

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 <>

28acde13 08/22/2014 07:00 AM Marian Ďurkovič

Parse Capabilities & Flags section of TRILL Version Sub-TLV

Change-Id: Ic82a2368c865031eaeee291055b6a4f176cde759
Reviewed-on: https://code.wireshark.org/review/3792
Reviewed-by: Anders Broman <>

76a674f0 08/22/2014 06:56 AM Marian Ďurkovič

TRILL ISIS: Implement TRILL Neighbor TLV (145)

Change-Id: I1b17b0ef26150fdc68b966f4837953f9832883cb
Reviewed-on: https://code.wireshark.org/review/3717
Petri-Dish: Anders Broman <>
Tested-by: Petri Dish Buildbot <>...

ff94a7ff 08/22/2014 06:55 AM Joerg Mayer

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 <>

d5ba8b4f 08/22/2014 06:55 AM Marian Ďurkovič

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 <>
Tested-by: Petri Dish Buildbot <>...

b6cb2ad0 08/22/2014 06:54 AM Wasim Abu Moch

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...

8b5ca59d 08/22/2014 03:12 AM Masayuki Takemura

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 <>

c2eb021d 08/22/2014 03:11 AM Marian Ďurkovič

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 <>
Tested-by: Petri Dish Buildbot <>...

50bb9306 08/21/2014 08:07 PM Jeff Morriss

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 <>

331d87e3 08/21/2014 08:04 PM Peter Harris

X11: Support xcb's new <case>

Change-Id: I32c6ab15d6dc7a67cdb50c4187e2752730315588
Reviewed-on: https://code.wireshark.org/review/3751
Reviewed-by: Jeff Morriss <>

0c38cf3c 08/21/2014 07:58 PM Bill Meier

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...

f580ebe3 08/21/2014 07:57 PM Bill Meier

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";...

5b5ef967 08/21/2014 07:56 PM Graham Bloice

Fix CMake checks of PCap functions, along with AirPCap

Change-Id: If55498167d5e357258841f2194962749c0dfc81e
Reviewed-on: https://code.wireshark.org/review/3787
Reviewed-by: Graham Bloice <>
Petri-Dish: Graham Bloice <>...

87b2364a 08/21/2014 07:51 PM Jeff Morriss

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...

6edc166c 08/21/2014 05:41 PM Jeff Morriss

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 <>

b6df4a56 08/21/2014 04:27 PM Martin Kaiser

usb_conv_info is no longer unused

Change-Id: I27e5c8686e7f7a907bdcec59e97ae93a090b7185
Reviewed-on: https://code.wireshark.org/review/3783
Reviewed-by: Martin Kaiser <>
Tested-by: Martin Kaiser <>

c8d9d298 08/21/2014 04:27 PM Martin Kaiser

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 <>
Tested-by: Martin Kaiser <>

3313e2d6 08/21/2014 04:27 PM Martin Kaiser

remove usb_trans_info from dissect_usb_interface_descriptor()

Change-Id: Ia1bfdd705021e784213e00b70cfabc42b524384d
Reviewed-on: https://code.wireshark.org/review/3781
Reviewed-by: Martin Kaiser <>
Tested-by: Martin Kaiser <>