7 years agoExpand the API for ISB:s
etxrab [Wed, 22 Feb 2012 10:01:16 +0000 (10:01 +0000)]
Expand the API for ISB:s

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

7 years agoReverse Revision 41134 (Need to fix error/warning before...)
alagoutte [Wed, 22 Feb 2012 09:18:30 +0000 (09:18 +0000)]
Reverse Revision 41134 (Need to fix error/warning before...)

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

7 years agoFrom Lars Ruoff:
etxrab [Wed, 22 Feb 2012 08:37:46 +0000 (08:37 +0000)]
From Lars Ruoff:
Dissector for Alcatel-Lucent Enterprise Universal Alcatel- and NOE protocol
Meant as a replacement for existing UA-dissector in trunk because of better
feature set:
- latest protocol specifiaction
- more detailed dissection and filtering possibilities on subprotocols
- RTP stream setup
- NOE over SIP

Lars Ruoff
On behalf of Alcatel-Lucent Enterprise


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

7 years agoMore debugging information - in at least one of the failures, neither of
guy [Wed, 22 Feb 2012 03:13:38 +0000 (03:13 +0000)]
More debugging information - in at least one of the failures, neither of
the "Wrote xxx" messages was printed, although the compiler appeared to
have been run on the .c file that was never claimed to have been
written, but got an error because it couldn't find the .h file (also
never claimed to have been written), and in one of the successes on the
same buildbot, they were both printed for the same file.

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

7 years agoHandle the case where there are no IDBs before the first non-SHB/non-IDB
guy [Wed, 22 Feb 2012 03:03:34 +0000 (03:03 +0000)]
Handle the case where there are no IDBs before the first non-SHB/non-IDB
block, which could be the case even in a *valid* file (consider a file
with an SHB, an NRB, an IDB, and a packet block, in that order); even if
there's no IDB before the first packet block, that should be reported to
the user as "interface N not less than interface count M", to more
precisely indicate the problem.

(Yes, the loop should probably keep going until it finds a packet block,
not just a non-IDB block.)

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

7 years agoWe need to build libui even if we're only building TShark. Fixes bug
guy [Wed, 22 Feb 2012 02:15:23 +0000 (02:15 +0000)]
We need to build libui even if we're only building TShark.  Fixes bug

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

7 years agoSmall fix.
tuexen [Tue, 21 Feb 2012 21:50:08 +0000 (21:50 +0000)]
Small fix.

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

7 years agoFrom Irene Ruengeler: Describe what we currently have in trunk/
tuexen [Tue, 21 Feb 2012 21:46:06 +0000 (21:46 +0000)]
From Irene Ruengeler: Describe what we currently have in trunk/
                      related to capturing from multiple

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

7 years agoFrom Irene Ruengeler: Updated screenshots.
tuexen [Tue, 21 Feb 2012 21:27:02 +0000 (21:27 +0000)]
From Irene Ruengeler: Updated screenshots.

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

7 years agoFix bugs which resulted in the buildbot errors.
tuexen [Tue, 21 Feb 2012 20:37:22 +0000 (20:37 +0000)]
Fix bugs which resulted in the buildbot errors.

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

7 years agoCorrectly write os string...
tuexen [Tue, 21 Feb 2012 18:01:44 +0000 (18:01 +0000)]
Correctly write os string...

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 18:01:01 +0000 (18:01 +0000)]
Whitespace changes.

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

7 years agoUse wtap_dump_open_ng() in tshark.
tuexen [Tue, 21 Feb 2012 17:19:45 +0000 (17:19 +0000)]
Use wtap_dump_open_ng() in tshark.

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

7 years agoThis should fix the buildbots...
tuexen [Tue, 21 Feb 2012 17:07:57 +0000 (17:07 +0000)]
This should fix the buildbots...

The problem was that when reading a .pcap file, we don't have any IDBs.
If reqested to write out an pcapng file, we (now) build a dummy IDB which
uses the file's encapsulation as the interface encapsulation. Therefore
it can't be per=packet.
We need to fix this by using wtap_dump_open_ng()...

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

7 years agoWhen saving a file and the are no IDBs, create a default one.
tuexen [Tue, 21 Feb 2012 16:51:23 +0000 (16:51 +0000)]
When saving a file and the are no IDBs, create a default one.
This seems right, but doesn't make the buildbots happy, because
a read pcap file is reported a per packet encaps...

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

