metze/wireshark/wip.git
10 years agoAdd a few more of the NOKIA extensions.
etxrab [Fri, 3 Jan 2014 13:29:48 +0000 (13:29 +0000)]
Add a few more of the NOKIA extensions.

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

10 years agoEIA2 is now functional
pascal [Fri, 3 Jan 2014 12:21:26 +0000 (12:21 +0000)]
EIA2 is now functional

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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Fri, 3 Jan 2014 10:22:10 +0000 (10:22 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

10 years agoUpdate NEWS and Release note
alagoutte [Fri, 3 Jan 2014 10:21:56 +0000 (10:21 +0000)]
Update NEWS and Release note

Revert part of last commit about AUTHORS-SHORT in Windows....

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

10 years agoUpdate with the removal of the ASN1 plugin and the GNM dissector.
etxrab [Fri, 3 Jan 2014 09:48:53 +0000 (09:48 +0000)]
Update with the removal of the ASN1 plugin and the GNM dissector.

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

10 years agoAdd about.rcc.cpp to svn:ignore
eapache [Fri, 3 Jan 2014 06:05:45 +0000 (06:05 +0000)]
Add about.rcc.cpp to svn:ignore

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

10 years agoMake sure we have a dissector table before calling dissector_try_uint_new. Fixes
eapache [Fri, 3 Jan 2014 06:03:28 +0000 (06:03 +0000)]
Make sure we have a dissector table before calling dissector_try_uint_new. Fixes
a null-ptr deref found while fuzzing.

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

10 years agoCheck flags that might be supported by both C and C++ still
jmayer [Fri, 3 Jan 2014 00:40:21 +0000 (00:40 +0000)]
Check flags that might be supported by both C and C++ still
separately.

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

10 years agoAs discussed on wireshark-dev: follow autotools to use
jmayer [Fri, 3 Jan 2014 00:14:46 +0000 (00:14 +0000)]
As discussed on wireshark-dev: follow autotools to use
-Wshorten-64-to-32 for c only

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

10 years agoDon't try to build asn1/asn1/Makefile either (see r54561).
morriss [Thu, 2 Jan 2014 20:48:33 +0000 (20:48 +0000)]
Don't try to build asn1/asn1/Makefile either (see r54561).

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

10 years agoNo seek-read routines use the length argument, so eliminate it from
guy [Thu, 2 Jan 2014 20:47:21 +0000 (20:47 +0000)]
No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().

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

10 years agoIt is AUTHORS-SHORT.txt in Windows
alagoutte [Thu, 2 Jan 2014 20:21:09 +0000 (20:21 +0000)]
It is AUTHORS-SHORT.txt in Windows
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)

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

10 years agoDon't use the length argument to the seek-read routine; no other
guy [Thu, 2 Jan 2014 20:17:24 +0000 (20:17 +0000)]
Don't use the length argument to the seek-read routine; no other
seek-read routine does that.

Pass the length we just filled in to buffer_assure_space() in the
seek-read routine, and use that in the memcpy() as well.

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

10 years agoDon't try to build asn1/gnm/Makefile (see r54561).
morriss [Thu, 2 Jan 2014 19:48:26 +0000 (19:48 +0000)]
Don't try to build asn1/gnm/Makefile (see r54561).

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

10 years agoDon't try to distribute asn1.dll since we no longer build it.
morriss [Thu, 2 Jan 2014 19:47:03 +0000 (19:47 +0000)]
Don't try to distribute asn1.dll since we no longer build it.

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

10 years agoDon't pass the wtap * to a routine if it's not needed.
guy [Thu, 2 Jan 2014 19:39:20 +0000 (19:39 +0000)]
Don't pass the wtap * to a routine if it's not needed.

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

10 years agoFill in the struct wtap_pkthdr in the seek-read routine.
guy [Thu, 2 Jan 2014 19:33:47 +0000 (19:33 +0000)]
Fill in the struct wtap_pkthdr in the seek-read routine.

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

10 years agoFix wireshark-qt startup coredump under autofoo and Windows: make cmake's
morriss [Thu, 2 Jan 2014 19:11:06 +0000 (19:11 +0000)]
Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).

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

10 years agoSet SVN properties.
morriss [Thu, 2 Jan 2014 18:32:58 +0000 (18:32 +0000)]
Set SVN properties.

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

