obnox/wireshark/wip.git
9 years agoWork out better whether RLC segment is a complete upper-layer PDU or not.
martinm [Thu, 17 Jun 2010 06:36:23 +0000 (06:36 +0000)]
Work out better whether RLC segment is a complete upper-layer PDU or not.

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

9 years agoDon't refer to file-static variables as extern (my gcc didn't like it).
martinm [Thu, 17 Jun 2010 05:03:08 +0000 (05:03 +0000)]
Don't refer to file-static variables as extern (my gcc didn't like it).

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

9 years agoHandle 64-bit file offsets in ReadAndX and WriteAndX.
guy [Wed, 16 Jun 2010 20:00:22 +0000 (20:00 +0000)]
Handle 64-bit file offsets in ReadAndX and WriteAndX.

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

9 years agoGo back to 64-bit sizes, but, before passing those sizes to
guy [Wed, 16 Jun 2010 18:28:28 +0000 (18:28 +0000)]
Go back to 64-bit sizes, but, before passing those sizes to
g_try_malloc() or g_try_realloc(), check whether they fit in a gsize
and:

if not, just pretend the allocation failed;

if so, cast them to gsize to squelch compiler warnings.

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

9 years agoRemove C++ comment.
stig [Wed, 16 Jun 2010 17:47:42 +0000 (17:47 +0000)]
Remove C++ comment.

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

9 years agoUse gsize for file offset.
stig [Wed, 16 Jun 2010 17:45:25 +0000 (17:45 +0000)]
Use gsize for file offset.

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

9 years agoFrom Hitoshi Irino via bug 4883:
stig [Wed, 16 Jun 2010 15:36:02 +0000 (15:36 +0000)]
From Hitoshi Irino via bug 4883:
Support NetFlow exported from Cisco ASA5500 series.

From me:
Fixed some hf description entries.

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

9 years agoUse gsize for file sizes.
stig [Wed, 16 Jun 2010 15:26:47 +0000 (15:26 +0000)]
Use gsize for file sizes.

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

9 years agoExport smb_fid_types.
guy [Wed, 16 Jun 2010 07:47:18 +0000 (07:47 +0000)]
Export smb_fid_types.

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

9 years agoFrom Joe Eykholt via bug 4882:
stig [Wed, 16 Jun 2010 05:54:11 +0000 (05:54 +0000)]
From Joe Eykholt via bug 4882:
Adds decodes for the FCoE Initialization Protocol features being added for
VN_port to VN_port (VN2VN) point-to-multipoint support.

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

9 years agoCast bytes_left down to an int once we've established it will fit.
guy [Wed, 16 Jun 2010 03:09:16 +0000 (03:09 +0000)]
Cast bytes_left down to an int once we've established it will fit.

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

9 years agoHandle WTAP_ERR_SHORT_WRITE in file_write_error_message().
guy [Wed, 16 Jun 2010 01:30:29 +0000 (01:30 +0000)]
Handle WTAP_ERR_SHORT_WRITE in file_write_error_message().

In eo_save_entry(), don't assume you can write the entire object in a
single write call - if the object is big enough (which would require a
64-bit address space), and you're not lucky enough to be running on
UN*X (which means LP64, so size_t and ssize_t are big enough for the
entire object), you can't.

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

9 years agoCleanup header file define guards.
stig [Tue, 15 Jun 2010 21:18:31 +0000 (21:18 +0000)]
Cleanup header file define guards.

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

9 years agoChanged Jose Pico's email, added David Perez as co-author.
stig [Tue, 15 Jun 2010 18:48:08 +0000 (18:48 +0000)]
Changed Jose Pico's email, added David Perez as co-author.

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

9 years agoRemove #include <inttypes.h>.
stig [Tue, 15 Jun 2010 15:32:19 +0000 (15:32 +0000)]
Remove #include <inttypes.h>.

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

