Commit Graph

51 Commits

Author SHA1 Message Date
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Jeff Morriss 729de1a635 As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 :

Write a new convenience routine for finding a conversation and, if it is not
found, create it.  The frame number and addresses are taken from pinfo (as is
the common case).

Use this function in a bunch of dissectors.

svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
Guy Harris b706db2b01 packet-ssl-utils.h now includes <stdio.h> itself.
svn path=/trunk/; revision=32371
2010-04-04 03:06:25 +00:00
Guy Harris f588599e6d packet-ssl-utils.h uses "FILE *"; at least on Solaris, we need to
include <stdio.h> to get "FILE *" declared.

svn path=/trunk/; revision=32368
2010-04-04 00:48:17 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Jaap Keuter 4ab14bc71e Ditch the last direct indexed character array.
And some minor formatting updates.

svn path=/trunk/; revision=31921
2010-02-19 07:43:26 +00:00
Stig Bjørlykke 539b558f8c Renamed some reassembled data texts.
Removed some check_col().

svn path=/trunk/; revision=31809
2010-02-06 18:20:21 +00:00
Stig Bjørlykke 88b72356ad Introduce "Reassembled length" filter element for all protocols doing
reassembly.

svn path=/trunk/; revision=31767
2010-02-02 16:01:52 +00:00
Anders Broman 440c3f9261 From Didier Gautheron:
check_col.diff
Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31519
2010-01-13 20:32:01 +00:00
Guy Harris 8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display
the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL ==
(int)BASE_NONE, so there's no source or binary compatiblity issue,
although we might want to eliminate BASE_NONE at some point and have the
BASE_ values used with integral types start at 0, so that you can't
specify BASE_NONE for an integral field.

svn path=/trunk/; revision=31319
2009-12-19 03:17:44 +00:00
Stig Bjørlykke d577ca0fa7 Guard #include <sys/types.h> with HAVE_SYS_TYPES_H.
svn path=/trunk/; revision=31053
2009-11-23 18:47:52 +00:00
Bill Meier 81a03aca75 Another Oops: #include <stdio.h> *is* required .....
svn path=/trunk/; revision=30584
2009-10-16 22:12:40 +00:00
Bill Meier f91657feb9 dtls_fragment_table never used; Remove it.
Remove unneeded #includes.
Adjust some indentation & spacing.

svn path=/trunk/; revision=30576
2009-10-16 21:17:57 +00:00
Kovarththanan Rajaratnam 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Jaap Keuter 01e559bb2f Fix for bug 4008:
Crash on TLSv1.2 packets, caused by ssl_short_name array overrun.

svn path=/trunk/; revision=29906
2009-09-14 21:24:24 +00:00
Kovarththanan Rajaratnam 8c48c6835f Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
Tomas Kukosa ebc78f0a07 Fix SSL decryption failure if client and server have the same TCP port
svn path=/trunk/; revision=29400
2009-08-13 09:07:03 +00:00
Kovarththanan Rajaratnam 6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Anders Broman c91a384702 Apply some of the patches from:
http://wiki.wireshark.org/Development/Optimization

svn path=/trunk/; revision=28356
2009-05-13 19:46:11 +00:00
Gerald Combs 6d04f793f0 Back out r27047 and r27053.
svn path=/trunk/; revision=27062
2008-12-19 17:39:52 +00:00
Gerald Combs fc71188963 Update calls to proto_tree_add_bytes_format to reflect r27047.
svn path=/trunk/; revision=27053
2008-12-18 20:19:49 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Bill Meier 33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Michael Tüxen bf796ee2a6 - Do not register UDP port 4433. Use dissector_add_handle instead.
- Also use dissector_add_handle() to make it available for DTLS/SCTP.

svn path=/trunk/; revision=26798
2008-11-17 21:44:42 +00:00
Bill Meier be76528ad8 #if ==> #ifdef
svn path=/trunk/; revision=26567
2008-10-27 01:39:32 +00:00
Bill Meier 8afa208ffb Windows build: #include winsock2.h only when needed.
#include winsock2.h pulls in about 90 distinct .h files
and about 140 total .h files. 
Currently winsock2.h is (mostly unnecessarily) included
for each dissector via packet.h/wtap.h.
This patch removes #include winsock2.h from wtap.h and 
then includes winsock2.h (or windows.h) in the 
few specific places required. 
With this patch, my Windows Wireshark build takes 
about 30% less time.