10 years agoDisabling building of the gnm dissector, I don't tink it was ever used.
etxrab [Thu, 2 Jan 2014 18:01:33 +0000 (18:01 +0000)]
Disabling building of the gnm dissector, I don't tink it was ever used.

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

10 years agoActually enable building filetap library.
jmayer [Thu, 2 Jan 2014 17:59:04 +0000 (17:59 +0000)]
Actually enable building filetap library.
NEWS changed

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

10 years agoStop building and distributing the asn1 plugin. I bleleve it to be obsolete.
etxrab [Thu, 2 Jan 2014 17:47:34 +0000 (17:47 +0000)]
Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.

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

10 years agoFix [-Wmissing-prototypes]
etxrab [Thu, 2 Jan 2014 17:42:02 +0000 (17:42 +0000)]
Fix [-Wmissing-prototypes]

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

10 years agoAdd About window for Wireshark Qt
alagoutte [Thu, 2 Jan 2014 17:04:10 +0000 (17:04 +0000)]
Add About window for Wireshark Qt

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

10 years agoFix icon in top of Wireshark Qt main window
alagoutte [Thu, 2 Jan 2014 16:52:56 +0000 (16:52 +0000)]
Fix icon in top of Wireshark Qt main window

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

10 years agoFor getopt() arg processing:
wmeier [Thu, 2 Jan 2014 15:41:45 +0000 (15:41 +0000)]
For getopt() arg processing:
 - Use exit(0) for -h option as per convention;

For g_option...() arg processing (when USE_GOPTION is set):
 - Fix bug: 'capinfos x' doesn't print any info about x;
   (bug introduced in SVN #48481);
 - Use stderr for error messages related to cmd-line arg parsing;

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

10 years agorename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]
jmayer [Thu, 2 Jan 2014 15:17:14 +0000 (15:17 +0000)]
rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]
to avoid colliding include file names with wiretap/file_wrappers.h

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

10 years agoFix indent always use tab
alagoutte [Thu, 2 Jan 2014 11:46:58 +0000 (11:46 +0000)]
Fix indent always use tab

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

10 years agoFix [-Wmissing-prototypes]
etxrab [Thu, 2 Jan 2014 11:27:10 +0000 (11:27 +0000)]
Fix [-Wmissing-prototypes]

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

10 years agoHave a routine that reads and processes the record header, and use it in
guy [Thu, 2 Jan 2014 09:23:45 +0000 (09:23 +0000)]
Have a routine that reads and processes the record header, and use it in
both the read and seek-read routines.

Use the packet length read from the packet header when reading packets
randomly.

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

10 years agoProcess the packet header and data in common code, shared by the read
guy [Thu, 2 Jan 2014 02:18:04 +0000 (02:18 +0000)]
Process the packet header and data in common code, shared by the read
and seek-read routines.

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

10 years agoRead the packet header in the seek-read routines as well as the read
guy [Thu, 2 Jan 2014 02:16:22 +0000 (02:16 +0000)]
Read the packet header in the seek-read routines as well as the read
routines.

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

10 years agoIf the uncompression buffers are empty, they have no data; set the count
guy [Wed, 1 Jan 2014 23:22:53 +0000 (23:22 +0000)]
If the uncompression buffers are empty, they have no data; set the count
of bytes in them to 0, as there's no data in them, and set the offset in
that buffer of the stream's current position, to 0, as we're currently
at the beginning of the file in both streams.

This fixes some tricky-to-reproduce errors (which show up only if the
ngsniffer_t structure is allocated from data that's been allocated,
written to in those variables, and freed).

#BACKPORT 1.8, 1.10

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

10 years agoBack out r54523 - more work is needed on it, and some testing found an
guy [Wed, 1 Jan 2014 23:19:17 +0000 (23:19 +0000)]
Back out r54523 - more work is needed on it, and some testing found an
unrelated uninitialized-data bug that I want to fix in the next commit,
and then backport.

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

10 years agoAdd svn:keywords property
wmeier [Wed, 1 Jan 2014 18:14:16 +0000 (18:14 +0000)]
Add svn:keywords property

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

10 years agoRemove incorrect property 'svn:keyword'
wmeier [Wed, 1 Jan 2014 18:11:38 +0000 (18:11 +0000)]
Remove incorrect property 'svn:keyword'

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

