Commit graph

20294 commits

Author SHA1 Message Date
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
Evan Huus
3a64f93a00 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8185
Support for Underwater Acoustic PDUs in packet-dis.c

svn path=/trunk/; revision=47119
2013-01-16 17:27:03 +00:00
Evan Huus
e49285b9e4 Null the finfo pointer after we free it. Reduces (but does not completely fix)
the errors from bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

svn path=/trunk/; revision=47114
2013-01-16 14:14:05 +00:00
Michael Mann
52699bd342 Bugfix version number in EtherIP dissector + general cleanup. Bug 8211 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8211)
#BACKPORT

svn path=/trunk/; revision=47112
2013-01-16 13:27:23 +00:00
Jeff Morriss
99ce4232cb As suggested in comments in sl_alloc() and sl_free(): add a new environment
variable (WIRESHARK_DEBUG_USE_SLICES) which turns off the slab allocator and uses
g_slices instead (which can themselves be turned off by setting
G_SLICE=always-malloc).

This makes debugging problems in slab-allocated memory easier to find
(hopefully including https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 ).


Set WIRESHARK_DEBUG_USE_SLICES when running Valgrind on *shark.


Remove unused structure member: emem_chunk_t.org.

svn path=/trunk/; revision=47110
2013-01-16 03:34:29 +00:00
Evan Huus
b1ac6585bc Don't run past the end of a fragment array, either in the loop or by putting a
useless sentinel in.

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

svn path=/trunk/; revision=47098
2013-01-15 16:51:55 +00:00
Jeff Morriss
1a93ee3345 Based on http://ask.wireshark.org/questions/17661/tcap-decoding-bug :
Register the Camel dissector for SSN 146 instead of (GSM MAP's) SSN 6-9.
Looks like the 6-9 list was a carryover from when this dissector was created
based on the GSM MAP dissector.

svn path=/trunk/; revision=47097
2013-01-15 16:44:02 +00:00
Martin Kaiser
e00af44a36 extend the iso7816 dissector
link request apdus to response apdus
dissect parameters p1 and p2 for some messages

svn path=/trunk/; revision=47096
2013-01-15 16:41:03 +00:00
Evan Huus
5a74d61822 Add modelines.
svn path=/trunk/; revision=47095
2013-01-15 16:37:29 +00:00
Evan Huus
e963cec25c Add missing header #include as the slab is part of the API even if nobody
outside wmem itself uses it yet.

svn path=/trunk/; revision=47094
2013-01-15 16:27:17 +00:00
Evan Huus
b0a0372cff Use the block allocator for wmem's file-scope by default.
svn path=/trunk/; revision=47093
2013-01-15 16:25:24 +00:00
Gerald Combs
b0ef1a67ed strcmp → g_strcmp0. Fixes a crash on Windows.
svn path=/trunk/; revision=47085
2013-01-14 23:23:50 +00:00
Evan Huus
e4f46ce55f Take a wild guess at what might be causing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

It can't hurt, in any case.

svn path=/trunk/; revision=47084
2013-01-14 22:29:23 +00:00
Gerald Combs
b82f42d8cf When the user is editing text or selecting from a combo box, don't
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.

Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.

svn path=/trunk/; revision=47083
2013-01-14 22:21:11 +00:00
Gerald Combs
6be760c512 Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.
svn path=/trunk/; revision=47078
2013-01-14 20:05:24 +00:00
Chris Maynard
ad78db491a Fix Coverity CID 732304: Missing break in switch.
svn path=/trunk/; revision=47077
2013-01-14 19:23:26 +00:00