Commit graph

23203 commits

Author SHA1 Message Date
Anders Broman
09e32f5fb8 Minor optimizations.
svn path=/trunk/; revision=52695
2013-10-19 20:16:00 +00:00
Evan Huus
1f3549168d Don't link explicitly with libwmem, it's already in libwireshark and the symbol
doubling leads to all sorts of very subtle badness (including test failures due
to funny internal assertions because the two wmems have mismatching state).

Make wmem_init and wmem_cleanup PUBLIC instead of LOCAL so that they don't get
stripped and don't cause a link failure when trying to build oids_test (now that
it's not linking with libwmem explicitly). There is possibly a better way to fix
this, but I'm not sure what it is.

svn path=/trunk/; revision=52694
2013-10-19 19:40:02 +00:00
Michael Mann
3635bea0a4 Add OID unit tests. Bug 9294 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9294)
From Ed Beroset

svn path=/trunk/; revision=52692
2013-10-19 18:52:13 +00:00
Michael Mann
b752cfa88d Correct source code formatting. Bug 9146 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9146)
From Roland Knall

svn path=/trunk/; revision=52691
2013-10-19 16:50:52 +00:00
Pascal Quantin
030b8c51d2 Update comments
svn path=/trunk/; revision=52690
2013-10-19 16:13:40 +00:00
Balint Reczey
2ec414c257 Minor refactoring in CMake ABI dump generation
svn path=/trunk/; revision=52689
2013-10-19 15:51:36 +00:00
Balint Reczey
70dce86ab3 Set and use TMPDIR for ABI dump generation when using CMake
svn path=/trunk/; revision=52688
2013-10-19 14:55:12 +00:00
Pascal Quantin
f6e6660a19 Update E.212 list to Operational Bulletin No. 1038 (15.X.2013)
svn path=/trunk/; revision=52687
2013-10-19 14:10:05 +00:00
Pascal Quantin
d9a0c655f9 Update ITU E.164 list to Operational Bulletin No. 1038 (15.X.2013)
svn path=/trunk/; revision=52686
2013-10-19 14:09:14 +00:00
Jörg Mayer
64018e9ee2 Convert to new hf handling
svn path=/trunk/; revision=52685
2013-10-19 10:04:39 +00:00
Jörg Mayer
141673b515 Some more decoding of mint traffic, start reformatting (incomplete)
svn path=/trunk/; revision=52684
2013-10-19 09:04:10 +00:00
Michael Mann
2657071e88 Don't allow invalid ranges to be specified for the stats tree. Bug 9130 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9130)
Not sure which memory allocation should be used here (using wmem caused crash), but this revision can at least be easily backported to 1.10 where the bug was reported.

Also allow a single number to be used in the stats range since it's considered a valid "range" by the UAT.

svn path=/trunk/; revision=52679
2013-10-18 21:17:01 +00:00
Jakub Zawadzki
d3a09e0514 - Remove hf_ integers from few more dissectors
- udp: remove proto_udp.

svn path=/trunk/; revision=52678
2013-10-18 21:11:11 +00:00
Bill Meier
19f63eb2bd Revert SVN #52650 as per discussion on wireshark-dev
svn path=/trunk/; revision=52671
2013-10-18 15:08:19 +00:00
Michael Mann
4578df790d Use Z_tree for the subtree
svn path=/trunk/; revision=52670
2013-10-18 14:41:01 +00:00
Jörg Mayer
1318ec2c5e Beginnings of Motrola's MiNT protocol.
Most important missing item: Fill in the test functions
to avoid using all packets to the (fixed) ports.

svn path=/trunk/; revision=52669
2013-10-18 13:09:22 +00:00
Jörg Mayer
1b0fa2ec9c Forgot in the previous checkin.
svn path=/trunk/; revision=52668
2013-10-18 13:06:33 +00:00
Jörg Mayer
662c7704f8 After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h
Renamed column_info.h to column-info.h to have consistency
with the column*h files.

svn path=/trunk/; revision=52667
2013-10-18 13:06:05 +00:00
Bill Meier
2197f291e5 Revert SVN #52665.
Compilation fails on (only the ?) OSX-10.6-x64 buildbot with error:

netscaler.c: In function 'nstrace_read_v30':
netscaler.c:1295: warning: implicit conversion shortens 64-bit value into a 32-bit value

