Commit Graph

20309 Commits

Author SHA1 Message Date
Evan Huus c25c5915c5 Add wrapper functions for realloc, free and gc, but don't expose them in the
header yet as not all allocators implement them.

svn path=/trunk/; revision=47219
2013-01-23 00:59:38 +00:00
Pascal Quantin ae61fe0158 Try to fix dissection of GSM protocol family broken by r47209.
Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks.
(I hope I got everything right...)


svn path=/trunk/; revision=47218
2013-01-22 23:25:44 +00:00
Jaap Keuter 6e1c54c8fd Fix for CID 761911-761984 and CID 761985-761994.
Try to convince Coverity that the passed in item pointer is appreciated,
but not used.
This time see if it pleases the Windows compiler too.

svn path=/trunk/; revision=47217
2013-01-22 22:07:44 +00:00
Bill Meier 1c7c18b725 Fix a typo in a comment;
Do some minor whitespace & etc cleanup.

svn path=/trunk/; revision=47216
2013-01-22 20:55:54 +00:00
Evan Huus 7ad70545cc More fixes for handling of NULL-pointers and 0-lengths in calls to
malloc/realloc/free.

svn path=/trunk/; revision=47215
2013-01-22 18:46:35 +00:00
Gerald Combs 6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Bill Meier df41b2aefa #include <epan/reassemble.h> not needed.
svn path=/trunk/; revision=47212
2013-01-22 15:55:59 +00:00
Bill Meier 9a636739ba Create/use extended value-string;
Add editor modelines;
Do minor whitespace, long lines, and etc cleanup.

svn path=/trunk/; revision=47211
2013-01-22 15:38:55 +00:00
Jaap Keuter 6a6aaf7409 Fix for CID 717414-717435.
Never ever access a string in a value string by its array index.
Use the proper access functions (val_to_str[_ext] and friends).

Also: make clean compile, so move out of dirty dissectors.

svn path=/trunk/; revision=47209
2013-01-22 07:18:20 +00:00
Anders Broman 332012288b Revert 47201 it does not compile on Windows.
svn path=/trunk/; revision=47208
2013-01-22 07:05:39 +00:00
Michael Mann 52b63d96a4 Update the FeliCa dissector to identify FeliCa Standard commands
From Tyson Key, bug 8243 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8243)

svn path=/trunk/; revision=47205
2013-01-22 04:29:37 +00:00
Chris Maynard 604fd1f1c5 Try to eliminate VS Code Analysis warning: warning C6385: Invalid data: accessing 'hf_packetbb_addr_value', the readable size is '16' bytes, but '4004' bytes might be read
svn path=/trunk/; revision=47204
2013-01-22 02:48:55 +00:00
Chris Maynard 0e34036761 Fix bug found by VS Code Analysis: warning C6336: Arithmetic operator has precedence over question operator, use parentheses to clarify intent
svn path=/trunk/; revision=47202
2013-01-22 01:56:07 +00:00
Jaap Keuter 86dd0abcd3 Fix for CID 761911-761984 and CID 761985-761994.
Try to convince Coverity that the passed in item pointer is appreciated,
but not used.

svn path=/trunk/; revision=47201
2013-01-21 22:38:11 +00:00
Alexis La Goutte 23b5828115 From Subramanian via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8109 Add support for Bidirectional Forwarding Detection (BFD) for MPLS Label Switched Paths (LSPs) [ RFC 5884]
svn path=/trunk/; revision=47193
2013-01-21 08:38:40 +00:00
Anders Broman b7548f11bd Update to 3GPP TS 25.419 V11.0.0 (2012-09) no change in asn1.
svn path=/trunk/; revision=47192
2013-01-21 07:09:13 +00:00
Jaap Keuter 5fe15dfd37 Fix CID 966637 and CID 966638
Check pointers before using them.

