6 years agoUse macdeployqt to add the Qt bits to our bundle. Put our libraries in
Gerald Combs [Mon, 30 Sep 2013 13:12:28 +0000 (13:12 -0000)]
Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have look at the correct executable.

svn path=/trunk/; revision=52295

6 years agoFrom Peter Paluch via
Evan Huus [Mon, 30 Sep 2013 11:57:14 +0000 (11:57 -0000)]
From Peter Paluch via

Extend the BPDU dissector in packet-bpdu.c so that it recognizes and displays
the PVID TLV in Cisco's PVST+/RPVST+ BPDUs.

svn path=/trunk/; revision=52294

6 years agoMore Qt app bundle migration. Still doesn't work quite right.
Gerald Combs [Mon, 30 Sep 2013 11:29:58 +0000 (11:29 -0000)]
More Qt app bundle migration. Still doesn't work quite right.

svn path=/trunk/; revision=52293

6 years agoStart migrating the OS X app bundle to Qt. This will likely break the
Gerald Combs [Mon, 30 Sep 2013 10:20:43 +0000 (10:20 -0000)]
Start migrating the OS X app bundle to Qt. This will likely break the

svn path=/trunk/; revision=52292

6 years agoDeep copy needed (clang warning flagged by Alexis!)
Martin Mathieson [Mon, 30 Sep 2013 10:15:50 +0000 (10:15 -0000)]
Deep copy needed (clang warning flagged by Alexis!)

