obnox/wireshark/wip.git
9 years agoMake wireshark-dev depend on the right automake.
jake [Fri, 27 Aug 2010 06:07:32 +0000 (06:07 +0000)]
Make wireshark-dev depend on the right automake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33947 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Kirill A. Korinskiy:
etxrab [Fri, 27 Aug 2010 06:02:54 +0000 (06:02 +0000)]
From Kirill A. Korinskiy:
Enumerated is derived from the Integer32 AVP Base Format.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33946 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoI suspect the changes to config.nmake committed in SVN #33942 were not intended.
wmeier [Thu, 26 Aug 2010 23:40:27 +0000 (23:40 +0000)]
I suspect the changes to config.nmake committed in SVN #33942 were not intended.
Revert the changes (for now ?) so the Buildbot will run again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33945 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDoxygen fixes.
etxrab [Thu, 26 Aug 2010 20:31:09 +0000 (20:31 +0000)]
Doxygen fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33942 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoCheck input string in ps_clean_string().
stig [Thu, 26 Aug 2010 20:22:28 +0000 (20:22 +0000)]
Check input string in ps_clean_string().

This fixes bug 5148.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33941 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFixed by running doxygen -u
etxrab [Thu, 26 Aug 2010 19:40:57 +0000 (19:40 +0000)]
Fixed by running doxygen -u

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33939 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix doxygen errors.
etxrab [Thu, 26 Aug 2010 19:40:08 +0000 (19:40 +0000)]
Fix doxygen errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33938 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoShow a text string of the Windows version (if Windows 2000 or higher.)
sfisher [Thu, 26 Aug 2010 18:06:56 +0000 (18:06 +0000)]
Show a text string of the Windows version (if Windows 2000 or higher.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33936 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd a newline. Fixup whitespace.
gerald [Thu, 26 Aug 2010 17:18:44 +0000 (17:18 +0000)]
Add a newline. Fixup whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33933 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix a number of doxygen directives.
etxrab [Thu, 26 Aug 2010 15:24:49 +0000 (15:24 +0000)]
Fix a number of doxygen directives.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33930 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix a number of doxygen directives.
etxrab [Thu, 26 Aug 2010 15:02:27 +0000 (15:02 +0000)]
Fix a number of doxygen directives.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33929 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Juha Siltanen via bug 5144:
stig [Thu, 26 Aug 2010 13:49:23 +0000 (13:49 +0000)]
From Juha Siltanen via bug 5144:
Added support for payload dissecting.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33928 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago- Try to fix a couple of doxygen comments.
etxrab [Thu, 26 Aug 2010 07:12:03 +0000 (07:12 +0000)]
- Try to fix a couple of doxygen comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33927 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago- Try to fix a couple of doxygen comments.
etxrab [Thu, 26 Aug 2010 06:46:30 +0000 (06:46 +0000)]
- Try to fix a couple of doxygen comments.
- whitspace changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33926 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoMove Windows-specific material inside an appropriate #ifdef.
gerald [Wed, 25 Aug 2010 22:41:26 +0000 (22:41 +0000)]
Move Windows-specific material inside an appropriate #ifdef.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33925 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd ws_load_library and ws_module_open, which respectively call
gerald [Wed, 25 Aug 2010 20:30:59 +0000 (20:30 +0000)]
Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33924 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUpdate the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 on Win64...
morriss [Wed, 25 Aug 2010 18:20:56 +0000 (18:20 +0000)]
Update the WinPcap developer's pack to 4.1.2.  Update PCAP_VERSION to 4.1.2 on Win64 too (for consistency more than anything I think).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33923 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version.
morriss [Wed, 25 Aug 2010 15:28:26 +0000 (15:28 +0000)]
Use PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33922 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoChange PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps builds...
morriss [Wed, 25 Aug 2010 15:27:14 +0000 (15:27 +0000)]
Change PCAP_VERSION to 4.1.2.  Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33921 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix wrong length of CSeq Method parameter
kukosa [Wed, 25 Aug 2010 14:10:58 +0000 (14:10 +0000)]
Fix wrong length of CSeq Method parameter

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33920 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoLet DCT2000 tree extend to end of ipprim or sctpprim bytes.
martinm [Wed, 25 Aug 2010 13:27:27 +0000 (13:27 +0000)]
Let DCT2000 tree extend to end of ipprim or sctpprim bytes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33919 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoShow (again?) MAC-d PDUs inside MAC-es PDUs.
martinm [Wed, 25 Aug 2010 13:01:00 +0000 (13:01 +0000)]
Show (again?) MAC-d PDUs inside MAC-es PDUs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33918 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix !Windows compilation.
gerald [Wed, 25 Aug 2010 00:20:50 +0000 (00:20 +0000)]
Fix !Windows compilation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33917 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoPartial fix for bug 5133. On Windows, call SetDllDirectory at startup if
gerald [Tue, 24 Aug 2010 23:39:29 +0000 (23:39 +0000)]
Partial fix for bug 5133. On Windows, call SetDllDirectory at startup if
it's present in Wireshark and dumpcap. This takes care of the airpcap.dll
PoC but we need to load wpcap.dll from a full path. We might want to
call SetDllDirectory from our other executables as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33916 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoMake the expert filter popup behave as in filter_utils.
etxrab [Tue, 24 Aug 2010 20:03:33 +0000 (20:03 +0000)]
Make the expert filter popup behave as in filter_utils.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33915 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDisplay content entry (with length) in tree.
stig [Tue, 24 Aug 2010 15:47:10 +0000 (15:47 +0000)]
Display content entry (with length) in tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33914 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix modifier in .cnf file.
stig [Tue, 24 Aug 2010 15:46:33 +0000 (15:46 +0000)]
Fix modifier in .cnf file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33913 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoRewrote to fetch content_tvb from dissect_ber_octet_string().
stig [Tue, 24 Aug 2010 15:43:32 +0000 (15:43 +0000)]
Rewrote to fetch content_tvb from dissect_ber_octet_string().
Display eContent entry (with length) in tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33912 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDisplay octet string fragments for RTSE segment data.
stig [Tue, 24 Aug 2010 15:09:11 +0000 (15:09 +0000)]
Display octet string fragments for RTSE segment data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33911 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDisplay constructed octet strings with correct hf_id.
stig [Tue, 24 Aug 2010 15:08:07 +0000 (15:08 +0000)]
Display constructed octet strings with correct hf_id.
Show octet string fragments as for reassembly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33910 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix issue which causes daintree-sna frames to be rejected with "capture length >...
wmeier [Tue, 24 Aug 2010 14:59:11 +0000 (14:59 +0000)]
Fix issue which causes daintree-sna frames to be rejected with "capture length > packet length".

This fix adds back two lines of code removed in SVN #33678.

 "Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
  include the FCS, and use it for the Daintree SNA file format. [...]"

This fix just restores the discarding of two end-of-frame "pad" bytes as each frame is read
from the capture file; This seems to me to be the correct behaviour.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33909 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoIndicate abort and abort-reason in info column.
stig [Tue, 24 Aug 2010 11:36:10 +0000 (11:36 +0000)]
Indicate abort and abort-reason in info column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33908 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd Id.
etxrab [Tue, 24 Aug 2010 07:44:36 +0000 (07:44 +0000)]
Add Id.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33907 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Gregor Beck:
etxrab [Tue, 24 Aug 2010 06:15:40 +0000 (06:15 +0000)]
From Gregor Beck:
ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33906 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago- fix using hex values as constraint
kukosa [Tue, 24 Aug 2010 05:53:17 +0000 (05:53 +0000)]
- fix using hex values as constraint
- avoid crash if unknown type is used in type assignment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33905 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Hamish Moffatt:
etxrab [Tue, 24 Aug 2010 05:44:55 +0000 (05:44 +0000)]
From Hamish Moffatt:
 daintree-sna.c doesn't initialise capture_file snapshot_length.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5128

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33904 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Christian Durrer:
etxrab [Tue, 24 Aug 2010 05:38:49 +0000 (05:38 +0000)]
From Christian Durrer:
Not all Ether-S-Bus telegrams are recognized and displayed correctly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5123

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33903 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoChange the wording in the menu.
etxrab [Tue, 24 Aug 2010 05:11:37 +0000 (05:11 +0000)]
Change the wording in the menu.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33902 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse consistent indentation;
wmeier [Tue, 24 Aug 2010 00:25:50 +0000 (00:25 +0000)]
Use consistent indentation;
Fix a few @param comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33901 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDisplay ISATAP encapsulated IPv4 addresses.
gerald [Tue, 24 Aug 2010 00:24:44 +0000 (00:24 +0000)]
Display ISATAP encapsulated IPv4 addresses.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33900 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoThe ARP hardware type and operation code are listed with the IANA in decimal notation...
sfisher [Mon, 23 Aug 2010 23:09:32 +0000 (23:09 +0000)]
The ARP hardware type and operation code are listed with the IANA in decimal notation, not hex.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33898 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Minor) Cleanup signal callbak signatures and related:
wmeier [Mon, 23 Aug 2010 19:29:08 +0000 (19:29 +0000)]
(Minor) Cleanup signal callbak signatures and related:
- Don't mark callback arg as _U_ if actually used (and vice-versa);
- Use Null as user_data in g_signal_callback if unused in callback;
- Use correct signature for certain event callbacks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33895 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoOn request from Albert Chin:
jake [Mon, 23 Aug 2010 18:16:22 +0000 (18:16 +0000)]
On request from Albert Chin:
Update libtoolize files

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33894 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago[Trivial] Use g_signal_connect() instead of g_signal_connect_data().
wmeier [Mon, 23 Aug 2010 16:48:42 +0000 (16:48 +0000)]
[Trivial] Use g_signal_connect() instead of g_signal_connect_data().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33893 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Trivial) Use consistent indentation.
wmeier [Mon, 23 Aug 2010 16:39:52 +0000 (16:39 +0000)]
(Trivial) Use consistent indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33892 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoRemove #if 0'd out code (dfilter_combo_add_empty()).
morriss [Mon, 23 Aug 2010 16:18:06 +0000 (16:18 +0000)]
Remove #if 0'd out code (dfilter_combo_add_empty()).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33891 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Trivial/Cosmetic) Fix signatures of some signal callback functions;
wmeier [Mon, 23 Aug 2010 15:58:48 +0000 (15:58 +0000)]
(Trivial/Cosmetic) Fix signatures of some signal callback functions;
Also:Add some missing G_CALLBACKs (even in commented out code)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33890 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Trivial) Whitespace cleanup.
wmeier [Mon, 23 Aug 2010 14:36:01 +0000 (14:36 +0000)]
(Trivial) Whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33889 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agonew_packet_list_column_button_pressed_cb(): return gboolean (not void): it's an event...
wmeier [Mon, 23 Aug 2010 14:08:35 +0000 (14:08 +0000)]
new_packet_list_column_button_pressed_cb(): return gboolean (not void): it's an event callback;
Note:
 the original code:
   static void new_packet_list_column_button_pressed_cb() {
     ...
     packet_list_popup(...);
     }
 the revised code:
   static gboolean new_packet_list_column_button_pressed_cb() {
     ...
     return packet_list_popup(...);
     }

 My guess is that the original code happened to work
 on some?/all? supported platforms depending upon the actual
 details of the generated calling_sequence/return code.
