11 years agoFrom RD Thrush: Fix for 'editcap relies on gnu extension to strptime(3)'
wmeier [Thu, 17 Jan 2008 21:04:48 +0000 (21:04 +0000)]
From RD Thrush: Fix for 'editcap relies on gnu extension to strptime(3)'

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

11 years agoNow that we have wiretap plugins, capinfos and editcap need to be linked against...
morriss [Thu, 17 Jan 2008 19:44:04 +0000 (19:44 +0000)]
Now that we have wiretap plugins, capinfos and editcap need to be linked against libwireshark (because the non-wiretap plugins use it but also init_progfile_dir() is in epan and they use that to load the plugins)

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

11 years agoadd some parentheses as suggested by the OS X buildbot
ulfl [Thu, 17 Jan 2008 19:30:35 +0000 (19:30 +0000)]
add some parentheses as suggested by the OS X buildbot

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

11 years agoepan (libwireshark) uses getservbyport() which, at least on Solaris, is in libsocket...
morriss [Thu, 17 Jan 2008 18:42:19 +0000 (18:42 +0000)]
epan (libwireshark) uses getservbyport() which, at least on Solaris, is in libsocket so add libsocket (and libnsl) to libwireshark_la_LIBADD

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

11 years agobetter conformance to the released DCP protocol spec:
ulfl [Thu, 17 Jan 2008 18:29:51 +0000 (18:29 +0000)]
better conformance to the released DCP protocol spec:
- redesign/refactoring the code to support BlockQualifier
- fix handling of BlockInfo
- rename some display strings for better spec conformance
- remove LLDP suboption

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

11 years agoAdd support for DLT_SCCP (SCCP without MTP2, MTP3, or any pseudo-header).
morriss [Thu, 17 Jan 2008 17:55:38 +0000 (17:55 +0000)]
Add support for DLT_SCCP (SCCP without MTP2, MTP3, or any pseudo-header).

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

11 years agoHmmm. The previous ansi_tcap.cnf did not make valid code.
stig [Thu, 17 Jan 2008 09:20:17 +0000 (09:20 +0000)]
Hmmm.  The previous ansi_tcap.cnf did not make valid code.
I hope this fix is correct...

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

11 years agoChanged some variable types to make it compile.
stig [Wed, 16 Jan 2008 20:49:50 +0000 (20:49 +0000)]
Changed some variable types to make it compile.

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

11 years ago- Removed some unused variables in asn1 dissectors
stig [Wed, 16 Jan 2008 20:41:23 +0000 (20:41 +0000)]
- Removed some unused variables in asn1 dissectors
- Fixed last parameter to cry_cipher_open() in pkcs12

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

11 years agoChanged to checksum_good and checksum_bad to align with other dissectors.
stig [Wed, 16 Jan 2008 19:16:30 +0000 (19:16 +0000)]
Changed to checksum_good and checksum_bad to align with other dissectors.

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

11 years agoPrint the string to STDOUT regardless of the value of tree.
jake [Wed, 16 Jan 2008 18:39:32 +0000 (18:39 +0000)]
Print the string to STDOUT regardless of the value of tree.

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

11 years ago- Display some sctpprim parameters
martinm [Wed, 16 Jan 2008 14:19:45 +0000 (14:19 +0000)]
- Display some sctpprim parameters
- Parse sctpprim v3 properly now
- Add wtp protocol name

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

11 years agoFrom Jim Young:
jake [Wed, 16 Jan 2008 07:36:34 +0000 (07:36 +0000)]
From Jim Young:
This patch provides a new RTP Player preferences dialog.  It allows one to
select the maximum number of visable channels in the RTP Player window.  The
default is four (4) channels which is the maximum number of usable channels
that the RTP Player can display and still have access to the bottom row buttons
on a 1024*768 resolution display.  Specifying a value less than 1 or greater than
10 will be result in the RTP Player displaying the default 4 channels.

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

