Commit graph

4974 commits

Author SHA1 Message Date
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
Anders Broman
8421bbd8a3 Add more GUIManager code #ifdef:ed out.
The popups should be working now exept for protocol help.
Help with testing and cleaning up apreciated.
GTK 2.6 requred, I'll look into that too later if no one beats me to it.

svn path=/trunk/; revision=34127
2010-09-15 20:51:44 +00:00
Anders Broman
31cf5ad237 Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34118
2010-09-14 20:50:03 +00:00
Anders Broman
7768145b5e Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34112
2010-09-13 20:21:41 +00:00
Guy Harris
82ed2ba728 set_menu_sensitivity() is used only if MENUS_USE_UIMANAGER is defined,
so define it only if MENUS_USE_UIMANAGER is defined.

Clean up indentation.

svn path=/trunk/; revision=34109
2010-09-12 22:36:52 +00:00
Guy Harris
9583a67e2d Get rid of /* within comment, clean up white space.
svn path=/trunk/; revision=34108
2010-09-12 21:53:26 +00:00
Anders Broman
b1d1e4bda6 Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34106
2010-09-12 19:26:42 +00:00
Bill Meier
8b7784d08e Remove what appear to be two redundant lines of code (AFAIKT).
svn path=/trunk/; revision=34090
2010-09-09 17:30:35 +00:00
Stephen Fisher
137054603c Resolve another issue the Windows buildbots are having after rev 34084:
guint8 -> guint16 for th_flags variable in segment struct.



svn path=/trunk/; revision=34089
2010-09-09 15:46:40 +00:00
Stephen Fisher
f18fe680e4 These two capture option variables are defined by capture_opts_init(), so
don't redefine them to new values.


svn path=/trunk/; revision=34073
2010-09-07 19:22:05 +00:00
Anders Broman
24f4f3bd05 Start adding GTKUIManager code.(#IF 0'ed out.).
svn path=/trunk/; revision=34071
2010-09-07 08:10:45 +00:00
Martin Mathieson
8c258c3452 Change bandwidth labels, and update stop time even on first frame.
svn path=/trunk/; revision=34068
2010-09-06 09:22:43 +00:00
Martin Mathieson
4b5c69c0d9 Add bandwidth figures per UE.
svn path=/trunk/; revision=34061
2010-09-03 16:45:05 +00:00
Martin Mathieson
d96bda809e Try to cast away windows buildbot problems.
svn path=/trunk/; revision=34060
2010-09-03 16:05:01 +00:00
Martin Mathieson
055d654cc2 Add bandwidth figures to RLC stats (per-UE and per-channel).
svn path=/trunk/; revision=34059
2010-09-03 15:22:28 +00:00
Stig Bjørlykke
7ac2adc395 Increase maximum number of nodes to 40.
10 is in some situations too few.

svn path=/trunk/; revision=34057
2010-09-03 09:12:40 +00:00
Anders Broman
f92d65f0cb Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34054
2010-09-03 08:41:04 +00:00
Anders Broman
5cd5da38d2 Add doxygen coments.
svn path=/trunk/; revision=34052
2010-09-03 07:27:59 +00:00
Anders Broman
851d48863c Add a comment
svn path=/trunk/; revision=34051
2010-09-03 07:25:51 +00:00
Anders Broman
9ebaecb807 Add comments
svn path=/trunk/; revision=34047
2010-09-02 19:23:01 +00:00
Anders Broman
3a5f906a72 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34043
2010-09-02 15:39:15 +00:00
Anders Broman
b6fc233757 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34042
2010-09-02 15:38:04 +00:00
Anders Broman
f32d9a570c Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34041
2010-09-02 06:34:04 +00:00
Anders Broman
9b8d6c102c Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34040
2010-09-02 06:22:12 +00:00
Anders Broman
0df3d83670 1.4 version does not display the t.38 graph.
(init/remove tap_listener missing)

svn path=/trunk/; revision=34038
2010-09-01 19:42:59 +00:00
Guy Harris
ca02af3248 Expand and update comments.
svn path=/trunk/; revision=34037
2010-09-01 17:49:27 +00:00
Anders Broman
5ed4941636 From Jaap Keuter:
Fix Wireshark don't show mgcp calls in "Telephony" => "VoIP calls"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5167

svn path=/trunk/; revision=34036
2010-09-01 12:39:29 +00:00
Stig Bjørlykke
fe341f145a Ensure we always update the display filter when changing profile.
svn path=/trunk/; revision=34030
2010-08-31 07:53:51 +00:00
Anders Broman
761149722e Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34029
2010-08-31 05:48:12 +00:00
Bill Meier
a35e5c72e9 Add #include <stdio.h> for fprintf
svn path=/trunk/; revision=34028
2010-08-30 23:58:19 +00:00
Anders Broman
f51ed4d4c3 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34027
2010-08-30 20:30:20 +00:00
Anders Broman
749c891a91 Switch to GTK UIManager.
svn path=/trunk/; revision=34026
2010-08-30 19:49:57 +00:00
Jeff Morriss
8016df02f1 Include stdio.h. Fixup indent some.
svn path=/trunk/; revision=34025
2010-08-30 19:14:54 +00:00
Jeff Morriss
b4c2ed1b86 Remove some unnecessary includes: a lot of things don't need globals.h and register.h
svn path=/trunk/; revision=34017
2010-08-30 16:10:01 +00:00
Anders Broman
6e5a0a481f Remove a redundant callback.
svn path=/trunk/; revision=34015
2010-08-30 14:32:38 +00:00
Anders Broman
60f258b4e5 Convert to GTKUIManager
svn path=/trunk/; revision=34014
2010-08-30 14:23:25 +00:00
Stig Bjørlykke
835a43312f Always update the display filter when changing a display filter macro
and when changing profile.  Not sure why I have to invalidate cfile.dfilter
in macro_update(), because this will be done in macros_post_update(),
but unless this we get a crash when renaming a macro...

This is a fix for bug 5002.

svn path=/trunk/; revision=34011
2010-08-30 08:47:26 +00:00
Anders Broman
6d0780b8ba Make a note about how to "activare" the filter popup.
svn path=/trunk/; revision=34008
2010-08-30 05:12:27 +00:00
Anders Broman
21107dff38 Switch to GTK UIManager.
svn path=/trunk/; revision=34002
2010-08-29 19:37:15 +00:00
Anders Broman
0042c07d2a Doxygen changes.
svn path=/trunk/; revision=33993
2010-08-29 15:14:38 +00:00