9 years agoFrom David Perez & Jose Pico from Taddong S.L. via bug 4451:
stig [Tue, 15 Jun 2010 14:03:49 +0000 (14:03 +0000)]
From David Perez & Jose Pico from Taddong S.L. via bug 4451:
This functionality keeps track of all SMB objects contained in a capture,
and is able to export to a file a full or partial captured file that has
been transfered through the SMB protocol. In a partial capture, the holes
produced by the non-captured information are filled out with zeros.
It includes the needed modifications of the SMB dissector in the way it keeps
track of the opened SMB files and also to feed the eo_smb tap listener.

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

9 years agoFrom Holger Freyther:
etxrab [Tue, 15 Jun 2010 13:36:11 +0000 (13:36 +0000)]
From Holger Freyther:
Cosmetic patch to fix Optional/Conditional mismatch.

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

9 years agoUpdate SCTP PPIDs.
tuexen [Mon, 14 Jun 2010 21:49:23 +0000 (21:49 +0000)]
Update SCTP PPIDs.

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

9 years agoFrom Jouni Malinen: Fix: RSN capabilities field in IEEE 802.11 RSN IE is parsed...
wmeier [Mon, 14 Jun 2010 14:34:32 +0000 (14:34 +0000)]
From Jouni Malinen:  Fix: RSN capabilities field in IEEE 802.11 RSN IE is parsed in incorrect byte order
Note: this bug was introduced in SVN #32342 [3/31/10] and thus was only present
in Development Wireshark versions.

From me: Display 'mobility_domain_mdid' as little-endian (to be verified)

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

9 years agoFix Bug #4871: Wrong Ack value in TCP flow graph when using relative sequence numbers.
wmeier [Mon, 14 Jun 2010 12:37:43 +0000 (12:37 +0000)]
Fix Bug #4871: Wrong Ack value in TCP flow graph when using relative sequence numbers.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4871

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

9 years agoThe .dmg packages can come in 32-bit and 64-bit flavors. Name them
gerald [Sun, 13 Jun 2010 23:02:18 +0000 (23:02 +0000)]
The .dmg packages can come in 32-bit and 64-bit flavors. Name them
accordingly.

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

9 years agoAdd packet-gopher.c from rev 33220.
jmayer [Sun, 13 Jun 2010 22:58:21 +0000 (22:58 +0000)]
Add packet-gopher.c from rev 33220.

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

9 years agoAdd a Gopher (RFC 1436) dissector.
gerald [Sun, 13 Jun 2010 20:30:43 +0000 (20:30 +0000)]
Add a Gopher (RFC 1436) dissector.

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

9 years agoAdd info to the "Enable OID resolution" tooltip that if 'True' then the 'SMI paths...
wmeier [Sun, 13 Jun 2010 20:27:21 +0000 (20:27 +0000)]
Add info to the "Enable OID resolution" tooltip that if 'True' then the 'SMI paths' and the 'SMI modules' preferences will be shown;
Fix a comment.

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-06-13]
gerald [Sun, 13 Jun 2010 15:03:31 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-06-13]

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

9 years agoAdd Copy (to clipboard) to expert item popup menu.
martinm [Sun, 13 Jun 2010 14:55:11 +0000 (14:55 +0000)]
Add Copy (to clipboard) to expert item popup menu.

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

9 years agoRename some variables; At least one ('end') seemed to confuse the Windows debugger;
wmeier [Sun, 13 Jun 2010 14:31:11 +0000 (14:31 +0000)]
Rename some variables; At least one ('end') seemed to confuse the Windows debugger;
Also: Udate some coments.

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

9 years agoFix Bug #4868; "Wireshark crash selecting Inter-Asterisk exchange v2 packet data"
wmeier [Sun, 13 Jun 2010 13:58:02 +0000 (13:58 +0000)]
Fix Bug #4868; "Wireshark crash selecting Inter-Asterisk exchange v2 packet data"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4868

A field length was being set incorrectly (too large) thus causing
packet_hex_apply_reverse_tag() to run off the end of a text_view buffer
(thus causing a crash) when attempting to highlight the field bytes
in the hex-view pane.

ToDo: Add some sanity checking in packet_hex_apply_reverse_tag().

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

9 years agoRemove the header letter spacing. It make the Lua reference hard to read.
gerald [Sun, 13 Jun 2010 00:39:06 +0000 (00:39 +0000)]
Remove the header letter spacing. It make the Lua reference hard to read.

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

