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

5080 commits

Author SHA1 Message Date
Sake Blok
831f5777b6 Repair copy (summary and as filter) functionality in the packet-list context menu. It got broken in the bulk of work required to move to the UImanager. 
svn path=/trunk/; revision=34984
 2010-11-20 14:55:02 +00:00
Anders Broman
2f0ee70e27 Remove comments used when editing. 
svn path=/trunk/; revision=34975
 2010-11-19 16:34:51 +00:00
Anders Broman
023fb81cbc [UImanager]Add missing GO to frame, and copy paste errors. 
svn path=/trunk/; revision=34945
 2010-11-18 15:57:12 +00:00
Chris Maynard
1e2ae5a88a Quote all fields when exporting to CSV. Fixes bug 2811. 
svn path=/trunk/; revision=34920
 2010-11-17 03:29:12 +00:00
Jeff Morriss
d63f2559da Split libui into libui and libui_dirty. The latter contains (only) 
text_import_scanner.c (which is generated and not by us so we can't guarantee
that it's clean).

svn path=/trunk/; revision=34912
 2010-11-16 20:13:26 +00:00
Anders Broman
4323fa647d Try to clean up the makefile a bit. 
svn path=/trunk/; revision=34898
 2010-11-16 09:15:15 +00:00
Jaap Keuter
8921865a93 Accomodate older flex versions. 
Make scanner compilation more environment agnostic.

svn path=/trunk/; revision=34897
 2010-11-16 06:46:12 +00:00
Jörg Mayer
3f62247f78 Another unused function with MAIN_MENU_USE_UIMANAGER 
svn path=/trunk/; revision=34895
 2010-11-16 00:18:54 +00:00
Jörg Mayer
a7f7ada049 cmake stuff: 
- Fix fallout from gtk/text_import_scanner.l patch: Wireshark will
  build with cmake again.
- Update README.cmake a bit
- Running "cmake -DUI_MANAGER=ON" will give you the new ui-manager.


svn path=/trunk/; revision=34885
 2010-11-15 20:25:28 +00:00
Anders Broman
cc8992668c Try to fix the build for text_import_scanner. 
Please check if the compile flags are OK...
3:d time lucky ?

svn path=/trunk/; revision=34862
 2010-11-13 16:47:57 +00:00
Anders Broman
702a76a99b Try to fix the build for text_import_scanner. 
Please check if the compile flags are OK...

svn path=/trunk/; revision=34861
 2010-11-13 16:24:14 +00:00
Martin Mathieson
005248a051 Add newline at end of file. 
svn path=/trunk/; revision=34860
 2010-11-13 16:04:00 +00:00
Anders Broman
06d94db99f Try to fix the build for text_import_scanner, 
not sure if it's correct but now it builds text_import_scanner.c
but still fails with:

c:\wireshark\gtk\text_import.h(34) : fatal error C1083: Cannot open include file
: 'glib.h': No such file or directory
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 9.0\
VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 9.0\
VC\BIN\nmake.exe"' : return code '0x2'
Stop.

svn path=/trunk/; revision=34858
 2010-11-13 14:47:53 +00:00
Jaap Keuter
2e614f1143 Get the build going again from the source distribution, with text import. 
svn path=/trunk/; revision=34857
 2010-11-13 11:35:21 +00:00
Jaap Keuter
296e43c3eb Add text import capability, like text2pcap, directly into the GUI. 
svn path=/trunk/; revision=34856
 2010-11-12 22:20:12 +00:00
Martin Mathieson
fb0b4efe07 Fix a column typo, and give them different menu accelerator keys. 
svn path=/trunk/; revision=34851
 2010-11-12 16:14:09 +00:00
Michael Tüxen
c85a470dec Bugfix from Irene Ruengeler to improve the TSN plot for SCTP 
when large gap reports are present.
 

svn path=/trunk/; revision=34823
 2010-11-09 16:29:15 +00:00
Stig Bjørlykke
612aef89c6 Added check for valid finfo->ds_tvb in packet_hex_print(), as we do not 
always have finfo->ds_tvb.

This bug was introdused in revision 34796.

svn path=/trunk/; revision=34821
 2010-11-09 12:31:50 +00:00
Bill Meier
c17c9fff87 Use value_string_ext fcns to access certain value_string arrays; 
Sort a few value_string arrays to be in ascending order by value;
Do minor reformatting and whitespace cleanup.

svn path=/trunk/; revision=34813
 2010-11-08 21:59:39 +00:00
Chris Maynard
c8a1ba4c68 Make maxlen a gsize instead of a guint. 
svn path=/trunk/; revision=34808
 2010-11-08 17:53:13 +00:00
Chris Maynard
803910c1aa Allow objects to be saved that otherwise couldn't be due to invalid characters 
in the filename, excessive filename lengths or duplicate filenames.  Fixes
bug 1671.

svn path=/trunk/; revision=34805
 2010-11-08 16:53:11 +00:00
Anders Broman
cab0cef11d Use value_string_ext for RTP payload types. 
svn path=/trunk/; revision=34804
 2010-11-08 14:43:59 +00:00
Anders Broman
d7c6139d76 From Alexander Koeppe: 
Patch that fixes overflowing highlighting of data.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5374

svn path=/trunk/; revision=34796
 2010-11-06 15:25:34 +00:00
Bill Meier
b78ec52693 Use value_string_ext fcns to access certain value_string arrays; 
Sort certain value_string arrays so the values are in ascending order;
Use val_to_str_ext() instead of for loops to do value_string array lookups (voip_calls.c).
Minor whitespace cleanup.

svn path=/trunk/; revision=34794
 2010-11-05 22:44:03 +00:00
Stig Bjørlykke
bb4acb8fe3 Corrected an if-statement in field_select_row_cb() where checking for 
hfinfo->strings and hfinfo->display.

This bug was found by clang.

svn path=/trunk/; revision=34785
 2010-11-05 08:10:40 +00:00
Anders Broman
8dda79ed20 From Alexander Koeppe: 
Window Scaling Graph - Fix display of x-axis in long-lasting captures
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5341

svn path=/trunk/; revision=34782
 2010-11-05 07:03:40 +00:00
Stig Bjørlykke
b1e1dcb54b Support empty column titles. 
svn path=/trunk/; revision=34777
 2010-11-04 11:37:06 +00:00
Jaap Keuter
562eb76905 From Alexis La Goutte: 
Replace all *_min()/*_max() by MIN() and MAX().

svn path=/trunk/; revision=34769
 2010-11-04 06:37:26 +00:00
Bill Meier
0ca948bacf Use value_string_ext fcns to access certain value_string arrays; 
Some whitespace cleanup.

svn path=/trunk/; revision=34763
 2010-11-03 18:28:35 +00:00
Chris Maynard
21f998ddf3 Use g_utf16_toutf8() instead of utf_16to8() to avoid the last display filter 
applied from being overwritten.  Fixes bug 3894.  Also, combined the open and
merge filters into one, so we have a single most recently used filter.

svn path=/trunk/; revision=34759
 2010-11-03 14:45:17 +00:00
Anders Broman
780907f9c5 (GTKUImanger) 
- make the accelerators work.

svn path=/trunk/; revision=34751
 2010-11-02 12:03:06 +00:00
Stig Bjørlykke
b3cdd16146 Use more descriptive names for capture filter and display filter icons. 
They are displayed in the toolbar dropdown when the window is too narrow.

svn path=/trunk/; revision=34741
 2010-11-01 10:29:07 +00:00
Stig Bjørlykke
f24037c964 Added a icon for "Edit Column Details". 
svn path=/trunk/; revision=34724
 2010-10-30 18:08:08 +00:00
Stig Bjørlykke
c0ea7f05bf Redissect packets instead of reload file on UAT changes. 
This way we can do changes while capturing.

svn path=/trunk/; revision=34709
 2010-10-30 11:43:11 +00:00
Jeff Morriss
3b34edd421 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4768 : 
Return an error if the user specifies a value in a range in excess of the
range-specified maximum.

Except when reading in preferences files which might have ranges that exceed
the maximum (because we didn't use to check): in that case silently lower the
out-of-range values.

svn path=/trunk/; revision=34703
 2010-10-29 23:30:36 +00:00
Guy Harris
17d4d51b7d Make the third argument to a UAT copy callback a size_t (not that any of 
the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694
 2010-10-29 21:11:33 +00:00
Stig Bjørlykke
04b977c4e6 Added a cast from size_t to unsigned int. 
svn path=/trunk/; revision=34693
 2010-10-29 20:54:08 +00:00
Bill Meier
f543357d14 Use value_string_ext fcns to access certain value_string arrays. 
svn path=/trunk/; revision=34692
 2010-10-29 20:22:02 +00:00
Stig Bjørlykke
fd52258052 Added a Copy button in UAT dialogs. 
Fixed setting sensitivity when having a selected row.

svn path=/trunk/; revision=34691
 2010-10-29 19:48:51 +00:00
Stig Bjørlykke
e111567e7e Calculate correct io->start_time. 
This fixes bug 5340.

svn path=/trunk/; revision=34661
 2010-10-27 07:45:31 +00:00
Anders Broman
aaa7068302 #if 0 "Work in progress" code 
svn path=/trunk/; revision=34638
 2010-10-24 18:08:07 +00:00
Anders Broman
a1e0507a63 Fix "More unused warnings in new menu code" based on code from Jörg Mayer. 
svn path=/trunk/; revision=34636
 2010-10-24 16:14:01 +00:00
Stig Bjørlykke
2cedc69849 Fixed "Compiled with" information in the About box. 
svn path=/trunk/; revision=34601
 2010-10-21 07:13:43 +00:00
Martin Mathieson
3dbfdb13cc Fix problem with creating filter expressions (where stats window is limited by existing filter). 
svn path=/trunk/; revision=34567
 2010-10-19 09:19:53 +00:00
Anders Broman
9ebba15246 (GUIManager) Make opening a recent file work from the recent files menu. 
svn path=/trunk/; revision=34562
 2010-10-18 19:19:27 +00:00
Anders Broman
bcd5ed10c3 (GTKUImanger) 
- Make Open file from the welocme screen work again.

svn path=/trunk/; revision=34556
 2010-10-18 15:40:51 +00:00
Bill Meier
15851701e8 Rework "extended value strings": 
- Allow direct access when a range of values begins with a value other than 0;
- Provide value_string_ext_new() for creating extended value strings at runtime;
- Do access to value_string_ext members via a macro (all but value_string.c);
- Update documentation.

svn path=/trunk/; revision=34514
 2010-10-14 17:50:35 +00:00
Guy Harris
9ccf7e431e Make variables used only in file_dlg_win32.c static. 
svn path=/trunk/; revision=34512
 2010-10-14 09:01:12 +00:00
Guy Harris
55bc235b90 Make routines unused outside file_dlg_win32.c static. 
svn path=/trunk/; revision=34511
 2010-10-14 08:59:35 +00:00
Anders Broman
01a9d015d5 From Jörg Mayer: 
(UIManger) Fix compilation warnings.

svn path=/trunk/; revision=34502
 2010-10-13 19:04:14 +00:00
Anders Broman
d1de327057 (GTKUImanger) 
- Open file from the welocme screen.

svn path=/trunk/; revision=34498
 2010-10-13 15:52:10 +00:00
Anders Broman
19e1998c2c (GTKUImanger) 
- Make use of the new WIRESHARK_FILE_STOCK icon.
- Make clearing of recent files work.
- Make the recent file list in the Welcome menu work again.

svn path=/trunk/; revision=34497
 2010-10-13 11:22:23 +00:00
Anders Broman
5bfb661d23 Add a wireshark file stock icon. 
svn path=/trunk/; revision=34496
 2010-10-13 11:15:11 +00:00
Anders Broman
fde95120d2 Try to get the build going again. 
svn path=/trunk/; revision=34495
 2010-10-13 04:29:07 +00:00
Anders Broman
ebb3a7f694 (GUIManager) Base code to get recent files to work with GUIManager. 
Based on code from http://people.gnome.org/~ebassi/recent-uimanager-inline.c by Emmanuele Bassi.

svn path=/trunk/; revision=34493
 2010-10-12 21:33:08 +00:00
Bill Meier
2e4f755e13 Define some vars & fcns as static; 
Also: do some minor reformmating and cleanup of whitespace.

svn path=/trunk/; revision=34492
 2010-10-12 19:26:07 +00:00
Bill Meier
2b0f6a63f1 Define some fcns & vars as static; 
Rename g_capture_in_progress to gbl_capture_in_progress (capture_if_dlg.c)
Do some whitespace cleanup.

svn path=/trunk/; revision=34490
 2010-10-12 17:39:44 +00:00
Bill Meier
2d3abb5cec Minor cleanup of the global name space: 
- Define some vars as static;
- Rename some externs to be less generic;
Also: cleanup some whitespace.

svn path=/trunk/; revision=34489
 2010-10-12 16:42:02 +00:00
Bill Meier
c004d57361 Minor cleanup of the global namespace: 
- Define some fcns and vars as static;
- Use less generic names for certain externs;
Also: Remove some usused #defines & cleanup some whitespace


svn path=/trunk/; revision=34488
 2010-10-12 16:05:19 +00:00
Bill Meier
c78221d4ce Rename g_resolv_flags --> gbl_resolv_flags; Also: cleanup some whitespace & indentation. 
svn path=/trunk/; revision=34487
 2010-10-12 13:15:08 +00:00
Anders Broman
6e31c8c406 It's no longer neccesarry to set the E_DFILTER_TE_KEY on the popup_menu objects. 
svn path=/trunk/; revision=34486
 2010-10-12 07:41:18 +00:00
Guy Harris
3c27b97c26 Get rid of C++-style comments; use #if 0/#endif to remove code. 
svn path=/trunk/; revision=34485
 2010-10-12 01:27:58 +00:00
Anders Broman
24d4eda023 menus.c: In function 'add_menu_recent_capture_file_absolute': 
menus.c:4583: warning: unused variable 'recent_files_list'

svn path=/trunk/; revision=34479
 2010-10-11 20:05:49 +00:00
Anders Broman
eb007bae23 Get filter_te from top_level rather then from the widget. 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5288

svn path=/trunk/; revision=34478
 2010-10-11 19:29:52 +00:00
Stig Bjørlykke
32da2562b8 We set sensitivity on the map button in ct_nb_map_switch_page_cb(). 
svn path=/trunk/; revision=34469
 2010-10-11 08:29:25 +00:00
Stig Bjørlykke
ce8e4aa47c Don't add a border around the main window, this looks bad in the new 
Ubuntu release.

svn path=/trunk/; revision=34468
 2010-10-11 08:28:38 +00:00
Bill Meier
09d718f723 Rename vals_status & vals_pdu_type to wsp_vals_status & wsp_vals_pdu_type 
svn path=/trunk/; revision=34463
 2010-10-10 20:45:19 +00:00
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