11 years agodumpcap link: remove duplicate epan/unicode-utils.obj
wmeier [Wed, 16 Jan 2008 04:40:18 +0000 (04:40 +0000)]
dumpcap link: remove duplicate epan/unicode-utils.obj

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

11 years agoAdd ':' to some labels to prevent assembler warning messages
wmeier [Wed, 16 Jan 2008 04:04:24 +0000 (04:04 +0000)]
Add ':' to some labels to prevent assembler warning messages

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

11 years agoCall post dissectors with call_dissector_only() to avoid an extra Data entry
stig [Tue, 15 Jan 2008 23:31:37 +0000 (23:31 +0000)]
Call post dissectors with call_dissector_only() to avoid an extra Data entry
if post dissectors are disabled, as pointed out by LEGO.

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

11 years agoMoved a G_GINT64_CONSTANT to a more correct position.
stig [Tue, 15 Jan 2008 23:25:40 +0000 (23:25 +0000)]
Moved a G_GINT64_CONSTANT to a more correct position.

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

11 years agoFixed a small issue reporting corresponding package num for retransmitted
stig [Tue, 15 Jan 2008 22:32:34 +0000 (22:32 +0000)]
Fixed a small issue reporting corresponding package num for retransmitted
reports and notifications.

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

11 years agoUse G_GINT64_CONSTANT(hope it makes the OS X build bot happy).
etxrab [Tue, 15 Jan 2008 22:23:57 +0000 (22:23 +0000)]
Use G_GINT64_CONSTANT(hope it makes the OS X build bot happy).
Unused variables fix to camel.

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

11 years agoUse G_GINT64_CONSTANT(hope it makes the build bot happy).
etxrab [Tue, 15 Jan 2008 22:07:29 +0000 (22:07 +0000)]
Use G_GINT64_CONSTANT(hope it makes the build bot happy).

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

11 years agoUse G_GINT64_MODIFIER hope it makes the build bot happy.
etxrab [Tue, 15 Jan 2008 21:57:50 +0000 (21:57 +0000)]
Use G_GINT64_MODIFIER hope it makes the build bot happy.
Probbably needed in x2ap as well (needs asn2wrs support or .cnf magic).

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

11 years agoUpdate the VC2005EE URL.
gerald [Tue, 15 Jan 2008 21:48:16 +0000 (21:48 +0000)]
Update the VC2005EE URL.

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

11 years agoDiscard existing list of disabled protocols in read_disabled_protos_list()
stig [Tue, 15 Jan 2008 21:41:52 +0000 (21:41 +0000)]
Discard existing list of disabled protocols in read_disabled_protos_list()
even if disabled_protos file does not exist.  This fixes a problem with
disabled protocols when changing profile.

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

11 years agoUse New GTK packages:
etxrab [Tue, 15 Jan 2008 20:18:04 +0000 (20:18 +0000)]
Use New GTK packages:
Overview of Changes from GLib 2.14.4 to GLib 2.14.5

* Bugs fixed:
 482313 gregex: no way to tell why compilation failed
 315437 extern inline -> static inline
 480122 g_module_open fails to open modules with ".la" extension
 495589 gspawn.c failing to set FD_CLOEXEC
 500638 gkeyfile speedup ...
 503029 g_time_val_from_iso8601 parse non-ISO8601 dates
 503420 gkeyfile leaks a hash table

Overview of Changes from GTK+ 2.12.3 to 2.12.4

 * Bugs fixed:
 494667 gdkpixloader jpeg loader problems with some files
 496546 Tooltips may crashe because a window is destroyed
 503824 gtk_paned_find_neighbours aborts with assertion failure
 388321 gtk_notebook_remove_tab_label
 503190 Doesn't build with directfb >= 1.0
 491847 gtk-builder-convert --root option doesn't work for GtkWin...
 492977 Setup autorelease pool automatically in each mainloop ite...
 499951 GtkAssistant remove_page may leave current_page as a dang...
 502250 Leak in gtkfilechooserdefault.c:shortcuts_reload_icons()
 503569 Leak in GtkTreeViewColumn
 504753 Destroyed subviews are not removed from the view hierarchy
 504804 Typo in TEST_EXPAND_ROW signal
 504984 Problems with hiding/showing transient windows
 505708 compatibility macros for signals has wrong type.
 506107 mem leak in print dialogue
 502850 gtk-builder-convert program not found
 504749 gtk-builder-convert and GtkMenu