10 years agoChange incorrect property 'keywords' to 'svn:keywords'
wmeier [Wed, 1 Jan 2014 18:08:30 +0000 (18:08 +0000)]
Change incorrect property 'keywords' to 'svn:keywords'

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

10 years agoRemove incorrect property 'svn:kywords'
wmeier [Wed, 1 Jan 2014 18:02:11 +0000 (18:02 +0000)]
Remove incorrect property 'svn:kywords'

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

10 years agoRemove incorrect property 'eol-style'
wmeier [Wed, 1 Jan 2014 17:58:19 +0000 (17:58 +0000)]
Remove incorrect property 'eol-style'

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

10 years agoFix property name: svn:eol_style ==> svn:eol-style
wmeier [Wed, 1 Jan 2014 17:54:44 +0000 (17:54 +0000)]
Fix property name: svn:eol_style ==> svn:eol-style

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

10 years agoFix compile issue
mmann [Wed, 1 Jan 2014 14:55:20 +0000 (14:55 +0000)]
Fix compile issue

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

10 years agoTry to pacify OSX-10.6-x64 buildbot
pascal [Wed, 1 Jan 2014 14:51:58 +0000 (14:51 +0000)]
Try to pacify OSX-10.6-x64 buildbot

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

10 years agoAdd proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() function...
pascal [Wed, 1 Jan 2014 14:33:19 +0000 (14:33 +0000)]
Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it.
Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions.
Update documentation a bit.

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

10 years agowimax_compact_ulmap_ie_decoder() is used outside of wimax_compact_ulmap_ie_decoder.c
pascal [Wed, 1 Jan 2014 14:29:16 +0000 (14:29 +0000)]
wimax_compact_ulmap_ie_decoder() is used outside of wimax_compact_ulmap_ie_decoder.c

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

10 years agoAdd extern C for init_wslua (for future use in Wireshark Qt)
alagoutte [Wed, 1 Jan 2014 14:12:38 +0000 (14:12 +0000)]
Add extern C for init_wslua (for future use in Wireshark Qt)

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

10 years agoFiletap library, version 0.001
mmann [Wed, 1 Jan 2014 13:18:45 +0000 (13:18 +0000)]
Filetap library, version 0.001

This is intended as the "tap library" for fileshark.  Right now its basically just a very stripped down (and renamed) copy of the wiretap library.  The goal is to remove "capture" and "wire" specific functionality out of the file handling to make it easier/simpler to support non-capture type files in the epan architecture.

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

10 years agoFix [-Wmissing-prototypes]
etxrab [Wed, 1 Jan 2014 12:25:44 +0000 (12:25 +0000)]
Fix [-Wmissing-prototypes]

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

10 years agoHappy new year!
stig [Wed, 1 Jan 2014 12:20:27 +0000 (12:20 +0000)]
Happy new year!

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

10 years agoFix [-Wmissing-prototypes]
etxrab [Wed, 1 Jan 2014 12:17:57 +0000 (12:17 +0000)]
Fix [-Wmissing-prototypes]

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

10 years agoUse a common code path for most of both sequential and random file
guy [Tue, 31 Dec 2013 23:51:10 +0000 (23:51 +0000)]
Use a common code path for most of both sequential and random file
access.  We currently can't provide a time stamp when randomly reading,
so don't set WTAP_HAS_TS in that case.

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

10 years agoBack out a change so that we can check it in again with the correct
guy [Tue, 31 Dec 2013 23:49:09 +0000 (23:49 +0000)]
Back out a change so that we can check it in again with the correct
commit message.

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

10 years agoWhen reading MIME-encapsulated files, read the entire file at once,
guy [Tue, 31 Dec 2013 23:48:02 +0000 (23:48 +0000)]
When reading MIME-encapsulated files, read the entire file at once,
don't break it into chunks.

This means we don't need to do reassembly in the MIME-encapsulated-data
dissector.

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

10 years agoWhen reading MIME-encapsulated files, read the entire file at once,
guy [Tue, 31 Dec 2013 23:47:24 +0000 (23:47 +0000)]
When reading MIME-encapsulated files, read the entire file at once,
don't break it into chunks.

