aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ftp.c
AgeCommit message (Collapse)AuthorFilesLines
2014-08-08Eliminate proto_tree_add_text from some dissectors.Michael Mann1-8/+4
Change-Id: I6f1710a093fc548c718defa9b40ab68877ede977 Reviewed-on: https://code.wireshark.org/review/3470 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-1/+1
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-1/+1
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-19Add new proto_tree_add_format_text() functionJakub Zawadzki1-5/+3
There are lot of text dissectors which want just to add escaped (not filtrable) text, add new function proto_tree_add_format_text() which just do this in optimized way. Change-Id: Ia0e189b620cc0a5b74cfdaef1ad4571d766bb2ab Reviewed-on: https://code.wireshark.org/review/1678 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-13isprint() -> g_ascii_isprint()AndersBroman1-1/+1
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41 Reviewed-on: https://code.wireshark.org/review/1624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-21fix some warnings.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=54334
2013-12-21include header file.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=54331
2013-12-21New functions: str_to_ip6(), str_to_ip()Jakub Zawadzki1-15/+3
This way we can avoid including lot of system header files in some dissectors and it might fix bug #9581 svn path=/trunk/; revision=54330
2013-12-15Fix [-Wmissing-prototypes]Jakub Zawadzki1-1/+2
svn path=/trunk/; revision=54135
2013-12-13Try to appease Visual Studio Code Analysis to avoid a false warning (as far ↵Chris Maynard1-4/+3
as I can tell), namely: warning C6054: String 'forbidden' might not be zero-terminated svn path=/trunk/; revision=54009
2013-12-13Do one or more of the following:Bill Meier1-5/+5
- Convert "4 space tabs" to spaces; - Remove some unneeded initializers; - 'offset++' --> 'offset += 1' for consistency; - Reformat hf[] entries; - Rework/add whitespace; - Adjust editor modelines (set tab-width to 8). svn path=/trunk/; revision=54005
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-7/+7
svn path=/trunk/; revision=52591
2013-09-14emem -> wmemMartin Kaiser1-7/+7
svn path=/trunk/; revision=52044
2013-07-16"man inet_pton" only says that it returns a negative value, zero or a ↵Chris Maynard1-47/+47
postive value, and not specifically -1, 0, or 1, so even though we know that's what wsutil's inet_pton will return, we shouldn't test against those exact values. svn path=/trunk/; revision=50670
2013-05-26Batch of filterable expert infos.Michael Mann1-6/+16
svn path=/trunk/; revision=49584
2012-12-26Fix a bunch of warnings.Guy Harris1-1/+1
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-07removed a last if (tree) check in dissect_ftpdata()Martin Kaiser1-21/+19
svn path=/trunk/; revision=46460
2012-12-07EPRT parameters are mandatory, flag up an error if they're missingMartin Kaiser1-52/+52
remove if (linelen!=0) check svn path=/trunk/; revision=46459
2012-12-07remove some more if (tree) checksMartin Kaiser1-23/+17
svn path=/trunk/; revision=46457
2012-12-07at one place, offset was incremented depending on if (tree)Martin Kaiser1-12/+10
this created a bug when offset was used later on remove the if (tree) check svn path=/trunk/; revision=46456
2012-12-07dissect_ftp() start at the beginning of the tvbMartin Kaiser1-11/+10
make this clear by not using a variable offset which is always 0 svn path=/trunk/; revision=46455
2012-12-07remove some more unnecessary if (tree) checksMartin Kaiser1-47/+43
svn path=/trunk/; revision=46454
2012-12-07remove some unnecessary if (tree) checks in the ftp dissectorMartin Kaiser1-41/+25
svn path=/trunk/; revision=46452
2012-10-24fix compliation on Win64Martin Kaiser1-1/+1
svn path=/trunk/; revision=45780
2012-10-24From Alexander KoeppeMartin Kaiser1-17/+93
parse EPSV response from me - no expert info under if(tree) - use hf_ftp_epsv_port instead of hf_ftp_pasv_port - don't use isdigit(), this is C99 - use temporary variable for IPv4 address https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729 svn path=/trunk/; revision=45778
2012-10-15From Alexander KoeppeMartin Kaiser1-32/+44
use inet_pton() for address parsing in FTP's EPRT command support IPv6 addresses https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729 svn path=/trunk/; revision=45565
2012-10-04From Alexander KoeppeMartin Kaiser1-1/+251
support for EPRT command as defined in RFC 2428 (IPv4 addresses only) from me simplify the code, expert info must not be under if(tree) based on the submission in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7729 svn path=/trunk/; revision=45308
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-09-05fix compilation on Win7x64 (I hope)Martin Kaiser1-1/+1
svn path=/trunk/; revision=44783
2012-09-05add modelines for the ftp dissectorMartin Kaiser1-0/+13
svn path=/trunk/; revision=44782
2012-09-05from Alexander KoeppeMartin Kaiser1-8/+19
ftp PASV and PORT commands: mark ip address and port in data view https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7693 svn path=/trunk/; revision=44781
2012-07-23Now check the first few bytes of the ftp-data segment to see if it looksMartin Mathieson1-16/+22
printable. If binary, just show the number of bytes in summary. Not that there are no items inside it, don't create ftp-data as a tree. Also, fix the type of the variable 'ti'. svn path=/trunk/; revision=43929
2012-07-22Calling tvb_format_text() for binary data segments (c1400 bytes) wasMartin Mathieson1-3/+6
*very* slow (in a profiled run where FTP data is carried over LTE MAC/RLC/PDCP/IP/TCP, this one function call was 20% of overall runtime). Have limited to call to ITEM_LABEL_LENGTH, as that is all that will be displayed anyway. As per comment, I'm not convinced that doing this for binary FTP data segments is worthwhile at all. It doesn't even display as hex. svn path=/trunk/; revision=43908
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-28Avoid assignement and clang warning.Martin Mathieson1-2/+1
svn path=/trunk/; revision=42317
2012-03-18Use a value_string_ext to reference a value_string array;Bill Meier1-599/+590
Use consistent indentation; Reformat some lines. svn path=/trunk/; revision=41640
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-2/+2
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-3/+3
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
2011-06-23Remove not needed forward declaration.Jakub Zawadzki1-3/+0
svn path=/trunk/; revision=37759
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-3/+3
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-11-04Corrected pointer types to avoid warnings from clang.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=34773
2010-09-15Remove a few more calls to check_col()Martin Mathieson1-13/+9
svn path=/trunk/; revision=34124
2010-01-18Fix a number of gcc _Wshadow warningsBill Meier1-3/+3
svn path=/trunk/; revision=31557
2009-10-25From Jakub Zawadzki:Anders Broman1-6/+2
Cleanup dissector code - use proper memory functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164 svn path=/trunk/; revision=30691
2009-10-19Adding RFC 2228 FTP replies.Jaap Keuter1-0/+15
svn path=/trunk/; revision=30623
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-4/+2
svn path=/trunk/; revision=29340
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-4/+4
(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-03-30In packet-enttec.c and packet-fw1.c, replace string pointer tracking with aGerald Combs1-2/+2
string buffer. In packet-ftp.c and packet-gift.c, cast some size_t's. svn path=/trunk/; revision=27896
2008-09-27Minor cleanup for proto_reg-handoff & etcBill Meier1-5/+3
svn path=/trunk/; revision=26285