9 years agoAndreas Schuler <andreas (A) schulerdev.de>
jmayer [Fri, 11 Jun 2010 16:11:42 +0000 (16:11 +0000)]
Andreas Schuler <andreas (A) schulerdev.de>
Updates to the DECT dissector:
- using proto_tree_add_none_format()/proto_tree_add_item() instead of
  proto_tree_add_uint_format() where it makes sense
- fixed display of full slot data
- added some references to documentation
- cleaned up packet length checking
- put descrambled bfield-data in a tree
- cleaned up some afield items
- use custom columns instead adding all infos to COL_INFO
- add some more infos to the columns

Me:
- Replace proto_tree_add_none_format(..., strvar) by
  proto_tree_add_none_format(..., "%s", strvar).
- Fix an unused variable warning.

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

9 years agoFix: Malformed packet if port is missing from path.
etxrab [Fri, 11 Jun 2010 11:49:01 +0000 (11:49 +0000)]
Fix: Malformed packet if port is missing from path.

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

9 years agoSmall cleanup.
stig [Fri, 11 Jun 2010 09:14:25 +0000 (09:14 +0000)]
Small cleanup.

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

9 years agoAdd the direction to so expert info texts.
martinm [Thu, 10 Jun 2010 15:28:41 +0000 (15:28 +0000)]
Add the direction to so expert info texts.

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

9 years agoDisplay RefuseReason in Info column.
stig [Thu, 10 Jun 2010 13:06:08 +0000 (13:06 +0000)]
Display RefuseReason in Info column.

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

9 years agoCheck if /usr/local exists before adding to CFLAGS/CPPFLAGS and LDFLAGS.
stig [Thu, 10 Jun 2010 10:31:46 +0000 (10:31 +0000)]
Check if /usr/local exists before adding to CFLAGS/CPPFLAGS and LDFLAGS.

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

9 years agoFrom Jim Young via bug 4862:
stig [Thu, 10 Jun 2010 10:13:34 +0000 (10:13 +0000)]
From Jim Young via bug 4862:
GLIB 2.14 necessary to compile Wireshark with Protocol help.

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

9 years agoFrom Jason Burns: DHCP Dissector - Support for DHCP Option 150 TFTP Server Address
wmeier [Thu, 10 Jun 2010 01:33:02 +0000 (01:33 +0000)]
From Jason Burns:  DHCP Dissector - Support for DHCP Option 150 TFTP Server Address

"According to this document DHCP Option 150 is an array of IPv4 TFTP Server
Addresses

http://cisco.com/en/US/products/sw/voicesw/ps556/products_tech_note09186a00800942f4.shtml#tftp_option

I fixed the capitalization of this option in the bootp dissector and changed
the type to match the actual use of the option. (ipv4_list)"

From me: Add a pointer to a draft RFC about the DHCP "TFTP Server Address" option.

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

9 years agoAdd dissector_table_foreach.
etxrab [Wed, 9 Jun 2010 20:25:50 +0000 (20:25 +0000)]
Add dissector_table_foreach.

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

9 years agoFix a copy paste error.
etxrab [Wed, 9 Jun 2010 20:24:23 +0000 (20:24 +0000)]
Fix a copy paste error.

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

9 years agoDo some constifying (based upon gcc -Wwrite-strings warnings)
wmeier [Wed, 9 Jun 2010 18:32:35 +0000 (18:32 +0000)]
Do some constifying (based upon gcc -Wwrite-strings warnings)

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

9 years agoDo some constifying [or other] based upon gcc -Wwrite-strings warnings.
wmeier [Wed, 9 Jun 2010 18:12:17 +0000 (18:12 +0000)]
Do some constifying [or other] based upon gcc -Wwrite-strings warnings.

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

9 years agoFix a gcc -Wstrict-prototypes warning
wmeier [Wed, 9 Jun 2010 17:56:37 +0000 (17:56 +0000)]
Fix a gcc -Wstrict-prototypes warning

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

