Commit graph

225 commits

Author SHA1 Message Date
Bill Meier
371d2dc915 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10401


svn path=/trunk/; revision=48441
2013-03-20 14:50:20 +00:00
Anders Broman
f92bd64966 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48439
2013-03-20 05:59:22 +00:00
Anders Broman
d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

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

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Michael Mann
8c0d526f58 SNMP dissector should handle aes256 (better version than r47690)
svn path=/trunk/; revision=47902
2013-02-26 11:38:39 +00:00
Martin Kaiser
38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly
svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
Pascal Quantin
9dc510fc8e Fix typo error
svn path=/trunk/; revision=47693
2013-02-16 13:55:10 +00:00
Michael Mann
46dbc91896 Add decryption algorithm preference to SNMP dissector.
Bug 8328 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8328)

svn path=/trunk/; revision=47690
2013-02-16 02:10:50 +00:00
Michael Mann
8ad4ccb850 Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)

svn path=/trunk/; revision=47328
2013-01-28 21:08:14 +00:00
Graham Bloice
cf4fcaa8b6 snmp dissector did not correctly set length of pdu's of more than 127 bytes. The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
svn path=/trunk/; revision=47173
2013-01-20 10:01:34 +00:00
Guy Harris
1cd57ad3c5 bytestring_to_str() now returns a const char *; assign its result to a
const char *, not a char *.

svn path=/trunk/; revision=46769
2012-12-26 10:54:03 +00:00
Guy Harris
954b90418a Squelch a qualifier-discard warning.
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Anders Broman
eb618abad9 From Bill Parker:
Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'

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

svn path=/trunk/; revision=45418
2012-10-09 08:40:02 +00:00
Jakub Zawadzki
7a9d27c33f Regenerate asn.1 dissectors.
svn path=/trunk/; revision=45110
2012-09-24 19:38:46 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki
5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Jakub Zawadzki
0176a135db Propage changes done in generated dissectors to asn1/
svn path=/trunk/; revision=44845
2012-09-10 15:24:00 +00:00
Michael Mann
a3db9aedfb bugfix minor memory leaks with GString use
svn path=/trunk/; revision=44514
2012-08-15 13:55:29 +00:00
Chris Maynard
c38a247faa Fix Coverity CID 280019 (formerly 19): "Logically dead code" that abroman previously commited a fix for in r17532, but forgot to also commit a change to asn1/snmp/packet-snmp-template.c as well, so the change was apparently inadvertently reverted the next time that packet-snmp.c was regenerated.
svn path=/trunk/; revision=44179
2012-08-01 02:08:29 +00:00
Pascal Quantin
996e2f58b8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7508 :
Display snmp.contextName as FT_STRING

svn path=/trunk/; revision=43883
2012-07-21 08:50:32 +00:00
Chris Maynard
7e3019c186 tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer. Fixes Coverity CID's 280233 and 280234.
svn path=/trunk/; revision=43696
2012-07-13 20:43:55 +00:00
Pascal Quantin
1410207421 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 :
Do not call tvb_ensure_length_remaining on an empty tvb

svn path=/trunk/; revision=43648
2012-07-10 15:43:03 +00:00
Guy Harris
659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Chris Maynard
951b5b9c54 Do not use BASE_NONE for FT_*INT* types.
svn path=/trunk/; revision=43179
2012-06-09 17:56:08 +00:00
Anders Broman
2a30b1eff9 Get rid of a couple of warnings.
svn path=/trunk/; revision=43065
2012-06-04 13:21:44 +00:00
Chris Maynard
0c49176411 tvb_length_remaining() can return a negative number, so be sure to handle it. Fixes Coverity CID's 280233-280235.
svn path=/trunk/; revision=42839
2012-05-24 23:35:23 +00:00
Jakub Zawadzki
c09a95a0e3 Fix bug #7283
When Engine ID is 128 we should only break when we know the enterprise id.

svn path=/trunk/; revision=42825
2012-05-24 12:26:34 +00:00
Guy Harris
7b4894e3ed Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42556
2012-05-11 03:28:26 +00:00
pascal
1cd8ca08a6 From Evan Huus:
Fix Integer32 length field detection
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7192

