From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7nK0-00069I-W7 for qemu-devel@nongnu.org; Fri, 18 Nov 2016 12:51:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7nK0-0005gh-84 for qemu-devel@nongnu.org; Fri, 18 Nov 2016 12:51:33 -0500 Received: from hera.aquilenet.fr ([2a01:474::1]:51641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7nK0-0005gU-1q for qemu-devel@nongnu.org; Fri, 18 Nov 2016 12:51:32 -0500 From: Samuel Thibault Date: Fri, 18 Nov 2016 18:51:28 +0100 Message-Id: <20161118175128.17192-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20161118175128.17192-1-samuel.thibault@ens-lyon.org> References: <20161118175128.17192-1-samuel.thibault@ens-lyon.org> Subject: [Qemu-devel] [PULL] tftp: fake support for netascii protocol List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Vincent Bernat , jan.kiszka@siemens.com, Samuel Thibault From: Vincent Bernat Some network equipments are requesting a file using the netascii protocol and this is not configurable. Currently, qemu's tftpd only supports the octet protocol. This commit makes it accept the netascii protocol as well but do not perform the requested transformation (LF -> CR,LF) as it would be far more complex. The current implementation is good enough. A user has always the choice to preencode the served file correctly. Signed-off-by: Vincent Bernat Signed-off-by: Samuel Thibault --- slirp/tftp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/slirp/tftp.c b/slirp/tftp.c index c185906..ab1c05d 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -326,13 +326,15 @@ static void tftp_handle_rrq(Slirp *slirp, struct sockaddr_storage *srcsas, return; } - if (strcasecmp(&tp->x.tp_buf[k], "octet") != 0) { + if (strcasecmp(&tp->x.tp_buf[k], "octet") == 0) { + k += 6; + } else if (strcasecmp(&tp->x.tp_buf[k], "netascii") == 0) { + k += 9; + } else { tftp_send_error(spt, 4, "Unsupported transfer mode", tp); return; } - k += 6; /* skipping octet */ - /* do sanity checks on the filename */ if (!strncmp(req_fname, "../", 3) || req_fname[strlen(req_fname) - 1] == '/' || -- 2.10.2