GTK+ 2.12.5
This release fixes an incomplete icon cache that was
accidentally shipped in 2.12.4.

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

11 years agoInclude dirent.h if we have it (to fix glib-1 compile: it needed DIR).
morriss [Tue, 15 Jan 2008 19:39:31 +0000 (19:39 +0000)]
Include dirent.h if we have it (to fix glib-1 compile: it needed DIR).

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

11 years agoOops, glib's iconv stuff is in glib >= 2, not just glib > 2
morriss [Tue, 15 Jan 2008 19:24:27 +0000 (19:24 +0000)]
Oops, glib's iconv stuff is in glib >= 2, not just glib > 2

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

11 years agoThe glib iconv routines are new to glib-2 so #ifdef around them to get glib-1 builds...
morriss [Tue, 15 Jan 2008 18:37:48 +0000 (18:37 +0000)]
The glib iconv routines are new to glib-2 so #ifdef around them to get glib-1 builds going again.  I started to merge in using the regular iconv routines (if we don't have glib-2 but we HAVE_CONV) but the code rapidly got ugly with all the #ifdef's; it could be done but it's probably not worth the effort/ugliness.

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

11 years agomake per_constrained_integer handle 64bits needed for X2AP.
etxrab [Tue, 15 Jan 2008 17:59:43 +0000 (17:59 +0000)]
make per_constrained_integer handle 64bits needed for X2AP.

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

11 years agoBump date
stig [Tue, 15 Jan 2008 14:34:03 +0000 (14:34 +0000)]
Bump date

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

11 years agoFrom Neil Piercy:
etxrab [Tue, 15 Jan 2008 06:54:30 +0000 (06:54 +0000)]
From Neil Piercy:
Dissect RRC NAS Message PDUs.

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

11 years agoChanged to use GTK stock icon for preferences in the toolbar.
stig [Tue, 15 Jan 2008 00:24:59 +0000 (00:24 +0000)]
Changed to use GTK stock icon for preferences in the toolbar.

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

11 years agoFixed a typo in the docbook.
stig [Mon, 14 Jan 2008 23:22:36 +0000 (23:22 +0000)]
Fixed a typo in the docbook.

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

11 years agoSave the changes also when selecting a profile from the list.
stig [Mon, 14 Jan 2008 21:58:45 +0000 (21:58 +0000)]
Save the changes also when selecting a profile from the list.

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

11 years agoSeveral profile enhancements:
stig [Mon, 14 Jan 2008 21:43:10 +0000 (21:43 +0000)]
Several profile enhancements:
- Give initial focus to the profiles list
- Enter in the profiles list selects the profile
- Give focus to the profile name when creating a new profile

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

11 years agoAdded cast of argument to isspace.
stig [Mon, 14 Jan 2008 19:19:47 +0000 (19:19 +0000)]
Added cast of argument to isspace.

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

11 years agoThis patch adds support for configuration profiles, which can be used to
stig [Mon, 14 Jan 2008 16:40:23 +0000 (16:40 +0000)]
This patch adds support for configuration profiles, which can be used to
configure and use more than one set of preferences and configuration files.

This can be found in the "Configuration Profiles..." menu item from the Edit
menu, or by pressing Shift-Ctrl-A.  It's also possible to start wireshark
and tshark with a named profile by using the "-C ProfileName" option.
A new status pane in the main window will show the current profile.

The configuration files currently stored in the Profiles are:
- Preferences
- Capture Filters
- Display Filters
- Coloring Rules
- Disabled Protocols
- User Accessible Tables

The recent data are by design not added to the profile.