9 years agoDo some constifying (based upon gcc -Wwrite-strings warnings);
wmeier [Wed, 9 Jun 2010 17:40:03 +0000 (17:40 +0000)]
Do some constifying (based upon gcc -Wwrite-strings warnings);
Replace "4 space  tabs" by 4 spaces.

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

9 years agoAdd idmp.
morriss [Wed, 9 Jun 2010 17:36:49 +0000 (17:36 +0000)]
Add idmp.

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

9 years agoDo some constifying (based upon gcc -Wwrite-strings warnings);
wmeier [Wed, 9 Jun 2010 17:24:58 +0000 (17:24 +0000)]
Do some constifying (based upon gcc -Wwrite-strings warnings);
Various minor ckeanup: remove some unecessary if statements & other
Move proto_reg_handoff... to the end of the file.

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

9 years agoRevise code slightly; mostly: remove some unnecessary if tests ....
wmeier [Wed, 9 Jun 2010 17:16:33 +0000 (17:16 +0000)]
Revise code slightly; mostly: remove some unnecessary if tests ....

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

9 years agoInitialize dst_ref.
stig [Wed, 9 Jun 2010 16:02:34 +0000 (16:02 +0000)]
Initialize dst_ref.

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

9 years agoRemoval of unused global variable.
gal [Wed, 9 Jun 2010 15:51:02 +0000 (15:51 +0000)]
Removal of unused global variable.

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

9 years agoRemoval of (hopefully!) the final warning.
gal [Wed, 9 Jun 2010 15:35:08 +0000 (15:35 +0000)]
Removal of (hopefully!) the final warning.

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

9 years agoUpdate for missing const for object identifier string and marking tree as unused.
gal [Wed, 9 Jun 2010 15:20:48 +0000 (15:20 +0000)]
Update for missing const for object identifier string and marking tree as unused.

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

9 years agoAdded packet-idmp.h.
stig [Wed, 9 Jun 2010 15:05:29 +0000 (15:05 +0000)]
Added packet-idmp.h.

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

9 years agoBuild dependency x509ce.
stig [Wed, 9 Jun 2010 14:59:02 +0000 (14:59 +0000)]
Build dependency x509ce.

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

9 years agoAdded default svn:ignore targets.
stig [Wed, 9 Jun 2010 14:47:39 +0000 (14:47 +0000)]
Added default svn:ignore targets.

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

9 years agoUpdates to the ROS dissector to support IDMP and fix to IDMP for implicit declaration...
gal [Wed, 9 Jun 2010 14:45:38 +0000 (14:45 +0000)]
Updates to the ROS dissector to support IDMP and fix to IDMP for implicit declaration of return value of call_ros_oid_callback().

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

9 years agoBuild Makefile in asn1/idmp.
stig [Wed, 9 Jun 2010 14:40:35 +0000 (14:40 +0000)]
Build Makefile in asn1/idmp.

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

9 years agoAdded packet-idmp.c
stig [Wed, 9 Jun 2010 14:33:54 +0000 (14:33 +0000)]
Added packet-idmp.c

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

9 years agoPrint correct RLRE reason in Info column.
stig [Wed, 9 Jun 2010 14:27:09 +0000 (14:27 +0000)]
Print correct RLRE reason in Info column.
Dump RLRQ/RLRE text in Info column even when having no reason code.

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

9 years agoSupport for X.519 (section 9) Internet Directly Mapped Protocol (IDMP).
gal [Wed, 9 Jun 2010 14:17:51 +0000 (14:17 +0000)]
Support for X.519 (section 9) Internet Directly Mapped Protocol (IDMP).

IDMP provides a mapping of request-response service elements directly onto the Internet TCP/IP protocol, bypassing the ACSE, Presentation, Session and Transport layers of the OSI model. It also supports the use of TLS services.

The DAP dissector has been updated to use the IDMP protocol.

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

9 years agoDo some constifying (based upon gcc -Wwrite-strings warnings);
wmeier [Wed, 9 Jun 2010 13:30:44 +0000 (13:30 +0000)]
Do some constifying (based upon gcc -Wwrite-strings warnings);
Use #if 0/#endif instead of /* ... */ to comment out code..

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