7 years agoFrom Lori Tribble:
etxrab [Tue, 21 Feb 2012 16:43:20 +0000 (16:43 +0000)]
From Lori Tribble:
 BACnet: Allow vendor specified network layer messages.'


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

7 years agoDisable debug output...
tuexen [Tue, 21 Feb 2012 16:33:33 +0000 (16:33 +0000)]
Disable debug output...

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

7 years agoWhen writing an option in an IDB, also write an endofoption option.
tuexen [Tue, 21 Feb 2012 16:32:25 +0000 (16:32 +0000)]
When writing an option in an IDB, also write an endofoption option.
Use (consistently) 0 as the default for the interface speed.
While there, do some whitespace cleanups.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:30:22 +0000 (16:30 +0000)]
Whitespace changes.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:29:29 +0000 (16:29 +0000)]
Whitespace changes.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:28:42 +0000 (16:28 +0000)]
Whitespace changes.

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

7 years agoFrom Jose Pedro Oliveira:
etxrab [Tue, 21 Feb 2012 16:14:57 +0000 (16:14 +0000)]
From Jose Pedro Oliveira:
dumpcap: only free os_version_str after the
libpcap_write_interface_description_block() calls.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 15:38:30 +0000 (15:38 +0000)]
Whitespace changes.

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

7 years agoImprove the error handling.
tuexen [Tue, 21 Feb 2012 15:36:08 +0000 (15:36 +0000)]
Improve the error handling.

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

7 years agoDon't dereference idb_inf in wtap_dump_open_ng() when
tuexen [Tue, 21 Feb 2012 15:21:01 +0000 (15:21 +0000)]
Don't dereference idb_inf in wtap_dump_open_ng() when
you provide NULL when you call it via wtap_dump_open.

This does not make the buildbots happy, but at least
tshark doesn't crash anymore.

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

7 years agoUse tab indentation as elsewhere in the files.
tuexen [Tue, 21 Feb 2012 15:16:45 +0000 (15:16 +0000)]
Use tab indentation as elsewhere in the files.
Only whitespace changes.

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

7 years agoCheck if the string exists first.
etxrab [Tue, 21 Feb 2012 13:59:08 +0000 (13:59 +0000)]
Check if the string exists first.

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

7 years agoExtend libpcap_write_interface_description_block() wiyh more options
etxrab [Tue, 21 Feb 2012 13:35:04 +0000 (13:35 +0000)]
Extend libpcap_write_interface_description_block() wiyh more options
all exept os curently unused.

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

7 years agoFix compilation (hopefully).
tuexen [Tue, 21 Feb 2012 12:56:52 +0000 (12:56 +0000)]
Fix compilation (hopefully).

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

7 years agoImprove peeking for IDBs.
tuexen [Tue, 21 Feb 2012 12:24:42 +0000 (12:24 +0000)]
Improve peeking for IDBs.
While there, cleanup some whitespaces.

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

7 years agoFrom Irene Ruengeler:
tuexen [Tue, 21 Feb 2012 11:59:41 +0000 (11:59 +0000)]
From Irene Ruengeler:
* Add support in the GUI for pipes.
* Allow the local interfaces to be rescanned via the GUI.
* Allow remote interfaces to be added and deleted.
The GUI can be extended to support other ways of capturing.

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

7 years agoFrom David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).
etxrab [Tue, 21 Feb 2012 09:25:41 +0000 (09:25 +0000)]
From David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).

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

etxrab [Tue, 21 Feb 2012 08:58:05 +0000 (08:58 +0000)]

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

7 years agoOnce we've read a valid SHB, we've concluded the file is a pcap-NG file,
guy [Tue, 21 Feb 2012 08:27:41 +0000 (08:27 +0000)]
Once we've read a valid SHB, we've concluded the file is a pcap-NG file,
so if we later get a short read, we have to return -1 and set *err to
WTAP_ERR_SHORT_READ.  Otherwise, we'll try other file types and, if none
of them match, we'll try to close the wtap structure, which crashes.

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

7 years agoDeclare opt_cont_buf_len
etxrab [Tue, 21 Feb 2012 07:25:22 +0000 (07:25 +0000)]
Declare opt_cont_buf_len

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

7 years agoFree the buffer
etxrab [Tue, 21 Feb 2012 06:57:14 +0000 (06:57 +0000)]
Free the buffer

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

