Commit Graph

40880 Commits

Author SHA1 Message Date
Guy Harris 0b835b8cb6 As we might use cf->lnk_t while a capture is in progress, we need up
update it after each burst of packets.  (This is broken - we should have
cf->lnk_t be WTAP_ENCAP_PER_PACKET in all capture file formats that can
handle more than one packet type, and, in order to support writing out
*some* such files in formats that can only handle one packet type, just
use the type of the first packet when doing a one-pass operation and
gather up all the packet types in a multi-pass operation.)

svn path=/trunk/; revision=43048
2012-06-03 23:38:11 +00:00
Guy Harris dbfb305368 g_filename_display_basename() returns a g_mallocated string, so its
callers either need to free it or their callers need to free it or....

This means that cf_get_display_name() must always return a g_mallocated
string and its callers or... must free it.

For some of those callers, create a new set_window_title() routine to do
the work - they're all using the same pattern.

svn path=/trunk/; revision=43047
2012-06-03 22:03:05 +00:00
Anders Broman d1c1455882 Fix warnings
svn path=/trunk/; revision=43046
2012-06-03 20:59:41 +00:00
Guy Harris bfb179ba46 When allowing the user to save a capture file before closing it, if it's
a live capture:

	have the dialog note that what's being saved are captured
	packets;

	have the dialog note that the capture will be stopped if you
	close/quit;

	actually stop the capture before saving the file or closing it.

This should fix bug 7318 (it appears to do so in my tests).

svn path=/trunk/; revision=43045
2012-06-03 20:39:45 +00:00
Guy Harris 49ac36fd59 Use g_filename_display_basename() rather than get_basename() when we're
getting the basename for display purposes, so it's converted from the
GLib/GTK+ locale filename encoding to UTF-8.  (For Windows, the locale
filename encoding is UTF-8, and the internal encoding is UTF-16, so the
file names should *probably* all be valid UTF-8 - Windows may not
support invalid UTF-16 in file names.  For Qt, I'm not sure whether the
file dialogs ever return file names in some non-UTF-8 encoding.)

svn path=/trunk/; revision=43044
2012-06-03 19:31:59 +00:00
Guy Harris 6230f46670 Update a comment.
svn path=/trunk/; revision=43043
2012-06-03 18:48:51 +00:00
Guy Harris 5537e925f1 Move the declaration of main_set_window_name() frm ui/ui_util.h to
ui/gtk/main_titlebar.h.

svn path=/trunk/; revision=43042
2012-06-03 18:40:23 +00:00
Guy Harris 742b22dd43 Move routines that handle the main window title bar out of
ui/gtk/gui_utils.c into ui/gtk/main_titlebar.c, and the declaration of
one of them out of ui/ui_util.h into ui/gtk/main_titlebar.h, and rename
them to clarify that they work on the window name and titlebar.

svn path=/trunk/; revision=43041
2012-06-03 18:35:34 +00:00
Anders Broman 3ae9cc81c4 Add more depricated functions
svn path=/trunk/; revision=43040
2012-06-03 18:03:51 +00:00
Anders Broman 55ad6f8b53 Get rid of mor hbox:es
svn path=/trunk/; revision=43039
2012-06-03 18:03:00 +00:00
Anders Broman de19187a4f From Evan Huus: Reset the comment tree when the filter changes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7317
svn path=/trunk/; revision=43038
2012-06-03 17:52:05 +00:00
Guy Harris 19dfeda6d6 Note in a comment that we should perhaps handle safe-saving on top of a
symlink.

svn path=/trunk/; revision=43037
2012-06-03 17:35:34 +00:00
Guy Harris cd90f2b6f5 gedit, at least, says
The file "xxx" is read-only.

if you try to save over a file that has no read permission bits.

svn path=/trunk/; revision=43036
2012-06-03 17:25:08 +00:00
Pascal Quantin 6a4606b1f1 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7324 :
Add support for the Gluster Handshake and Callback RPC-protocols

svn path=/trunk/; revision=43035
2012-06-03 17:15:21 +00:00
Guy Harris 1c03669611 Update a link (that's where it redirected to).
Remove "/en-us" from links; presumably it'll go to the appropriate
country and language for you (or will default to the country and primary
language of Redmond, Washington :-)).