---------------
Also:
- new_packet_list_column_button_pressed_cb(): 'path' arg is unused;
- new_packet_list_double_click_cb(): user_data arg is unused so
  don't supply same in the g_signal_connect.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33888 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix for attribute boolean, from bug 5127.
stig [Mon, 23 Aug 2010 09:17:03 +0000 (09:17 +0000)]
Fix for attribute boolean, from bug 5127.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33887 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago[Automatic manuf and enterprise-numbers update for 2010-08-22]
gerald [Sun, 22 Aug 2010 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-08-22]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33881 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd !ENDIF if needed.
gerald [Sun, 22 Aug 2010 00:41:06 +0000 (00:41 +0000)]
Add !ENDIF if needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33880 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd a "summary in tree" option similar to v4.
gerald [Sat, 21 Aug 2010 17:45:03 +0000 (17:45 +0000)]
Add a "summary in tree" option similar to v4.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33878 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoInitialize a variable before we try to free it.
gerald [Sat, 21 Aug 2010 16:38:13 +0000 (16:38 +0000)]
Initialize a variable before we try to free it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33877 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoNew packet list is no longer experimental.
wmeier [Sat, 21 Aug 2010 13:48:52 +0000 (13:48 +0000)]
New packet list is no longer experimental.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33876 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse GType instead of deprecated GtkType
wmeier [Sat, 21 Aug 2010 13:21:35 +0000 (13:21 +0000)]
Use GType instead of deprecated GtkType

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33875 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd some code to prefs_cleanup() to free (most of the) memory associated with the...
morriss [Sat, 21 Aug 2010 04:26:26 +0000 (04:26 +0000)]
Add some code to prefs_cleanup() to free (most of the) memory associated with the preferences.  This only happens during shutdown so it's not fixing a memory leak, but it makes me more comfortable to know where the preferences memory is freed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33874 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDocument what prefs_register_string_preference() does with your value pointer.
morriss [Sat, 21 Aug 2010 03:54:55 +0000 (03:54 +0000)]
Document what prefs_register_string_preference() does with your value pointer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33873 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoprefs_register_string_preference() overwrites the given value pointer with a copy...
morriss [Sat, 21 Aug 2010 03:44:36 +0000 (03:44 +0000)]
prefs_register_string_preference() overwrites the given value pointer with a copy of the string.  Since the string this dissector passes in is mallocated, keep a pointer to it and then free it after the pointer has been overwritten.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33872 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoRemove duplicate definition of COL_MAX_LEN and COL_MAX_INFO_LEN: apparently no one...
morriss [Sat, 21 Aug 2010 03:31:30 +0000 (03:31 +0000)]
Remove duplicate definition of COL_MAX_LEN and COL_MAX_INFO_LEN: apparently no one needs them in this file (probably because they're marked as "don't use").  Now they are only defined in column_info.h .

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33871 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoIf we have something that looks like a stateless autoconfiguration
gerald [Sat, 21 Aug 2010 00:19:32 +0000 (00:19 +0000)]
If we have something that looks like a stateless autoconfiguration
address, add the corresponding MAC address to the tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33870 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFree the err_str from capture_interface_list() even if the error isn't CANT_GET_INTER...
morriss [Fri, 20 Aug 2010 22:15:07 +0000 (22:15 +0000)]
Free the err_str from capture_interface_list() even if the error isn't CANT_GET_INTERFACE_LIST.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33866 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoWhen freeing the fileset entries, free the entry itself too.
morriss [Fri, 20 Aug 2010 22:13:46 +0000 (22:13 +0000)]
When freeing the fileset entries, free the entry itself too.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33865 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDon't leak the memory used by the original title when we're appending the version...
morriss [Fri, 20 Aug 2010 22:12:55 +0000 (22:12 +0000)]
Don't leak the memory used by the original title when we're appending the version to it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33864 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Turney Cal as a followup to rev 33841 and bug 5038:
morriss [Fri, 20 Aug 2010 21:56:52 +0000 (21:56 +0000)]
From Turney Cal as a followup to rev 33841 and bug 5038:

I tested your update ("wireshark -r foo.pcap" from a cmd window) and
found that it did not use the current folder for the next Open dialog
and didn't save the folder in recent.  The attached patch prepends the
filename with the current folder.

From me: don't leak memory when doing it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33863 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Kirill A. Korinskiy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
morriss [Fri, 20 Aug 2010 19:41:35 +0000 (19:41 +0000)]
From Kirill A. Korinskiy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5122:

I try use diameters XML files as sources for my XSL transform by xslt and found
some typos. I attach patch for fixing it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33862 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoSwitch wlan_stat_dlg to use GUIManager step 2.
etxrab [Fri, 20 Aug 2010 14:19:06 +0000 (14:19 +0000)]
Switch wlan_stat_dlg to use GUIManager step 2.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33860 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse defined functions.
stig [Fri, 20 Aug 2010 12:05:44 +0000 (12:05 +0000)]
Use defined functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33859 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoRemove a comment.
etxrab [Fri, 20 Aug 2010 11:57:20 +0000 (11:57 +0000)]
Remove a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33858 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix indentation.
etxrab [Fri, 20 Aug 2010 11:56:44 +0000 (11:56 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33857 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoSwitch wlan_stat_dlg to use GUIManager step 1.
etxrab [Fri, 20 Aug 2010 11:54:18 +0000 (11:54 +0000)]
Switch wlan_stat_dlg to use GUIManager step 1.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33856 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago Minor cleanup of rtp graph:
wmeier [Thu, 19 Aug 2010 22:04:37 +0000 (22:04 +0000)]
 Minor cleanup of rtp graph:
 - Display current value in combo boxes (pixels_per_tick, etc) to always
   match actual values being used to create graph;
 - yscale combo box entries:
    show values >= 1 sec as sec (not s000 ms);
 - Determine max yscale label width properly as the largest of the
   top or middle label lengths;
 - Cleanup some indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33855 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix two bugs related to use of the graph Y-Axis Scale combo-box:
wmeier [Thu, 19 Aug 2010 21:51:35 +0000 (21:51 +0000)]
Fix two bugs related to use of the graph Y-Axis Scale combo-box:
1. Incorrect specification of units: Should be ms & s not us and ms;
   Bug introduced in SVN #33834.
2. Selecting 50ms as the yscale actually used 50us as the scale;
   Bug introduced in SVN #30543.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33854 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFixed the popup menu table:
stig [Thu, 19 Aug 2010 20:11:28 +0000 (20:11 +0000)]
Fixed the popup menu table:
- Added missing NULL initializers
- Fixed some typos in the menu items

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33853 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse better naming.
etxrab [Thu, 19 Aug 2010 19:05:56 +0000 (19:05 +0000)]
Use better naming.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33852 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoSwitch over to use the GUIManager(can be turned of by a #define).
etxrab [Thu, 19 Aug 2010 19:05:11 +0000 (19:05 +0000)]
Switch over to use the GUIManager(can be turned of by a #define).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33851 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix gcc compile errors....
wmeier [Thu, 19 Aug 2010 15:22:03 +0000 (15:22 +0000)]
Fix gcc compile errors....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33850 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse proper signatures for event callback functions:
wmeier [Thu, 19 Aug 2010 15:02:23 +0000 (15:02 +0000)]
Use proper signatures for event callback functions:
   EG: Non-event signal callback functions shouldn't
   be directly used as event callback functions.
Replace use of deprecated "GtkSignalFunc";
Whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33849 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5114 (infinite loop in
morriss [Thu, 19 Aug 2010 02:17:01 +0000 (02:17 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5114 (infinite loop in
bootp dissector when dissecting packetcable MTA capabilities).

Limit the tlv_len to G_MAXUINT16 to prevent an integer overflow from causing us to
increment the working offset by 0 (thus causing us to loop).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33846 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoAdd placeholder items for ^Z as Edit->Undo, shift-^Z as Edit->Redo,
guy [Thu, 19 Aug 2010 00:14:07 +0000 (00:14 +0000)]
Add placeholder items for ^Z as Edit->Undo, shift-^Z as Edit->Redo,
and ^A as Edit->Select All.

Add more details about implementing Undo/Redo/Cut/Copy/Paste/Select All
in the comment for the placeholder items.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33845 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUse correct signature for "button-press-event" callback function;
wmeier [Thu, 19 Aug 2010 00:09:56 +0000 (00:09 +0000)]
Use correct signature for "button-press-event" callback function;
Whitespace cleanup;
Use gboolean as appropriate;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33844 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoVarious minor cleanup:
wmeier [Wed, 18 Aug 2010 22:20:01 +0000 (22:20 +0000)]
Various minor cleanup:
 - Non-event signal callback functions should return void;
 - Event signal callback had missing 'user_data' arg;
 - Rename various symbols for clarity;
 - Rename local functions with names of form gtk_...;
 - Use gboolean where appropriate;
 - Remove all 'exit(10)' statements;
 - Whitespace;
 - ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33843 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix for Bug 5052:
dimeg [Wed, 18 Aug 2010 21:12:26 +0000 (21:12 +0000)]
Fix for Bug 5052:
Good ZigBee Beacon detected as malformed

In ZigBee 2006 the Tx-Offset is optional, while in the 2007 and
later versions, the Tx-Offset is a required value. Since both 2006 and
and 2007 versions have the same protocol version (2), we should treat
the Tx-Offset as well as the update ID as optional elements

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33842 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agomain_cf_cb_file_read_finished(): use get_dirname() to get the directory of the
morriss [Wed, 18 Aug 2010 19:11:07 +0000 (19:11 +0000)]
main_cf_cb_file_read_finished(): use get_dirname() to get the directory of the
current file name.

This fixes a crash after failing to allocate some massive number of bytes if
the file name did not contain a path--which is the case when doing
"wireshark -r myfile.pcap".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33841 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix ipprim IPv6 port number offsets.
martinm [Wed, 18 Aug 2010 10:47:21 +0000 (10:47 +0000)]
Fix ipprim IPv6 port number offsets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33840 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoShow IPv6 addresses in ipprim summary line.
martinm [Wed, 18 Aug 2010 10:33:54 +0000 (10:33 +0000)]
Show IPv6 addresses in ipprim summary line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33839 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix indentation.
etxrab [Wed, 18 Aug 2010 08:09:37 +0000 (08:09 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33838 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Cal Turney:
etxrab [Wed, 18 Aug 2010 07:48:37 +0000 (07:48 +0000)]
From Cal Turney:
Restores Mark All Displayed item when all packets are displayed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5115

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33836 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoVarious minor cleanups....
wmeier [Wed, 18 Aug 2010 01:01:06 +0000 (01:01 +0000)]
Various minor cleanups....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33835 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoMinor cleanup of iax2 graph:
wmeier [Wed, 18 Aug 2010 00:04:53 +0000 (00:04 +0000)]
Minor cleanup of iax2 graph:
- Display current value in combo boxes (pixels_per_tick, etc) to always
  match actual values being used to create graph;
- yscale combo box entries:
   show ms values as ms (not x000 usecs);
   show us values with unit "us" (not "ms");
- Determine max yscale label width properly as the largest of the
  top or middle label lengths;
- Cleanup some indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33834 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoUpdates due to ITU Operational Bulletins 956 and 957
dimeg [Tue, 17 Aug 2010 22:48:39 +0000 (22:48 +0000)]
Updates due to ITU Operational Bulletins 956 and 957

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33833 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoThe Mobile Status msg in BSSAP+ has IMSI as first possible IE
dimeg [Tue, 17 Aug 2010 21:35:26 +0000 (21:35 +0000)]
The Mobile Status msg in BSSAP+ has IMSI as first possible IE

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33832 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoChange a channel type #define to be contiguous with others.
martinm [Tue, 17 Aug 2010 16:12:29 +0000 (16:12 +0000)]
Change a channel type #define to be contiguous with others.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33831 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Trivial) Reword comments about callback function signatures.
wmeier [Tue, 17 Aug 2010 14:01:33 +0000 (14:01 +0000)]
(Trivial) Reword comments about callback function signatures.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33830 f5534014-38df-0310-8fa8-9805f1628bb7

9 years ago(Trivial) window_delete_event_cb() 'user_data' arg is unused ...
wmeier [Tue, 17 Aug 2010 13:59:15 +0000 (13:59 +0000)]
(Trivial) window_delete_event_cb() 'user_data' arg is unused ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33829 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoMinor changes related to signal callback functions:
wmeier [Tue, 17 Aug 2010 13:44:12 +0000 (13:44 +0000)]
Minor changes related to signal callback functions:
- all: filter_te_syntax_check_cb should have an (unused) 'gpointer user_data' arg;
- filter_dlg.c: filter_sel_list_cb user_data arg is unused;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33828 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoCommit 33815 renamed packet-nt-sonmp.c to packet-ndp.c
jmayer [Tue, 17 Aug 2010 07:00:58 +0000 (07:00 +0000)]
Commit 33815 renamed packet-nt-sonmp.c to packet-ndp.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33827 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoDiscourage people from stealing <control> keystrokes that have somewhat
guy [Tue, 17 Aug 2010 01:36:53 +0000 (01:36 +0000)]
Discourage people from stealing <control> keystrokes that have somewhat
standard meanings for anything other than those standard purposes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33826 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFix two typos/bugs (introduced by me in the previous commit).
wmeier [Tue, 17 Aug 2010 01:01:48 +0000 (01:01 +0000)]
Fix two typos/bugs (introduced by me in the previous commit).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33825 f5534014-38df-0310-8fa8-9805f1628bb7

9 years agoFrom Tom Hughes: FastCGI dissector.
wmeier [Tue, 17 Aug 2010 00:51:44 +0000 (00:51 +0000)]
From Tom Hughes: FastCGI dissector.

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

From me: - Fix one bug;
         - Add a comment about some code which doesn't display info
            in COL_INFO as intended due to what seems to be a Wireshark bug in
            tcp_dissect_pdus() when there are multiple records in a
            TCP frame.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33824 f5534014-38df-0310-8fa8-9805f1628bb7