Planned future enhancements:
- make a more convenient function to switch between profiles
- add a "clone profile" button to copy an existing profile
- make the profiles list active and accept return as OK
- save users "Decode as" in the profile
- make new, clone and deletion of profiles more secure
- make some of the recent values available in the profile

This patch also fixes:
- setting default status pane sizes
- a bug setting status pane for packets when not having main lower pane.

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

11 years agoAdded copy of ethercat.dll, as pointed out by Peter Johansson.
stig [Mon, 14 Jan 2008 12:05:33 +0000 (12:05 +0000)]
Added copy of ethercat.dll, as pointed out by Peter Johansson.

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

11 years agouse FN_VARIANT parameter in INTEGER type for planned 64bit variants
kukosa [Mon, 14 Jan 2008 11:21:09 +0000 (11:21 +0000)]
use FN_VARIANT parameter in INTEGER type for planned 64bit variants

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

11 years agoFixed a guint64 compile issue with a Sun C 5.8 compiler.
stig [Mon, 14 Jan 2008 09:51:22 +0000 (09:51 +0000)]
Fixed a guint64 compile issue with a Sun C 5.8 compiler.
Fixed a tree placement.

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

11 years agoFixed a few "statement not reached" warnings and a "assignment type mismatch" warning.
stig [Mon, 14 Jan 2008 09:39:55 +0000 (09:39 +0000)]
Fixed a few "statement not reached" warnings and a "assignment type mismatch" warning.

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

11 years agoadd ssl_debug_flush() at the end of initialization
kukosa [Mon, 14 Jan 2008 09:34:26 +0000 (09:34 +0000)]
add ssl_debug_flush() at the end of initialization

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

11 years agoFix seek reading by adding the size of the block length at the end of the
sfisher [Mon, 14 Jan 2008 05:31:38 +0000 (05:31 +0000)]
Fix seek reading by adding the size of the block length at the end of the
block to the data offset.

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

11 years agosome minor updates
ulfl [Sun, 13 Jan 2008 22:26:11 +0000 (22:26 +0000)]
some minor updates

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

11 years agoAdd svn:eol-style native and svn:keywords Id
sfisher [Sun, 13 Jan 2008 21:10:09 +0000 (21:10 +0000)]
Add svn:eol-style native and svn:keywords Id

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

11 years agoMake pcapng.c compile on Unix (with gcc)
sfisher [Sun, 13 Jan 2008 20:48:36 +0000 (20:48 +0000)]
Make pcapng.c compile on Unix (with gcc)

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

11 years agoadd very experimental support for pcapng "PCAP Next Generation Dump File Format"...
ulfl [Sun, 13 Jan 2008 20:05:07 +0000 (20:05 +0000)]
add very experimental support for pcapng "PCAP Next Generation Dump File Format" - this is incomplete and buggy, be careful!

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

11 years agoUpdate package name from IANA's list.
etxrab [Sun, 13 Jan 2008 17:03:06 +0000 (17:03 +0000)]
Update package name from IANA's list.

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

11 years agotransactionId wasn't processed for:
etxrab [Sun, 13 Jan 2008 16:07:52 +0000 (16:07 +0000)]
transactionId wasn't processed for:
Fixes bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2165

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

11 years agoBasic support for the LDAP start_tls extended operation and fix to match up extended...
gal [Sun, 13 Jan 2008 14:12:47 +0000 (14:12 +0000)]
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results.

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

11 years agoSupport for keylists for protocols that use start_tls - where SSL is negotiated at...
gal [Sun, 13 Jan 2008 14:10:02 +0000 (14:10 +0000)]
Support for keylists for protocols that use start_tls - where SSL is negotiated at some point during a conversation and cannot be assumed on the basis of the port number alone.

Also dissection of Distinguished Names.

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

11 years agoFrom Michael Earnhart:
jake [Sun, 13 Jan 2008 11:56:39 +0000 (11:56 +0000)]
From Michael Earnhart:
Patch to add cdp Power_request and Power_available fields
This added the support for the 0x0019 and 0x001a power_request and power_available fields.