svn path=/trunk/; revision=26535
2008-10-24 00:42:09 +00:00
Michael Tüxen ebd05a6014 Bugfix from Robin Seggelmann for Certificate Request messages.
svn path=/trunk/; revision=26475
2008-10-16 10:11:24 +00:00
Jaap Keuter 28c2ad711d From Michael Bernhard:
The dissector asserted displaying cookies in DTLS frames because it was registered as FT_NONE.

svn path=/trunk/; revision=26207
2008-09-15 19:49:43 +00:00
Guy Harris 9e6329860a Fix some warnings - declare some arguments, variables, and structure
members to be const pointers when that's possible, and throw in some
casts when the GLib API fails to have properly consted arguments.

Use ep_strdup_printf() in some cases.

svn path=/trunk/; revision=25596
2008-06-25 03:05:19 +00:00
Anders Broman bf9ccab9cb Change depreciated function g_tree_traverse -> g_tree_foreach
svn path=/trunk/; revision=25239
2008-05-05 20:03:15 +00:00
Bill Meier b25aa005c1 A few minor pedantic fixes ....
svn path=/trunk/; revision=24301
2008-02-11 17:04:51 +00:00
Sake Blok 3c9a7b9dcd Bug 1954 From Mikael Magnusson :
This patch updates the DTLS dissector to be compatible with OpenSSL 0.9.8f in
the following ways:
* Handle both SSL version number 0xfeff (RFC 4347 and OpenSSL 0.9.8f), and
0x100 (Used by OpenSSL 0.9.8e and earlier)
* Reassemble fragmented handshake messages.





svn path=/trunk/; revision=23369
2007-11-05 23:05:20 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Gerald Combs 9bf0729452 Fix include paths.
svn path=/trunk/; revision=22076
2007-06-11 19:03:20 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Guy Harris e7fc05410d Use "address_to_str()" to format an address, rather than assuming it's
an IPv4 address.

svn path=/trunk/; revision=21568
2007-04-25 22:33:47 +00:00
Jeff Morriss bc1a33021c Pass NULL (instead of proto_) in the last parameter of tap_queue_packet()
because NULL is just as interesting as the proto_ entry and the latter
generates a compiler warning.

svn path=/trunk/; revision=21460
2007-04-18 04:13:50 +00:00
Tomas Kukosa 9f2ccb7fc0 - SSL desegmentation support
- SSL DEFLATE compression method support (RFC3749)
- fix for Bugzilla Bug 1515: SSL bug with mutual authentication

svn path=/trunk/; revision=21368
2007-04-10 15:12:48 +00:00
Jeff Morriss 10e8a95401 Add brackets to extern of ssl_version_short_names[] to fix compiler warnings.
svn path=/trunk/; revision=21166
2007-03-24 13:21:08 +00:00
Stephen Fisher dfc2b16e29 Fix mess with ssl_version_short_names[] being defined multiple places
now that it is no longer a static variable in packet-ssl-utils.h.
Leaving it as static caused a warning turned error that it was unused
in the current file (packet-ssl-utils.h).  Resolution: Move the variable
to packet-ssl.c and declare as extern in packet-dtls.c - the only other
place that needs it.


svn path=/trunk/; revision=21161
2007-03-24 01:38:58 +00:00
Ulf Lamping 7994794ad9 fix a lot more warnings
svn path=/trunk/; revision=21142
2007-03-23 01:29:52 +00:00
Tomas Kukosa 51fc862945 prepare SSL dissector for similar desegmentation as is in the TCP as current one does not work well in many cases
svn path=/trunk/; revision=20405
2007-01-12 10:25:03 +00:00
Bill Meier 739eb43c3a More ethereal --> wireshark
svn path=/trunk/; revision=20270
2007-01-02 14:11:35 +00:00
Guy Harris 90a3563fa5 Fix some compiler warnings (some by getting rid of variables unused if
you don't have GNU TLS).

svn path=/trunk/; revision=19037
2006-08-26 00:05:26 +00:00
Tomas Kukosa ce4e15b76d new ssl_dissector_add() function which can be called from another dissectors (similar to dissector_add())
svn path=/trunk/; revision=19026
2006-08-25 08:07:26 +00:00
Ronnie Sahlberg 7b3b26fd39 from a. samuel
ssl and dtls updates


svn path=/trunk/; revision=18816
2006-08-02 08:15:51 +00:00
Ulf Lamping c63ce3b15d MSVC doesn't like the conversion from guint64 to double, use gint64 instead (should be safe if I understand the implementation correct)
svn path=/trunk/; revision=18585
2006-06-27 16:50:28 +00:00