This means we don't need to do reassembly in the MIME-encapsulated-data
dissector.

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

10 years agoWhen reading sequentially, pass the packet data length to
guy [Tue, 31 Dec 2013 23:43:54 +0000 (23:43 +0000)]
When reading sequentially, pass the packet data length to
ngsniffer_read_rec_data(), and separatelyskip extra data after that.

When reading randomly, use the packet length read from the packet
header.

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

10 years agoUse the packet length read from the packet header when reading packets
guy [Tue, 31 Dec 2013 23:41:35 +0000 (23:41 +0000)]
Use the packet length read from the packet header when reading packets
randomly.

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

10 years agoTrust the packet length we calculate when reading packets randomly.
guy [Tue, 31 Dec 2013 23:34:43 +0000 (23:34 +0000)]
Trust the packet length we calculate when reading packets randomly.

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

10 years agoMake it clearer that we're using the packet length read from the packet
guy [Tue, 31 Dec 2013 23:33:49 +0000 (23:33 +0000)]
Make it clearer that we're using the packet length read from the packet
header when reading packets randomly.

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

10 years agoUse the packet length read from the packet header when reading packets
guy [Tue, 31 Dec 2013 23:32:30 +0000 (23:32 +0000)]
Use the packet length read from the packet header when reading packets
randomly.

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

10 years agoUse the packet length read from the packet header when reading packets
guy [Tue, 31 Dec 2013 23:31:44 +0000 (23:31 +0000)]
Use the packet length read from the packet header when reading packets
randomly.

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

10 years agoUse the packet length read from the packet header, and check for an EOF
guy [Tue, 31 Dec 2013 23:30:39 +0000 (23:30 +0000)]
Use the packet length read from the packet header, and check for an EOF
and treat it as an error, when reading packets randomly.

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

10 years agoUse the packet length read from the packet header, and check for an EOF
guy [Tue, 31 Dec 2013 23:30:18 +0000 (23:30 +0000)]
Use the packet length read from the packet header, and check for an EOF
and treat it as an error, when reading packets randomly.

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

10 years agoRevert r54510: OSX buildbots still complain about unused hf variables
pascal [Tue, 31 Dec 2013 17:19:43 +0000 (17:19 +0000)]
Revert r54510: OSX buildbots still complain about unused hf variables

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

10 years agoAdd -h option (with output to stdout and exit status 0).
wmeier [Tue, 31 Dec 2013 16:23:00 +0000 (16:23 +0000)]
Add -h option (with output to stdout and exit status 0).
Add editor modelines.

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

10 years agoFollow convention for -h option:
wmeier [Tue, 31 Dec 2013 16:17:09 +0000 (16:17 +0000)]
Follow convention for -h option:
  Output to stdout & then exit(0).
Add editor modelines.

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

10 years agoUse the normal convention for exit status and output file descriptors:
wmeier [Tue, 31 Dec 2013 15:10:51 +0000 (15:10 +0000)]
Use the normal convention for exit status and output file descriptors:
Changes:
 - exit(1) if error (not exit(-1));
 - for -h: output to stdout & exit(0);

Also:
 - editor modelines: set tab-width=8;
 - use a consistent whitespace & formatting style;

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

10 years agoAdd SVN properties
pascal [Tue, 31 Dec 2013 14:50:52 +0000 (14:50 +0000)]
Add SVN properties

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

10 years agomove packet-tango.c from dirty to clean
martink [Tue, 31 Dec 2013 14:48:48 +0000 (14:48 +0000)]
move packet-tango.c from dirty to clean

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

10 years agoadd Novell PKIS to the list of new protocols
martink [Tue, 31 Dec 2013 14:25:28 +0000 (14:25 +0000)]
add Novell PKIS to the list of new protocols

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

10 years agoFrom Dirk
martink [Tue, 31 Dec 2013 14:20:08 +0000 (14:20 +0000)]
From Dirk
dissector for Novell's PKIS certificate extensions

from me
clean up the $Id$ tags
remove packet-pkis(-template).h
remove ASN.1 definitions that cause compiler warnings
   (OID, SecurityLabelType2)
move the dissector to the clean ASN.1 dissectors
support CMake build
change the name to novell_pkis

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

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

10 years agoadd some more box names
martink [Tue, 31 Dec 2013 13:09:52 +0000 (13:09 +0000)]
add some more box names

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

