osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
33361 commits 23 branches 0 tags 1.3 GiB
Commit graph

5013 commits

Author SHA1 Message Date
Guy Harris
708e2d905b Fix build. 
svn path=/trunk/; revision=34456
 2010-10-10 19:42:30 +00:00
Anders Broman
45371fce82 - Fix more callbacks. 
When using the GUImanager the callback signature is (GtkAction *action , gpointer user_data) which causes problems when retreiveing
object data stored with the widget such as the filter box widget.

Work around that problem by doing
	filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
	filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
in the follow_udp/tcp/ssl_stream.

svn path=/trunk/; revision=34455
 2010-10-10 19:33:42 +00:00
Guy Harris
f9371b0e0b It's now "change column", not just "rename column"; fix build. 
Clean up indentation.

svn path=/trunk/; revision=34454
 2010-10-10 19:05:04 +00:00
Anders Broman
dc03d627d7 Fix up a number of callbacks. 
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5288
requires abit of reworking of the callbacks or a different aproach to setting object data.

svn path=/trunk/; revision=34453
 2010-10-10 18:10:33 +00:00
Stig Bjørlykke
7bb2c88475 Fix menu entry. 
svn path=/trunk/; revision=34447
 2010-10-09 18:41:46 +00:00
Stig Bjørlykke
2ed80dc7ba Fix menu entries. 
svn path=/trunk/; revision=34446
 2010-10-09 18:38:25 +00:00
Stig Bjørlykke
4ce3021a07 Prefix window title with "Wireshark". 
svn path=/trunk/; revision=34445
 2010-10-09 18:37:31 +00:00
Stig Bjørlykke
ccfe41300c Added "Edit Column Details" functions to the packet list heading popup. 
Removed "Rename Column Title" as this is moved to "Edit Column Details".

svn path=/trunk/; revision=34444
 2010-10-09 15:22:53 +00:00
Stig Bjørlykke
20cdf3194c From Alexander Koeppe via bug 5287: 
Correct order of Window Scaling Graph in Graph control box.

svn path=/trunk/; revision=34443
 2010-10-09 11:37:57 +00:00
Stig Bjørlykke
06a60e48c3 Show custom column occurrence in the packet list heading tooltips. 
svn path=/trunk/; revision=34434
 2010-10-08 11:08:36 +00:00
Anders Broman
0135435c0f Get rid of an GUI artifact if the recent list is empty. 
svn path=/trunk/; revision=34431
 2010-10-08 06:05:06 +00:00
Guy Harris
a9e7cb04cc Make some routines unused outside gtk/menus.c static. 
svn path=/trunk/; revision=34430
 2010-10-08 03:09:15 +00:00
Guy Harris
e6894e3175 Fix a routine name - that menu item has nothing to do with colorization. 
svn path=/trunk/; revision=34429
 2010-10-08 03:00:54 +00:00
Guy Harris
cf6b73afed Clean up white space. 
set_menu_object_data_meat_old() is only used with main_menu_factory;
simplify it.

Add some comments to #else's and #endif's.

svn path=/trunk/; revision=34428
 2010-10-08 02:38:47 +00:00
Guy Harris
186ad7c299 set_menu_sensitivity_old() is now only used for the main menu; simplify 
it accordingly.

svn path=/trunk/; revision=34427
 2010-10-08 02:17:37 +00:00
Guy Harris
d4c3cbea6d Move a comment next to the only item to which it now refers. 
svn path=/trunk/; revision=34425
 2010-10-08 01:38:12 +00:00
Guy Harris
1e2d185461 Clean up white space. 
svn path=/trunk/; revision=34423
 2010-10-08 01:31:47 +00:00
Guy Harris
bb5e9d6d01 Move menu_items[] inside the #ifdef MAIN_MENU_USE_UIMANAGER/#else/#endif 
that has the main menu stuff for when we *are* using GTKUIManager.

svn path=/trunk/; revision=34422
 2010-10-08 01:22:54 +00:00
Guy Harris
832f622237 Use #error to cause the build to fail for un-implemented stuff (such as 
"GTKUIManager with the old packet list").

Replicate the "don't do silly stuff such as using Control+A for anything
other than Select All" comment near the place where the main menu is
defined if we're using GTKUIManager.