svn path=/trunk/; revision=43034
2012-06-03 17:08:38 +00:00
Pascal Quantin 3201d56f05 Convert space to tab
svn path=/trunk/; revision=43033
2012-06-03 16:49:58 +00:00
Alexis La Goutte 6c8174a1a8 Make checkhf tools Happy, Remove hf_ieee80211_chan*
svn path=/trunk/; revision=43032
2012-06-03 16:49:01 +00:00
Alexis La Goutte 44d7c7fb73 Add 802.11 AP Channel Report IE (51)
svn path=/trunk/; revision=43031
2012-06-03 16:47:15 +00:00
Alexis La Goutte 588fd3e761 Enhance 802.11 Secondary Channel Offset (62)
svn path=/trunk/; revision=43030
2012-06-03 16:45:30 +00:00
Alexis La Goutte 9a7409589a Enhance 802.11 HT Info 1.1 (60)
svn path=/trunk/; revision=43029
2012-06-03 16:43:19 +00:00
Alexis La Goutte 7852f04531 Cleanup Header (Remove e-mail of original author to report bugs...)
svn path=/trunk/; revision=43028
2012-06-03 16:41:11 +00:00
Alexis La Goutte 8f94d6a813 Enhance 802.11 (Vendor Specific) HT Capability (45)
And fix last Dead Store warning found by Clang


svn path=/trunk/; revision=43027
2012-06-03 16:39:55 +00:00
Guy Harris db4c94e438 Update some links (the "[Ff]amily[Ii]d=" links just redirected to the
"id=" links when I last tried them).

There  are apparently both x86 and x86 versions of the VC++ 2005
distributables and, at least for the non-SP1 versions, there's also an
IA64 version.  List them.

If the URLs have the country and language in them, the displaylang= item
doesn't seem to work (tried with both "displaylang=en" and
"displaylang=de" with both "en-us" and "de-de").  Remove it.

Fix some typoes.

svn path=/trunk/; revision=43026
2012-06-03 16:39:27 +00:00
Alexis La Goutte 3899295893 Enhance 802.11 (vendor specifiq) HT Info 1.0 (Draft)
svn path=/trunk/; revision=43025
2012-06-03 16:37:56 +00:00
Pascal Quantin 8edc336db6 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7323 :
Add support for the Gluster Portmapper and DUMP RPC-protocols

svn path=/trunk/; revision=43024
2012-06-03 16:17:38 +00:00
Pascal Quantin b3f2c794e2 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7315 :
Initial support for the GlusterD RPC-protocol

svn path=/trunk/; revision=43023
2012-06-03 15:52:15 +00:00
Gerald Combs 06df7ab354 [Automatic manuf, services and enterprise-numbers update for 2012-06-03]
svn path=/trunk/; revision=43020
2012-06-03 14:03:36 +00:00
Anders Broman 345b48d1ea Try to squelch warnings
svn path=/trunk/; revision=43019
2012-06-03 09:26:15 +00:00
Pascal Quantin 7221f9e870 Add references to MSVC++ 2008 64-bit redistributables.
Add version numbers for MSVC++ 2010 64-bit redistributables.
--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    docbook/wsdg_src/WSDG_chapter_tools.xml

svn path=/trunk/; revision=43018
2012-06-03 08:15:43 +00:00
Guy Harris 5a9a6ed033 Fix end of closing tag.
svn path=/trunk/; revision=43017
2012-06-03 07:47:20 +00:00
Guy Harris 1dd90d3560 Default to the version recommended in the Developer's Guide, namely
MSVC++ 2010 Express Edition.

svn path=/trunk/; revision=43016
2012-06-03 07:07:35 +00:00
Guy Harris f4a5c30ef6 Close XML tag.
svn path=/trunk/; revision=43015
2012-06-03 07:04:13 +00:00
Guy Harris 3035d820d2 Say "For {compiler}, you need" rather than "For {compiler}, use" - when
discussing VC++ 2010, at least, you may need *both* of them if you'll be
doing both 32-bit and 64-bit builds; hopefully this makes it sound a bit
less like a choice of one or the other but not both.