svn path=/trunk/; revision=52291

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 30 Sep 2013 09:03:41 +0000 (09:03 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=52290

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 30 Sep 2013 09:03:28 +0000 (09:03 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=52289

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 30 Sep 2013 09:03:16 +0000 (09:03 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=52288

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 30 Sep 2013 09:03:06 +0000 (09:03 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=52287

6 years agoFix indent (use 4 spaces)
Alexis La Goutte [Mon, 30 Sep 2013 09:02:56 +0000 (09:02 -0000)]
Fix indent (use 4 spaces)

svn path=/trunk/; revision=52286

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 30 Sep 2013 09:02:44 +0000 (09:02 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=52285

6 years agoFix compile when use gzip from make dist-gzip (Missing some images)
Alexis La Goutte [Mon, 30 Sep 2013 08:38:00 +0000 (08:38 -0000)]
Fix compile when use gzip from make dist-gzip (Missing some images)

svn path=/trunk/; revision=52284

6 years agoDon't link qtshark against portaudio
Jörg Mayer [Mon, 30 Sep 2013 08:12:46 +0000 (08:12 -0000)]
Don't link qtshark against portaudio

svn path=/trunk/; revision=52283

6 years agoStrip out references to PortAudio. Qt has its own audio module (Phonon).
Gerald Combs [Mon, 30 Sep 2013 07:55:11 +0000 (07:55 -0000)]
Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282

6 years agoUse array_length macro in two places. Add modelines. Remove trailing whitespace.
Evan Huus [Mon, 30 Sep 2013 00:05:43 +0000 (00:05 -0000)]
Use array_length macro in two places. Add modelines. Remove trailing whitespace.

svn path=/trunk/; revision=52281

6 years agoFor an EPB, write out an "end of options" option if we write out any
Guy Harris [Sun, 29 Sep 2013 22:54:13 +0000 (22:54 -0000)]
For an EPB, write out an "end of options" option if we write out any
other options.

Eliminate duplicate comment.

Fix indentation.

svn path=/trunk/; revision=52280

6 years agoAdd a MBIM (Mobile Broadband Interface Model) dissector
Pascal Quantin [Sun, 29 Sep 2013 22:50:27 +0000 (22:50 -0000)]
Add a MBIM (Mobile Broadband Interface Model) dissector
Still to be done:
- fragmentation support
- plug the MBIM dissector on USB dissector

svn path=/trunk/; revision=52279

6 years agoAs pointed out in bug 9127, tcpdump dissects Juniper Attributes
Jörg Mayer [Sun, 29 Sep 2013 22:40:25 +0000 (22:40 -0000)]
As pointed out in bug 9127, tcpdump dissects Juniper Attributes
quite well - reimplement that in Wireshark.

There is room for improvement in this patch, e.g. use subtrees for
the subattributes.

svn path=/trunk/; revision=52278

6 years agoAdd a routine to return the length of a string option, given the string;
Guy Harris [Sun, 29 Sep 2013 22:20:32 +0000 (22:20 -0000)]
Add a routine to return the length of a string option, given the string;
0 means "this option won't be written", and use it when writing pcap-ng

svn path=/trunk/; revision=52277

6 years agoRemove unused variable.
Evan Huus [Sun, 29 Sep 2013 21:06:44 +0000 (21:06 -0000)]
Remove unused variable.

svn path=/trunk/; revision=52276

6 years agoRename routines that write pcap-ng files to "pcapng_xxx" rather than
Guy Harris [Sun, 29 Sep 2013 20:53:13 +0000 (20:53 -0000)]
Rename routines that write pcap-ng files to "pcapng_xxx" rather than

Rename the low-level write routine in pcapio.c to write_to_file(), as
it's used for both pcap and pcap-ng files.

svn path=/trunk/; revision=52275

6 years agoWe always write to a FILE *, so:
Guy Harris [Sun, 29 Sep 2013 20:26:25 +0000 (20:26 -0000)]
We always write to a FILE *, so:

make libpcap_write_to_file() static;

don't pass it as an argument to write routines, just have them
call it directly;

make the handle argument a FILE *.

Make the data length argument to libpcap_write_to_file() a size_t, as
that's what, for example, fwrite() takes as a size argument.

svn path=/trunk/; revision=52274

6 years agoUse a common routine to write out string options.
Guy Harris [Sun, 29 Sep 2013 19:11:37 +0000 (19:11 -0000)]
Use a common routine to write out string options.

This fixes a problem noted in bug 9202, where the calculation of the
padding for the SHB_HARDWARE option was wrong.

svn path=/trunk/; revision=52273

6 years agoConvert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.
Michael Mann [Sun, 29 Sep 2013 18:19:29 +0000 (18:19 -0000)]
Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.

svn path=/trunk/; revision=52272

6 years agoRemoving the assignments to "str" was an error, as its value is returned
Guy Harris [Sun, 29 Sep 2013 18:07:33 +0000 (18:07 -0000)]
Removing the assignments to "str" was an error, as its value is returned
from the functions.

svn path=/trunk/; revision=52271

6 years agoCleanup some proto_tree_add_ipv4_format calls that shouldn't be.
Michael Mann [Sun, 29 Sep 2013 17:18:56 +0000 (17:18 -0000)]
Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.

svn path=/trunk/; revision=52270

6 years agoConvert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_ti...
Michael Mann [Sun, 29 Sep 2013 16:40:01 +0000 (16:40 -0000)]
Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.

Only proto_tree_add_time_format calls remaining are in, which may just need some additional filters.

svn path=/trunk/; revision=52269

6 years agoConvert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. Now...
Michael Mann [Sun, 29 Sep 2013 15:49:04 +0000 (15:49 -0000)]
Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value.  Now proto_tree_add_ipxnet_format is currently unused.

svn path=/trunk/; revision=52268

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-09-29]
Gerald Combs [Sun, 29 Sep 2013 14:03:41 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-09-29]

svn path=/trunk/; revision=52265

6 years agoReplace some val_to_str calls with the equivalent val_to_str_const calls (and
Evan Huus [Sun, 29 Sep 2013 12:44:50 +0000 (12:44 -0000)]
Replace some val_to_str calls with the equivalent val_to_str_const calls (and
implement rval_to_str_const to do this). The format-strings didn't have any
parameter specifiers in them, so they were clearly never used (or they would
have blown up) but still a bug.

This is one of the first steps towards converting val_to_str and friends to
wmem. I'm honestly not sure what the best approach is for the API in this case:
the vast majority of usage is within dissectors, so just hard-coding packet
scope (the way they currently hard-code ep_ scope) doesn't look terrible, but
there are *some* uses in taps and other places that will need to be converted to
something else if we go that route. Adding a wmem_pool parameter just for the
uncommon case seems a bit like overkill, though perhaps it is the right thing to

svn path=/trunk/; revision=52264

6 years agoGet rid of a redundant check - pcapng_read_packet_block() already checks
Guy Harris [Sun, 29 Sep 2013 00:37:04 +0000 (00:37 -0000)]
Get rid of a redundant check - pcapng_read_packet_block() already checks
whether the (zero-based) interface ID is < the number of interface IDs,
so we don't need to do so in pcapng_read().

Unions are tricky - if the compiler doesn't ensure that the right
component of the union is being used at any given time, various problems
can happen.

Remove some members from the "data" union in the wtapng_block_t
structure, and use a local variable of the specified type.

svn path=/trunk/; revision=52262

6 years agoDon't assert that the key to a wmem tree operation is short. If XMPP wants to
Evan Huus [Sat, 28 Sep 2013 23:45:18 +0000 (23:45 -0000)]
Don't assert that the key to a wmem tree operation is short. If XMPP wants to
use a 1500-byte string as a key, so be it. It will be slow, but at least it will


svn path=/trunk/; revision=52261

6 years agoFrom Peter Van Eynde via
Evan Huus [Sat, 28 Sep 2013 23:26:23 +0000 (23:26 -0000)]
From Peter Van Eynde via

Fix some minor length calculation mistakes in the WCCP decoder.

svn path=/trunk/; revision=52260

6 years agoMake the sample "The following bugs have been fixed:" entry match the
Guy Harris [Sat, 28 Sep 2013 21:29:11 +0000 (21:29 -0000)]
Make the sample "The following bugs have been fixed:" entry match the
syntax used in actual release notes we've shipped (putting the buglist
link in parentheses).

svn path=/trunk/; revision=52257

6 years agoMention bug 9200 being fixed.
Guy Harris [Sat, 28 Sep 2013 21:25:44 +0000 (21:25 -0000)]
Mention bug 9200 being fixed.

svn path=/trunk/; revision=52256

6 years agoThe pcap-ng spec says the captured length is the minimum of the
Guy Harris [Sat, 28 Sep 2013 21:06:17 +0000 (21:06 -0000)]
The pcap-ng spec says the captured length is the minimum of the
interface snapshot length and the packet length; make it so.

svn path=/trunk/; revision=52253

6 years agoActually, the captured length must be the minimum of:
Guy Harris [Sat, 28 Sep 2013 20:08:39 +0000 (20:08 -0000)]
Actually, the captured length must be the minimum of:

the number of bytes available for packet data in the block;

the packet length;

*and* the snapshot length for the interface.

One more fix for bug 9200, so it should *now* be fixed.

svn path=/trunk/; revision=52250

6 years agoFix cut-and-pasteo.
Guy Harris [Sat, 28 Sep 2013 19:26:23 +0000 (19:26 -0000)]
Fix cut-and-pasteo.

Finishes the fix for bug 9200.

svn path=/trunk/; revision=52247

6 years agoCorrectly calculate the captured length in a Simple Packet Block -
Guy Harris [Sat, 28 Sep 2013 18:25:07 +0000 (18:25 -0000)]
Correctly calculate the captured length in a Simple Packet Block -
subtract out the minimum SPB size, which includes the length of
*everything* except for the packet data.

Fixes one problem found by the file in bug 9200.

svn path=/trunk/; revision=52244

6 years agoIn a Simple Packet Block, the captured length isn't the block length
Guy Harris [Sat, 28 Sep 2013 18:03:20 +0000 (18:03 -0000)]
In a Simple Packet Block, the captured length isn't the block length
minus the lengths of the two length fields and the packet length field,
it's the minimum of that and the packet length, as there might be

Fixes one problem found by the file in bug 9200.

While we're at it, pcapng_read_packet_block() and
pcapng_read_simple_packet_block() return an integer, not a Boolean;
return 0, not FALSE (they have the same value, but returning 0 makes it
clearer that the return value isn't restricted to TRUE or FALSE).

svn path=/trunk/; revision=52241

6 years agoThere's no interface ID in a Simple Packet Block.
Guy Harris [Sat, 28 Sep 2013 17:44:50 +0000 (17:44 -0000)]
There's no interface ID in a Simple Packet Block.

Fixes one problem found by the file in bug 9200.

svn path=/trunk/; revision=52238

6 years agoStart dissect multipart messages.
Anders Broman [Sat, 28 Sep 2013 08:58:06 +0000 (08:58 -0000)]
Start dissect multipart messages.

svn path=/trunk/; revision=52237

6 years agoFix various warnings in (hopefully) the right ways.
Evan Huus [Sat, 28 Sep 2013 02:41:49 +0000 (02:41 -0000)]
Fix various warnings in (hopefully) the right ways.

svn path=/trunk/; revision=52236

6 years ago1. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well as some...
Michael Mann [Sat, 28 Sep 2013 00:45:44 +0000 (00:45 -0000)]
1. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well as some other minor cleanup) and adjust the calling functions accordingly.

2. Converted several add_protocol_subtree calls to add_tlv_subtree to get true filterability.  Many of the add_protocol_subtree are effectively being (ab)used as proto_tree_add_text with different highlighting.

3. Convert tvb_new_subset into tvb_new_subset_length.

Still looks like some of the remaining "protocols" need more specific filters, and should just be regular FT_BYTES fields.

svn path=/trunk/; revision=52235

6 years agoFix a typo (a missed replace)
Jörg Mayer [Fri, 27 Sep 2013 22:30:34 +0000 (22:30 -0000)]
Fix a typo (a missed replace)

svn path=/trunk/; revision=52234

6 years agoHack for
Jörg Mayer [Fri, 27 Sep 2013 20:33:29 +0000 (20:33 -0000)]
Hack for

With 6 unknown bytes leading to the two known values for the
last two bytes this cannot yet be properly dissected. Dissect
the one known case. More traces with additional properties
required to get more sense into the first 6 bytes.

svn path=/trunk/; revision=52233

6 years agoAnd also where it is declared. Doesn't VSC++ warn about anything?
Martin Mathieson [Fri, 27 Sep 2013 16:40:50 +0000 (16:40 -0000)]
And also where it is declared. Doesn't VSC++ warn about anything?

svn path=/trunk/; revision=52232

6 years agoTemporarily make an uncalled function non-static, until it gets called
Martin Mathieson [Fri, 27 Sep 2013 16:38:45 +0000 (16:38 -0000)]
Temporarily make an uncalled function non-static, until it gets called

svn path=/trunk/; revision=52231

6 years agoRemove unused parameter
Martin Mathieson [Fri, 27 Sep 2013 16:29:05 +0000 (16:29 -0000)]
Remove unused parameter

svn path=/trunk/; revision=52230

6 years agoAnother step towards DRX support in LTE MAC
Martin Mathieson [Fri, 27 Sep 2013 16:18:09 +0000 (16:18 -0000)]
Another step towards DRX support in LTE MAC

svn path=/trunk/; revision=52229

6 years agoFix:
Jörg Mayer [Fri, 27 Sep 2013 08:06:44 +0000 (08:06 -0000)]

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c: In function ‘dissect_openflow_v_1_3’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c:1125:18: error: variable ‘version’ set but not used [-Werror=unused-but-set-variable]
     guint8 type, version;

Remove some trailing whitespace.

svn path=/trunk/; revision=52228

6 years agoHave ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.
Gerald Combs [Fri, 27 Sep 2013 03:33:26 +0000 (03:33 -0000)]
Have ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.

The welcome screen in the Qt port runs "dumpcap -S" to draw sparklines.
On OS X this means that it holds open a BPF device for each interface.
Trying to capture using another instance of Wireshark (or tcpdump, or
tshark, or...) will trigger the creation of an additional BPF device but
we won't have permission to use it. Forcing device creation at startup
works around this.

svn path=/trunk/; revision=52227

6 years agoFix:
Anders Broman [Thu, 26 Sep 2013 21:21:54 +0000 (21:21 -0000)]
packet-openflow.c:577:31: error: "/*" within comment
packet-openflow.c:655:24: error: "/*" within comment
cc1: warnings being treated as errors
packet-openflow.c: In function 'dissect_openflow_features_reply_v1_3':
packet-openflow.c:671: warning: unused parameter 'pinfo'
packet-openflow.c:671: warning: unused parameter 'length'
packet-openflow.c: In function 'dissect_openflow_multipart_request_v1_3':
packet-openflow.c:809: warning: unused parameter 'pinfo'
packet-openflow.c:809: warning: unused parameter 'length'
packet-openflow.c: At top level:
packet-openflow.c:1033: warning: return type defaults to 'int'
packet-openflow.c:1119: warning: return type defaults to 'int'

svn path=/trunk/; revision=52226

6 years agoFrom
Anders Broman [Thu, 26 Sep 2013 21:15:44 +0000 (21:15 -0000)]

c1222 dissector has wrong tag value for BER-encoding of calling_AE_qualifier

svn path=/trunk/; revision=52225

6 years agoFrom
Anders Broman [Thu, 26 Sep 2013 21:08:49 +0000 (21:08 -0000)]
removed obsolete references to se_alloc

svn path=/trunk/; revision=52224

6 years agoStart refactoring to dissect each version separatly.
Anders Broman [Thu, 26 Sep 2013 21:05:04 +0000 (21:05 -0000)]
Start refactoring to dissect each version separatly.

svn path=/trunk/; revision=52223

6 years agoAdd a few AVP:s
Anders Broman [Thu, 26 Sep 2013 21:04:10 +0000 (21:04 -0000)]
Add a few AVP:s

svn path=/trunk/; revision=52222

6 years agoWhen a line of text wraps to the next line, the character that caused the line to...
Chris Maynard [Thu, 26 Sep 2013 17:27:53 +0000 (17:27 -0000)]
When a line of text wraps to the next line, the character that caused the line to wrap was not being printed.


svn path=/trunk/; revision=52221

6 years agoDo all checks against the reported length; a packet that wasn't captured
Guy Harris [Wed, 25 Sep 2013 22:53:53 +0000 (22:53 -0000)]
Do all checks against the reported length; a packet that wasn't captured
in its entirety due to a snapshot length being specified is not

Instead of checking for the the sum of the offset and the value length
being less than the offset, check whether the TLV length is <= 4 and, if
so, just quit at that point (that also handles the "value is zero
length" case).  That makes sure that valuelength isn't negative; given
that length is < 65536, valuelength < 65532, so that won't cause offset
to overflow, so that means offset won't go backwards.

svn path=/trunk/; revision=52220

6 years agoFrom
Anders Broman [Wed, 25 Sep 2013 21:15:25 +0000 (21:15 -0000)]

oid_subid2encoded generates faulty encodings for 3-, 4- and 5-byte subid values

svn path=/trunk/; revision=52219

6 years agoFrom Masayuki Takemura:
Anders Broman [Wed, 25 Sep 2013 21:11:25 +0000 (21:11 -0000)]
From Masayuki Takemura:
According to 3GPP R8/R9/R10/R11, the mobility option "3GPP Specific PMIPv6 error
code" is 1 octet length.

However, in the source file packet-mip6.c, the length of the option is set to 4 octets (around line 1744):

svn path=/trunk/; revision=52218

6 years agoDissect bssmap_reroute_cmd and bssmap_reroute_complete and
Anders Broman [Wed, 25 Sep 2013 21:06:05 +0000 (21:06 -0000)]
Dissect bssmap_reroute_cmd and bssmap_reroute_complete and
add new IE dissection to bssmap_cl3_info.

svn path=/trunk/; revision=52217

6 years agoAdd the abillity to let vendor AVP subdisectors add Message type to the info column.
Anders Broman [Wed, 25 Sep 2013 20:58:37 +0000 (20:58 -0000)]
Add the abillity to let vendor AVP subdisectors add Message type to the info column.

svn path=/trunk/; revision=52216

6 years agoMinor correction to dissection of DLR frames in Ethernet/IP dissector. Bug 9186...
Michael Mann [Wed, 25 Sep 2013 19:13:10 +0000 (19:13 -0000)]
Minor correction to dissection of DLR frames in Ethernet/IP dissector.  Bug 9186 (

From Joakim Wiberg

svn path=/trunk/; revision=52215

6 years agoPrevent offset overflow in DTP dissector. Fixes
Evan Huus [Wed, 25 Sep 2013 16:57:21 +0000 (16:57 -0000)]
Prevent offset overflow in DTP dissector. Fixes

Also add modelines.

svn path=/trunk/; revision=52214

6 years agoRequire the NTLMSSP response contents to be long enough before we try to memcpy
Evan Huus [Wed, 25 Sep 2013 16:41:09 +0000 (16:41 -0000)]
Require the NTLMSSP response contents to be long enough before we try to memcpy
it. Fixes

svn path=/trunk/; revision=52213

6 years agoBeginning to work on bug 9127 (Juniper proprietary TLV in RSVP):
Jörg Mayer [Wed, 25 Sep 2013 10:11:07 +0000 (10:11 -0000)]
Beginning to work on bug 9127 (Juniper proprietary TLV in RSVP):
- Print hexdump of unknown or vendor specific toplevel TLVs
- Try to print the name of type 204 (something still missing)

svn path=/trunk/; revision=52212

6 years agoDelete extra_split if we're not using it. This keeps its handle from
Gerald Combs [Wed, 25 Sep 2013 00:26:36 +0000 (00:26 -0000)]
Delete extra_split if we're not using it. This keeps its handle from
showing up in the main window. Make it local to layoutPanes().

svn path=/trunk/; revision=52211

6 years agoFrom Chris Bontje via
Evan Huus [Tue, 24 Sep 2013 22:42:27 +0000 (22:42 -0000)]
From Chris Bontje via

A few enhancements to the SEL Fast Message (selfm) Dissector:
- Final piece of dissection for standard Fast Meter messages to display pad byte
  (if present) and single-byte checksum footer.
- Enhancement to digital word display to show 1-byte bit patterns on proto_item
  without requiring user to expand tree.

svn path=/trunk/; revision=52210

6 years agoPrevent crashing as a result of tree removal in r52208. Tree removal + this patch...
Michael Mann [Tue, 24 Sep 2013 21:06:05 +0000 (21:06 -0000)]
Prevent crashing as a result of tree removal in r52208.  Tree removal + this patch should be the "quick" fix to bug 5349 (  I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking).

I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349.  Cleanup shouldn't need to be backported.

svn path=/trunk/; revision=52209

6 years agoYou are in a twisty little maze of code paths, all different. Get rid
Guy Harris [Tue, 24 Sep 2013 20:32:19 +0000 (20:32 -0000)]
You are in a twisty little maze of code paths, all different.  Get rid
of the if (tree) tests in dissect_mac_header_generic_decoder(), as some
of the stuff done inside there should be done even if we're not building
a protocol tree, e.g. CRC stuff and calling subdissectors.

Get rid of a gratuitous pair of curly braces, and fix the indentation of
one line, while we're at it.

svn path=/trunk/; revision=52208

6 years agoStuff used when checking the CRC needs to be done regardless of whether
Guy Harris [Tue, 24 Sep 2013 19:57:41 +0000 (19:57 -0000)]
Stuff used when checking the CRC needs to be done regardless of whether
we're building a protocol tree or not.

svn path=/trunk/; revision=52207

6 years agoGet rid of unused variable.
Guy Harris [Tue, 24 Sep 2013 19:56:56 +0000 (19:56 -0000)]
Get rid of unused variable.

svn path=/trunk/; revision=52206

6 years agoFix copy-and-pasteo(?).
Guy Harris [Tue, 24 Sep 2013 19:09:10 +0000 (19:09 -0000)]
Fix copy-and-pasteo(?).

svn path=/trunk/; revision=52205

6 years agoOne advantage of making as many things as possible static is that, if
Guy Harris [Tue, 24 Sep 2013 19:07:22 +0000 (19:07 -0000)]
One advantage of making as many things as possible static is that, if
they're not being used, the compiler can be made to warn about that.

In this case, Broadcast_Control_Pointer_IE() was used because of a
missing case in a switch statement; put that case in.

svn path=/trunk/; revision=52204

6 years agoWimax dissector improvements:
Michael Mann [Tue, 24 Sep 2013 18:45:39 +0000 (18:45 -0000)]
Wimax dissector improvements:

1. Remove message type field from all MAC Management "sub"dissectors and place it in Mac Management subdissector itself.  This may cause backwards-compatibility issues (malformed packets) with third-party subdissectors of the MAC Management dissector, but it didn't make sense to have so many filters for a single enumerated value, especially when the various "protocol" filters covers many of them.

2. Removed some if(tree) checks as column info and calling other dissectors are sometimes executed underneath.  Some of this is in preparation for addressing bug 5349.

3. Make all dissector functions (and a few others) static, and use register_dissector() when necessary.

4. Convert generic decoder CRC errors into expert info, rather than have it be a "protocol" filter (it just looks funny that way)

In general, these dissectors seem "over-protocolized". I understand the need for all of the dissectors, but I don't know if they all need "protocol" status.

svn path=/trunk/; revision=52203

6 years agoUpgrade RRC dissector to v11.7.0
Pascal Quantin [Tue, 24 Sep 2013 17:56:17 +0000 (17:56 -0000)]
Upgrade RRC dissector to v11.7.0

svn path=/trunk/; revision=52202

6 years agoOn Win it's nmake, not make
Jörg Mayer [Tue, 24 Sep 2013 16:50:21 +0000 (16:50 -0000)]
On Win it's nmake, not make

svn path=/trunk/; revision=52201

6 years agoFrom Wido Kelling via :
Jeff Morriss [Tue, 24 Sep 2013 01:12:44 +0000 (01:12 -0000)]
From Wido Kelling via :

Fix decoding of the Auto-Negotiation bits in LLDP (they were off by one).

svn path=/trunk/; revision=52199

6 years agoFrom robionekenobi via :
Jeff Morriss [Tue, 24 Sep 2013 01:04:10 +0000 (01:04 -0000)]
From robionekenobi via :

This enhancement add the missing structure CAUT, some missing integer
converted to Strings and some field that were unknown to a better explanation.

Sorted alphabetically the MQCFINT_Parse VALS structure to better find what is
missing in this VALS structure

svn path=/trunk/; revision=52198

6 years agoFrom Peter Wu via :
Jeff Morriss [Tue, 24 Sep 2013 00:31:49 +0000 (00:31 -0000)]
From Peter Wu via :

Allow reading SSL keylog files with carriage returns.

svn path=/trunk/; revision=52197

6 years agoBeginnings of win cmake support (not yet working), created by Graham Bloice,
Jörg Mayer [Mon, 23 Sep 2013 21:45:55 +0000 (21:45 -0000)]
Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
  Document how to (one day) run on Windows
- CMakeLists.txt
  Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
  New: Creates HINTS for finding includes and libraries
  inside the Wireshark support library installation.
- FindXXX.cmake
  Make use of HINTS generated by FindWSWinLibs.cmake

This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.

svn path=/trunk/; revision=52194

6 years agoEnsure to release an existing DRX configuration when receiving a RRC Connection Setup...
Pascal Quantin [Mon, 23 Sep 2013 21:21:58 +0000 (21:21 -0000)]
Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message

svn path=/trunk/; revision=52193

6 years agoUpgrade LPPa dissector to v11.3.0
Pascal Quantin [Mon, 23 Sep 2013 20:20:36 +0000 (20:20 -0000)]
Upgrade LPPa dissector to v11.3.0

svn path=/trunk/; revision=52192

6 years agoAdd dissection of new IEs in UL_UNITDATA
Anders Broman [Mon, 23 Sep 2013 19:02:33 +0000 (19:02 -0000)]
Add dissection of new IEs in UL_UNITDATA

svn path=/trunk/; revision=52191

6 years agoAnother step towards tracking UE DRX state
Martin Mathieson [Mon, 23 Sep 2013 17:34:18 +0000 (17:34 -0000)]
Another step towards tracking UE DRX state

svn path=/trunk/; revision=52190

6 years agoDTP Dissector Enhancements
Michael Mann [Mon, 23 Sep 2013 15:54:29 +0000 (15:54 -0000)]
DTP Dissector Enhancements

1) Corrections to the naming and terminology of DTP, its TLVs, types and values

2) Improvements to the dissection of Trunk Status and Trunk Type TLVs whose values and meaning have not been properly decoded so far

3) Improvements to the dissection of the Domain TLV (now using proto_tree_add_item() to display its value; this also allows for filtering operations)

4) Minor cleanups to the code (mainly renaming the macro names to make them more consistent)

From Peter Paluch, Bug 9156 (

svn path=/trunk/; revision=52189

6 years agoTiny indentation fix.
Evan Huus [Mon, 23 Sep 2013 12:09:58 +0000 (12:09 -0000)]
Tiny indentation fix.

svn path=/trunk/; revision=52188

6 years agoThe pointer into proto_tree_add_oid can be NULL if the length is 0. Exposed
Evan Huus [Mon, 23 Sep 2013 12:09:20 +0000 (12:09 -0000)]
The pointer into proto_tree_add_oid can be NULL if the length is 0. Exposed
because wmem_alloc(pool, 0) returns NULL (like pretty much every other
malloc-style function) where ep_ or se_ alloc did not.


svn path=/trunk/; revision=52187

6 years agoFix Function call argument is an uninitialized value warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:53 +0000 (07:20 -0000)]
Fix Function call argument is an uninitialized value warning found by Clang

svn path=/trunk/; revision=52186

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:45 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52185

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:38 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52184

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:28 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52183

6 years agoFrom Peter Wu: on systems other than Windows, skip the GUI tests if the
Guy Harris [Sun, 22 Sep 2013 21:51:05 +0000 (21:51 -0000)]
From Peter Wu: on systems other than Windows, skip the GUI tests if the
DISPLAY environment variable isn't set.

From me: note that this won't be the right thing to do on OS X if we
switch to a toolkit that doesn't use X11, and that this may or may not
be the right thing to do with toolkits using Wayland or Mir directly.

svn path=/trunk/; revision=52182

6 years agoFix some typos, indentation. Don't try to write the NRB if the pointer to our
Evan Huus [Sun, 22 Sep 2013 20:18:25 +0000 (20:18 -0000)]
Fix some typos, indentation. Don't try to write the NRB if the pointer to our
two lists is itself NULL.

svn path=/trunk/; revision=52181

6 years agoMore emem -> wmem conversion:
Pascal Quantin [Sun, 22 Sep 2013 20:04:35 +0000 (20:04 -0000)]
More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180

6 years agoFix -Wshadow, indentation
Evan Huus [Sun, 22 Sep 2013 20:01:32 +0000 (20:01 -0000)]
Fix -Wshadow, indentation

svn path=/trunk/; revision=52179

6 years agoRemove unused parameter.
Evan Huus [Sun, 22 Sep 2013 19:58:22 +0000 (19:58 -0000)]
Remove unused parameter.

svn path=/trunk/; revision=52178

6 years agoTurn off debuging.
Anders Broman [Sun, 22 Sep 2013 19:43:51 +0000 (19:43 -0000)]
Turn off debuging.

svn path=/trunk/; revision=52177

6 years agoGet rid of struct addrinfo, use the hastables for name resolution instead.
Anders Broman [Sun, 22 Sep 2013 19:40:02 +0000 (19:40 -0000)]
Get rid of struct addrinfo, use the hastables for name resolution instead.

svn path=/trunk/; revision=52176