9 years agoNew option (-R) to asn2wrs to register the PDUs defined in the conformance file as...
gal [Wed, 9 Jun 2010 09:27:28 +0000 (09:27 +0000)]
New option (-R) to asn2wrs to register the PDUs defined in the conformance file as BER syntaxes  (register_ber_syntax_dissector()).

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

9 years agoCorrected a typo in "display seconds with hours and minutes".
stig [Wed, 9 Jun 2010 08:52:56 +0000 (08:52 +0000)]
Corrected a typo in "display seconds with hours and minutes".

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

9 years agoAvoid a crash when deleting the first character in the filter.
stig [Tue, 8 Jun 2010 21:36:31 +0000 (21:36 +0000)]
Avoid a crash when deleting the first character in the filter.

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

9 years agoNEW_FILTER_COMBO_BOX: Make the Expression... button work again.
morriss [Tue, 8 Jun 2010 18:42:20 +0000 (18:42 +0000)]
NEW_FILTER_COMBO_BOX: Make the Expression... button work again.

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

9 years agoNEW_FILTER_COMBO_BOX: dfilter_combo_add_empty() doesn't appear to be needed: the...
morriss [Tue, 8 Jun 2010 16:01:50 +0000 (16:01 +0000)]
NEW_FILTER_COMBO_BOX: dfilter_combo_add_empty() doesn't appear to be needed: the entry field is empty even after populating thelist of recent filters.

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

9 years agodfilter_entry_match() (for NEW_FILTER_COMBO_BOX): unset value each time through the...
morriss [Tue, 8 Jun 2010 14:40:31 +0000 (14:40 +0000)]
dfilter_entry_match() (for NEW_FILTER_COMBO_BOX): unset value each time through the loop to avoid duplicate initialization warnings from glib.

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

9 years agoRemove C++ style comment.
etxrab [Tue, 8 Jun 2010 10:37:03 +0000 (10:37 +0000)]
Remove C++ style comment.

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

9 years agoFix packet-gtpv2.c:945:1: error: "/*" within comment
etxrab [Tue, 8 Jun 2010 08:55:07 +0000 (08:55 +0000)]
Fix packet-gtpv2.c:945:1: error: "/*" within comment

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

9 years agoFrom Tamás Regõs:
etxrab [Tue, 8 Jun 2010 08:36:22 +0000 (08:36 +0000)]
From Tamás Regõs:
Change dissection of  User Location Info (ULI) to show the spare bits
in the protocol tree and don't show ECI as a bitfield.

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

9 years agoRename the NEW_FILTER_COMBO_BOX routine dfilter_entry_match_new() to
guy [Mon, 7 Jun 2010 23:33:16 +0000 (23:33 +0000)]
Rename the NEW_FILTER_COMBO_BOX routine dfilter_entry_match_new() to
dfilter_entry_match(), as the old dfilter_entry_match() isn't defined or
used if NEW_FILTER_COMBO_BOX is defined.

Clean up indentation a bit.

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

9 years agoDon't define dfilter_entry_match() if we're using a combo box, as it's
guy [Mon, 7 Jun 2010 19:17:12 +0000 (19:17 +0000)]
Don't define dfilter_entry_match() if we're using a combo box, as it's
not used.

Clean up indentation.

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

9 years agoDeclare dfilter_list only if we're going to use it.
guy [Mon, 7 Jun 2010 18:49:37 +0000 (18:49 +0000)]
Declare dfilter_list only if we're going to use it.

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

9 years agoUse NEW_FILTER_COMBO_BOX.
etxrab [Mon, 7 Jun 2010 18:28:17 +0000 (18:28 +0000)]
Use NEW_FILTER_COMBO_BOX.
If there is no major problems the code can be cleaned up in a few days time.

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

9 years agoUpdate the code for NEW_FILTER_COMBO_BOX.
etxrab [Mon, 7 Jun 2010 18:25:37 +0000 (18:25 +0000)]
Update the code for NEW_FILTER_COMBO_BOX.

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

9 years ago1.3.6 -> 1.5.0
gerald [Mon, 7 Jun 2010 16:43:09 +0000 (16:43 +0000)]
1.3.6 -> 1.5.0

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

