Commit Graph

51165 Commits

Author SHA1 Message Date
Guy Harris 2c73dbcd75 Squelch compiler warnings.
svn path=/trunk/; revision=54500
2013-12-30 22:14:45 +00:00
Michael Mann 58346b6327 Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory.
svn path=/trunk/; revision=54499
2013-12-30 22:07:38 +00:00
Guy Harris 94387fdcbd 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.

svn path=/trunk/; revision=54498
2013-12-30 21:03:43 +00:00
Guy Harris e133ec250b More reverse engineering.
svn path=/trunk/; revision=54497
2013-12-30 20:56:53 +00:00
Pascal Quantin 3490faec34 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.

svn path=/trunk/; revision=54496
2013-12-30 12:26:03 +00:00
Guy Harris 5946c5236b 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.

svn path=/trunk/; revision=54495
2013-12-30 06:43:19 +00:00
Bill Meier 8724d5de0f Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places.
svn path=/trunk/; revision=54494
2013-12-30 02:24:11 +00:00
Bill Meier f7208c8562 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.

svn path=/trunk/; revision=54493
2013-12-30 01:47:51 +00:00
Jakub Zawadzki ce68b8db87 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.

svn path=/trunk/; revision=54492
2013-12-29 23:29:03 +00:00
Guy Harris 87328505f0 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.

svn path=/trunk/; revision=54491
2013-12-29 23:09:12 +00:00
Bill Meier f7af5c4887 For the Juan Antonio entry: specify the dissector written;
Move the entry to the end ofthe first section (before the
 'and by' section.

svn path=/trunk/; revision=54490
2013-12-29 21:22:51 +00:00
Bill Meier 756457682d 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).

svn path=/trunk/; revision=54489
2013-12-29 20:58:27 +00:00
Martin Kaiser 745c8660be From stcook
clear the temporary buffer after each DXM channel data line

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

svn path=/trunk/; revision=54488
2013-12-29 18:45:09 +00:00
Gerald Combs 870635c248 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.

svn path=/trunk/; revision=54485
2013-12-29 17:28:12 +00:00
Jakub Zawadzki 2693738f49 Set svn:keywords and svn:eol-style properties.
svn path=/trunk/; revision=54484
2013-12-29 16:00:26 +00:00
Michael Mann 57a62f7a4d New dissector for the CCSDS CFDP protocol. Bug 9517 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9517)
From Juan Antonio

svn path=/trunk/; revision=54482
2013-12-29 15:28:49 +00:00
Gerald Combs f01ee8af9f [Automatic manuf, services and enterprise-numbers update for 2013-12-29]
svn path=/trunk/; revision=54480
2013-12-29 15:03:50 +00:00
Martin Kaiser 82f9e9ec68 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

svn path=/trunk/; revision=54479
2013-12-28 20:37:21 +00:00
Michael Mann d3ed64d8e3 Add ZigBee Green Power dissector. Bug 9424 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9424)
From DSR Corporation

svn path=/trunk/; revision=54478
2013-12-28 12:26:37 +00:00
Guy Harris a8ac118885 Use Unicode REPLACEMENT CHARACTER for TS 23.038 errors, as we do for
unassigned code points in some other character sets.

svn path=/trunk/; revision=54477
2013-12-27 23:55:23 +00:00
Jakub Zawadzki d6b35d5c6b mp2t: return offset when dissecting AF (continuation of r54396)
svn path=/trunk/; revision=54476
2013-12-27 17:42:46 +00:00
Jakub Zawadzki 6bb97fa327 Generate prototype for plugin_reg_handoff()
This should fix warnings:
 plugin.c:XX:1: warning: no previous prototype for 'plugin_reg_handoff' [-Wmissing-prototypes]

svn path=/trunk/; revision=54475
2013-12-27 15:46:50 +00:00
Guy Harris cc74708a79 Fix some typoes, quote $CFLAGS and $LDFLAGS when using them in
assignments (not sure that's necessary, but...).

svn path=/trunk/; revision=54474
2013-12-27 11:08:41 +00:00
Anders Broman d0915cabb3 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54473
2013-12-27 10:49:35 +00:00
Alexis La Goutte fa2c0bb556 From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576
Replace g_memmove with memmove

However there still one move g_memmove related code in "packaging/macosx/native-gtk/glibconfig.h".

svn path=/trunk/; revision=54472
2013-12-27 08:11:25 +00:00
Guy Harris 2412913616 Fix configure-script errors with some versions of autoconf.
svn path=/trunk/; revision=54470
2013-12-26 21:45:51 +00:00
Evan Huus 31954c98ee From Robert Jongbloed via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8355

Support RTP/RTCP multiplexing. With input from Jonathan Lennox.

svn path=/trunk/; revision=54469
2013-12-26 21:35:20 +00:00
Guy Harris 0893e06324 OK, "i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc.
build 5658) (LLVM build 2336.11.00)" likes -Wmissing-prototypes but not
-Wmissing-declarations and G++ 4.8.2 likes -Wmissing-declarations but
not -Wmissing-prototypes, so check whether *either* of them requires
-Werror in order to be detected as NSFC++.

Fix a copy-and-pasteo while we're at it.

Don't treat a different willingness to accept
-Wmissing-{prototypes,declarations} as an indication that you have
mismatched C and C++ compilers.

svn path=/trunk/; revision=54468
2013-12-26 21:03:54 +00:00
Michael Mann 29f61a9deb Add numeric types instead of string where possible in the RTPproxy dissector. Bug 9561 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9561)
From Peter Lemenkov

