Commit Graph

43362 Commits

Author SHA1 Message Date
Gerald Combs 101e9755c7 Try to speed up rendering.
svn path=/trunk/; revision=45841
2012-10-30 22:25:37 +00:00
Martin Kaiser 3a8b276c81 Card Information Structure (CIS) dissection
- restructure the existing code
- consistent filter names
- remove unnecessary if(tree) checks
- dissect the tpll_v1 and manfid tuples

svn path=/trunk/; revision=45840
2012-10-30 22:08:24 +00:00
Gerald Combs 12dfeadbbf Get rid of a couple of unused variables. Other minor cleanup.
svn path=/trunk/; revision=45839
2012-10-30 20:24:08 +00:00
Gerald Combs 0a28fb8f6a Update the Qt byte view widget to reflect the recent changes in the GTK+
byte view.

Move the packet_char_enc enum from packet.h to frame_data.h. Make the
encoding flag a packet_char_enc and make it one bit.

Get rid of the "cfile" global in a few places. C++-ize some of the font
code. Clean up some variable names.

svn path=/trunk/; revision=45838
2012-10-30 19:21:24 +00:00
Anders Broman 27b5d556cb Dissect Handover Initiate/Handover Acknowledge messages.
svn path=/trunk/; revision=45836
2012-10-30 13:06:03 +00:00
Anders Broman 7ac8c137d9 Fix Incorrect decoding of RSVP RECORD_ROUTE Object.
"in RSVP RESV message there incorrect
explanation of field "Flags" of Label subobject is appeared in Packet Details
section: value 0x01 of Flags field mistakenly defined as "Local Protection
Available" (I guess that this is borrowed from Flags field of IPv4 Address
subobject). Flags 0x01 in Label subobject means that particular label is global
(RFC 3209, Clause 4.4.1.3)."

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7876

svn path=/trunk/; revision=45835
2012-10-30 09:13:13 +00:00
Anders Broman 240789d01d See if this makes OSX buildbots happy
svn path=/trunk/; revision=45834
2012-10-30 06:28:59 +00:00
Evan Huus 9037787982 Add wmem readme to the appropriate build files.
svn path=/trunk/; revision=45833
2012-10-30 01:30:57 +00:00
Evan Huus 7588f12291 Some documentation for wmem.
svn path=/trunk/; revision=45832
2012-10-30 01:24:16 +00:00
Bill Meier 041fe5ef99 Add a comment noting that on Windows the
"use of window's own __try {} __finally {} and __except {}
mechanism" along with "macros based on kazlib's  exception code"
has problems and does not always work properly.

svn path=/trunk/; revision=45831
2012-10-29 20:12:28 +00:00
Bill Meier 25a1d9d667 Remove obsolete & incorrect comment:
/* Composite tvbuffs don't work at the moment -- tests commented out until
 * they do. */


svn path=/trunk/; revision=45830
2012-10-29 16:19:31 +00:00
Anders Broman 3d194979d6 Add IE/Options dissection.
svn path=/trunk/; revision=45829
2012-10-29 16:02:51 +00:00
Alexis La Goutte 4bb9ebb9e0 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7768 IEEE802.11 dissector field size issue
There are a handful of fields in the IEEE802.11 dissector that are comprised of
a 16-bit value.  The hf array for these fields has the necessary masks to
correctly parse a 16-bit value, yet some of the fields were being added as 1
byte.  This patch corrects these fields with a proto_tree_add_item approach
(instead of proto_tree_add_[uint|boolean]).