Get rid of reference to 32-bit builds with MSVC++ 2008 (did it do 64-bit
builds? I didn't see any reference to 64-bit redistributables for it on
the pages for the other redistributables).

svn path=/trunk/; revision=43014
2012-06-03 03:55:37 +00:00
Guy Harris 8fbf7f36f2 Mention vcredist_x64.exe in the table, and mark the vcredist_*.exe as
filenames throughout.  Do the same with some other file names.

svn path=/trunk/; revision=43013
2012-06-03 03:49:05 +00:00
Guy Harris 7f2ad04127 I don't know what the version number is of the MSVC++ 2010 SP1 x86-64
redistributables.

svn path=/trunk/; revision=43012
2012-06-03 03:32:46 +00:00
Guy Harris cd55e12b57 Mention the installers for the 64-bit versions of the redistributables.
svn path=/trunk/; revision=43011
2012-06-03 03:24:22 +00:00
Guy Harris df48550ce2 Indicate what you're supposed to do with vcredist_x86.exe (download it
to the WIRESHARK_LIB_DIR, and don't run it after downloading it).

Indicate that the version of vcredist_x86.exe you download depends not
only on the major version of the VC++ you have but on what service packs
you have.

svn path=/trunk/; revision=43010
2012-06-03 02:53:36 +00:00
Anders Broman dbc4b09004 From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ equivalent
svn path=/trunk/; revision=43009
2012-06-02 23:53:04 +00:00
Pascal Quantin aa95f6b73d Revert files committed by error in revision 43007
svn path=/trunk/; revision=43008
2012-06-02 19:20:04 +00:00
Pascal Quantin 797b83c838 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7322 :
Add a missing break in packet-bpkmattr.c (CID 280484)

svn path=/trunk/; revision=43007
2012-06-02 19:15:07 +00:00
Guy Harris 68a4971594 If the user tries to save a capture file atop a file that has all its
write bits turned off or, on 4.4-Lite-based systems, has its "user
immutable" bit turned on, ask them if they really want to overwrite the
file (as those are both used to say "this file is precious, don't let me
easily accidentally trash it") and, if the "user immutable" bit is set,
turn it off first so that the move in the "safe save" won't fail.

svn path=/trunk/; revision=43006
2012-06-02 18:53:13 +00:00
Guy Harris 2e4f30d0f9 The only reason we need to do locale conversions is that path names as
returned by the file selection dialog are in the locale's character
encoding.  Just convert those, and use the formatting capabilities of
the GTK+ message dialog rather than formattting the message to a string
and translating it in its entirety.

Use g_filename_display_basename() to do the locale conversion while
we're at it.

svn path=/trunk/; revision=43005
2012-06-02 18:13:12 +00:00
Guy Harris 49216b1091 Clean up indentation.
svn path=/trunk/; revision=43004
2012-06-02 17:05:12 +00:00
Guy Harris 5f0c275f0f If the rename in a safe "Save As" fails, the current file's name has
*not* changed; what we need to, on Windows, reopen is the *old* file
name, not the name we're saving as.

svn path=/trunk/; revision=43003
2012-06-02 16:59:47 +00:00
Anders Broman 4cbb31e99c Try to squelch warnings
svn path=/trunk/; revision=43002
2012-06-02 15:52:42 +00:00
Anders Broman b10d4714e1 Try to squelch warnings
svn path=/trunk/; revision=43001
2012-06-02 15:32:54 +00:00
Anders Broman cd7c20c9d9 Try to squelch warnings
svn path=/trunk/; revision=43000
2012-06-02 15:32:34 +00:00
Anders Broman 19507efa88 Try to squelch warnings
svn path=/trunk/; revision=42999
2012-06-02 14:56:18 +00:00
Anders Broman 2bc42dc547 Try to squelch warnings
svn path=/trunk/; revision=42998
2012-06-02 14:13:14 +00:00
Anders Broman b647402c60 From Evan Huus Memory leak in voip_calls.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7320
svn path=/trunk/; revision=42997
2012-06-02 13:28:42 +00:00