In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as
1) there's no guarantee that "%ll" works
and
2) there's no guarantee that "long long" works
(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).
svn path=/trunk/; revision=21978
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).
The failures fall into two categories:
(1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'. This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
(2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size. Such values need to be cast to 'long
long' or 'unsigned long long'.
svn path=/trunk/; revision=21975
epan/filesystem.c
have get_plugin_dir() calling init_plugin_dir() if necessary
epan/epan.c and epan/report_err.c
move the report_failure family into the new report_err.c file, have epan_init() calling the initializer
epan/plugins.h and epan/proto.c
do not have init_plugins() calling the proto_reg functions instead do it in init_proto()
gtk/main.c and tshark.c
init_plugin_dir() has become suprefluous
capinfos.c and editcap.c
load the wiretap plugins
Makefiles
do what's needed to build withe the above changes.
svn path=/trunk/; revision=21935
- packet-user_encap.c: use the new UAT_PROTO_DEF
- gtk/uat_gui.c: change the order of "containment" of the widgets to have the clist fields sized to the scrolledwindow instead of the whole window
svn path=/trunk/; revision=21934
state to "no packets", "file open", or "live capture in progress".
Instead, to update the main window title when the user-specified prefix
for the title changes:
save the un-decorated title as a data value attached to the main
window in set_main_window_name();
have a new routine to update the title, which fetches the
un-decorated title, decorates it, and sets the title to the
decorated value.
This fixes bug 1608.
svn path=/trunk/; revision=21876
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set and, if so and we weren't run
with special privileges, set the running_in_build_directory_flag. Have
it do the same if it finds ".libs" in the pathname of the program and we
weren't run with special privileges, as that means it was probably run
from the libtool wrapper script and presumably thus isn't an installed
binary.
This means that get_credential_info() has to be called before
init_progfile_dir().
Clean up some indentation.
svn path=/trunk/; revision=21866
early on, and use the converted versions.
#if 0 out the error dialog for CANT_GET_AIRPCAP_INTERFACE_LIST, rather
than commenting it out - it's a bit easier to un-out the code, and you
don't have to worry about whether there's a comment in the stuff being
xxx-outed.
svn path=/trunk/; revision=21838
- Update the wireless/AirPcap GUI code to support 802.11n as well as
some related upcoming code changes.
- Remove airpcap.h from the repository, since it exists in the AirPcap
devpack (and will be superseded Real Soon Now).
- Show the individual channel flag bits in radiotap.
Fix the 802.11n MCS set display.
This is a partial checkin, so hopefully nothing is broken.
svn path=/trunk/; revision=21831
wrong timestamp. Place a cap on the amount of silence that we do
insert. This should fix bug 1580.
Update the release notes.
svn path=/trunk/; revision=21818
The splash screen shows a progress bar and a percentage complete - like the progress dialog.
As dissectors are initialised and handed off the name is shown. However, the names of plugin dissectors are not shown.
The update to the make-dissector-reg shell script has been tested, though I think generally the python version is used.
svn path=/trunk/; revision=21716
probably fail (as you're probably out of disk space or over quota), and,
even if they don't, the file's going to be corrupt in any case.
(Hopefully that's sufficient to avoid warnings that we're ignoring the
result of fwrite().)
For fread(), check for errors or short reads, at least in all cases
where we have a provision for failing if the read fails.
svn path=/trunk/; revision=21649
--enable-extra-gcc-checks set.
If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.
Constify a bunch of stuff, and make some other changes, to get rid of
warnings.
Clean up some indentation.
svn path=/trunk/; revision=21526
`selection->type != GTK_SELECTION_MULTIPLE' failed" error when
opening the User Specified Decodes with multiple decodes setup.
The problem is caused by the selection mode for the list being
set to multiple. I changed it to none so that the user doesn't
get the false impression that you can select only certain items
and clear them (the clear button clears them all).
svn path=/trunk/; revision=21287
TCP/SSL Stream dialog find buttons because one of the functions used
only works with GTK 2.4+. Reported by Chris Maynard on -dev list.
svn path=/trunk/; revision=21285
Next try is to use the WINVER #define. AFAIK, this depends on the Platform SDK version used, which is actually our problem here. So this fix *might* work ...
svn path=/trunk/; revision=21168
sockaddr_storage doesn't depend on the MSVC version used, but the version of the Winsock API, which might be updated by the Platform SDK even on MSVC 6 - so depending on the _MSC_VER is not the way to go
svn path=/trunk/; revision=21162
(Fixing warnings)
stripped away some unused variables/parameters
+ in prefs.c
suggestion of parentheses makes gcc happy
svn path=/trunk/; revision=21156
Fix for bug #491: Unexpected frame.time_delta behavior
This patch ... fixes bug 491. It does this by changing the
behaviour of the frame.time_delta field so it reflects the delta
time between captured packets (tshark already did this). To keep
the delta time between displayed packets, the field
frame.time_delta_displayed is created.
svn path=/trunk/; revision=21154
I did however see some small errors in the
documentation that I did not notice when I sent in the patch. This
patch corrects them and adds an accelerated key:
- table 6.1 remove "Analyze" from "Identical..." column for "Copy as Filter"
- table 6.2 add "Edit" from "Identical..." column for "Copy as Filter"
- Added accelerator key for "Copy as Filter". I chose "Shift+Ctrl+C", so
that "Ctrl+C" is still available for "standard" copy
Image figure 3.4 should be renewed, reflecting the change in the menu
structure.
svn path=/trunk/; revision=21140
* add SUA to the "VoIP Calls" tap.
* propagate changes to packet-sccp.h to other dissectors
From Neil Piercy:
* add SLR, DLR and CAUSE to COL_INFO
svn path=/trunk/; revision=21126
split the "sensitivity control" into "Copy" and "Copy/As Filter", otherwise it's not possible to copy a field that is not filterable (e.g. text only descriptions)
svn path=/trunk/; revision=21097
A new function is introduced, prefs_register_protocol_subtree(), that allows the subtree the protocol should appear under to be specified. The subtree is specified as a string, with a '/' delimiting each subtree element. For example,
prefs_register_protocol(proto_dap, prefs_register_dap);
becomes
prefs_register_protocol_subtree("OSI/X.500", proto_dap, prefs_register_dap);
The function will create all the intermediate subtree nodes that are required, if they don't already exist.
This allows the grouping of procotols which should make the list of protocols more manageable as even more are added. The current aim is to group by protocol family e.g.
+ OSI
+ X.400
X.411
X.420
+ X.500
DISP
DAP
DOP
DSP
+ X.509
X509AF
X509CE
...
but others grouping could be envisioned (e.g. by first letter).
As the intermediate nodes may already have preferences (e.g. OSI), then modules are now allowed to have submodules. Previously each node was either a subtree or held preferences. This is consistent with the "User Interface" node.
The subtree structure has no effect on how the preferences are saved to file, and the "Protocol Preferences..." menu option will bring up the preferences expanded to the correct node.
In addition, a new "blank page" has been introduced for intermediate nodes that have no preferences (and is also used when the "Protocols" node itself is chosen). This prevents confusion when the user moves from a node with preferences to a node without preferences, but the page old page is still shown.
There is also a change to prevent '#' characters in a value being treated as a comment when parsing the preferences file. (There is nothing that adds comments when writing the preferences file.)
svn path=/trunk/; revision=21066
- instead of wrongly using the h248 call counter use tapinfo's counter
graph_analysis.c:
- beautify the code (I was trying to the bug that got fixed by bzeroing m3ua tap data however this looks better!).
svn path=/trunk/; revision=21063
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1336
Since mtp3_stat_draw() returns immediately if passed a NULL tapdata pointer,
call it with a pointer to the stat data (instead of NULL) in
mtp3_stat_gtk_cb().
svn path=/trunk/; revision=21042
screen
Changed IP address label to fit into an event box which is in the ip
address hbox. This allows the label to expand to fit the capture dialog
window, but no further. Expanding the capture dialog window will show
more IP addresses. Left align the label. Add ... in the middle of a
long list of IP addresses to show the first few and the last few with
the gtk_label_set_ellipsize() function in GTK 2.6 and up.
svn path=/trunk/; revision=21038
and there are no formats in which the file can be saved by some means
other than copying the raw data; "Save As" isn't a very useful function
in that case, and that prevents us from having an empty list of formats
in which the file can be saved.
svn path=/trunk/; revision=21032
add new WS command line option -P to be able to change some of the path settings
this is experimental, please report bugs
svn path=/trunk/; revision=21022
- Split the HTTP tap into two taps: one for the HTTP statistics
and the other for the export object function. This allows the
HTTP statistics to work again (they seem to have been
partially broken since SVN rev 18901).
- Pass the conversation data (conv_data) between functions now
instead of using the global variable stat_info (now only used
for the HTTP stats)
- Pass only pointers from the HTTP dissector to the Export Object
tap, where we'll then copy the values and insert into the slist.
- Make sure we free all memory allocated by this feature when
we're done with it.
- Various other minor improvements
svn path=/trunk/; revision=21021
epan/dissectors/
packet-bctp.c:
no newline at end of file
packet-epl.c:
C++ style comments are not allowed in ISO C90
packet-sccp.c:
missing initializer
packet-sccp.h:
comma at end of enumerator list
packet-sctp.c:
suggest parentheses around assignment used as truth value
packet-vnc.c:
control reaches end of non-void function
pointer targets in passing argument 1 of 'g_strtod' differ in
signedness
pointer targets in passing argument 3 of 'vnc_client_to_server'
differ in signedness
gtk/
main.c:
C++ style comments are not allowed in ISO C90
u3.h:
function declaration isn't a prototype
Other (trivial) stuff
packet-sccp.h:
Add svn properties
svn path=/trunk/; revision=21011
I have changed the patch according to your suggestions and also changed
the doc[book] files accordingly. I tested the patch and it does seem to
work fine on my test-system.
ULFL: In addition, I've added the en-/disabling to the other (already existing) Copy menu items - some just did nothing, some crashed if nothing was selected.
I've also sligthly changed the menu seperators and made both context menus look a bit more identical.
svn path=/trunk/; revision=21005
- Note in the user's guide that export object is not available
in GTK1 builds of Wireshark.
- Make scanning through the slists more efficient
- Use new tap.c function called have_tap_listener() to only save
object payload data when the export object listener is actively
listening for it.
- Save objects in the HTTP dissector with g_malloc() instead of
se_malloc() and free it when we're done with it - when the
export object window is closed (Fixes bug #1412)
- Various minor improvements
svn path=/trunk/; revision=20980
- Add to User's Guide
- Add a help button
- Move a lot of code into the shared export_object.c file and out of
dissector specific file export_object_http.c. This will make adding
additional protocols much easier.
- Change comment in packet-http.c to reflect new name (Export Object)
- Various other minor improvements
svn path=/trunk/; revision=20961
This patch add a test on the GTK version to avoid a warning with the "gtk-label-select-on-focus" configuration parameter, introduced in GTK-2.9.0.
svn path=/trunk/; revision=20936
feature lists all of the content found in an HTTP stream (images, http, etc.)
and displays it in a list that allows the user to save each one as a file that
is already reassembled by the dissectors.
svn path=/trunk/; revision=20867
I have provided a patch for a crash that occurs in uat_gui.c if from the
"Edit preferences..." button when you choose Protocols -> DLT_USER ->
the "Edit..." button -> the "New" button -> the "Cancel" button.
The crash happens because dd gets freed prior to traversing its internal
structure, hence I moved the call to g_free for dd beneath the traversal
of the dd internals.
svn path=/trunk/; revision=20813
Create two new files (ws_strsplit.[ch]) that use GTK2 code to override
the buggy g_strsplit() function when compiling for GTK1. Include this
work-around function (ws_strsplit) in libwireshark.def. Add notes on usage
to README.developer. Include epan/ws_strsplit.h in all files that use
g_strsplit().
svn path=/trunk/; revision=20804
(this should be combined into a generic function as this CSV encapsulation functionality is implemented several times)
svn path=/trunk/; revision=20791
Have these buttons reloading the capture file if needed.
Some rearrangement of the window (the editor is still missing "ornaments" and tooltips)
svn path=/trunk/; revision=20788
* Remove macros_dlg, the DFMacros UAT goes in the menu with all the rest
* in packet-user_encap.c WTAP_ENCAP=XXX has become useless information for the user leave just the DLT#
svn path=/trunk/; revision=20753
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289
Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)
From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.
svn path=/trunk/; revision=20726
* fields of an uat table now are passed using an array of uat_filed_t
* field callbacks take two more userdata arguments
* add some macros to define uat field callbacks.
* uats can be registered as preferences for a specific protocol
- the preference widget is a button that opens the uat's window
* dfilter-macro => reflect changes to API
svn path=/trunk/; revision=20695
This is only a "personal backup" of some design ideas / experiments for this page - and needs a lot more work / cleanup. I'm checking this in just to prevent data loss.
svn path=/trunk/; revision=20640
This is a patch adding items to the context menus for the packet list
and packet details panes for copying packet data to the clipboard.
New menu item on packet list pane:
Copy (sub menu) ->
Summary (Text) Copies fields displayed in the packet
list, tab separated
Summary (CSV) Copies fields displayed in the packet
list, comma separated
Hex and Text Copies data for the selected frame in
hex-editor style (similar to Copy\All Information in packet bytes pane)
Text Only Copies data for the selected frame,
dropping non-printable characters other than line breaks (similar to
Copy\Text Only in packet bytes pane)
Hex Columns As Hex and Text but without text
Hex Stream Copies data for the selected frame as an
unpunctuated list of hex values
Binary Stream Copies raw packet bytes to the clipboard
as MIME type application/octet-stream
svn path=/trunk/; revision=20581
the process. This change assumes that you can make a copy of a
GtkTreeIter and use it later (which may not be valid), and hasn't been
tested using GTK 1.
svn path=/trunk/; revision=20550
is greater than 3 we can get detailed interface information. This should
limit the amount of work we have to do when new WinPcap releases come out.
svn path=/trunk/; revision=20542
"The Help ! Contents and the Help ! User's Guide both display the User's
Guide."
Remove the duplicate Help!/User's Guide item
svn path=/trunk/; revision=20523
as an argument, and, on an error, if they have an error message, have
them set that "gchar *" to point to a g_malloc()ed string containing the
error message, rather than taking a pointer to a buffer for that message
as an argument. That's more like what's done in Wiretap, and doesn't
impose an upper limit on the lengths of those error messages. If that
pointer is null, don't allocate the message string and return it.
Have that error message already have the "cant_get" processing applied
to it, so nobody other than those routines need to call the "cant_get"
routines to process the error messages.
Have get_airpcap_interface_list() explicitly set "*err" to the
appropriate error code.
Clean up indentation.
svn path=/trunk/; revision=20521
default font of Sans 10 instead of the setting in Wireshark (such as
Monospace 10). On some systems this bug was causing the contents of columns
such as the command line specified (CLS) time to be cut off.
svn path=/trunk/; revision=20512
A user asked what file format the flow graph is saved as, which isn't
apparent by looking at the dialog. I had to try saving a file and check
its type -- plain text file. Could someone please apply the attached
patch or similar change to graph_analysis.c. My patch updates the title
of the dialog box from "Wireshark: Save graph to file" to "Wireshark:
Save graph to text file".
However, I used the term "plain text file" instead ;-)
svn path=/trunk/; revision=20510
property, which selects the entire contents of a label when it comes
into focus. This property annoyingly defaults to TRUE, which meant that
the labels in simple dialogs and the about box would unexpectedly show
up selected.
Work around this by setting the focus on the "OK" button in the about
dialog and the first button specified in simple dialogs.
svn path=/trunk/; revision=20507
that you must restart wireshark for the changes to take effect. The sentence
used to say to hit the save button first, which is now gone by default.
svn path=/trunk/; revision=20489
32-bit numbers. Separate signed and unsigned accessors have been
added and used where appropriate.
Definitely not for 0.99.5.
svn path=/trunk/; revision=20472
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)
svn path=/trunk/; revision=20446
- Win32 only: try to load help page from local user-guide.chm (if HHC_DIR is set in config.nmake) and if that fails:
- show corresponding help page directly from www.wireshark.org in the configured web browser.
The "internet way" will be the only way for all UNIX based versions, as they cannot read .chm files.
svn path=/trunk/; revision=20445
- initially show the "My Documents" folder
- don't use the "open folder" preference setting on save and alike dialogs (we don't do it in the GTK versions either)
svn path=/trunk/; revision=20433
As a nice side effect, the dir/file part of the dialogs is bigger now, which makes handling of the dialogs much nicer/faster. Yes, it still fits into 800*600 screen resolution.
Needs testing, I might have placed a g_free() call at the wrong place ...
svn path=/trunk/; revision=20423
When the "recent" file is written, any references to files on the U3 device itself are modified to have the drive replace with "$U3_DEVICE_PATH". Similarly, when the recent file is read, "$U3_DEVICE_PATH" is replaced with the current U3 device path.
This ensures that if/when the U3 device path changes when inserting it into different machines, recent captures on the U3 device itself can still be opened from the recent menu.
svn path=/trunk/; revision=20417
A BER-encoded file can be dissected as one of a number of registered syntaxes (registered using register_ber_syntax_dissector()).
Syntaxes may also be associated with OIDs (or other strings) using register_ber_oid_syntax().
A default syntax with which to dissect a BER-encoded file is determined from its filename (extension). For example, ".cer" and ".crt" files will be dissected as "Certificate".
svn path=/trunk/; revision=20414
fix this, by providing required functions in the new file file_util.c - it's mostly copied from GLib (g_open alike - that take UTF8 as filename format but don't use msvcrt.dll V6 for this as the glib files do)
"link" to these functions in file_util.h: #define eth_open eth_stdio_open
revert changes (from SVN 20282) throughout the code related to these file functions which were introduced with the first tries of MSVC 2005 ...
Hopefully I've done everything right with the new file_util.c ...
svn path=/trunk/; revision=20402
to GByteArrays. Add format_uri() to strutil, which formats a byte string
with percent-escapes. Fixup whitespace and indentation.
svn path=/trunk/; revision=20397
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express
svn path=/trunk/; revision=20282
if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.
If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.
When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.
svn path=/trunk/; revision=20261
"When analysing a trace with 802.11 packages (made by airpcap) and selecting
Statistics->Conversation List->WLAN all wlan conversations are listed. When
after this selecting Apply as filter->Selected->A<->B a display filter is
created as
eth.addr==<A> && eth.addr==<B>
when if should be
wlan.addr==<A> && wlan.addr==<B>"
svn path=/trunk/; revision=20234
distcheck failure. Move the nmake build targets for airpdcap from
epan/dissectors to epan. This will probably break the Windows build.
svn path=/trunk/; revision=20231
move the files until these changes are checked in). Add an AC_DEFINE
for airpdcap (which will be removed once the changes have settled).
Update the airpdcap code to compile on non-Windows systems. Fix up
comments and whitespace to conform more closely to the rest of the
code base. Verified to compile under Windows and OS X.
svn path=/trunk/; revision=20227
this primarily removes code and simplifies (==eliminates) the need to track the data that is allocated and should potentially be slightly faster than a slab allocator.
however these functions are called A LOT so there might be a performance hit when using emem with full debugging canary values and all the bells and whistles activated.
this change also makes any future attempt to parallellize dissection of frames easier if we just make the ep allocator allocate from a threads specific ep pool.
(something we would have to do anyway to make ep allocations multithreaded)
this works in all my tests so far but needs more test coverage.
svn path=/trunk/; revision=20194
Here is a patch for Bug 771.
It solves the problem of datalink header selection, when the interface has more than one.
svn path=/trunk/; revision=20186
width that is hard-coded in get_column_longest_string(), but also on the
width of the user specified title of the column (in case it is wider.)
svn path=/trunk/; revision=20117
support.
WEP key preferences have been overloaded to allow WPA keys. The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.
Add a few text and whitespace fixups.
svn path=/trunk/; revision=20049
by myself:
Corrected patch; epan/column.c and epan/column_utils.c were not included. This
one has now been properly tested against a clean checkout of today's code.
- New menu option available under view\time display format
- New sub-option (e) to -t switch for both wireshark and tshark
- Extended recent settings code to handle new value
- Did NOT add new explicit epoch time column
svn path=/trunk/; revision=20040
can be used to add descriptive text inline with other preference items.
The "preference" contents are not written to disk.
Fixup whitespace.
svn path=/trunk/; revision=20037
flow graph window is open. Added if(pinfo->cinfo) before attempting to use
pinfo->cinfo->col_first. The rest is indentation changes for the new if
statement.
svn path=/trunk/; revision=20028
proto_can_match_selected() routines, to more clearly separate the two
functions - but have them both call the same underlying routine, so
they both make the same decisions as to whether a match-selected string
can be constructed or not.
svn path=/trunk/; revision=19976
proto_construct_match_selected_string() to indicate what it does - and
have it return a Boolean indication of whether the string could be
built, returning the string through a pointer, and, if that pointer is
null, have it just return the Boolean and not construct the string.
Get rid of proto_can_match_selected() -
proto_construct_match_selected_string() can be used for that, which
means we have only one piece of code that knows whether a "match
selected" string can be constructed or not.
Have proto_construct_match_selected_string() support matching
zero-length FT_NONE (and FT_PCRE, but that shouldn't happen) fields even
if there's no epan_dissect_t, as such a match just checks whether the
field is present.
svn path=/trunk/; revision=19967