7 years agoChange comment to Loop ower all IDB:s that appear before any packets sugested by...
etxrab [Tue, 21 Feb 2012 05:58:40 +0000 (05:58 +0000)]
Change comment to Loop ower all IDB:s that appear before any packets sugested by Guy, there can be more IDBs in a cpture file

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

7 years agoFrom Jose Pedro Oliveira shb_os value: get_os_version_info() instead of get_runtime_v...
etxrab [Tue, 21 Feb 2012 05:52:50 +0000 (05:52 +0000)]
From Jose Pedro Oliveira shb_os value: get_os_version_info() instead of get_runtime_version_info()

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

7 years agoAlways test tvb_reported_length_remaining() return val for '> 0' instead of '!=0'
wmeier [Tue, 21 Feb 2012 02:02:11 +0000 (02:02 +0000)]
Always test tvb_reported_length_remaining() return val for '> 0' instead of '!=0'
Also: Whitespace cleanup.

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

7 years agoIndentation & whitespace cleanup....
wmeier [Mon, 20 Feb 2012 23:28:23 +0000 (23:28 +0000)]
Indentation & whitespace cleanup....

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

7 years ago(Trivial) Fix a typo in a comment; Do some whitespace changes.
wmeier [Mon, 20 Feb 2012 22:46:24 +0000 (22:46 +0000)]
(Trivial) Fix a typo in a comment; Do some whitespace changes.

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

7 years agoFrom Jose Pedro Oliveira fix a typo
etxrab [Mon, 20 Feb 2012 22:40:17 +0000 (22:40 +0000)]
From Jose Pedro Oliveira  fix a typo

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

7 years agoUse tvb_reported_length_remaining() iso tvb_length_remaining().
wmeier [Mon, 20 Feb 2012 22:22:48 +0000 (22:22 +0000)]
Use tvb_reported_length_remaining() iso tvb_length_remaining().

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

7 years agoFix 'variable set but then unused'; Do some whitespace cleanup.
wmeier [Mon, 20 Feb 2012 22:20:30 +0000 (22:20 +0000)]
Fix 'variable set but then unused'; Do some whitespace cleanup.

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

7 years agoproto_reg_handoff...() doesn't need 'if(!Initialized)';
wmeier [Mon, 20 Feb 2012 22:00:50 +0000 (22:00 +0000)]
proto_reg_handoff...() doesn't need 'if(!Initialized)';
Also: Do some whitespace cleanup.

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

7 years ago(Trivial) Whitespace changes
wmeier [Mon, 20 Feb 2012 21:39:19 +0000 (21:39 +0000)]
(Trivial) Whitespace changes

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

7 years agoJose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os
etxrab [Mon, 20 Feb 2012 21:17:43 +0000 (21:17 +0000)]
Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os

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

7 years agoFrom e.yimjia Add LPP decoding support in ULP protocol dissector \n https://bugs...
etxrab [Mon, 20 Feb 2012 20:32:53 +0000 (20:32 +0000)]
From e.yimjia Add LPP decoding support in ULP protocol dissector \n https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6851

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

7 years agoFrom David Wei more containers not to dissect if pref is set
etxrab [Mon, 20 Feb 2012 20:25:20 +0000 (20:25 +0000)]
From David Wei more containers not to dissect if pref is set

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

7 years agoThou shalt not stop dissecting after doing processing for COL_INFO ....
wmeier [Mon, 20 Feb 2012 20:23:56 +0000 (20:23 +0000)]
Thou shalt not stop dissecting after doing processing for COL_INFO ....

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

7 years agoHandle reading and writing of multiple IDB:s, write IDB options and use correct lengt...
etxrab [Mon, 20 Feb 2012 20:15:51 +0000 (20:15 +0000)]
Handle reading and writing of multiple IDB:s, write IDB options and use correct lengt for strings, handle more than 100 char comment

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

7 years agoFrom Paul Erkkila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6835
alagoutte [Mon, 20 Feb 2012 17:28:28 +0000 (17:28 +0000)]
From Paul Erkkila  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6835
Patch to add Hazelcast dissector

From me :
* Fix indent (use tab)
* Fix a Clang Warning (about unused offset)
* Reorder function
* Add Paul in Authors file
* Add CmakeFile modification

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

7 years agoFix tpo.
guy [Mon, 20 Feb 2012 00:01:21 +0000 (00:01 +0000)]
Fix tpo.

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