10 years agoZero security struct to avoid reading garbage value, and remove a redundant test
martinm [Tue, 31 Dec 2013 00:46:53 +0000 (00:46 +0000)]
Zero security struct to avoid reading garbage value, and remove a redundant test

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

10 years agoAdd new function: tvb_skip_guint8()
darkjames [Mon, 30 Dec 2013 23:58:45 +0000 (23:58 +0000)]
Add new function: tvb_skip_guint8()

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

10 years agoClean up white space.
guy [Mon, 30 Dec 2013 23:44:42 +0000 (23:44 +0000)]
Clean up white space.

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

10 years agoAdd an "ATM reassembly failed" flag for capture file readers to provide,
guy [Mon, 30 Dec 2013 23:37:12 +0000 (23:37 +0000)]
Add an "ATM reassembly failed" flag for capture file readers to provide,
and set it in NetXRay/Windows Sniffer files if the putative "ATM
reassembly failed" flag is set and, if reassembly failed, don't attempt
to dissect the packet.

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

10 years agogcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static.
guy [Mon, 30 Dec 2013 22:31:04 +0000 (22:31 +0000)]
gcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static.

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

10 years agoFix a couple of old typos;
wmeier [Mon, 30 Dec 2013 22:22:22 +0000 (22:22 +0000)]
Fix a couple of old typos;
Use a consistent formatting style for function defs;
Add editor modelines.

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

10 years agoSquelch compiler warnings.
guy [Mon, 30 Dec 2013 22:14:45 +0000 (22:14 +0000)]
Squelch compiler warnings.

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

10 years agoMove tcap and camel "persistent data" functionality to the dissectors themselves...
mmann [Mon, 30 Dec 2013 22:07:38 +0000 (22:07 +0000)]
Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory.

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

10 years agoIf we don't have libgcrypt, have a stub zbee_sec_ccm_decrypt() routine
guy [Mon, 30 Dec 2013 21:03:43 +0000 (21:03 +0000)]
If we don't have libgcrypt, have a stub zbee_sec_ccm_decrypt() routine
that always returns FALSE, meaning "can't decrypt".

Should fix bug 9608.

We already declare zbee_sec_ccm_decrypt() in a header file, so don't
declare it in the source file.

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