svn path=/trunk/; revision=34419
 2010-10-08 00:33:38 +00:00
Anders Broman
a7c4d6ea06 Reinsert #ifdef's removed by mistake. 
svn path=/trunk/; revision=34404
 2010-10-07 15:58:10 +00:00
Anders Broman
914a6d47d7 Remove #ifdef'ed code for MENUS_USE_UIMANAGER. 
svn path=/trunk/; revision=34403
 2010-10-07 15:23:45 +00:00
Martin Mathieson
62e6b6aceb Add more CRC failure codes. 
svn path=/trunk/; revision=34401
 2010-10-07 14:44:00 +00:00
Anders Broman
3e39a7382f From Alexander Koeppe: 
New TCP Graph - Window Scaling.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5276

svn path=/trunk/; revision=34393
 2010-10-06 05:48:01 +00:00
Jeff Morriss
5af01ed393 Add (a copy of) glib's g_strv_length() if we have glib < 2.6 
svn path=/trunk/; revision=34380
 2010-10-05 13:28:57 +00:00
Stig Bjørlykke
fb0621683d Split some texts on the welcome page to make "Interface List" and 
"Capture Help" smaller to make room for longer filenames in the
Open Recent list.

svn path=/trunk/; revision=34379
 2010-10-05 06:59:11 +00:00
Stig Bjørlykke
738c0ace24 From Jose Pico via bug 5272: 
Export Object SMB functionality fixes.

svn path=/trunk/; revision=34365
 2010-10-04 12:19:58 +00:00
Anders Broman
5ecf33cbc6 (GUIManager)set time display format(makes file load work again). 
svn path=/trunk/; revision=34364
 2010-10-04 11:21:01 +00:00
Stig Bjørlykke
ac7c3787b5 Explain BPF in the tooltips for "Compile BPF". 
svn path=/trunk/; revision=34363
 2010-10-04 11:04:13 +00:00
Anders Broman
e66c219596 (GUIManager)set_menu_sensitivity_old not used when MENUS_USE_UIMANAGER defined. 
svn path=/trunk/; revision=34361
 2010-10-04 10:36:38 +00:00
Stig Bjørlykke
6e5dea0171 Added some defines to make it compile with MAIN_MENU_USE_UIMANAGER. 
svn path=/trunk/; revision=34360
 2010-10-04 08:43:15 +00:00
Anders Broman
c7bce2e142 Mark unused parameters as unused. 
svn path=/trunk/; revision=34359
 2010-10-04 08:01:55 +00:00
Sake Blok
d2ea494622 Add a cast to make the OSX-PPC buildbot happy. 
Removed debugging commenting-out that slipped through...


svn path=/trunk/; revision=34353
 2010-10-03 19:28:05 +00:00