7 years agoDon't run Flex-generated files through checkapi - they use forbidden
guy [Sun, 19 Feb 2012 23:35:19 +0000 (23:35 +0000)]
Don't run Flex-generated files through checkapi - they use forbidden
APIs such as malloc and free.

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

7 years ago(Minor): use GLIB_CFLAGS instead of GTK_CFLAGS; also put libcliui: as first target
wmeier [Sun, 19 Feb 2012 23:30:03 +0000 (23:30 +0000)]
(Minor): use GLIB_CFLAGS instead of GTK_CFLAGS; also put libcliui: as first target

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

7 years ago(Minor): Use GLIB_CFLAGS instead of GTK_CFLAGS when compiling in ui directory.
wmeier [Sun, 19 Feb 2012 23:28:31 +0000 (23:28 +0000)]
(Minor): Use GLIB_CFLAGS instead of GTK_CFLAGS when compiling in ui directory.

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

wmeier [Sun, 19 Feb 2012 23:26:29 +0000 (23:26 +0000)]

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

7 years agoWe already have GENERATED_HEADER_FILES; use that instead of
guy [Sun, 19 Feb 2012 22:41:53 +0000 (22:41 +0000)]
We already have GENERATED_HEADER_FILES; use that instead of

If we have DIRTY_GENERATED_C_FILES, use it the same way we use

GENERATED_FILES is "everything to nuke on a "make maintainer-clean"",
not "everything to put into the distribution".

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

7 years agoWe already have GENERATED_HEADER_FILES; no need for GENERATED_H_FILES.
guy [Sun, 19 Feb 2012 22:25:54 +0000 (22:25 +0000)]

Remove a bunch of stuff copied over from ui/gtk/Makefile.am that doesn't
apply here.


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

7 years agoA few more changes to fix the Windows build: Fix building tshark-tap-register.c
wmeier [Sun, 19 Feb 2012 21:38:48 +0000 (21:38 +0000)]
A few more changes to fix the Windows build: Fix building tshark-tap-register.c

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

7 years agoui/cli now needs to be a distribution directory.
guy [Sun, 19 Feb 2012 19:30:45 +0000 (19:30 +0000)]
ui/cli now needs to be a distribution directory.

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

7 years agoThis is 2 levels down, unlike the 1-level-down ui/Makefile.nmake I
guy [Sun, 19 Feb 2012 19:28:31 +0000 (19:28 +0000)]
This is 2 levels down, unlike the 1-level-down ui/Makefile.nmake I
copied as an initial contents of this.

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

7 years agoBuild the TShark taps into a static libcliui library in the ui/cli
guy [Sun, 19 Feb 2012 19:01:01 +0000 (19:01 +0000)]
Build the TShark taps into a static libcliui library in the ui/cli
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

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

7 years agoPut back the comment for the rule to generate wireshark-tap-register.c.
guy [Sun, 19 Feb 2012 18:59:08 +0000 (18:59 +0000)]
Put back the comment for the rule to generate wireshark-tap-register.c.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-02-19]
gerald [Sun, 19 Feb 2012 15:03:32 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-02-19]

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

7 years agoReflect the move of dftest.c back to the top-level directory.
guy [Sun, 19 Feb 2012 08:59:17 +0000 (08:59 +0000)]
Reflect the move of dftest.c back to the top-level directory.

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

7 years agoMove dftest.c back to the top-level directory; that way, all of the
guy [Sun, 19 Feb 2012 05:57:14 +0000 (05:57 +0000)]
Move dftest.c back to the top-level directory; that way, all of the
stuff in ui/cli can be stuffed into a libcliui library to link with
TShark, and all of the source files containing main() (except for
Wireshark) are in the top-level directory (dftest isn't any more special
than TShark or capinfos or mergecap or editcap or...).

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

7 years agoui/gtk/main.c calls get_conn_cfilter(), which is defined in ui/util.c,
guy [Sun, 19 Feb 2012 00:19:35 +0000 (00:19 +0000)]
ui/gtk/main.c calls get_conn_cfilter(), which is defined in ui/util.c,
so we need to link libui *after* libgtkui.  (It worked on Mac OS X, but
the OS X linker might do things differently from the GNU linker.)

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

7 years agoWe renamed "libui_win32.lib" to "libgtkui_win32.lib" elsewhere; fix it
guy [Sun, 19 Feb 2012 00:13:33 +0000 (00:13 +0000)]
We renamed "libui_win32.lib" to "libgtkui_win32.lib" elsewhere; fix it

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