(Life is too short for me to dig multiple levels deep into a set of macros to try to see which
 actual line of code is causing the problem.  Maybe the patch submitter can identify the problem).


svn path=/trunk/; revision=52666
2013-10-18 04:31:08 +00:00
Bill Meier
c50b988807 From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280

From me: fix indentation(tabs->spaces) and trailing whitespace.


svn path=/trunk/; revision=52665
2013-10-18 03:36:04 +00:00
Michael Mann
42c52d8612 Add more filterable fields around EDNS(0)
svn path=/trunk/; revision=52664
2013-10-18 01:53:32 +00:00
Michael Mann
e746a62459 Bugfix an apparent typo in edns0 "Higher bits in extended RCODE". Bug 9199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9199).
#BACKPORT(1.10)

svn path=/trunk/; revision=52662
2013-10-17 20:54:42 +00:00
Evan Huus
cbe8af0a8b Revert the optimization in r52578. As Jakub predicted, it caused at least one
infinite loop to pop up. We're just going to have to eat the performance hit.
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9282)

svn path=/trunk/; revision=52660
2013-10-17 12:24:25 +00:00
Tomas Kukosa
744f47107e H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)
svn path=/trunk/; revision=52659
2013-10-17 11:24:43 +00:00
Evan Huus
934bfff003 Temporarily revert r52651 it caused a regression when trying to tvb_memcpy from
a negative offset (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9277)

svn path=/trunk/; revision=52658
2013-10-17 02:43:21 +00:00
Michael Mann
747f1409a1 Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165)
From Andreas Schultz

From me: Use expert API instead of throwing exception for a bad length.

svn path=/trunk/; revision=52657
2013-10-17 02:13:23 +00:00
Michael Mann
9e494dbe18 Be able to search through HTTP request and HTTP response lines. Bug 9134 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9134)
From Edwin Groothuis

svn path=/trunk/; revision=52656
2013-10-17 01:23:12 +00:00
Evan Huus
5344c7fef2 If the length we allocated was 0, don't try and write to the returned pointer.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9276

svn path=/trunk/; revision=52655
2013-10-16 22:52:40 +00:00
Bill Meier
80b5c92af0 Remove trailing blanks; Fix some indentation;
Add editor modelines.

svn path=/trunk/; revision=52653
2013-10-16 20:35:08 +00:00
Bill Meier
94ba4e9875 Fix inconsistent indentation & formatting, trailing blanks.
Add some parens.
Add editor modelines.

svn path=/trunk/; revision=52652
2013-10-16 20:32:57 +00:00
Anders Broman
4223c93c37 Create an internal _tvb_memcpy() without the sanity checks to be caled from tvb internal routines with sanity checks to avoid duplicated checks.
svn path=/trunk/; revision=52651
2013-10-16 20:05:59 +00:00
Anders Broman
26ad68d45b Prepend to lists rather than append as that's more efficient.
svn path=/trunk/; revision=52650
2013-10-16 20:02:14 +00:00
Evan Huus
09066e4eba In packet-wsp.c, don't use the get_long_integer macro where we only need the
very smallest part of its logic. Just call tvb_get_guint8 directly and check
that the return is between 1 and 4. Properly fixes the set-but-unused and
associated warnings that were showing up.

svn path=/trunk/; revision=52648
2013-10-16 18:08:24 +00:00
Gerald Combs
1701f42969 Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).
Move code from ipv6-utils.h to packet-ipv6.c since that was the only
place it was used. Comment out unused code.

svn path=/trunk/; revision=52645
2013-10-16 17:19:59 +00:00
Gerald Combs
4515b2b3aa Fix a comment.
svn path=/trunk/; revision=52644
2013-10-16 17:05:29 +00:00
Gerald Combs
2aa86c5af7 Back out the previous commit. We'll have to find a different fix.
svn path=/trunk/; revision=52643
2013-10-16 16:44:56 +00:00
Gerald Combs
cdebec19c8 Work around a self-assingment error picked up by Clang 5.0.
svn path=/trunk/; revision=52642
2013-10-16 16:41:28 +00:00
Bill Meier
9b40d29017 Fix (what appears to be) a minor bug when dissecting RTMP.
svn path=/trunk/; revision=52641
2013-10-16 14:17:05 +00:00
Pascal Quantin
938206442c Upgrade RRLP dissector to V11.0.0
svn path=/trunk/; revision=52640
2013-10-16 03:06:46 +00:00
Bill Meier
f6e09faa2d From Ed Beroset: add modelines and fix irregular indenting;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9273