svn path=/trunk/; revision=45828
2012-10-29 15:25:07 +00:00
Alexis La Goutte 02a97f92e2 From report of Sergio Garcia Murillo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7906 Nelly Mosser (Control: 0x66) at 11Khz incorrectly displayed as 8Khz
From me
Fix issue and add link to SWF documentation ( http://www.adobe.com/content/dam/Adobe/en/devnet/swf/pdf/swf_file_format_spec_v10.pdf )

svn path=/trunk/; revision=45827
2012-10-29 14:13:12 +00:00
Anders Broman 2ec15712c5 From Michal Labedzki:
[PATCH 18] Bluetooth: Add colofilter for ATT protocol

Add colofilter for ATT protocol. 
Why "green"? Looks good and ATT seems to be similar to SDP - use attributes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=45826
2012-10-29 12:57:09 +00:00
Anders Broman 66ddbc8c5d Add dissection ofDTM ASSIGNMENT COMMAND and fix message types.
svn path=/trunk/; revision=45825
2012-10-29 12:49:45 +00:00
Alexis La Goutte 78ff79be82 From Jérôme LAFORGE via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7896 [DHCPv4] Implement RFC3004 for DHCP option 77
From me:
* Fix checkAPIs warning
* Add RFC3004 to the list of supported RFC

svn path=/trunk/; revision=45824
2012-10-29 11:10:26 +00:00
Pascal Quantin 79f67d319e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7790 :
Add missing offset increment after displaying minimum count

svn path=/trunk/; revision=45823
2012-10-28 20:59:04 +00:00
Evan Huus 4105ae6c6c Fix null-pointer dereference in mip6 dissector when optp is NULL because
we don't recognize the option.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7922

svn path=/trunk/; revision=45822
2012-10-28 20:23:06 +00:00
Bill Meier 953283a3d7 Changes:
- Remove 'if (tree)' around an indirect call to expert...();
- Create/use extended value strings as appropriate;
- Localize some variables;
- Remove unneeded initializers;
- Reformat hf[] array entries (use a consistent format);
- Use a consistent indentation and a consistent whitespace style.

svn path=/trunk/; revision=45821
2012-10-28 19:54:29 +00:00
Martin Kaiser 000f8eb62c fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913
When we create a new color filter, we prepend the color filter list with
a default entry and launch an edit dialogue. If the user cancels, we
have to remove this _first_ entry from the list (not the last one).

svn path=/trunk/; revision=45820
2012-10-28 19:13:54 +00:00
Anders Broman 526f61a340 fix [-Werror=uninitialized]
svn path=/trunk/; revision=45819
2012-10-28 18:33:12 +00:00
Anders Broman 6266e87f84 Only add a subtree if optp->subtree_index is non NULL. should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7920
svn path=/trunk/; revision=45818
2012-10-28 18:04:45 +00:00
Gerald Combs a3177785a5 [Automatic manuf, services and enterprise-numbers update for 2012-10-28]
svn path=/trunk/; revision=45815
2012-10-28 14:03:32 +00:00
Evan Huus ee5a8dd17d Do free overwritten names when registering oids. There was a comment claiming
we couldn't since the name might not be on the heap, but it looks to me like
we're always careful to put it on the heap via a g_strdup if necessary.

Fixes some minor memory leaks.

svn path=/trunk/; revision=45814
2012-10-27 21:01:41 +00:00
Evan Huus 67f2dc0876 Don't leak memory when registering duplicate preferences subtree modules. Take
wmem_permanent copies of the substrings we actually need, and g_free the
temporary tokenized copy.

svn path=/trunk/; revision=45813
2012-10-27 20:41:58 +00:00
Evan Huus b7ff007bbb There's no need to g_strdup our default prefs - setting them as literals
works just fine and doesn't leak any memory.

Use wmem_permanent_scope() for the one string we do have to copy, to ensure
it doesn't leak either.

svn path=/trunk/; revision=45812
2012-10-27 20:29:12 +00:00
Pascal Quantin 51e45c8da9 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7911 :
Fix dissection of some GSM RR IEs which include length octet

From me:
Keep displaying those IEs as TLV to keep coherency with other TLV IEs
Fix dissection of Dynamic ARFCN Mapping

svn path=/trunk/; revision=45811
2012-10-27 17:03:12 +00:00
Evan Huus 221ae051f2 SVN properties for wmem slab files.
svn path=/trunk/; revision=45810
2012-10-27 15:36:50 +00:00
Evan Huus a02e765e00 Experimental slab allocator logic for wmem.
Thanks to Sébastien Tandel for the idea.

svn path=/trunk/; revision=45809
2012-10-27 15:35:32 +00:00
Jakub Zawadzki 418f56d093 Don't use wtap_phdr() for getting pkthdr struct after wtap_seek_read().
svn path=/trunk/; revision=45808
2012-10-27 08:32:41 +00:00
Evan Huus 0ed00c491d Update openSafety dissector with new Modbus dissector table name.
Fixes
> OOPS: dissector table "mbtcp.modbus.data" doesn't exist
> Protocol being registered is "openSAFETY"
introduced in revision 45793.

svn path=/trunk/; revision=45807
2012-10-27 02:53:29 +00:00
Evan Huus 43fadb88cb Add comment explaining the addr->hf field to column-utils for future
reference. Those lines were already starting to look like magic and
it's only been 24 hours.

svn path=/trunk/; revision=45806
2012-10-27 02:48:45 +00:00
Evan Huus b464dcd888 Create init and cleanup functions for wmem as a whole.
Call them from epan_init() and epan_cleanup().
Expose a permanent wmem scope for allocations that should only be freed when
epan is done (which is *not* necessarily when the program finishes).

svn path=/trunk/; revision=45805
2012-10-27 02:42:05 +00:00
Evan Huus 2ea364607a Make the allocator destructor part of wmem_allocator_t. This avoids two
potential bugs:
 - calling the wrong destroy function on an allocator
 - a pool allocator forgetting to call free_all on itself in the destructor

Also, fix potential typedef redefinition warning in wmem_allocator_glib.h

svn path=/trunk/; revision=45804
2012-10-27 02:29:46 +00:00
Bill Meier 84f5f91022 Fix [-Wunused-but-set-variable] warnings.
svn path=/trunk/; revision=45803
2012-10-26 21:47:02 +00:00
Bill Meier 31b1b3780c General cleanup (No changes in dissection):
- rename variables to fix all "shadowed variable" warnings;
- remove certain 'if(tree)' statements;
   (A new-style dissector) should return the same
    'bytes processed' whether or not 'tree == NULL');
