Commit graph

44599 commits

Author SHA1 Message Date
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
Gerald Combs
8f62d93328 Add layouts.h
svn path=/trunk/; revision=47166
2013-01-19 17:17:01 +00:00
Bill Meier
3026b7c324 Add a rule to create layouts.h (using gdk-pixbuf-csource
in a similar manner as done in Makefile.am)

(On my Windows 7 system gdk-pixbuf-csource gives an error
message about "...Couldn't recognize the image file format...".
Let's see what happens in the Windows buildbots).

svn path=/trunk/; revision=47165
2013-01-19 16:39:28 +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
179016c9cb There is no wireless layout.
svn path=/trunk/; revision=47161
2013-01-19 13:01:00 +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
3d280a8c95 Replace more XPMs with PNGs.
svn path=/trunk/; revision=47159
2013-01-19 05:48:43 +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
Guy Harris
971059b7f1 Add an RCS ID to the generated dissector.
Wireshark always expects there to be a config.h, so don't test
HAVE_CONFIG_H any more.

svn path=/trunk/; revision=47156
2013-01-18 22:14:07 +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
Bill Meier
2dda8659ef Fix two issues related to conversion to use ws_gtk_grid...() [svn #47002].
svn path=/trunk/; revision=47154
2013-01-18 20:55:11 +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
Gerald Combs
6b3308d113 Use CMAKE_VERSION for the Info.plist comment.
svn path=/trunk/; revision=47152
2013-01-18 16:05:29 +00:00
Alexis La Goutte
0e711d5a04 Remove epan/packet-ncp2222.c from .gitignore
svn path=/trunk/; revision=47151
2013-01-18 15:52:23 +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
46049a8747 Fix indent for Documentation (Tab => Spaces)
svn path=/trunk/; revision=47148
2013-01-18 15:51:54 +00:00
Alexis La Goutte
fdb281b2c3 Happy New Year also for Documentation
Also add -I option of TShark & dumpcap and the default capture type for editcap is now pcapng

svn path=/trunk/; revision=47147
2013-01-18 15:51:43 +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
Jaap Keuter
9d41364811 Replace SESSIONNAME with the use of an API call, just as in the code.
svn path=/trunk/; revision=47144
2013-01-18 06:22:01 +00:00
Gerald Combs
a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
svn path=/trunk/; revision=47143
2013-01-18 01:37:27 +00:00
Gerald Combs
5efca1b8e1 Add more AirPcap code, disabled for now.
svn path=/trunk/; revision=47142
2013-01-18 01:36:37 +00:00
Gerald Combs
36884ea203 Don't call prefs_airpcap_update() for now. Remove some debugging code.
svn path=/trunk/; revision=47141
2013-01-18 01:08:44 +00:00
Gerald Combs
7f70a5e438 Fix compilation on Windows.
svn path=/trunk/; revision=47140
2013-01-18 00:59:47 +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
Bill Meier
7a9095ee15 Minor cleanup:
- Whitespace;
  - Long lines.

svn path=/trunk/; revision=47138
2013-01-17 22:38:51 +00:00
Bill Meier
26f1bad60c General cleanup:
Indentation: Use 4 spaces;
  parens;
  unneeded initializers;
  whitespace.

svn path=/trunk/; revision=47137
2013-01-17 22:26:37 +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
Bill Meier
e19db35fab Use gtk_box_pack_start() instead of gtk_container_add()
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
 the same.

Also: Add an XXX comment:
        "progess" rendering doesn't seem to work for Gtk3 ??


svn path=/trunk/; revision=47135
2013-01-17 21:34:23 +00:00
Bill Meier
f06b4b62bf Use gtk_box_pack_start() instead of gtk_container_add()
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
 the same.

Also: Add an XXX comment:
        "progess" rendering doesn't seem to work for Gtk3 ??

svn path=/trunk/; revision=47134
2013-01-17 20:56:13 +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
Anders Broman
402906be13 Opening the capture options triggers a rescan of all the packets caused by the call to update_decryption_mode_list() for airpcap.
If we don't get the airpcap_if_list, don't do anything regarding air_pcap.

update_decryption_mode_list() should probably check if a change is taking place before rescaning all packets.

svn path=/trunk/; revision=47131
2013-01-17 12:21:57 +00:00
Evan Huus
bff31de434 Add modelines
svn path=/trunk/; revision=47130
2013-01-17 03:37:41 +00:00
Bill Meier
88c3c64b0a Fix Gtk3 window resize behavior to match Gtk2.
Specifically: use gtk_box_pack_start() instead
 of gtk_container_add() in a number of places.

Also: do some whitespace cleanup.

svn path=/trunk/; revision=47129
2013-01-16 23:18:53 +00:00
Bill Meier
f0f5583ce4 Remove redundant call to gtk_box_set_child_packing().
svn path=/trunk/; revision=47128
2013-01-16 22:43:58 +00:00
Pascal Quantin
4bceaa501a Remove forbidden C++ style comments
svn path=/trunk/; revision=47127
2013-01-16 22:38:42 +00:00
Bill Meier
c90956edb4 General cleanup: whitespace, parens & etc.
svn path=/trunk/; revision=47126
2013-01-16 22:32:29 +00:00
Martin Kaiser
530de5ae97 no need for if (tree)
svn path=/trunk/; revision=47125
2013-01-16 21:57:34 +00:00
Bill Meier
8d41249753 Use gdk_cairo_set_source_rgba() and GdkRGBA.
svn path=/trunk/; revision=47124
2013-01-16 21:51:20 +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