9 years agoUse find_or_create_conversation() rather than only conversation_new().
wmeier [Mon, 7 Jun 2010 16:32:21 +0000 (16:32 +0000)]
Use find_or_create_conversation() rather than only conversation_new().
Fixes bug #2907: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907

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

9 years agoMove proto_reg_handoff...(...) to the end of the file;
wmeier [Mon, 7 Jun 2010 16:00:24 +0000 (16:00 +0000)]
Move proto_reg_handoff...(...) to the end of the file;
Remove a few unneeded if statements and a few uneeded initializers;

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

9 years agoMove proto_reg_handoff...(...) to the end of the file.
wmeier [Mon, 7 Jun 2010 15:38:55 +0000 (15:38 +0000)]
Move proto_reg_handoff...(...) to the end of the file.

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

9 years agoECI (E-UTRAN Cell Identifier) wrongly decoded.
etxrab [Mon, 7 Jun 2010 14:29:03 +0000 (14:29 +0000)]
ECI (E-UTRAN Cell Identifier) wrongly decoded.
Spotted by Tamás Regõs.

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

9 years agoFrom Tamás Regõs:
etxrab [Mon, 7 Jun 2010 12:29:04 +0000 (12:29 +0000)]
From Tamás Regõs:
updated TGPPGmb.xml to version 9.2.0.

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

9 years agoAlas, the stuff to see whether the standard output and error are the
guy [Mon, 7 Jun 2010 09:43:32 +0000 (09:43 +0000)]
Alas, the stuff to see whether the standard output and error are the
same works only on UN*X; note that, and don't bother compiling it on
Windows.

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

9 years agoIf we get an error reading the capture file, don't give up - run the
guy [Mon, 7 Jun 2010 08:42:29 +0000 (08:42 +0000)]
If we get an error reading the capture file, don't give up - run the
taps, etc., so we at least print the statistics for the packets we
*could* read.

Also, if we're printing packet data, and the standard output and
standard error are going to the same place, before printing the error
message for that error, flush the standard output and print a newline to
the standard error, so the error appears after all the packet data, and
has a newline separating it from the packet data.

This fixes bug 4845.

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

9 years agoClean up indentation.
guy [Sun, 6 Jun 2010 22:35:33 +0000 (22:35 +0000)]
Clean up indentation.

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

9 years agoGet rid of file_write(); nobody uses it, and file writers should use
guy [Sun, 6 Jun 2010 22:24:48 +0000 (22:24 +0000)]
Get rid of file_write(); nobody uses it, and file writers should use
wtap_dump_file_write() (it does the right error checking for you, and
returns FALSE on failure and gives you the right error code).

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

9 years agoDon't use fwrite directly when writing a dump file; call it through
guy [Sun, 6 Jun 2010 22:19:30 +0000 (22:19 +0000)]
Don't use fwrite directly when writing a dump file; call it through
wtap_dump_file_write().  Replace various wrappers around fwrite() with
wtap_dump_file_write(), or at least make the wrappers call
wtap_dump_file_write().

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

9 years agoMove the seekback stuff out of esc_read() to the one place where it's
guy [Sun, 6 Jun 2010 19:37:49 +0000 (19:37 +0000)]
Move the seekback stuff out of esc_read() to the one place where it's
done.

Use the wtap_dump_file_ routines to write out capture files, and check
for errors.

Use the phton macros, when available, to translate to big-endian byte
order.  Add a new phton24() macro.

Clean up indentation.

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

9 years agoRename wtap_dump_file_write_all() to wtap_dump_file_write(), and have
guy [Sun, 6 Jun 2010 19:14:32 +0000 (19:14 +0000)]
Rename wtap_dump_file_write_all() to wtap_dump_file_write(), and have
everybody use it; the places using the old wtap_dump_file_write() were
using it in the same way the old wtap_dump_file_write_all() did.

That also lets us get rid of wtap_dump_file_ferror().

Also, have the new wtap_dump_file_write() check for errors from
gzwrite() and fwrite() differently - the former returns 0 on error, the
latter can return a short write on error.

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