- simplify code in numerous places (including removing
   redundant/repeated code);
- fix remaining uses of FALSE as 'encoding' arg;
- use consistent indentation and formatting.

ToDo: Changes to fix apparent cases of incorrect
      dissection.

svn path=/trunk/; revision=45802
2012-10-26 21:17:33 +00:00
Gerald Combs d08f111496 Minor cleanup.
svn path=/trunk/; revision=45801
2012-10-26 18:31:00 +00:00
Gerald Combs 6c92b6d86a Add an option (-P) for a minimum plugin count.
svn path=/trunk/; revision=45800
2012-10-26 16:30:48 +00:00
Bill Meier c654a52e64 (Minor) Use correct description for tvb_find_guint8().
svn path=/trunk/; revision=45799
2012-10-26 16:09:01 +00:00
Gerald Combs 04fea80bf8 From Sho Amano via bug 7914:
If the source codes are checked out using TortoiseSVN on Windows,
"nmake -f Makefile.nmake packaging_papps" fails in the middle.

This is because the line end of packaging\nsis\wireshark.nsi is CRLF in
this case, and ws-manifest.pl cannot handle such case.

svn path=/trunk/; revision=45798
2012-10-26 15:51:28 +00:00
Anders Broman a579e9875b Prepare to dissect 3GPP options.
svn path=/trunk/; revision=45797
2012-10-26 15:35:41 +00:00
Anders Broman b3572877da More options dissecton.
svn path=/trunk/; revision=45796
2012-10-26 13:29:02 +00:00
Pascal Quantin 1ac326467c Fix copy/paste error
svn path=/trunk/; revision=45795
2012-10-26 05:50:57 +00:00
Anders Broman 0b645cf006 Fix [-Werror=sign-compare] [-Wunused-but-set-variable]
svn path=/trunk/; revision=45794
2012-10-26 05:46:56 +00:00
Michael Mann 1fe105a5ab Improve Modbus/TCP dissector, Part 1
This is a portion of the patch supplied in bug 7902 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7902).  Breaking the functionality up into smaller chunks.

This definitively breaks the Modbus dissection into 3 dissectors:
Modbus - real protocol PDU
Modbus/TCP - Encapsulation of Modbus over TCP (with a small header before PDU)
Modbus RTU - Originally an encapsulation of Modbus over serial (with smaller header + CRC), but can also be sent over TCP.

General cleanup/refactoring (including display filter names) based on the 3 dissectors.
Also included:
1. Enhanced dissection to include preferences for register data to be dissected as UINT16, UINT32 or FLOAT
2. Dynamic port registration
3. Additional fields now filterable

svn path=/trunk/; revision=45793
2012-10-26 02:15:20 +00:00
Evan Huus 361aedec1f Create SET_ADDRESS_HF that takes an additional hf_ value that can be
used to override the filter generated from the address column.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 (again).

svn path=/trunk/; revision=45792
2012-10-26 01:59:17 +00:00
Evan Huus c6b522bc70 Revert revision 44921.
See discussion on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728

svn path=/trunk/; revision=45791
2012-10-26 00:42:34 +00:00
Jeff Morriss d97b4ec325 Fix problem where NTP times with the high-bit set to 0 (which RFC 2030
chapter 3 has redefined to mean years *after* 2036) were being represented as
times prior to 1968.

This has been broken since r35840 (apparently not many people see NTP
timestamps beyond 2036 :-)): apparently I over-optimized packet-ntp's code
while copying it into proto.c: that temporary variable is necessary for the
unsigned math to happen correctly before assigning the result to the (signed)
time_t.

Leave a comment in the code indicating why the temporary variable is needed.
Copy that comment to packet-ntp.c.

Fix the same problem in ntp_to_nstime(): it also did not use the temporary variable.

svn path=/trunk/; revision=45790
2012-10-25 22:26:52 +00:00
Pascal Quantin 4518ece9f9 From Umberto Corponi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7912 :
Allow dissection of ESM messages with integrity protection and EEA0 ciphering

From me:
Tighten heuristic to check for allowed EPS bearer identity values

svn path=/trunk/; revision=45789
2012-10-25 21:37:12 +00:00