osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
49404 commits 26 branches 0 tags 795 MiB
Commit graph

49404 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Morriss
3b1463d6b3 Clean up warnings when we don't HAVE_LIBPCAP. 
svn path=/trunk/; revision=52680
 2013-10-18 21:32:59 +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
Guy Harris
f86132a09a White space cleanups (thanks either to shekhar.chandra@citrix.com or 
Bill Meier; see bug 9280).

svn path=/trunk/; revision=52677
 2013-10-18 20:28:11 +00:00
Jeff Morriss
d69a93f70e Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS. 
svn path=/trunk/; revision=52676
 2013-10-18 18:28:57 +00:00
Evan Huus
2322bd3122 Fix lemon FSF address and add license exception for the generated mate grammar 
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.

svn path=/trunk/; revision=52675
 2013-10-18 18:10:46 +00:00
Jeff Morriss
2ac63d7a44 Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI. 
svn path=/trunk/; revision=52674
 2013-10-18 17:42:32 +00:00
Jeff Morriss
db68b808dd Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in 
the C++ stuff.

ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it
doesn't seem necessary on Fedora 18 (64-bit).  Leaving it out for now--let's
see what others say...

svn path=/trunk/; revision=52673
 2013-10-18 16:56:27 +00:00
Gerald Combs
be9eedeb8c Make sure LIBGCRYPT_CFLAGS is added to AM_CPPFLAGS. 
svn path=/trunk/; revision=52672
 2013-10-18 16:32:43 +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
Gerald Combs
98f3bb5f15 Sign all of the executables. 
svn path=/trunk/; revision=52663
 2013-10-17 22:34:38 +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
Gerald Combs
e7202d159a If static analysis is enabled disable error checking when compiling the 
Qt code. This should hopefully work around a builder issue.

svn path=/trunk/; revision=52661
 2013-10-17 17:50:00 +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
Gerald Combs
f6884b5945 Add checks to see if CC and/or CXX are Clang. Add "-Qunused-arguments" 
to CFLAGS and/or CXXFLAGS as needed.

svn path=/trunk/; revision=52654
 2013-10-16 22:39:44 +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
Gerald Combs
fe55299806 Don't bother checking for clang, just add -Qunused-arguments to the 
compiler flags checks.

svn path=/trunk/; revision=52649
 2013-10-16 18:40:13 +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
Pascal Quantin
7c2219f301 1.11.0 -> 1.11.1 
svn path=/trunk/; revision=52647
 2013-10-16 17:32:45 +00:00
Gerald Combs
5fba0c2474 If we're using Clang add -Qunused-arguments in order to avoid a bunch 
of warnings described at
http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html

svn path=/trunk/; revision=52646
 2013-10-16 17:22:58 +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
55f3af2174 Fix various: whitespace, comments & etc. 
Add editor modelines.

svn path=/trunk/; revision=52639
 2013-10-16 02:39:09 +00:00
Bill Meier
9ae071f406 Add blank line before 'and by' 
svn path=/trunk/; revision=52638
 2013-10-16 02:34:03 +00:00
Chris Maynard
d61a6dd316 Add Ed Beroset to the list of Wireshark authors. 
svn path=/trunk/; revision=52637
 2013-10-16 01:10:04 +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
Pascal Quantin
78d3fe6248 Update the list of new protocols supported 
svn path=/trunk/; revision=52635
 2013-10-16 00:35:02 +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
Gerald Combs
c4dcd0ca24 If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the 
installer package. Add commented-out code to sign the .dmg as well in
case Apple supports that in the future.

svn path=/trunk/; revision=52633
 2013-10-15 23:03:48 +00:00
Gerald Combs
fb9d4296be Adjust parenthesis to make gcc happy. 
svn path=/trunk/; revision=52632
 2013-10-15 21:31:32 +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