This patch adds modelines and cleans up the irregular indentation of
this dissector's code.  The only other change was in
asn1/c1222/packet-c1222-template.c to consolidate an #ifdef that had a
redundant #endif (line 812) and subsequent reopening #ifdef (line
824).  The only thing between them was comments, so the span of the
original #ifdef (line 644) was simply extended by eliminating those
two lines.

The purpose for this patch is to make the file easier to edit and
understand in advance of more substantive patches later.  This patch
is intended to be easy to review by having only non-substantive
changes.


svn path=/trunk/; revision=52636
2013-10-16 00:57:28 +00:00
Evan Huus
7b3dfaa525 As suggested separately by both Jakub and Anders: only read the
WIRESHARK_DEBUG_WMEM_OVERRIDE environment variable once in wmem_init, not every
time wmem_allocator_new is called. We currently create a new pinfo pool for
every packet we dissect, so this is a small performance win, especially when
getenv is slow (which may happen if a large number of environment variables are
set, such as when fuzz-testing).

svn path=/trunk/; revision=52634
2013-10-15 23:16:35 +00:00
Anders Broman
6731cba63a Don't try heuristic dissectors on second pass if no match was found in the first one.
svn path=/trunk/; revision=52631
2013-10-15 21:28:04 +00:00
Balint Reczey
49343d633c Fix ABI check error for libwireshark
svn path=/trunk/; revision=52630
2013-10-15 20:14:47 +00:00
Chris Maynard
63e4539229 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9272
Add tshark -G column-formats report and document the missing ftypes, heuristic-decodes and plugins reports.

From me: Sort the reports.  Add modelines to epan/column.c.  Minor whitespace changes.

svn path=/trunk/; revision=52627
2013-10-15 18:27:35 +00:00
Anders Broman
b0080ae123 g_slist_prepend() should be faster than g_slist_append() use it where the order shouldn't matter.
svn path=/trunk/; revision=52626
2013-10-15 18:21:03 +00:00
Anders Broman
9c3be9d5ae Try to optimize heuristics slightly.
svn path=/trunk/; revision=52624
2013-10-15 18:19:57 +00:00
Cal Turney
4ae53bc208 Reorder all of the bitmask trees according to its endianess from highest to lowest order bit.
These consist of the following bitmask fields: 
[packet-smb.c] 'Create Flags', 'Access Mask', 'File Attributes', 'Share Access', 'Create Options',
               'Security Flags', 'Optional Support'(in TreeConnect AndX responses), and "Quota Flags"
[packet-smb2.c] 'Flags', 'Session Flags', 'Security mode', and 'Interface Capabilities'.

[packet-smb.c] Made the tfs_file_attribute_xxx true_false_string values less verbose and more compact.

[packet-smb2.c] Changed all references to "RMDA" to RDMA".

[packet_smb.c] In dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO() (GetInfo response) changed "Unknown Field"
               to "Reserved" (See capture 'DMtrace2.cap' frame 20023).

svn path=/trunk/; revision=52623
2013-10-15 16:41:29 +00:00
Evan Huus
7d66e3806b Don't do canaries in blocks of guint32, it appears to cause alignment issues
when running tests on Solaris. Revert back to byte-at-a-time, but do fewer bytes
to avoid a performance hit.

svn path=/trunk/; revision=52617
2013-10-15 13:15:38 +00:00
Evan Huus
586dea0e04 Check the length *before* accessing the array, and cap the
length-retrieved-from-packet at the size of the array we have.

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

svn path=/trunk/; revision=52616
2013-10-15 13:05:31 +00:00
Evan Huus
a6d8e1888c Fix a length check in the OID code, we add an extra byte if is_first, not the
other way around. Also add an assert so it blows up if we get it wrong, rather
than leading to uninitialized memory.

Fixes the last errors I can find in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9268

svn path=/trunk/; revision=52615
2013-10-15 12:34:45 +00:00