svn path=/trunk/; revision=47186
2013-01-20 21:14:12 +00:00
Alexis La Goutte 31b969a4b5 Replace tvb_get_ipv4 / ip_to_str ... by tvb_ip_to_str
svn path=/trunk/; revision=47181
2013-01-20 18:32:56 +00:00
Alexis La Goutte 26df7b88e5 Fix indent (Replace tabs by space) and add Modelines info
svn path=/trunk/; revision=47180
2013-01-20 18:32:47 +00:00
Alexis La Goutte 56bddf989b Use proto_tree_add_item for stun_att_reserved and use FT_BYTES type.
svn path=/trunk/; revision=47179
2013-01-20 18:32:37 +00:00
Alexis La Goutte 48cef7c61a Enhance FIX generator
* Remove whitespace and tab
* Add information how to generate packet-fix.h (in top of packet-fix.h)

Regenerate packet-fix.h

svn path=/trunk/; revision=47178
2013-01-20 18:32:23 +00:00
Pascal Quantin 1a182e2a79 Dissect ETWS and CMAS notifications
svn path=/trunk/; revision=47177
2013-01-20 17:14:24 +00:00
Gerald Combs 4cd9fb3084 [Automatic manuf, services and enterprise-numbers update for 2013-01-20]
svn path=/trunk/; revision=47174
2013-01-20 15:03:39 +00:00
Graham Bloice cf4fcaa8b6 snmp dissector did not correctly set length of pdu's of more than 127 bytes. The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
svn path=/trunk/; revision=47173
2013-01-20 10:01:34 +00:00
Evan Huus f3ba854bec NULL is also a valid return for g_malloc if the requested size is 0.
svn path=/trunk/; revision=47172
2013-01-20 02:47:58 +00:00
Evan Huus 8df0020ac6 Don't add the new block to the hash table if it is NULL, which is a
valid non-error return from realloc if the new requested size is 0.

svn path=/trunk/; revision=47171
2013-01-20 02:44:32 +00:00
Evan Huus 518eee193b Use epan-scoped memory to clean up another 1Kb+ of valgrind
sorta-false-positive leaks.

svn path=/trunk/; revision=47170
2013-01-19 20:14:42 +00:00
Evan Huus 669b98bb5f Rewrite wmem_allocator_simple to track allocations using a GHashTable instead of
a GSList. This permits it to implement the new realloc and free functions. Also
fill in an empty gc function, since there isn't much it can do as far as
garbage-collection goes.

svn path=/trunk/; revision=47169
2013-01-19 19:56:20 +00:00
Evan Huus 1390569a99 Use wmem epan-scoped memory when initializing dcerpc so that it gets freed when
we shut down. Cleans up 5Kb worth of valgrind sorta-false-positive leaks.

svn path=/trunk/; revision=47168
2013-01-19 19:36:20 +00:00
Evan Huus 21453d5db6 Add three more slots to the wmem allocater definition (not yet implemented
by any particular allocator) and better document the entire structure.

svn path=/trunk/; revision=47163
2013-01-19 16:15:32 +00:00
Jaap Keuter f177deead0 Fix for CID 280252.
We can be sure we've at least 0 bytes remaining in the TVB.

svn path=/trunk/; revision=47162
2013-01-19 13:06:26 +00:00
Jaap Keuter a43975ca82 Following r47157, this tries to suppress similar Coverity issues.
svn path=/trunk/; revision=47160
2013-01-19 10:54:09 +00:00
Gerald Combs 2c5ce01f33 Add an "Appearance" (aka "User Interface") preference pane. Having an
"Advanced" pane gives us the luxury of omitting some items in favor of
simplicity so do that.

svn path=/trunk/; revision=47158
2013-01-19 00:57:57 +00:00
Jaap Keuter 69489bc85a Try and see if we can suppress about half of the Coverity issues.
svn path=/trunk/; revision=47157
2013-01-18 23:25:22 +00:00
Evan Huus 2a1e61d582 From Kaushal Shah via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8021
Experimental and Reserved sub-TLVs from [RFC 3630]