svn path=/trunk/; revision=42241
2012-04-25 20:20:23 +00:00
Jörg Mayer
2097912587 Rename crypt-xxx to xxx
svn path=/trunk/; revision=40511
2012-01-15 12:29:44 +00:00
Anders Broman
42b44648c8 Get rid of Warnings.
svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
Guy Harris
bbed650915 Do some more length checking to avoid a dissector bug error. Should fix
bug 6564.

svn path=/trunk/; revision=39831
2011-11-14 18:42:11 +00:00
Stig Bjørlykke
be353072dc Added support for big integer64 values.
This fixes bug 6295.

svn path=/trunk/; revision=39666
2011-10-29 18:26:57 +00:00
Bill Meier
794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier
54716c768a Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
svn path=/trunk/; revision=39491
2011-10-20 14:36:14 +00:00
Bill Meier
31abdcb584 Convert asn1 template files proto_tree_add_item() 'encoding' arg for field types FT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. Always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).

svn path=/trunk/; revision=39428
2011-10-15 19:48:19 +00:00
Bill Meier
24cf0aad06 Update generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
The only change in each file is in a comment showing the asn2wrs cmd used to build that file.

svn path=/trunk/; revision=39427
2011-10-15 19:27:27 +00:00
Bill Meier
6142dd287b Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1/*:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

 Also: For type FT_IPv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39332
2011-10-10 01:38:20 +00:00
Bill Meier
e18e2694c6 Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
     FT_BYTES
     FT_IPV6
     FT_IPXNET
     FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
 

svn path=/trunk/; revision=39263
2011-10-05 02:39:04 +00:00
Gerald Combs
44332d7279 Change the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.
svn path=/trunk/; revision=39114
2011-09-23 22:44:28 +00:00
Anders Broman
6d94629c4b Gnenerate the dissector for previous commit.
svn path=/trunk/; revision=38304
2011-08-02 04:17:45 +00:00
Stig Bjørlykke
f282154ab0 Use correct encoding for proto_tree_add_item().
svn path=/trunk/; revision=38107
2011-07-19 10:51:12 +00:00
Anders Broman
2477298026 From Sean Van Gorder:
When Wireshark attempts to read an SNMP packet with a variable-bindings item
with an OID containing an index string which includes an entry of type
"Unsigned32", Wireshark will stop dissecting the packet at this index entry and
end with the error:

[Dissector bug, protocol SNMP: proto.c:2761: failed assertion
"DISSECTOR_ASSERT_NOT_REACHED"]

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

svn path=/trunk/; revision=37558
2011-06-05 20:12:44 +00:00
Alexis La Goutte
ec7709406e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36771
2011-04-21 16:00:38 +00:00
Alexis La Goutte
7239db18ec Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36760
2011-04-21 13:34:22 +00:00
Stephen Fisher
fcfcfa347c Rollback r36614 and change dissect_SMUX_PDUs_PDU() to use previously
unused smux_tree instead of tree.  Per suggestion from Stig on -dev.


svn path=/trunk/; revision=36624
2011-04-13 15:48:24 +00:00
Stephen Fisher
4b416d92d0 Fix Coverity 524: NEGATIVE_RETURNS
Coverity sees that two calls to tvb_length_remaining() with an offset
of 0 may return -1 (for an "out of bounds" condition), which would lead
to an assignment of -1 to an unsigned variable and then passing it
to functions further down that cannot accept negative values.

Use tvb_ensure_length_remaining() to throw an exception in a case of
out of bounds access (though unlikely with an offset of 0) instead of
tvb_length_remaining(), which would return -1.


svn path=/trunk/; revision=36615
2011-04-12 22:23:03 +00:00
Stephen Fisher
ce2eea5b95 Fix Coverity 1047: UNUSED_VALUE in dissect_smux
svn path=/trunk/; revision=36614
2011-04-12 22:12:05 +00:00
Stig Bjørlykke
42f41ddf0b Corrected switch-case flow.
Coverity 1184.

svn path=/trunk/; revision=36579
2011-04-12 09:05:43 +00:00
Gerald Combs
a5b20fbdf6 Add a relative path to the "#line" directives we produce. Regenerate the
SNMP and SPNEGO dissectors to see if it helps Coverity locate the
original source files.

svn path=/trunk/; revision=36522
2011-04-08 19:51:39 +00:00