Submitted patch slightly modified to present summary line and make more robust.

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

11 years agoFix for bug #2017: VoIP trace crashes Wireshark when specific RTP Player
sfisher [Sun, 13 Jan 2008 04:24:24 +0000 (04:24 +0000)]
Fix for bug #2017: VoIP trace crashes Wireshark when specific RTP Player
buttons are clicked

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

11 years agoClean up the usage information of editcap and change the text
sake [Sat, 12 Jan 2008 18:31:07 +0000 (18:31 +0000)]
Clean up the usage information of editcap and change the text
of the -t option to fit its current behaviour

('fixes' bug 2101)

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

11 years agoFrom Martin Peylo (bug 2184), fix for:
sake [Sat, 12 Jan 2008 12:06:56 +0000 (12:06 +0000)]
From Martin Peylo (bug 2184), fix for:

The current dissection of GeneralizedTime in packet-ber does not consider all
the possibilities how this field can be constructed.

According to ITU-T X.680 this field can be encoded as
This is a regex-like expression where each letter except the literal 'Z'
represents an ASCII encoded digit.

So far only the first 14 digits are dissected and the 15th character is put
into parentheses. This may not show all available information.

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

11 years agoFix Windows warning/error: integral size mismatch
sfisher [Sat, 12 Jan 2008 06:38:09 +0000 (06:38 +0000)]
Fix Windows warning/error: integral size mismatch

Then fix comparison of signed/unsigned warning/error

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

11 years agoDon't write closing PDML tag for Data protocol - it uses simple (self-closing) tags.
martinm [Sat, 12 Jan 2008 00:34:17 +0000 (00:34 +0000)]
Don't write closing PDML tag for Data protocol - it uses simple (self-closing) tags.

Fixes bug 2185.

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

11 years agoThe Windows compiler thinks that doing return(func_that_returns_void()) in a function...
morriss [Fri, 11 Jan 2008 21:06:00 +0000 (21:06 +0000)]
The Windows compiler thinks that doing return(func_that_returns_void()) in a function that itself returns void is "'void' function returning a value".  So don't do that.

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

11 years agoAssociate Wireshark with Tektronix K12xx/K15 .rf5 files
morriss [Fri, 11 Jan 2008 19:25:51 +0000 (19:25 +0000)]
Associate Wireshark with Tektronix K12xx/K15 .rf5 files

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

11 years agoUpdate the documentation style sheet with a modified version of AsciiDoc's
gerald [Fri, 11 Jan 2008 18:52:13 +0000 (18:52 +0000)]
Update the documentation style sheet with a modified version of AsciiDoc's

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

11 years agoFix up some display filter names:
etxrab [Fri, 11 Jan 2008 07:29:27 +0000 (07:29 +0000)]
Fix up some display filter names:

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

11 years agoFrom Yukiyo Akisada:
jake [Fri, 11 Jan 2008 07:28:01 +0000 (07:28 +0000)]
From Yukiyo Akisada:
This modifications are for the new protocol support.
HSE protocol was defined at Fieldbus Foundation <http://www.fieldbus.org/>.

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

11 years agoFix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2111 : After verifying that...
morriss [Thu, 10 Jan 2008 23:16:59 +0000 (23:16 +0000)]
Fix bugs.wireshark.org/bugzilla/show_bug.cgi?id=2111 : After verifying that there's enough TVB for the smallest possible message, also verify that the length parameter in the message is at least that big.

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

11 years agoFix for bug 2187.
jake [Thu, 10 Jan 2008 22:27:28 +0000 (22:27 +0000)]
Fix for bug 2187.
Don't cast so rigorously that you loose the mantissa.

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

