Commit Graph

45 Commits

Author SHA1 Message Date
Stig Bjørlykke 84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Jeff Morriss 33f116a46d Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

Remove check_col().

svn path=/trunk/; revision=34436
2010-10-08 17:48:22 +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
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 47e732e29e Changed "reassembled_length" -> "reassembled.length".
svn path=/trunk/; revision=31776
2010-02-03 08:47:15 +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
Gerald Combs 8533da1c94 Don't call tvb_new_subset on a NULL pointer. Fixes bug 4101.
svn path=/trunk/; revision=31029
2009-11-19 22:41:01 +00:00
Ronnie Sahlberg 161667e6bd From Matthieu Patou,
add code to decrypt ntlmv1 and v2 traffic





svn path=/trunk/; revision=30355
2009-10-06 09:13:57 +00:00
Kovarththanan Rajaratnam 17c9803cac Sanitize epan includes
svn path=/trunk/; revision=29499
2009-08-21 20:25:24 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +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
Stig Bjørlykke 9a0020f2f9 From Peter (bug 2942):
Allow optimalization with -ftracer.

svn path=/trunk/; revision=26822
2008-11-22 15:55:01 +00:00
Ronnie Sahlberg b4d74f2506 from metze
fallback to spnego_krb5_wrap for RFC4121 krb5 blobs


svn path=/trunk/; revision=26295
2008-09-29 18:52:17 +00:00
Bill Meier 69336f7d96 Minor cleanup for proto_reg-handoff & etc
svn path=/trunk/; revision=26285
2008-09-27 14:02:23 +00:00
Bill Meier 33af75a599 Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25628
2008-06-28 21:09:57 +00:00
Richard van der Hoff 1350d63c1e From Chris Maynard (bug 1852):
These packet-g*.c files all have display filter issues:

1) packet-gryphon.c: PROTOABBREV is "gryphon", but display filter fields are
prefixed with only "gryph".

2) packet-gmrp.c: PROTOABBREV is "gmrp", but display filter fields are prefixed
with "garp".

3) packet-gssapi.c: PROTOABBREV is "gss-api", but display filter fields are
prefixed with "gssapi".

4) packet-gvrp.c: PROTOABBREV is "gvrp", but display filter fields are prefixed
with "garp", most of which conflict with packet-gmrp.c's display filter fields.




svn path=/trunk/; revision=24058
2008-01-10 16:35:54 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Stephen Fisher f002ac6db5 Fix various warnings
Move packet-cops.c out of clean dissectors due to a #define conflict
in the headers of net-snmp with our config.h


svn path=/trunk/; revision=21398
2007-04-13 00:50:23 +00:00
Stephen Fisher ab8f589336 Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
svn path=/trunk/; revision=21233
2007-03-27 22:50:11 +00:00
Ronnie Sahlberg 2aaabbba43 check for whether the blob starts with "NTLMSSP" before any other check if it is not BED/DER encoded and call tha appropriate subdissector if so.
this fixes some issues with some really ancient cifs implementations where the previous tests and statemanagement would cause it to fail othervise.



svn path=/trunk/; revision=20136
2006-12-14 10:11:40 +00:00
Ronnie Sahlberg e3c9fab51c add primitive reassembly of gssapi
this will allow reassembly of gssapi blobs that span multiple smb/sessionsetup command pdus



svn path=/trunk/; revision=19119
2006-09-02 11:46:15 +00:00
Ronnie Sahlberg 8e830b8ef4 break out the handling of conversation specific data so that we will always have one such struct (and not an value pointer to an oid struct)
so that it is easier to attach other useage to the conversation specific state



svn path=/trunk/; revision=19113
2006-09-02 02:03:26 +00:00
Ronnie Sahlberg 62780fec5a resolve the oid to a variable before we check it in the conditional so that
we can add code to check that it looks sane (for better heuristics) when
we start adding GSS-KRB reassembly.

we need this for some transports such as SMB/SessionSetup that will transport GSS-KRB blobs inside multiple PDUs (multiple different SMB/SessionSetups) so we can reassemble the blobs before decoding them.


