ce81449ed9
packet dissection now takes pointer to tvb instead of guint8 data
...
implement frame_tvbuff, right now almost a copy of 'real' tvb.
svn path=/trunk/; revision=50497
2013-07-11 05:47:02 +00:00
40a66a273c
Fix bug #8908 : Strange behavior of tree expand/collapse in packet details
...
Only expand subtree when parent was also expanded
svn path=/trunk/; revision=50479
2013-07-10 01:50:27 +00:00
678913dd09
Avoid having double "Default" entry in "Create New Profile".
...
#BACKPORT 1.10
svn path=/trunk/; revision=50471
2013-07-09 19:00:11 +00:00
e8fed416a2
Another change that should have been part of r50465, which removed the limits to the number of characters in the display filter(s). [Technically, there is still the inherent 65535 limit.]
...
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=50469
2013-07-09 18:01:44 +00:00
9c9864976f
Use sizeof() instead of hard-coded values. Other minor whitespace cleanup.
...
svn path=/trunk/; revision=50466
2013-07-09 16:58:07 +00:00
dacf47c217
Remove the advanced filter field arbitrary text limit of 100 and remove the filter field arbitrary text limit of 256.
...
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8909
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=50465
2013-07-09 16:44:47 +00:00
bbf7636e61
From Cal Turney:
...
Wireshark crashes when switching from a v1.11.0 profile to a v1.4.6 prof and then to a v1.5.1 profile.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8884
#BACKPORT 1.10
svn path=/trunk/; revision=50455
2013-07-09 04:22:43 +00:00
59644b3899
New Qt feature: Show related packet list items in the frame number
...
column. Conversation spans (setup frame to last frame) are shown with a
square bracket. Linked frames are shown with a circle.
Use correct column justifications in Qt. Move common
justification-related packet list code to ui/packet_list_utils.[ch].
Add a last_frame element to conversation_t.
svn path=/trunk/; revision=50447
2013-07-08 16:54:18 +00:00
36d3734dcb
From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8906 :
...
This patch augments Wireshark's and tshark's augument usage reports (-? and
-t?) and the Wireshark and tshark man pages to list all available timestamp
options available for the -t option.
svn path=/trunk/; revision=50445
2013-07-08 16:25:13 +00:00
792f35a28c
Make tree_is_expanded array static, add setter/getter function.
...
svn path=/trunk/; revision=50433
2013-07-07 16:33:49 +00:00
218608f1a2
Count SDUs even when dumping only the MAC header
...
svn path=/trunk/; revision=50420
2013-07-06 21:07:42 +00:00
88ae57458f
Attachment #11134 proposed as fix for bug #8899 by Peter Hatina
...
svn path=/trunk/; revision=50341
2013-07-03 14:12:44 +00:00
ff8842c865
Fix Coverity CID 1037114 (Dereference before null check).
...
svn path=/trunk/; revision=50298
2013-07-01 15:20:02 +00:00
43442af8e3
Define certain 'const char *...' arrays as static.
...
(That is: Don't create the array on the stack each time
the function is called).
Reduces code memory usage and execution time.
(See SVN #50271 )
svn path=/trunk/; revision=50295
2013-07-01 14:32:08 +00:00
f426c3cd45
Consistently maintain the callState member of an iax2_info_t structure
...
as a voip_call_state value; don't have it sometimes a voip_call_state
and sometimes a frame subtype.
This should squelch some complaints from newer versions of Clang about
unnecessary array-bounds checks - the array-bounds checks are done on
frame subtypes, where they *are* necessary (nothing prevents an
untrustworthy IAX2 implementation or an untrustworthy capture file
writer from putting an arbitrary value in the packets), not on
voip_call_state values (where it was only necessary because the value
wasn't, in that case, a voip_call_state value, it was a frame subtype
cast to a voip_call_state).
svn path=/trunk/; revision=50277
2013-07-01 02:51:48 +00:00
397ab1dbb7
Fix indent (Tabs => Spaces) and add modelines info for follow_* files
...
svn path=/trunk/; revision=50245
2013-06-29 22:01:01 +00:00
b5187b496b
Use newly assigned DLT for PDU export functionality
...
svn path=/trunk/; revision=50212
2013-06-28 13:05:12 +00:00
277aed869e
Make colors used by colorize_filter_te_as_* as preferences. Bug 5413 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5413 )
...
svn path=/trunk/; revision=50203
2013-06-28 03:03:36 +00:00
16fc2c5998
Remove a no-longer-used variable.
...
svn path=/trunk/; revision=50194
2013-06-27 18:44:11 +00:00
7f5d688bda
Windows changes for main_window_update ....
...
svn path=/trunk/; revision=50192
2013-06-27 17:45:07 +00:00
1895c1c5a0
cleanup, use packet_list_iter_nth_child() in another place.
...
svn path=/trunk/; revision=50189
2013-06-27 17:12:23 +00:00
0bdc0efc46
get main_window_update out of the way... pass an update_cb to the capture_sync stuff
...
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!
I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.
svn path=/trunk/; revision=50188
2013-06-27 17:10:50 +00:00
97d59088b0
#gtk #packet-list simplify, use gtk_tree_view_column_add_attribute() for text attribute.
...
svn path=/trunk/; revision=50176
2013-06-26 22:03:57 +00:00
0426c05d49
packet-editor: Allow focus for byteview, it should fix problems with field hexeditor not getting key-press-event.
...
Generally it should be also safe for builds without packet-editor, just in case ifdef it.
svn path=/trunk/; revision=50172
2013-06-26 17:15:25 +00:00
500d399393
Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
...
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
bbf6a3766e
Move tempfile.{h,c} into wsutil.
...
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
74dc568ef1
As pointed out by Guy: timestats uses packet_info so it belongs in epan
...
not wsutil.
svn path=/trunk/; revision=50159
2013-06-26 00:18:44 +00:00
a441793cba
Move a couple of time-related modules into wsutil.
...
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.
svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
847fbeefdb
Fix build with packet editor enabled. (Fix a typo while we're at it.)
...
svn path=/trunk/; revision=50153
2013-06-25 21:45:56 +00:00
f0c9b34b55
Allocate memory for col_text[_len] when really needed
...
remove columnized bit, now the same can be done with col_text.
svn path=/trunk/; revision=50144
2013-06-25 18:27:31 +00:00
f56d9b49b3
packet_list_iter_children() simplify, just call packet_list_iter_nth_child(..., 0)
...
svn path=/trunk/; revision=50143
2013-06-25 18:07:33 +00:00
ca99b7a50a
Cast away another implicit conversion not allowed in C++ warning
...
svn path=/trunk/; revision=50109
2013-06-21 22:37:40 +00:00
eb0d10c9d2
Sort the man pages. Add capinfos and reordercap. Should we also any others (i.e., asn2deb, dftest, idl2deb, idl2wrs, randpkt)?
...
svn path=/trunk/; revision=50107
2013-06-21 15:30:08 +00:00
50bc11bc14
One more fix for the protocol grey highlighting.
...
svn path=/trunk/; revision=50100
2013-06-21 00:49:35 +00:00
2bd2bfb416
Yet another fix, put spaces in insensitive or normal state.
...
svn path=/trunk/; revision=50099
2013-06-21 00:42:19 +00:00
135ecc1d88
fix for r50095 don't fetch parent hfinfo, traverse tree to get top one.
...
svn path=/trunk/; revision=50098
2013-06-21 00:23:55 +00:00
1b69a2b3c8
Highlight protocol bytes in grey, idea stolen from qtshark
...
svn path=/trunk/; revision=50095
2013-06-20 23:28:35 +00:00
2dab2c8102
Fix file_import_dlg.c:132: warning: useless storage class specifier in empty
...
declaration
I guess anonymous enums can't be static?
svn path=/trunk/; revision=50079
2013-06-20 16:44:46 +00:00
9229a5eeb3
Sort the list of encapsulation types, but still have Ethernet be the default.
...
svn path=/trunk/; revision=50077
2013-06-20 16:40:46 +00:00
88a4c49bf7
update the button in the status bar when a packet comment is added
...
(this is a quick fix, the case when the last comment is removed
is still not handled correctly)
svn path=/trunk/; revision=50069
2013-06-19 23:37:38 +00:00
8411a601df
Implement bug 8675: show stream id in follow TCP stream window.
...
svn path=/trunk/; revision=50067
2013-06-19 23:27:12 +00:00
21a682ea24
Fix for bug 6090. Clear the list store when resetting the dialog.
...
svn path=/trunk/; revision=50064
2013-06-19 22:57:39 +00:00
3369a97da7
If the user turns off printing of the packet summary line, disable the column headings checkbox; otherwise, enable it.
...
svn path=/trunk/; revision=50053
2013-06-19 19:16:35 +00:00
f655e90d8b
Remove col_headings_cb from print_cmd_toggle_detail() altogether. It's not needed since if summary isn't printed, neither are column headings anyway.
...
svn path=/trunk/; revision=50051
2013-06-19 18:44:42 +00:00
50da1aacf9
Try and keep r50047 and still fix
...
print_dlg.c:916: warning: value computed is not used
svn path=/trunk/; revision=50050
2013-06-19 18:38:52 +00:00
95a68da158
Fix for
...
Building C object ui/gtk/CMakeFiles/gtkui.dir/print_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c: In function ‘print_cmd_toggle_detail’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c:910:38: error: variable ‘col_headings_cb’ set but not used [-Werror=unused-but-set-variable]
GtkWidget *print_bt, *summary_cb, *col_headings_cb, *details_cb;
^
cc1: all warnings being treated as errors
No idea wether the fix is correct. Compile tested only.
svn path=/trunk/; revision=50047
2013-06-19 18:30:04 +00:00
909d2eb309
Allow for column headers not to be printed in order to make it possible to export packets as plain text in a format that could then have a chance of being imported again (assuming other factors such as packet bytes were printed, etc.) in order to recover the original pcap file.
...
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1636
svn path=/trunk/; revision=50036
2013-06-19 15:22:56 +00:00
d09ffee44e
Add ability to export decrypted IPsec PDUs
...
svn path=/trunk/; revision=50022
2013-06-18 23:01:46 +00:00
860b920383
Make the B->A graph label show as A<-B to be consistent with the column
...
heading.
svn path=/trunk/; revision=49954
2013-06-16 02:35:51 +00:00
8c9edf1280
Have the seek-read routines take a Buffer rather than a guint8 pointer
...
as the "where to put the packet data" argument.
This lets more of the libwiretap code be common between the read and
seek-read code paths, and also allows for more flexibility in the "fill
in the data" path - we can expand the buffer as needed in both cases.
svn path=/trunk/; revision=49949
2013-06-16 00:20:00 +00:00
14b65f91a4
Ensure that Wireshark isn't obscured by the system taskbar or by any other desktop toolbars. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3034
...
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=49937
2013-06-14 17:47:54 +00:00
51b02ed94d
From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8793 :
...
Fix crash if you cancel the Flow Graph window while the Graph Analysis window
is still open: close the Graph Analysis window when the user cancels the Flow
Graph window.
From me: do the same thing for the window-delete case.
svn path=/trunk/; revision=49908
2013-06-12 15:50:37 +00:00
0b8d569887
If, after editing the settings for a particular interface, we don't have
...
a Capture Options window to update, don't try to update it.
#BACKPORT
svn path=/trunk/; revision=49850
2013-06-09 00:24:28 +00:00
a12ee2e673
Fix 'Misaligned columns in hex dump pane' [1]
...
Old code was broken for all pango version < 1.20
[1] http://www.wireshark.org/lists/wireshark-dev/201306/msg00015.html
svn path=/trunk/; revision=49848
2013-06-08 18:57:49 +00:00
e4893f0448
Ensure we only put private profiles directly in the profiles menu and
...
put global profiles in the "New from Global" menu.
svn path=/trunk/; revision=49830
2013-06-07 06:53:24 +00:00
a4d78ca253
From report of IgorVK via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8736 Crash analyzing VoIP Calls
...
Wireshark crashes when analyzing Telephony->VoIP Calls from the pcap file attached.
From me :
Some packets is detect to be T38 and ->stop_fd is not initialize
#Backport 1.10 and 1.8
svn path=/trunk/; revision=49804
2013-06-06 16:00:23 +00:00
b4414c61d9
As of r49659, StatisticsMenu is now just Statistics.
...
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8770
svn path=/trunk/; revision=49788
2013-06-05 16:42:22 +00:00
27872a9324
Apply the same tooltip for the text entry as for the updated label tooltip in r49726, but with a typo fix: "thefield" -> "the field".
...
svn path=/trunk/; revision=49727
2013-06-03 20:34:50 +00:00
a0823d82c9
Custom columns are specified using display filter field names, not
...
display filters.
svn path=/trunk/; revision=49726
2013-06-03 20:01:15 +00:00
00ea06430a
Implement PARAM_UINT as a spin button with a range of 0 to G_MAXUINT.
...
svn path=/trunk/; revision=49669
2013-06-01 01:23:59 +00:00
a8e7b7ccfe
Neither gtk_mac_lte_stat_init() nor gtk_rlc_lte_stat_init() are referred
...
to outside the files that define them; make them static.
svn path=/trunk/; revision=49664
2013-05-31 23:07:51 +00:00
6c4ceb643b
The SIP and WSP statistics taps register themselves; get rid of their
...
hardcoded menu items.
svn path=/trunk/; revision=49663
2013-05-31 23:05:40 +00:00
e8947ae24d
Add a REGISTER_STAT_GROUP_TELEPHONY_SCTP, make the SCTP chunk counter
...
register itself in that group, and get rid of its hardcoded menu item.
Also, as the H.225 counter is registering itself, get rid of its
hardcoded menu item.
svn path=/trunk/; revision=49662
2013-05-31 23:00:39 +00:00
cfebdcd2f5
The BOOTP/DHCP statistics tap registers itself; get rid of the explicit
...
menu item for it.
svn path=/trunk/; revision=49660
2013-05-31 22:10:43 +00:00
a24a4db3f8
Consistently use "/Statistics", rather than "/StatisticsMenu", in action
...
names, to avoid confusion. (Action names are not, in fact, paths; we're
just using path syntax for them as a convention.)
svn path=/trunk/; revision=49659
2013-05-31 22:07:11 +00:00
c7bd9ae115
Add a REGISTER_STAT_GROUP_TELEPHONY_LTE for the Telephony/LTE menu, and
...
use it o register the MAC and RLC statistics dialogues. Get rid of the
explicit menu items for them, as they now show up in the menu as a
result of the tap registering itself.
svn path=/trunk/; revision=49658
2013-05-31 21:57:15 +00:00
6974bcecb1
Don't call gtk_widget_unregister_window() in bytes_view_unrealize() after GTK+ 3.8.0
...
to prevent double invocation causing crash.
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8604 .
The patch is from Jakub Zawadzki.
svn path=/trunk/; revision=49655
2013-05-31 20:57:07 +00:00
15894ac4dd
Use #ifdefs in the XML to include or exclude the packet-editor and
...
capture menu items, rather than hiding them at run time.
For the capture menu items, translate the GtkAction callback calling
sequence to the normal widget callback calling sequence with individual
routines for each action, rather than a generic translator.
svn path=/trunk/; revision=49649
2013-05-31 07:06:10 +00:00
eb8217a371
IOSTAT: plot LOAD y-axis in number of I/O not number of I/O times 1000
...
svn path=/trunk/; revision=49647
2013-05-31 02:14:19 +00:00
ecf32a1e7a
Put back some conversation list and endpoint list statistics presumably
...
lost in the conversion to GTKUiManager.
svn path=/trunk/; revision=49642
2013-05-30 22:40:31 +00:00
d34f9683b0
Add a stat group REGISTER_STAT_GROUP_TELEPHONY_GSM for the Telephony/GSM
...
statistics menu.
Have the CAMEL counter register itself in that menu, rather than having
main_menubar.c create the menu item for it.
svn path=/trunk/; revision=49641
2013-05-30 22:32:10 +00:00
c7501cbf67
Use gtk_widget_register_window() and gtk_widget_unregister_window()
...
instead of deprecated gdk_window_set_user_data() for GTK+ 3 >= 3.8
svn path=/trunk/; revision=49633
2013-05-30 16:42:32 +00:00
d98b0cc231
Fix and clarify name resolution preference tooltips. Print the
...
description before the name+type since that's presumably what people
are looking for.
svn path=/trunk/; revision=49622
2013-05-29 18:01:03 +00:00
f57fbb614f
Bugfix crash when 'SCTP' -> 'Prepare Filter for this Association' has no associations. Bug 8731 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8731 )
...
Dialog (wants to) pop up noting no associations, but sctp_set_filter() wants to press on assuming there is an association. Added NULL check to prevent assumption.
svn path=/trunk/; revision=49610
2013-05-29 13:50:45 +00:00
a8023c97a3
Menu labels aren't paths, they're just the strings shown to the user for
...
the menu item.
svn path=/trunk/; revision=49572
2013-05-25 02:37:51 +00:00
3598d9e2ac
Have register_param_stat() add menu items, rather than having the menu
...
items hardcoded into ui/gtk/main_menubar.c
Get rid of more stuff implying that the code for adding menu items is
used only by Lua, as it's also used by register_param_stat().
Add the items to the menu list sorted by the menu item name shown to the
user.
Get rid of some const declarations that are lies.
Use the label given for a menu item as the label in the menu, rather
than parsing it from a token.
svn path=/trunk/; revision=49552
2013-05-24 03:10:56 +00:00
4caa94335d
And another (cosmetic) change for that.
...
svn path=/trunk/; revision=49550
2013-05-24 01:11:07 +00:00
699f06760c
A long-overdue rename of register_dfilter_stat() to
...
register_param_stat() to reflect that it's for arbitrary statistics tap
parameters, not just a display filter.
svn path=/trunk/; revision=49549
2013-05-24 01:10:16 +00:00
3c41347f67
Rename register_lua_menu_bar_menu_items() to
...
register_menu_bar_menu_items(), to emphasize that it's not just for Lua.
svn path=/trunk/; revision=49548
2013-05-24 01:05:39 +00:00
dcdfc836c2
We don't want to restrict the ability to dynamically add statistics
...
menus to Lua taps.
svn path=/trunk/; revision=49547
2013-05-23 23:32:20 +00:00
6613d28818
Use a single #ifdef HAVE_LUA/#endif for two routines (currently) used
...
only from the Lua code.
svn path=/trunk/; revision=49544
2013-05-23 03:26:22 +00:00
14147099ea
Include ui/gtk/export_pdu_dlg.h so that the functions defined here are
...
checked against their declarations.
svn path=/trunk/; revision=49540
2013-05-23 01:07:51 +00:00
82554ebb52
make_menu_xml() is only used if we HAVE_LUA; only define it when we'll use it.
...
svn path=/trunk/; revision=49539
2013-05-23 00:33:33 +00:00
9c6cae4bde
Include ui/gtk/addr_resolution_dlg.h so that functions defined here are
...
checked against their declarations.
Fix a tpo.
svn path=/trunk/; revision=49536
2013-05-22 23:28:11 +00:00
845728e520
Make a routine not used outside this file static.
...
svn path=/trunk/; revision=49535
2013-05-22 23:25:17 +00:00
fe233df490
Include ui/gtk/prefs_filter_expressions.h so that functions defined here
...
are checked against their declarations.
svn path=/trunk/; revision=49534
2013-05-22 23:22:35 +00:00
1fe073a93b
Make a routine not used outside this file static.
...
svn path=/trunk/; revision=49533
2013-05-22 23:20:35 +00:00
b213dcc584
Make a routine not used outside this file static.
...
svn path=/trunk/; revision=49532
2013-05-22 23:16:54 +00:00
f053368a0d
Include ui/recent_utils.h, to check functions defined here against their
...
declarations - and fix a problem that turned up.
svn path=/trunk/; revision=49531
2013-05-22 23:14:44 +00:00
70bb111bab
Turn "packet_is_ssl()" into a general "does the packet whose dissection
...
is in this epan_dissect_t contain the field whose name is passed as an
argument" routine in libwireshark, and use it where we used
packet_is_ssl(). (We should check to see if anything *else* could use
it.)
svn path=/trunk/; revision=49530
2013-05-22 23:02:19 +00:00
3384fee177
Include ui/gtk/main_80211_toolbar.h so that the functions we define are
...
checked against their declarations in that file.
svn path=/trunk/; revision=49529
2013-05-22 22:43:07 +00:00
5a56506cf5
Include "ui/recent_utils.h" so that the functions we define are checked
...
against the declarations for them.
svn path=/trunk/; revision=49528
2013-05-22 22:39:05 +00:00
f35b5919a7
Include "ui/gtk/gtk_iface_monitor.h" so that our definitions are checked
...
against the published declarations.
svn path=/trunk/; revision=49527
2013-05-22 22:34:27 +00:00
05c9234020
Make routines not used outside their source files static.
...
svn path=/trunk/; revision=49522
2013-05-22 20:23:10 +00:00
eb56f6fb96
Get rid of an unused routine.
...
svn path=/trunk/; revision=49521
2013-05-22 20:22:40 +00:00
107fa2d599
Sigh, it was a "building without libpcap" issue.
...
svn path=/trunk/; revision=49507
2013-05-22 10:21:52 +00:00
9277023cce
OK, try hiding from *THIS*, GCC. Will break other buildbots, but the
...
code prior to this built on other buildbots *and* on my 10.6 VM, so I
don't know what the GCC on the buildbots is getting wrong....
svn path=/trunk/; revision=49505
2013-05-22 09:59:58 +00:00
f096a1e57a
OK, try directly including capture_session.h.
...
svn path=/trunk/; revision=49502
2013-05-22 09:05:35 +00:00
575dc6d110
OK, what's your beef, GCC?
...
svn path=/trunk/; revision=49500
2013-05-22 08:48:26 +00:00
8596d17d7f
Pull the capture-session state information out of capture_opts and put
...
it into a separate capture_session structure. capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).
svn path=/trunk/; revision=49493
2013-05-22 07:44:28 +00:00
Jakub Zawadzki