svn path=/trunk/; revision=54467
2013-12-26 15:42:06 +00:00
Michael Mann f563d1d4f8 ZigBee Test Profile #2 and ZDP fixes. Bug 9584 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9584)
From DSR Corporation

svn path=/trunk/; revision=54466
2013-12-26 15:08:18 +00:00
Michael Mann 60b1c30382 Bugfix attribute id parsing in zbee dissectors. Bug 9566 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9566)
From Fabio Tarabelloni

svn path=/trunk/; revision=54465
2013-12-26 14:28:22 +00:00
Evan Huus a2abd0eef4 Protect ucp_mktime against too-short input strings, as caught by Alexis'
ASAN-fuzzing.

svn path=/trunk/; revision=54464
2013-12-26 14:12:50 +00:00
Michael Mann 6697a94ba5 "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)
From Roland Knall

This fix is on top of/in conjunction with r54193 and both need to be backported.

svn path=/trunk/; revision=54463
2013-12-26 14:10:26 +00:00
Evan Huus 441ebf8cc8 Use the correct define for the array length check, actually fixes the overflow I
originall tried to fix in r54441.

svn path=/trunk/; revision=54462
2013-12-26 14:01:37 +00:00
Guy Harris 67527befa6 Report files not recognized as capture files as type "unknown" rather
than as open errors.

svn path=/trunk/; revision=54461
2013-12-26 13:45:59 +00:00
Guy Harris e3d4fe8aae Add some new tags seen.
svn path=/trunk/; revision=54460
2013-12-26 12:58:26 +00:00
Jakub Zawadzki ca91b33cc8 There's no need to mark inline functions with _U_
svn path=/trunk/; revision=54459
2013-12-26 10:53:53 +00:00
Alexis La Goutte e79f82dc9f Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54458
2013-12-26 10:00:36 +00:00
Alexis La Goutte c39b9e7db5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54457
2013-12-26 09:54:31 +00:00
Alexis La Goutte 766d4438f2 Fix -Wunused-const-variable found by Clang
svn path=/trunk/; revision=54456
2013-12-26 09:54:22 +00:00
Alexis La Goutte 00fb8f078a From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9595
Small changes (mainly textual) to packet-scsi.c

The attached patch fixes small issues in SCSI dissection:
1. Extends the meaning of some fields (for example, the mysterious 'LBPME' becomes 'LBPME (logical block provisioning management enabled) / TPE'
2. Adds another ASC value which is important to me - 'Thin Provisioning Soft Threshold Reached' . Added comment where to get all of them (at  http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt)
3. Fixes a small typo: scsi.extcopy.dest_lba is 'Destination LBA', not 'Source LBA' (silly copy-paste mistake).

svn path=/trunk/; revision=54455
2013-12-26 09:54:12 +00:00
Chris Maynard 8411568048 Since the documentation states that, "Text2pcap understands a hexdump of the form generated by od -Ax -tx1 -v.", supply an example that actually matches that format.
In addition, change the hex bytes so that they represent a valid, well-formed packet, rather than a malformed RSVP packet.  This should allow a user to more clearly verify that the text2pcap converstion worked as expected in the event he/she desires to test text2pcap using the example provided.


svn path=/trunk/; revision=54454
2013-12-26 03:45:12 +00:00
Guy Harris c0823e1977 OmniPeek's dissection nonwitstanding, the timestamp field in the
PeekRemote packets from Cisco appears to be a 64-bit timestamp; it's
probably the Time Synchronization Function timestamp (TSFT), so call it
that.

svn path=/trunk/; revision=54453
2013-12-25 23:03:12 +00:00
Guy Harris 189debcadb Code that uses that parameter is #if 0'ed out, so _U_ it for now.
svn path=/trunk/; revision=54452
2013-12-25 09:23:33 +00:00
Martin Mathieson 21f8c1fb7b Show ciphering and integrity keys separately. Correct inputs to integrity calculation (result still not right with gcrypt 1.6 yet)
svn path=/trunk/; revision=54451
2013-12-25 08:44:43 +00:00
Michael Mann e44ebaa9de Use expert info instead of proto_tree_add_text.
svn path=/trunk/; revision=54450
2013-12-25 03:48:20 +00:00
Michael Mann 6535f89772 Make many fields filterable. Used convert_proto_tree_add_text.pl to do a "first pass" at converting proto_tree_add_text calls since this dissector is the worse (ab)user (by volume) of proto_tree_add_text and the "coding style" is very conducive to having convert_proto_tree_add_text.pl correctly guessing the field info.
Another pass or two of convert_proto_tree_add_text.pl (with more manual intervention) is needed to be a "proper" dissector, but it gets it off of the checkAPIs.pl "naughty list" in time for Christmas.

svn path=/trunk/; revision=54449
2013-12-24 23:41:24 +00:00
Guy Harris b5baf01b86 No need for quotes around the arguments to AC_MSG_ macros.
svn path=/trunk/; revision=54448
2013-12-24 18:51:13 +00:00
Guy Harris 8713e0457b Some warning options are, for reasons not entirely obvious to me, not
supported by some versions of g++ even though the corresponding version
of gcc supports them.  Other versions of g++, and clang, support them.

Check, before adding a -W option for C++, whether the compiler supports
it; that check must be done with -Werror, at least with g++, in order to
get a non-zero exit status from the compiler.

svn path=/trunk/; revision=54447
2013-12-24 18:43:42 +00:00
Alexis La Goutte 68e7ccc5dc From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

rename and remove some variables

svn path=/trunk/; revision=54446
2013-12-24 15:16:02 +00:00