aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-smtp.c
AgeCommit message (Collapse)AuthorFilesLines
2010-05-23Fix for bug 4544 - Decrypted data for STARTLS session is not shown in packet ↵sake1-3/+11
list when using "starttls" SSL decryption preference - make sure the SSL dissector knows how to reach the original dissector for the decrypted data - make sure the SMTP dissector does not call the SSL dissector again with the decrypted data git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32921 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-13As suggested in ↵morriss1-23/+18
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32790 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-22Minor Reformatting; Rename some enum constant identifiers to be a bit more ↵wmeier1-579/+584
specific; git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32270 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-02Introduce "Reassembled length" filter element for all protocols doingstig1-0/+6
reassembly. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31767 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-22Fix some gcc -Wshadow warningswmeier1-25/+25
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31623 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-10From rmkml via wireshark-dev:stig1-0/+3
Redirect secure SMTP traffic on non-standard port 465 to the ssl dissector. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31482 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-18Introduce a value_string to provide descriptions for some SMTP responsesfisher1-1/+29
codes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31305 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkkrj1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-18From Kovarththanan Rajaratnam via bug 3548:stig1-10/+10
(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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-03size_t fix (you won't get more than 2^31-1 bytes there).guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27953 f5534014-38df-0310-8fa8-9805f1628bb7
2008-11-23From Didier Gautheron (bug 3056):stig1-30/+36
1) do more work when tree is NULL, otherwise data desegmentation doesn't work. 2) set desegment_len to DESEGMENT_ONE_MORE_SEGMENT rather than 1 when searching for end of line. 3) set frame_data->pdu_type for STARTTLS cmd and use se_alloc0 rather than se_alloc 4) restore pinfo can_desegment to saved_can_desegment or ssl can't desegment packets. 5) move TLS call before searching for cmd. It doesn't deal with rejected TLS negotation. Not hard to do but I haven't a capture, it anyone can share one. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26826 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-11From Ward van Wanrooij (bug 2955):stig1-4/+7
Add the fragment to the defragmentation sequence if the SMTP dissector encouters a packet that contains both a DATA fragment and the terminating \r\n.\r\n sequence. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26419 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-30Minor proto_reg_handoff cleanup: use find_dissector when appropriate.wmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26308 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-10strncasecmp ==> g_ascii_strncasecmpwmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26172 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-07Move the advancement of the packet offset outside the "if (tree)".guy1-11/+10
This fixes bug 2856. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26159 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-07Style and indentation cleanups.guy1-106/+39
Don't initialize a variable that's set (in the handoff registration routine) before being used. Now that we're GLib 2.0-only, use g_ascii_isalpha() rather than rolling our own. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26157 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-07Add support for TLS-over-SMTP.guy1-109/+157
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26156 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-06Have a line_is_smtp_command() routine to check whether a line is an SMTPguy1-20/+69
command, and use that in the parsing loop (that means we don't have to treat 4-character commands and non-4-character commands separately). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26155 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-06Add some comments.guy1-0/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26153 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-05Move another comment next to the code to which it refers.guy1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26144 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-05Move a comment to the right place.guy1-10/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26143 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-05Clean up indentation.guy1-455/+455
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26142 f5534014-38df-0310-8fa8-9805f1628bb7
2008-05-14Fix some of the Errors/warnings detected by checkapi.wmeier1-3/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25290 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-13Initialize linelen to avoid a warning.stig1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24994 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-13Support for RFC 2920 SMTP Command Pipelining. gal1-55/+118
The client can send multiple requests before waiting for responses. Multiple requests/responses are delimited in the info column using " | ". Also changed to using "C:" (client) and "S:" (server) to save space in the info column and align with examples in RFC 2821. Lack of support for PIPELINING was shown up during Sake's session at SharkFest08! git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24989 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-09Remove:etxrab1-4/+0
#ifdef NEED_G_ASCII_STRCASECMP_H #include "g_ascii_strcasecmp.h" #endif git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24859 f5534014-38df-0310-8fa8-9805f1628bb7
2007-12-28Add submission port dissection.jake1-0/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23957 f5534014-38df-0310-8fa8-9805f1628bb7
2007-11-27strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delendaguy1-6/+10
est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our own versions if they're missing from GLib (as is the case with GLib 1.x). In the code to build the list of named fields for Diameter, don't use g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping in the hash function and use g_ascii_strcasecmp() in the compare function. We do this because there is no guarantee that toupper(), tolower(), and functions that use them will, for example, map between "I" and "i" in all locales; in Turkish locales, for example, there are, in both upper case and lower case, versions of "i" with and without a dot, and the upper-case version of "i" is "I"-with-a-dot and the lower-case version of "I" is "i"-without-a-dot. This causes strings that should match not to match. This finishes fixing bug 2010 - an earlier checkin prevented the crash (as there are other ways to produce the same crash, e.g. a bogus dictionary.xml file), but didn't fix the case-insensitive string matching. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23623 f5534014-38df-0310-8fa8-9805f1628bb7
2007-10-23Apply the small performance enhancment patches for:etxrab1-1/+1
- 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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23252 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-15Added support for RFC3030 (BDAT) in SMTP.stig1-38/+113
Added data fragment length to COL_INFO. Changed some 0/1 values to boolean. http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1736 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22516 f5534014-38df-0310-8fa8-9805f1628bb7
2007-07-04New preference to allow for the reassembly of SMTP DATA and subsequent ↵gal1-20/+180
dissection as Internet Message Format (imf). (imf dissector in separate patch). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22240 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-28Remove almost all of the casts I committed recently and in place ofsfisher1-4/+4
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21253 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-28Fix a bunch of warnings, add svn:keywords Id and svn:eol-style nativesfisher1-4/+4
to packet-iuup.c. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21244 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-25Allow DCT2000 support to find a couple of more protocols.martinm1-1/+4
Try to squash some warnings seen on the ubuntu buildbot log git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19683 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-21change a whole bunch of ethereal into wiresharksahlberg1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18196 f5534014-38df-0310-8fa8-9805f1628bb7
2005-08-12remove some unused variables from scsisahlberg1-25/+3
change two gmemchunks in smtp to se_alloc() and remove one now redundant init routine. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15308 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-02From Jon Ringle:etxrab1-2/+2
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13243 f5534014-38df-0310-8fa8-9805f1628bb7
2004-09-27Move prefs.c and prefs.h into the epan subdirectory.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12115 f5534014-38df-0310-8fa8-9805f1628bb7
2004-08-21Prevent the word "desegmentation" at the GUI, but use reassembling at that ↵ulfl1-2/+3
places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions. I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences. Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect. If you encounter any mistakes I've made here, please let me know... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11784 f5534014-38df-0310-8fa8-9805f1628bb7
2004-08-06From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that anguy1-1/+1
include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11615 f5534014-38df-0310-8fa8-9805f1628bb7
2004-07-18Move dissectors to epan/dissectors directory.gram1-0/+597
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11410 f5534014-38df-0310-8fa8-9805f1628bb7