From me: use consistent whitespace

svn path=/trunk/; revision=47155
2013-01-18 22:04:15 +00:00
Evan Huus 21b5dc0107 Make the buffer argument to FvalueToStringRepr functions volatile
and use that to fix a -Wclobbered error that bleeding-edge GCC throws
on tvbuff types.

Also remove a variable that looked like it was being used to hide the error
before GCC got clever.

svn path=/trunk/; revision=47153
2013-01-18 19:27:31 +00:00
Alexis La Goutte 02bc1028b5 Replace tvb_get_ipv4 / ip_to_str ... by tvb_ip_to_str
svn path=/trunk/; revision=47150
2013-01-18 15:52:15 +00:00
Alexis La Goutte 46452171c9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47149
2013-01-18 15:52:05 +00:00
Alexis La Goutte b4cdfdc5f1 Enhance MRCPv2 dissector * Fix indent (Tab => 4 Spaces) and add Modelines info * Replace by string_string * Replace if else if... by switch()
svn path=/trunk/; revision=47146
2013-01-18 15:51:33 +00:00
Anders Broman 39b51c7c07 Dissect 3GPP PCO option.
svn path=/trunk/; revision=47145
2013-01-18 09:49:22 +00:00
Gerald Combs ae7ee61e84 Rename the "saved_val" preference element to "stashed_val" in order to
more clearly indicate that it's a copy of a preference value rather than
something we've saved in the preferences file. Update
prefs_pref_to_str() to handle default, stashed, and current prefs.

Create ui/preference_utils.[ch] and move some common routines there. Use
prefs_pref_type_name() in the GTK+ preferences dialog.

Make the "OK" button in the Qt preferences dialog work. We simply write
the prefs and redissect on "OK" and do nothing on "Cancel". This is
intentionally different from the Apply/OK/Cancel behavior in the GTK+
version.

Add a general "emitAppSignal" method to wsApp and use it for packet
dissection and preference changes.

Suggest that we might want to create a WsString class to make conversion
between QStrings, gchar *s, and GStrings easier.

svn path=/trunk/; revision=47139
2013-01-18 00:50:14 +00:00
Jaap Keuter d97b358e64 Fix for bug 8212.
Disable speed optimization which otherwise cause dissector asserts due to 
appending text and setting lengths.

svn path=/trunk/; revision=47136
2013-01-17 22:06:22 +00:00
Anders Broman c6f702432e Register in the UDP heuristic table rather than the internal one.
svn path=/trunk/; revision=47133
2013-01-17 16:10:22 +00:00
Pascal Quantin 71dd7c2fe4 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8227 :
Electromagnetic Emission Parser parses field Event Id as Entity Id

svn path=/trunk/; revision=47132
2013-01-17 13:20:45 +00:00
Evan Huus bff31de434 Add modelines
svn path=/trunk/; revision=47130
2013-01-17 03:37:41 +00:00
Pascal Quantin 4bceaa501a Remove forbidden C++ style comments
svn path=/trunk/; revision=47127
2013-01-16 22:38:42 +00:00
Martin Kaiser 530de5ae97 no need for if (tree)
svn path=/trunk/; revision=47125
2013-01-16 21:57:34 +00:00
Martin Kaiser 6ba6ea6533 don't attempt reassembly if more than 1000 consecutive fragments are
missing

this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8222

svn path=/trunk/; revision=47123
2013-01-16 21:51:16 +00:00
Pascal Quantin e7d64a962f From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8215 :
Several ERF types are incorrectly calling downstream dissectors under the erf_tree instead of under the top level tree

svn path=/trunk/; revision=47122
2013-01-16 21:47:28 +00:00
Evan Huus 72a00dc259 Add a cast to shut up MSVC.
svn path=/trunk/; revision=47120
2013-01-16 18:33:34 +00:00