7 years agoCreate a libui (static) library in the ui directory, which contains the
guy [Sat, 18 Feb 2012 23:55:41 +0000 (23:55 +0000)]
Create a libui (static) library in the ui directory, which contains the
object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.

This cleans things up a little bit, and may also fix the Windows build.

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

7 years agoUpdate.
guy [Sat, 18 Feb 2012 20:25:15 +0000 (20:25 +0000)]

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

7 years agoRename the (static) library built from stuff in ui/gtk to "libgtkui" in
guy [Sat, 18 Feb 2012 20:24:54 +0000 (20:24 +0000)]
Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.

(Forgot Makefile.nmake.)

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

7 years agoRename the (static) library built from stuff in ui/gtk to "libgtkui" in
guy [Sat, 18 Feb 2012 20:21:30 +0000 (20:21 +0000)]
Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.

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

7 years agoReplace the old very simple (line based) RSH dissector with a slightly
sfisher [Fri, 17 Feb 2012 18:28:07 +0000 (18:28 +0000)]
Replace the old very simple (line based) RSH dissector with a slightly
modified version of the EXEC since the protocols are nearly identical.

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

7 years agoFix a typo that broke compilation on all platforms
jmayer [Fri, 17 Feb 2012 18:23:48 +0000 (18:23 +0000)]
Fix a typo that broke compilation on all platforms

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

7 years agoFix an old copy and paste mistake in a C comment.
sfisher [Fri, 17 Feb 2012 18:20:28 +0000 (18:20 +0000)]
Fix an old copy and paste mistake in a C comment.

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

7 years agoMove exec_isdigit_string() and exec_isprint_string() functions out of
sfisher [Fri, 17 Feb 2012 17:22:12 +0000 (17:22 +0000)]
Move exec_isdigit_string() and exec_isprint_string() functions out of
the exec dissector and into wsutil/str_util.c.  Rename them to
isdigit_string() and isprint_string().  Also rename the variables they use
for consistency: string -> str and position -> pos.

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

7 years agoTrying to fix the compile of ui/util.c on Windows by moving the
jmayer [Fri, 17 Feb 2012 16:59:14 +0000 (16:59 +0000)]
Trying to fix the compile of ui/util.c on Windows by moving the
source file directly into the sources variable - there seems to
be a subtle difference between ui/util.c and epan/crypt/md5.c

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

7 years agoFix tooltips (There is a hidden column).
tuexen [Fri, 17 Feb 2012 16:48:55 +0000 (16:48 +0000)]
Fix tooltips (There is a hidden column).

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

7 years agoFrom Anders: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6839 :
morriss [Fri, 17 Feb 2012 15:38:36 +0000 (15:38 +0000)]
From Anders: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6839 :