10 years agoMore reverse engineering.
guy [Mon, 30 Dec 2013 20:56:53 +0000 (20:56 +0000)]
More reverse engineering.

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

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9286 :
pascal [Mon, 30 Dec 2013 12:26:03 +0000 (12:26 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9286 :
PLMN 440 20 is now used by SoftBank.
While we are at it, update the E.212 list to the latest operational bulletin no. 1041.

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

10 years agoFor file formats that don't have magic numbers, so they're recognized by
guy [Mon, 30 Dec 2013 06:43:19 +0000 (06:43 +0000)]
For file formats that don't have magic numbers, so they're recognized by
heuristics, but do have a file extension that files of that format are
likely to have, use the extension of the file we're opening, if it has
one, as a hint for which heuristics to try first.

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

10 years agoUse G_GUINT64_CONSTANT(nn) instead of nnULL in a few places.
wmeier [Mon, 30 Dec 2013 02:24:11 +0000 (02:24 +0000)]
Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places.

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

10 years agoDon't use 'l' as a constant modifier:
wmeier [Mon, 30 Dec 2013 01:47:51 +0000 (01:47 +0000)]
Don't use 'l' as a constant modifier:
 Define NTP_BASETIME as an unsigned [int] constant;

Also:
 Add editor modelines;
 Create/use an extended value-string;
 Use casts to time_t consistently;
 'offset++' --> 'offset += 1'
 Adjust some whitespace.

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

10 years agoMake arrow down/ up work in gtk again.
darkjames [Sun, 29 Dec 2013 23:29:03 +0000 (23:29 +0000)]
Make arrow down/ up work in gtk again.

Broken by r54328 g_ascii_isprint() can test only char type and event->keyval is unsigned int.

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

10 years agoReplace a global variable used only for its size with a #define for the
guy [Sun, 29 Dec 2013 23:09:12 +0000 (23:09 +0000)]
Replace a global variable used only for its size with a #define for the
size; this eliminates a global variable and also eliminates some
compiler warnings on LP64 platforms.

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

10 years agoFor the Juan Antonio entry: specify the dissector written;
wmeier [Sun, 29 Dec 2013 21:22:51 +0000 (21:22 +0000)]
For the Juan Antonio entry: specify the dissector written;
Move the entry to the end ofthe first section (before the
 'and by' section.

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

10 years agoFrom robionekenobi: packet-mq enhancement
wmeier [Sun, 29 Dec 2013 20:58:27 +0000 (20:58 +0000)]
From robionekenobi: packet-mq enhancement
 Add new Structure dissection
 Fix some small issues
 Reformat some part of code
 use spaces instead of tabs for indentation

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

From me:
 Remove some trailing whitespace;
 Change a few tabs to spaces;
 Change editor-modelines tab-width, etc to 8 (altho
   not really relevant since tabs not being used).

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

10 years agoFrom stcook
martink [Sun, 29 Dec 2013 18:45:09 +0000 (18:45 +0000)]
From stcook
clear the temporary buffer after each DXM channel data line

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

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

10 years agoThe IEEE OUI, IAB, and OUI-36 lists currently redirect to
gerald [Sun, 29 Dec 2013 17:28:12 +0000 (17:28 +0000)]
The IEEE OUI, IAB, and OUI-36 lists currently redirect to
http://standards.ieee.org/regauthmaint.html, which says

IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th

As a result the manuf file got clobbered. Revert the manuf file to
its non-clobbered state and add sanity checks to make-manuf. Add a
note about the impending addition of OUI-28.

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

10 years agoSet svn:keywords and svn:eol-style properties.
darkjames [Sun, 29 Dec 2013 16:00:26 +0000 (16:00 +0000)]
Set svn:keywords and svn:eol-style properties.

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

10 years agoNew dissector for the CCSDS CFDP protocol. Bug 9517 (https://bugs.wireshark.org...
mmann [Sun, 29 Dec 2013 15:28:49 +0000 (15:28 +0000)]
New dissector for the CCSDS CFDP protocol.  Bug 9517 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9517)

From Juan Antonio

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

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-12-29]
gerald [Sun, 29 Dec 2013 15:03:50 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-12-29]

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

10 years agouse the correct record length for an IPv6 record in the NRB
martink [Sat, 28 Dec 2013 20:37:21 +0000 (20:37 +0000)]
use the correct record length for an IPv6 record in the NRB

this is already correct in 1.8 and 1.10 and was
accidentially(?) changed in r52176

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

10 years agoAdd ZigBee Green Power dissector. Bug 9424 (https://bugs.wireshark.org/bugzilla...
mmann [Sat, 28 Dec 2013 12:26:37 +0000 (12:26 +0000)]
Add ZigBee Green Power dissector.  Bug 9424 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9424)

From DSR Corporation

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

10 years agoUse Unicode REPLACEMENT CHARACTER for TS 23.038 errors, as we do for
guy [Fri, 27 Dec 2013 23:55:23 +0000 (23:55 +0000)]
Use Unicode REPLACEMENT CHARACTER for TS 23.038 errors, as we do for
unassigned code points in some other character sets.

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

10 years agomp2t: return offset when dissecting AF (continuation of r54396)
darkjames [Fri, 27 Dec 2013 17:42:46 +0000 (17:42 +0000)]
mp2t: return offset when dissecting AF (continuation of r54396)

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

10 years agoGenerate prototype for plugin_reg_handoff()
darkjames [Fri, 27 Dec 2013 15:46:50 +0000 (15:46 +0000)]
Generate prototype for plugin_reg_handoff()

This should fix warnings:
 plugin.c:XX:1: warning: no previous prototype for 'plugin_reg_handoff' [-Wmissing-prototypes]

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

10 years agoFix some typoes, quote $CFLAGS and $LDFLAGS when using them in
guy [Fri, 27 Dec 2013 11:08:41 +0000 (11:08 +0000)]
Fix some typoes, quote $CFLAGS and $LDFLAGS when using them in
assignments (not sure that's necessary, but...).

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

10 years agoFix [-Wmissing-prototypes]
etxrab [Fri, 27 Dec 2013 10:49:35 +0000 (10:49 +0000)]
Fix [-Wmissing-prototypes]

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