11 years agoFix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2186 (many unnamed structs...
morriss [Thu, 10 Jan 2008 22:19:53 +0000 (22:19 +0000)]
Fix bugs.wireshark.org/bugzilla/show_bug.cgi?id=2186 (many unnamed structs in packet-ecatmb.h) by adding predictable (but not very descriptive) struct names

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

11 years agoFrom Andy Chu: A dissector for China Mobile Point to Point (cmpp) protocol,
morriss [Thu, 10 Jan 2008 21:23:53 +0000 (21:23 +0000)]
From Andy Chu: A dissector for China Mobile Point to Point (cmpp) protocol,
it's the SMS protocol used in China.

From me: some code cleanup and convert it from a plugin to a regular

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

11 years agoadd some comments re desirability of renaming fields
richardv [Thu, 10 Jan 2008 16:43:48 +0000 (16:43 +0000)]
add some comments re desirability of renaming fields

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

11 years agoFrom Chris Maynard (bug 1852):
richardv [Thu, 10 Jan 2008 16:35:54 +0000 (16:35 +0000)]
From Chris Maynard (bug 1852):

These packet-g*.c files all have display filter issues:

1) packet-gryphon.c: PROTOABBREV is "gryphon", but display filter fields are
prefixed with only "gryph".

2) packet-gmrp.c: PROTOABBREV is "gmrp", but display filter fields are prefixed
with "garp".

3) packet-gssapi.c: PROTOABBREV is "gss-api", but display filter fields are
prefixed with "gssapi".

4) packet-gvrp.c: PROTOABBREV is "gvrp", but display filter fields are prefixed
with "garp", most of which conflict with packet-gmrp.c's display filter fields.

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