Anders Broman
ff72f80ecd [GTKUImanagerFix a typo and a callback. 
svn path=/trunk/; revision=34352
 2010-10-03 19:11:10 +00:00
Anders Broman
425ead9128 [GTKUImanager]Fix Help callbacks. 
svn path=/trunk/; revision=34349
 2010-10-03 17:37:43 +00:00
Stig Bjørlykke
0cb22a7c23 Added a missing separator. 
svn path=/trunk/; revision=34347
 2010-10-03 16:37:58 +00:00
Stig Bjørlykke
0ca8c586d3 Use UTF8_HORIZONTAL_ELLIPSIS instead of "..." in menus. 
svn path=/trunk/; revision=34346
 2010-10-03 16:09:25 +00:00
Stig Bjørlykke
25d8d91add Use correct text for "Not Selected". 
svn path=/trunk/; revision=34344
 2010-10-03 15:26:03 +00:00
Stig Bjørlykke
e07ef26e9a Add the missing "... or not Selected". 
svn path=/trunk/; revision=34343
 2010-10-03 15:22:16 +00:00
Stig Bjørlykke
229df68593 Use correct text for "Not Selected". 
svn path=/trunk/; revision=34342
 2010-10-03 15:10:29 +00:00
Sake Blok
f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM: 
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
 2010-10-03 12:04:18 +00:00
Sake Blok
a301593846 Reverting SVN 34338, looks like libpcap and winpcap are more different than I thought. I might have to set up a local windows build system again :( 
svn path=/trunk/; revision=34339
 2010-10-02 21:15:20 +00:00
Sake Blok
1e01a2889b Use pcap_open_dead instead of pcap_create for the compile BPF button. This makes the button available on systems which do not have libraries that have pcap_create (like Windows for example) 
Change a couple of values into defined constants.


svn path=/trunk/; revision=34338
 2010-10-02 20:26:09 +00:00
Stig Bjørlykke
2e560e12a9 Ensure we always show the selected frame when changing sort order. 
svn path=/trunk/; revision=34337
 2010-10-02 16:41:20 +00:00
Bill Meier
b24ef36cc0 Fix a compilation error 
svn path=/trunk/; revision=34335
 2010-10-02 15:15:40 +00:00
Sake Blok
3664650ead Make capture filter syntax checking independent of pcap_create by using pcap_compile_nopcap 
svn path=/trunk/; revision=34333
 2010-10-02 14:47:41 +00:00
Sake Blok
2ca8b0aab7 Check for HAVE_PCAP_CREATE in a few more spots to fix building on systems with a pcap-library that does not support pcap_create 
svn path=/trunk/; revision=34331
 2010-10-02 12:24:28 +00:00
Sake Blok
9cde3f3f20 Add syntax checking to the capture filter text entry in the capture setup screen. Since capture filters are DLT dependent, it is not useful to do syntax checking in the capture filter dialog (unless we check each filter against every possible DLT) 
svn path=/trunk/; revision=34330
 2010-10-02 11:29:26 +00:00
Sake Blok
34fdc9c7a9 When a user selected a non-default DLT for the interface, change the DLT to the user-selected DLT before compiling the BPF code. 
svn path=/trunk/; revision=34329
 2010-10-02 11:07:50 +00:00
Sake Blok
98c8dc0319 pcap_activate needs to be called to set the DLT of the selected interface, otherwise the BPF filter is compiled with a DLT of NULL, which will make a filter like "ether host 00:00:00:00:00:00" fail to compile. 
svn path=/trunk/; revision=34328
 2010-10-02 10:28:18 +00:00
Sake Blok
2bffa17891 Add navigation to previous/next packets in the conversation. It will check TCP and UDP first and if this is not TCP or UDP, it will use IP. 
Accelerator keys:

<ctrl>+[   Goto Previous Packet In Conversation
<ctrl>+]   Goto Next Packet In Conversation



svn path=/trunk/; revision=34319
 2010-10-01 22:46:30 +00:00
Anders Broman
316e50f8cd [GTKUImanager]Fix faulty paths. 
svn path=/trunk/; revision=34318
 2010-10-01 21:46:16 +00:00
Stig Bjørlykke
e18935acfd GTK_STOCK_EDIT came in gtk 2.6.0 
svn path=/trunk/; revision=34317
 2010-10-01 19:23:15 +00:00
Martin Mathieson
46a5047471 Initialize a variable to avoid a (bogus) gcc warning. 
svn path=/trunk/; revision=34313
 2010-10-01 17:03:39 +00:00
Stig Bjørlykke
98f6aa9311 Add a new right-click popup menu for the statusbar profiles for easy functions 
to create new, copy, delete and rename configuration profiles.

svn path=/trunk/; revision=34312
 2010-10-01 16:29:37 +00:00
Jeff Morriss
089c063192 (GtkUIManager) view_menu_colorize_auto_scroll_live_cb(): check if we got a widget before dereferencing it. Not sure if this is just hiding another bug, but it lets Wireshark start. 
svn path=/trunk/; revision=34310
 2010-10-01 14:39:35 +00:00
Anders Broman
a1087a7bdb (GUIManager)Try to fix the time format issue. 
svn path=/trunk/; revision=34309
 2010-10-01 14:20:59 +00:00
Jeff Morriss
f0598543d9 (GUIManager) Rename prefs_cb() to menus_prefs_cb() to avoid conflict with the (extern'd) prefs_cb() in prefs_dlg.h 
svn path=/trunk/; revision=34302
 2010-09-30 21:56:47 +00:00
Anders Broman
a11667bcae [GTKUImanager] Fix a few callbacks, use #defines for strings. 
svn path=/trunk/; revision=34299
 2010-09-30 21:23:49 +00:00
Stig Bjørlykke
bd47db5055 Indicate that the selected display filter is applied by disabling the "Apply" 
button.  Indicate that no filter is applied by disabling the "Clear" button.

svn path=/trunk/; revision=34288
 2010-09-30 17:27:08 +00:00
Anders Broman
df5a2fc900 Further GUIManager updates. 
svn path=/trunk/; revision=34281
 2010-09-29 16:09:42 +00:00
Jörg Mayer
362118a292 Compile failed because of text after #endif 
svn path=/trunk/; revision=34276
 2010-09-28 21:04:48 +00:00
Anders Broman
8dc2ef0004 Update GUIManager menubar code. 
svn path=/trunk/; revision=34275
 2010-09-28 20:27:28 +00:00
Stephen Fisher
2c3fe49a03 Format changes from r34265 to fit a 80 column wide window. 
svn path=/trunk/; revision=34268
 2010-09-27 21:23:29 +00:00
Stephen Fisher
eb27557794 Fix bug #553 by ensuring that the upper-left corner of Wireshark is within the viewable area of the monitor. 
svn path=/trunk/; revision=34265
 2010-09-27 20:02:54 +00:00
Anders Broman
70ca54ad1e GUImanager: Add missing set_menu_sensitivity(). 
svn path=/trunk/; revision=34257
 2010-09-26 18:14:44 +00:00
Stig Bjørlykke
93633b301f Allow creating a filter from a multi occurrence field if only one 
value is present.

svn path=/trunk/; revision=34252
 2010-09-26 10:54:12 +00:00
Guy Harris
d14653afc2 More whitespace cleanups. 
svn path=/trunk/; revision=34251
 2010-09-25 19:05:18 +00:00
Guy Harris
8d46ec1533 Clean up indentation. 
svn path=/trunk/; revision=34250
 2010-09-25 18:44:20 +00:00
Sake Blok
7ec231f7f1 Fix the output of columns with "show resolved" disabled when all occurrences are displayed. 
Limit the input field for occurrence to 4 characters to prevent an overflow.
Make sure "... as filter" does not result in an invalid filter string if all occurrences are displayed.


svn path=/trunk/; revision=34247
 2010-09-25 09:33:29 +00:00
Anders Broman
f442f4fe49 Further GUIManager updates, the basics are now there. 
svn path=/trunk/; revision=34237
 2010-09-24 14:52:44 +00:00
Stig Bjørlykke
a777700ac7 Disable the "File Set" menu while capturing, because changing file while 
capturing causes an assert in cf_reset_state().

We still get this assert if the "List Files" dialog is opened before we start
capture and we change file during capturing.  Maybe we have to close this
dialog when starting capture?  Or maybe disable all files except the one
being captured to?  Then we also may have to update the "Last Modified" and 
"Size" columns.

svn path=/trunk/; revision=34234
 2010-09-24 12:39:15 +00:00
Anders Broman
8fbb2be4f9 Update GUIManager menubar code. 
svn path=/trunk/; revision=34232
 2010-09-24 06:46:14 +00:00
Bill Meier
838ffd0c72 Fix crash creating a filter (using "Expression ...") for a field with an extended value_string 
svn path=/trunk/; revision=34223
 2010-09-23 20:45:22 +00:00
Stig Bjørlykke
f5ab6c1930 Store "Show Resolved" setting for custom columns. 
svn path=/trunk/; revision=34220
 2010-09-23 19:41:55 +00:00
Stig Bjørlykke
a1b2b3cbcb Do not set custom occurrence in recent file, this is used for column width. 
svn path=/trunk/; revision=34219
 2010-09-23 19:36:09 +00:00
Stig Bjørlykke
3061558a4c Disable sorting while capturing. 
svn path=/trunk/; revision=34216
 2010-09-23 18:07:49 +00:00
Jörg Mayer
de68ad3066 H. Sivank <hsivank@gmail.com> 
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
 2010-09-23 07:02:33 +00:00
Jörg Mayer
95ddff9f17 Put the guides into the "guides" subdirectory of DOC_DIR 
svn path=/trunk/; revision=34197
 2010-09-23 06:53:40 +00:00
Sake Blok
7364bef1b3 When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences. 
svn path=/trunk/; revision=34186
 2010-09-22 20:56:14 +00:00
Jaap Keuter
e4b94c0d8f Fix for bug 5172: 
Properly retrieve the H.245 endpoint IP address.

svn path=/trunk/; revision=34184
 2010-09-22 16:35:02 +00:00
Stig Bjørlykke
ca5fd0c797 Make it compile. 
svn path=/trunk/; revision=34175
 2010-09-21 09:59:45 +00:00
Guy Harris
7ee31c94d7 Move a bunch of definitions before the code that uses at least one of 
the variables in question.

svn path=/trunk/; revision=34174
 2010-09-21 09:53:44 +00:00
Anders Broman
8c964f34cf Try to fix: 
"In menus_init() you seem to use ui_manager_packet_list_heading before it's initialized."

svn path=/trunk/; revision=34173
 2010-09-21 09:30:16 +00:00
Guy Harris
ef4a2e73b0 Get rid of C++ comment. 
svn path=/trunk/; revision=34171
 2010-09-21 07:17:20 +00:00
Stig Bjørlykke
c2e11e06be Make "Displayed Columns" work yet again, as done in revision 34160. 
Bring back 'Resize Column' and 'Rename Column Title'.

svn path=/trunk/; revision=34170
 2010-09-21 07:08:35 +00:00
Guy Harris
4eaaf279d0 Fix comments. 
svn path=/trunk/; revision=34169
 2010-09-21 05:58:14 +00:00
Anders Broman
838aa2db49 Update GUIManager menubar code(#IF 0 ). 
svn path=/trunk/; revision=34168
 2010-09-21 05:32:32 +00:00
Anders Broman
f62d9d36cc Wrong signature used for a GtkToggleActionEntry callback. 
svn path=/trunk/; revision=34167
 2010-09-21 05:24:02 +00:00
Anders Broman
c237a52cca Remove leftover debug code/comment 
svn path=/trunk/; revision=34166
 2010-09-21 05:10:38 +00:00
Stig Bjørlykke
1bc7a24d9b Make "Displayed Columns" work again. 
svn path=/trunk/; revision=34160
 2010-09-20 13:11:48 +00:00
Jeff Morriss
20cc0d7ce9 Don't include stock icons that we no longer use. 
svn path=/trunk/; revision=34150
 2010-09-17 13:38:09 +00:00
Anders Broman
0519ad45f3 Use GTK dialog stock icons rather than our own. 
svn path=/trunk/; revision=34149
 2010-09-17 12:54:07 +00:00
Guy Harris
ae13a7ce0c Fix some bugs that show up when you build with the old packet list. 
svn path=/trunk/; revision=34148
 2010-09-17 08:48:19 +00:00
Guy Harris
5f7787d9ec Use the same control sequences for the old packet list that are used for 
the new packet list.

svn path=/trunk/; revision=34144
 2010-09-17 04:58:30 +00:00
Gerald Combs
a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy(). 
svn path=/trunk/; revision=34137
 2010-09-16 19:20:06 +00:00
Jeff Morriss
b6e984c095 #if out ui_desc_conv_filter_popup to get the builds going (it looks like it should be used but it isn't currently). 
svn path=/trunk/; revision=34135
 2010-09-16 13:12:02 +00:00
Anders Broman
0b44725f9f Fix a typo. 
svn path=/trunk/; revision=34133
 2010-09-16 10:40:33 +00:00
Guy Harris
8c5d32aa8f Remove C++ comments. 
svn path=/trunk/; revision=34132
 2010-09-16 08:58:46 +00:00
Anders Broman
57f8d0373d menus.c:1508: warning: unused parameter 'current' 
menus.c:1508: warning: unused parameter 'user_data'
Mark parameters as unused.

svn path=/trunk/; revision=34131
 2010-09-16 08:15:45 +00:00
Anders Broman
55580a9662 Use GUIManager for the pop-up:s. 
Can be dissabled by commenting out 
#define MENUS_USE_UIMANAGER 1

svn path=/trunk/; revision=34130
 2010-09-16 07:48:18 +00:00