9 years agoFrom Jim Young:
etxrab [Sun, 6 Jun 2010 16:25:41 +0000 (16:25 +0000)]
From Jim Young:
Remove unneeded "gtk_tree_path_free(path);" from case
"GDK_Return:" in tree_view_key_pressed_cb() that was reverted in r32957 to restore X11 functionality lost in refactored code from r32323.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4847

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-06-06]
gerald [Sun, 6 Jun 2010 15:03:33 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-06-06]

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

9 years agoAdd 32bit Ubuntu 10.04 to supported platforms
krj [Sun, 6 Jun 2010 06:09:26 +0000 (06:09 +0000)]
Add 32bit Ubuntu 10.04 to supported platforms

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

9 years agoFrom Rolf Fiedler: support for writing EyeSDN trace files.
guy [Sat, 5 Jun 2010 22:59:20 +0000 (22:59 +0000)]
From Rolf Fiedler: support for writing EyeSDN trace files.

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

9 years agoFirst check for the new GTK+/OS X integration functions, then the old
guy [Sat, 5 Jun 2010 22:04:28 +0000 (22:04 +0000)]
First check for the new GTK+/OS X integration functions, then the old
ones; it appears that at least one user's -ligemacintegration has both
(see bug 4823), and we should choose the new ones in that case.

Also, always set have_ige_mac if we have the functions.

Fix tpyoes while we're at it.

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

9 years agoFrom John Fitzgibbon:
jake [Sat, 5 Jun 2010 09:22:45 +0000 (09:22 +0000)]
From John Fitzgibbon:
When specifying SA keys for AES-CTR, Wireshark expects a key length of 160, 224
or 288 bits, (i.e. 128, 192 or 256 bits, followed by the 32 bit nonce value),
but gcry_cipher_setkey() in packet_ipsec.c fails, as it expects 128, 192 or 256
bits.

Omitting the nonce won't work -- even if Wireshark liked those key lengths,
gcrypt wouldn't be able to decrypt without it.

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

9 years agoClean up indentation.
guy [Sat, 5 Jun 2010 02:19:45 +0000 (02:19 +0000)]
Clean up indentation.

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

9 years agoClarify an error message (and the corresponding comment).
guy [Sat, 5 Jun 2010 01:55:06 +0000 (01:55 +0000)]
Clarify an error message (and the corresponding comment).

Fix the no-libpcap build.

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

9 years agoBack out r33088 for now.
gerald [Sat, 5 Jun 2010 00:29:31 +0000 (00:29 +0000)]
Back out r33088 for now.

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

9 years agoFrom Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4831 :
morriss [Sat, 5 Jun 2010 00:25:46 +0000 (00:25 +0000)]
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4831 :

Add the data read/write length to the NFS tree so it is filterable.

From me: don't bother incrementing the offset just to decrement it again.
Change the hf info a bit.

(Ideally the RPC dissector would add the length to the tree not as a text
item; that is left for future work.)

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

9 years agoCatch some cases that don't currently work.
guy [Sat, 5 Jun 2010 00:08:37 +0000 (00:08 +0000)]
Catch some cases that don't currently work.

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

9 years agoFrom Chris Maynard via bug 1546:
gerald [Fri, 4 Jun 2010 23:16:31 +0000 (23:16 +0000)]
From Chris Maynard via bug 1546:

Add units to the rate.

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

9 years agoThou shalt not have a tap whose listener is always active; that means,
guy [Fri, 4 Jun 2010 23:08:08 +0000 (23:08 +0000)]
Thou shalt not have a tap whose listener is always active; that means,
for example, that, if it's a TShark tap, TShark can never be run with
"-w -", as it means that TShark will always have to dissect the packets.

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

9 years agoAdd a preference that allows the user to decide if they want the calling and
morriss [Fri, 4 Jun 2010 20:52:02 +0000 (20:52 +0000)]
Add a preference that allows the user to decide if they want the calling and
called GTs (if RI=GT) put in the (pinfo) source and destination (and thus into
the source and destination columns).

This may help (if the PCs change but the GT does not) or hurt (if the GT or RI
change but the PCs do not) TCAP's ability to identify which messages belong to
which TCAP "session."

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