11 years agoAdd the file op APIs (e.g., open()) to the list of prhobited APIs (should use the...
morriss [Thu, 10 Jan 2008 15:03:58 +0000 (15:03 +0000)]
Add the file op APIs (e.g., open()) to the list of prhobited APIs (should use the eth_* versions instead).

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

11 years agoUse glib equivalent of ntohs
wmeier [Thu, 10 Jan 2008 14:42:55 +0000 (14:42 +0000)]
Use glib equivalent of ntohs

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

11 years agopinfo->pseudo_header can and should be assumed to be non-null by a
guy [Thu, 10 Jan 2008 09:40:15 +0000 (09:40 +0000)]
pinfo->pseudo_header can and should be assumed to be non-null by a
dissector.  This fixes Coverity CID 238 (as we *were* assuming it was
non-null in one statement, and then only checking it later).

Set pinfo->p2p_dir to one of P2P_DIR_RECV or P2P_DIR_SENT, as it's
supposed to be, not to a Boolean value, and explain the basis on which
it's being set.

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

11 years agoGet rid of extra blank lines at the end of the file.
guy [Thu, 10 Jan 2008 08:50:16 +0000 (08:50 +0000)]
Get rid of extra blank lines at the end of the file.

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

11 years agoUse WTAP_ENCAP_ERF as the file encapsulation, as that's what we'd
guy [Thu, 10 Jan 2008 08:49:11 +0000 (08:49 +0000)]
Use WTAP_ENCAP_ERF as the file encapsulation, as that's what we'd
otherwise use as the per-packet encapsulation.

The close routine does nothing; get rid of it - you don't *need* a close
routine (by default, the subtype_close pointer is null, which means that
nothing per-file-type is done when the file is closed).

Make the code to handle the length fields in the ERF header common,
rather than copying it to each group of record types.

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

11 years agoadd support for qpi level 516 : posix acl
sahlberg [Wed, 9 Jan 2008 23:10:17 +0000 (23:10 +0000)]
add support for qpi level 516 : posix acl

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

11 years agoFrom Florent Drouin:
morriss [Wed, 9 Jan 2008 22:58:34 +0000 (22:58 +0000)]
From Florent Drouin:

fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1727 (pppd format file
incorrectly detected as being an ERF file) by:

The file_seek() call has been replaced by a call to file_read(), so, when the
end of the file is reached and the current record is truncated, we have got an
This solves the problem of bad file format detection.

Additionaly, the ERF heuristic has been improved.

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

11 years agodissect_e164_cc(): when the address is BCD coded, don't increment cc_offset just...
morriss [Wed, 9 Jan 2008 22:25:47 +0000 (22:25 +0000)]
dissect_e164_cc(): when the address is BCD coded, don't increment cc_offset just to get the 2nd octet of the address (because cc_offset is used later as the offset where the CC starts).

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

11 years agoDisplay the Country Code information in a subtree of the digits (to make it obvious...
morriss [Wed, 9 Jan 2008 22:01:57 +0000 (22:01 +0000)]
Display the Country Code information in a subtree of the digits (to make it obvious that it's a subfield).  Add #defines for the NAI and NP values and use them rather than hex values.  Initial the 'np' variable to clean up a warning.

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

11 years agoFrom Shmulik Bezalel:
etxrab [Wed, 9 Jan 2008 21:14:01 +0000 (21:14 +0000)]
From Shmulik Bezalel:
Present the country code description gsmmap and SCCP.
Added small ASN1 bugfix - missing EXPORTS used by gsmmap.asn(Handle older ver).

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

11 years agoIn case of QoS Information, Length field is missing.
etxrab [Wed, 9 Jan 2008 20:49:33 +0000 (20:49 +0000)]
In case of QoS Information, Length field is missing.

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

11 years agoWhen searching for EOC (because we have an indefinite length) don't stop searching...
morriss [Wed, 9 Jan 2008 17:06:25 +0000 (17:06 +0000)]
When searching for EOC (because we have an indefinite length) don't stop searching just because we ran out of TVB (thus assuming that the EOC is just beyond the end of the message).  Instead, try to keep going which will throw an exception (ReportedBoundsError).  I had a packet which was missing the EOC (probably programmer error) and Wirshark was reporting BoundsError (Packet size limited during capture) instead of ReportedBoundsError (Malformed Packet); this patch fixes that.

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

11 years ago#ifdef DEBUG around left-over printfs. Should these just be deleted?
martinm [Wed, 9 Jan 2008 16:21:03 +0000 (16:21 +0000)]
#ifdef DEBUG around left-over printfs.  Should these just be deleted?

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

11 years agoPavol Rusnak <stick@gk2.sk>:
jmayer [Wed, 9 Jan 2008 16:05:17 +0000 (16:05 +0000)]
Pavol Rusnak <stick@gk2.sk>:

Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2183

Strptime function is not properly included. It needs __USE_XOPEN macro, but it
is defined in wrong place. It must be defined before _any_ include file.
Otherwise I get "implicit declaration of function `strptime`" (gcc 4.3.0).

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

11 years agomore sophisticated H245 OLC handling focusing on more reliable T.38 establishment
kukosa [Wed, 9 Jan 2008 13:30:31 +0000 (13:30 +0000)]
more sophisticated H245 OLC handling focusing on more reliable T.38 establishment

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

11 years agoExplicitly check for missing NULL terminator on RTCP BYE reason string (this bug...
martinm [Wed, 9 Jan 2008 12:39:14 +0000 (12:39 +0000)]
Explicitly check for missing NULL terminator on RTCP BYE reason string (this bug has been seen on 2 stacks now...).

Fixes bug 2180.

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

11 years agoExit with 1, not 2, if exec fails, so we don't report an additional
guy [Wed, 9 Jan 2008 11:50:22 +0000 (11:50 +0000)]
Exit with 1, not 2, if exec fails, so we don't report an additional
error for the exit status, over and above the one for the exec failure.

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

11 years agoUse dup2() rather than eth_close() followed by dup() to ensure that a
guy [Wed, 9 Jan 2008 11:40:38 +0000 (11:40 +0000)]
Use dup2() rather than eth_close() followed by dup() to ensure that a
given file descriptor get duped to another descriptor.

Handle exec errors in sync_pipe_open_command() the same way they're
handled in sync_pipe_start(); that fixes bug 2177.

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

11 years agoFrom Steve Karg:
jake [Wed, 9 Jan 2008 09:34:19 +0000 (09:34 +0000)]
From Steve Karg:
Wireshark decodes a BACnet ReadRange Ack packet as malformed. The packet itself
is valid as checked with the BACnet 135-2004 specification.

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

11 years agoTo ease troubleshooting of bug #2017 and for code clarity in the future, use
sfisher [Wed, 9 Jan 2008 08:34:58 +0000 (08:34 +0000)]
To ease troubleshooting of bug #2017 and for code clarity in the future, use
two different variables for types voip_rtp_stream_info_t (strinfo) and
voip_calls_info_t (callsinfo) instead of using strinfo for both.

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

11 years agoMake ANSI IS-637-A Teleservice - "ansi_637_tele" and
etxrab [Wed, 9 Jan 2008 06:45:32 +0000 (06:45 +0000)]
Make ANSI IS-637-A Teleservice - "ansi_637_tele" and
ANSI IS-637-A Transpor t- "ansi_637_trans" callable by name.

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

11 years agoAdded svn:ignore targets for asn1/x2ap and asn1/s1ap.
stig [Tue, 8 Jan 2008 23:16:10 +0000 (23:16 +0000)]
Added svn:ignore targets for asn1/x2ap and asn1/s1ap.

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

11 years agoFixed some small typos.
stig [Tue, 8 Jan 2008 23:14:13 +0000 (23:14 +0000)]
Fixed some small typos.

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

11 years agoChanged email address for Gerald from zing.org to wireshark.org
stig [Tue, 8 Jan 2008 22:54:51 +0000 (22:54 +0000)]
Changed email address for Gerald from zing.org to wireshark.org
in a lot of files, which I suppose is correct.

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

11 years agoMake RTP player G.729 Annex B compatible.
jake [Tue, 8 Jan 2008 13:04:50 +0000 (13:04 +0000)]
Make RTP player G.729 Annex B compatible.

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

11 years agoGraeme Lunt:
jmayer [Tue, 8 Jan 2008 08:07:45 +0000 (08:07 +0000)]
Graeme Lunt:

(The fix is to cd back to "../portableapps/win32", rather than
"../u3/win32", at the end of the nsis-bits target in makefile.nmake.)


Get rid of some whitespace at the end of lines.

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

11 years agoFrom Shmulik Bezalel:
etxrab [Tue, 8 Jan 2008 05:29:38 +0000 (05:29 +0000)]
From Shmulik Bezalel:
Add support for ucs2 on ussd string.
(Changing the font from Lucida console to Arial dissplaed all chars correctly).

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

11 years agoFrom Shmulik Bezalel:
etxrab [Tue, 8 Jan 2008 05:18:36 +0000 (05:18 +0000)]
From Shmulik Bezalel:
Add support for ucs2 on ussd string.
(Changing the font from Lucida console to Arial dissplaed all chars correctly).

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

11 years agoAdd a cast.
stig [Mon, 7 Jan 2008 23:00:09 +0000 (23:00 +0000)]
Add a cast.

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

11 years agoAdded missing Eriscsson.xml
etxrab [Mon, 7 Jan 2008 22:00:26 +0000 (22:00 +0000)]
Added missing Eriscsson.xml

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

11 years agoFrom Balint Reczey (bug 2146):
stig [Mon, 7 Jan 2008 21:24:23 +0000 (21:24 +0000)]
From Balint Reczey (bug 2146):
Make it possible to write Lua dissectors that use TCP reassembly.

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

11 years agoFrom Marton Nemeth (bug 2168):
stig [Mon, 7 Jan 2008 21:16:44 +0000 (21:16 +0000)]
From Marton Nemeth (bug 2168):
Add reference to Wiki in INSTALL.

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

11 years agoAs noted by David Halik in bug 2172:
stig [Mon, 7 Jan 2008 20:56:24 +0000 (20:56 +0000)]
As noted by David Halik in bug 2172:
Removed an unnamed union member in ethercat.

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