Commit Graph

134 Commits

Author SHA1 Message Date
Jeff Morriss 56735f8c16 Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Chris Maynard 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Guy Harris 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
Jeff Morriss 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
Guy Harris b213dcc584 Make a routine not used outside this file static.
svn path=/trunk/; revision=49532
2013-05-22 23:16:54 +00:00
Guy Harris 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
Guy Harris 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
Jeff Morriss 2572f8ac1e From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :
Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.

svn path=/trunk/; revision=49361
2013-05-17 00:42:45 +00:00
Irene Rüngeler 27816067e8 Set Start menu button inactive, if capture is in progress.
svn path=/trunk/; revision=49231
2013-05-10 11:52:44 +00:00
Anders Broman a268bb6b94 Add the abillity to export PDU:s to file using a USER_DLT adding meta data before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector.
This is prof-of-concept needs a bit of cleanup.

svn path=/trunk/; revision=49177
2013-05-05 19:37:51 +00:00
Irene Rüngeler 22e43ff352 Ifdef LibPcap
svn path=/trunk/; revision=48830
2013-04-12 13:33:22 +00:00
Irene Rüngeler 590a68a677 The button are only needed if libpcap is present.
svn path=/trunk/; revision=48829
2013-04-12 12:46:25 +00:00
Irene Rüngeler a17ec349b4 Change the sensitivity of the start button depending on the number of interfaces selected.
svn path=/trunk/; revision=48827
2013-04-12 11:56:00 +00:00
Guy Harris d942759401 Add routines to file.c to indicate whether:
a save can be done ("can" in the sense of "there's something to
	save" and in the sense of "we can write that something out");

	a "save as" can be done (in the sense of "we can write what we
	have out");

	there's unsaved data to save (which might be unsaved changes or
	might be a temporary file full of packets);

and use them as appropriate.  This means that the "unsaved data"
indicator in the UI will be turned on for temporary files full of
packets as well as for files with unsaved changes; that's what we want.

svn path=/trunk/; revision=48693
2013-04-01 23:44:29 +00:00
Guy Harris f8965b7b2c If we can't write the capture out in a file format that supports
per-packet comments, don't let the user add/edit/delete per-packet
comments - they can comment all they want, but once Wireshark closes the
file, those comments will be gone.

svn path=/trunk/; revision=48692
2013-04-01 22:23:55 +00:00
Guy Harris e2eabbc883 Make the menu item for importing a hex dump text file be "Import from
Hex Dump", to clarify that it's not some sort of "generic" import
function, just one that can read a hex dump file.  ("Import from Hex
Dump Text" is another possibility.)  Use that string in the dialog title
as well.

svn path=/trunk/; revision=48665
2013-03-31 04:17:47 +00:00
Anders Broman 684c9e5d5c From Jim Young:
Add casts to support c++ when HAVE_GTKOSXAPPLICATION is defined.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8525

svn path=/trunk/; revision=48557
2013-03-26 05:02:05 +00:00
Pascal Quantin 1aa1f2ee67 Add a few missing explicit casts
svn path=/trunk/; revision=48544
2013-03-25 08:34:46 +00:00
Evan Huus c4a36c513f Redissect extra packet windows in all cases (that I know of) where we
redissect normal packet list.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8482

svn path=/trunk/; revision=48528
2013-03-24 16:47:38 +00:00
Chris Maynard 37e7e36915 Fix compilation if WANT_PACKET_EDITOR is defined. Should we also add an edit_window_cb_ref?
svn path=/trunk/; revision=48454
2013-03-21 16:50:47 +00:00
Evan Huus 4836f13ac0 From Michail Koreshkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8371
Add item to context menu of frame references to open the referenced frame in a
new window. Very useful when the referenced frame is hidden by a filter.

From me:
- modelines
- simplify some of the logic

svn path=/trunk/; revision=48451
2013-03-21 15:27:38 +00:00
Bill Meier 8112ecc321 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404

Note: The following parts of the patch had been previously done:
 asn1/snmp/packet-snmp-template.c
 epan/dissectors/packet-snmp.c
 epan/dissectors/packet-x11.c

Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
 didn't compile and needed a few additional patches.


svn path=/trunk/; revision=48447
2013-03-21 02:29:09 +00:00
Anders Broman 2cc00294c7 Use explicit casts.
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Alexis La Goutte a4eb0a12ed From Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATURE IMPLEMENTED: SMB2 SUPPORT FOR EXPORT->OBJECTS->SMB
Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.

Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2

svn path=/trunk/; revision=48210
2013-03-09 08:44:14 +00:00
Bill Meier 162817ad33 it's ==> its & its ==> it's as needed.
In a few cases:
 Fix spelling;
 Clean up whitespace and formatting style.

svn path=/trunk/; revision=47889
2013-02-25 23:35:13 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Chris Maynard fae8a2aeb5 Separate Time Shift item from Time Reference items. From Cal Turney via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me.

svn path=/trunk/; revision=47261
2013-01-24 20:06:20 +00:00
Chris Maynard d85feecdd8 For menu consistency and shortcut simplification, change some "Ignore" related shortcuts to match "Mark" and "Time Reference" shortcuts. Specifically:
Ignore All Displayed Packets <alt><shift><control>D ==> <shift><control>D
Unignore All Packets         <shift><control>D      ==> <alt><control>D

svn path=/trunk/; revision=47203
2013-01-22 02:03:41 +00:00
Chris Maynard aed63758a1 Avoid using *<control>X shortcuts. In this case, using *<control>D instead.
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176

svn path=/trunk/; revision=47194
2013-01-21 16:36:40 +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 18679dccbd Replace gtk_table..() with ws_gtk_grid...().
svn path=/trunk/; revision=47027
2013-01-11 01:41:55 +00:00
Gerald Combs 4ca47864db Move profile deletion code from profile_dlg.c to profile.c. Add left
mouse and context (right mouse) signals to label stacks and use them to
pop up profile menus in the status bar. Add profile actions (manage,
new, edit, delete) to the profile dialog.

svn path=/trunk/; revision=46863
2012-12-30 19:33:05 +00:00
Gerald Combs 5bd252c44f Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Gerald Combs a5d5162826 Qt: Implement packet comments. Fix packet detail updates.
GTK+: Shorten the packet comment menu item name.  Remove a couple of
unneeded includes.

Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.

svn path=/trunk/; revision=46709
2012-12-23 04:37:58 +00:00
Evan Huus 52aff57285 Remove unneeded initializations, and one redundant if condition.
svn path=/trunk/; revision=46702
2012-12-22 21:14:13 +00:00
Gerald Combs 896eeaf187 The Wireshark file icon makes more sense than a floppy disk[1]. Switch
back to it and name it "Save" instead of "File".

  [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx

svn path=/trunk/; revision=46696
2012-12-22 17:41:40 +00:00