this probably only happens for SMB/SessionSetup   but the design of that command is so "nice" that you can not tell whether the blob is fragmented or not or how big it is supposed to be by looking at the SMB layer itself, one needs to know the BER length field for the BER APPLICATION tag. :-(

to make things worse, the only way match multiple such fragments together one will need not just the fragments from the SessionSetup requests  but also the UID that is returned in the response to the initial request.
perverse design.


lets assume that there will almost never be multiple sessionsetups on the same tcp session in real traces    so to make things easier just ignore the UID for now when reassembling. (well reassembly is not added yet but will be)




svn path=/trunk/; revision=19112
2006-09-02 00:43:19 +00:00
Ronnie Sahlberg 000182e09b remove a comment with dead code
remove three pointless volatile declarations


svn path=/trunk/; revision=19111
2006-09-02 00:24:31 +00:00
Ronnie Sahlberg 4c5987ce98 always create a conversation for gssapi
we will need a conversation in more places once we start adding reassembly of gss-krb blobs that span multiple pdus (smb/sessionsetup)



svn path=/trunk/; revision=19110
2006-09-02 00:17:35 +00:00
Ronnie Sahlberg fea1419b6f from Metze
fix the bug where decryption of dcerpc wrapped inside gsskrb sometimes fail




svn path=/trunk/; revision=18404
2006-06-09 08:54:23 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Ronnie Sahlberg 94f416ca62 fix for bug #856
dont try to lookup a NULL string since this string will be dereferenced
in the ghashtable   hash callback



svn path=/trunk/; revision=17802
2006-04-04 07:53:39 +00:00
Ronnie Sahlberg 6ea1842885 remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns.
create a new dissector table where MAC algorithms for dns/tsig can be registered.


register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates.



svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Jörg Mayer 69dcb66cd9 More char -> const char warning fixes
svn path=/trunk/; revision=15218
2005-08-05 00:23:22 +00:00
Ronnie Sahlberg 33f4400f83 the maximum ASN OID length is 256 bytes and there is a define to control this.
fix bug251 and all other occurances where an oid string  passed to packet_ber_object_identifier()
is not defined as foo[MAX_OID_STR_LEN]

svn path=/trunk/; revision=14720
2005-06-21 09:38:59 +00:00
Ronnie Sahlberg b958accede move one function only used by SPNEGO to packet-spnego.c
remove the include of <epan/asn1.h> from kerberos, ntlmssp and gssapi since they no longer need to include that file.


svn path=/trunk/; revision=14709
2005-06-20 05:28:56 +00:00
Ronnie Sahlberg 9df676d79b convert gssapi to use packet-ber helpers instead of the asn1 ones.
once spnego is converted as well, the   epan/asn1.h  include can be removed from :
kerberos, spnego, gssapi and ntlmssp



svn path=/trunk/; revision=14708
2005-06-20 04:44:39 +00:00
Tim Potter 2ebd49cd2c Apply abartlet@samba.org's "raw NTLMSSP over GSS-SPNEGO" patch.
svn path=/trunk/; revision=13788
2005-03-17 02:27:26 +00:00
Guy Harris 90f8224360 Have GSS-API subdissectors supply a "data is encrypted" flag to their
callers, so that they can tell "no decrypted tvbuff because I couldn't
decrypt it" from "no decrypted tvbuff because it's not encrypted in the
first place".  Set that based on the Kerberos seal algorithm field in
the SPNEGO Kerberos 5 wrap dissector code.

Use that to determine whether the GSS-API encapsulated data in LDAP is
encrypted or not., rather than using a heuristic.

Set the length of the SASL blob tvbuff based on the SASL length and the
length of the tvbuff from which it's consstructed, rather than setting
it to the SASL length.

svn path=/trunk/; revision=13780
2005-03-16 21:59:25 +00:00
Ronnie Sahlberg 349c5a8699 from metze
various bugfixes and enhancements to decryption of secure ldap


svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
Ronnie Sahlberg 8700645d54 add support to decrypt and dissect sign-and-sealed traffic.
(cifs: dc's talking to eachother   and when longhorn comes out: anyone wanting to talk dce to a dc!)

((this is an incredibly advanced feature well worthy of mentioning in NEWS))


svn path=/trunk/; revision=13690
2005-03-10 10:16:49 +00:00
Ronnie Sahlberg 6fec8dca5f some authentication stuff from metze
svn path=/trunk/; revision=13584
2005-03-04 12:28:00 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Anders Broman 851ecd2ac4 From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the 
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass 
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image 
are present, and T.38 conversation if only m=image is present. I expect that 
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38 
packets.

svn path=/trunk/; revision=13243
2005-02-02 20:07:03 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00