A patch to set for PayloadType = 1 for Connectionless-Information

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 17 Feb 2012 13:33:53 +0000 (13:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoinclude "../util.h" -> include "ui/util.h"
jmayer [Fri, 17 Feb 2012 12:46:50 +0000 (12:46 +0000)]
include "../util.h" -> include "ui/util.h"

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

7 years agoStart moving files to ui/ and ui/cli/
jmayer [Fri, 17 Feb 2012 12:30:27 +0000 (12:30 +0000)]
Start moving files to ui/ and ui/cli/

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

7 years agotime_t and nstime.nsecs are both signed so don't cast them to unsigned to display...
morriss [Fri, 17 Feb 2012 03:17:34 +0000 (03:17 +0000)]
time_t and nstime.nsecs are both signed so don't cast them to unsigned to display them.

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

7 years agoFix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6703 :
morriss [Fri, 17 Feb 2012 03:02:32 +0000 (03:02 +0000)]
Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6703 :

r35887 added ntp_to_nstime() to packet-ntp since a couple of dissectors had
their own versions.  The version used was from packet-netflow; switch to the
version from packet-zep because that one's math works better: the fractional
time is actually shown.

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

7 years ago(Re)fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :
morriss [Fri, 17 Feb 2012 02:53:02 +0000 (02:53 +0000)]
(Re)fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :

The change made in r40742 turned out to not be portable (FreeBSD doesn't have
the timezone global variable), so use another method to determine the current

Also fix a bug introduced by r40742's change to display this timestamp in UTC:
if the reported (by the message) time zone has a negative offset to UTC, shift
it forward (not backward) to get UTC (and the opposite for positive offsets).

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

7 years agoUse tce correct IE id
etxrab [Thu, 16 Feb 2012 20:23:16 +0000 (20:23 +0000)]
Use tce correct IE id

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

7 years agoFix from Irene Ruengeler: Show correct details in the interface dialog on
tuexen [Thu, 16 Feb 2012 20:22:34 +0000 (20:22 +0000)]
Fix from Irene Ruengeler: Show correct details in the interface dialog on

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

7 years agoWith the WTAP_ERR_UNSUPPORTED error, Wiretap supplies a string giving
guy [Thu, 16 Feb 2012 18:58:40 +0000 (18:58 +0000)]
With the WTAP_ERR_UNSUPPORTED error, Wiretap supplies a string giving
the details of what in particular is unsupported; report it in TShark
and Wireshark.


Handle WTAP_ERR_COMPRESSION_NOT_SUPPORTED in TShark, and have its error
message in Wireshark not speak of gzip, in case we support compressed
output in other formats in the future.

If we see a second section header block in a pcap-NG file, don't report
it as "the file is corrupted", report it as "the file uses a feature we
don't support", as that's the case - and don't free up the interface
data array, as the file remains open, and Wireshark might still try to
access the packets we were able to read.

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

7 years agoAs suggested on the -dev list today, add Wireshark_package.pmdoc to the source
morriss [Thu, 16 Feb 2012 16:31:09 +0000 (16:31 +0000)]
As suggested on the -dev list today, add Wireshark_package.pmdoc to the source

To do this, however, requires renaming that directory because automake can't
handle files with spaces in their names.

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

7 years agoRegister the p772 dissector.
stig [Thu, 16 Feb 2012 09:18:33 +0000 (09:18 +0000)]
Register the p772 dissector.

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

7 years agoLet part of the patch speak for itself:
jmayer [Thu, 16 Feb 2012 08:31:19 +0000 (08:31 +0000)]
Let part of the patch speak for itself:

     { &hf_ieee80211_addr,
-      {"Source or Destination address", "wlan.addr", FT_ETHER, BASE_NONE, NULL, 0,
-       "Source or Destination Hardware Address", HFILL }},
+      {"Hardware address", "wlan.addr", FT_ETHER, BASE_NONE, NULL, 0,
+       "SA, DA, BSSID, RA or TA Hardware Address", HFILL }},

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

7 years agoFrom Naoyoshi Ueda:
etxrab [Thu, 16 Feb 2012 05:21:09 +0000 (05:21 +0000)]
From Naoyoshi Ueda:
Patch to fix DTLS decryption.


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

7 years agoFix the rest of of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6764 :
morriss [Thu, 16 Feb 2012 03:00:52 +0000 (03:00 +0000)]
Fix the rest of of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6764 :

The Lua API does not have FT_*, it has ftypes.*, so use that in the
documentation.  Also, list out each ft so the user knows what the available
options are.

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

7 years agoAgain, turn off the debug logging; it messes up the fuzz-testing bot.
guy [Thu, 16 Feb 2012 02:06:48 +0000 (02:06 +0000)]
Again, turn off the debug logging; it messes up the fuzz-testing bot.

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

7 years agoFrom Pascal Quantin:
etxrab [Wed, 15 Feb 2012 22:56:20 +0000 (22:56 +0000)]
From Pascal Quantin:
[NAS EPS] PDN Connectivity Request message dissection fixes.


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

7 years agoMake it possible to get inforamtion from the read SHB to the one to write out.
etxrab [Wed, 15 Feb 2012 19:44:16 +0000 (19:44 +0000)]
Make it possible to get inforamtion from the read SHB to the one to write out.

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

7 years agoFrom Andy Karch:
etxrab [Wed, 15 Feb 2012 06:01:01 +0000 (06:01 +0000)]
From Andy Karch:
Enhance L2TP filters to include assigned IDs.


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

7 years agoTYPE_PAD records can have zero bytes of payload; don't treat them as
guy [Tue, 14 Feb 2012 22:31:33 +0000 (22:31 +0000)]
TYPE_PAD records can have zero bytes of payload; don't treat them as

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

7 years agoFrom David Wei:
etxrab [Tue, 14 Feb 2012 20:23:02 +0000 (20:23 +0000)]
From David Wei:
Fix handling of piggybacked messages.

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