From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HIaWQ-00043i-Vg for qemu-devel@nongnu.org; Sat, 17 Feb 2007 20:07:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HIaWP-00043O-FR for qemu-devel@nongnu.org; Sat, 17 Feb 2007 20:07:22 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HIaWP-00043L-AZ for qemu-devel@nongnu.org; Sat, 17 Feb 2007 20:07:21 -0500 Received: from nz-out-0506.google.com ([64.233.162.235]) by monty-python.gnu.org with esmtp (Exim 4.52) id 1HIaWO-0005UA-TQ for qemu-devel@nongnu.org; Sat, 17 Feb 2007 20:07:21 -0500 Received: by nz-out-0506.google.com with SMTP id i11so2269610nzi for ; Sat, 17 Feb 2007 17:07:20 -0800 (PST) Message-ID: <45D7A6C4.1020600@codemonkey.ws> Date: Sat, 17 Feb 2007 19:07:16 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <45D7A43B.20808@codemonkey.ws> In-Reply-To: <45D7A43B.20808@codemonkey.ws> Content-Type: multipart/mixed; boundary="------------040508070006090301010104" Subject: [Qemu-devel] [PATCH 3/3] Change -tftp option to take a root directory Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Erwan Velu This is a multi-part message in MIME format. --------------040508070006090301010104 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This patch changes the -tftp option to take a root directory instead of a prefix. I know it's common for a TFTP server to take a prefix but it's easier typing wise to expose files as being part of a root. For example, without this patch, to PXE boot: qemu -hda disk.img -tftp /home/anthony/tftpboot -bootp /home/anthony/tftpboot/pxelinux.0 With the patch: qemu -hda disk.img -tftp /home/anthony/tftpboot -bootp /pxelinux.0 Also helps deal with the fact that TFTP filenames are limited to 512 characters. Regards, Anthony Liguori --------------040508070006090301010104 Content-Type: text/x-patch; name="tftp-root.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="tftp-root.diff" diff -r 91f98dfbdc3f qemu-doc.texi --- a/qemu-doc.texi Thu Feb 15 21:22:02 2007 -0600 +++ b/qemu-doc.texi Thu Feb 15 21:22:03 2007 -0600 @@ -438,13 +438,12 @@ override the default configuration (@opt override the default configuration (@option{-net nic -net user}) which is activated if no @option{-net} options are provided. -@item -tftp prefix +@item -tftp dir When using the user mode network stack, activate a built-in TFTP -server. All filenames beginning with @var{prefix} can be downloaded -from the host to the guest using a TFTP client. The TFTP client on the -guest must be configured in binary mode (use the command @code{bin} of -the Unix TFTP client). The host IP address on the guest is as usual -10.0.2.2. +server. The files in @var{dir} will be exposed as the root of a TFTP server. +The TFTP client on the guest must be configured in binary mode (use the command +@code{bin} of the Unix TFTP client). The host IP address on the guest is as +usual 10.0.2.2. @item -bootp file When using the user mode network stack, broadcast @var{file} as the BOOTP diff -r 91f98dfbdc3f slirp/tftp.c --- a/slirp/tftp.c Thu Feb 15 21:22:02 2007 -0600 +++ b/slirp/tftp.c Thu Feb 15 21:22:03 2007 -0600 @@ -102,8 +102,15 @@ static int tftp_read_data(struct tftp_se { int fd; int bytes_read = 0; - - fd = open(spt->filename, O_RDONLY | O_BINARY); + char buffer[1024]; + int n; + + n = snprintf(buffer, sizeof(buffer), "%s/%s", + tftp_prefix, spt->filename); + if (n >= sizeof(buffer)) + return -1; + + fd = open(buffer, O_RDONLY | O_BINARY); if (fd < 0) { return -1; @@ -328,8 +335,7 @@ static void tftp_handle_rrq(struct tftp_ /* only allow exported prefixes */ - if (!tftp_prefix - || (strncmp(spt->filename, tftp_prefix, strlen(tftp_prefix)) != 0)) { + if (!tftp_prefix) { tftp_send_error(spt, 2, "Access violation", tp); return; } diff -r 91f98dfbdc3f vl.c --- a/vl.c Thu Feb 15 21:22:02 2007 -0600 +++ b/vl.c Thu Feb 15 21:22:03 2007 -0600 @@ -6487,7 +6487,7 @@ void help(void) " is provided, the default is '-net nic -net user'\n" "\n" #ifdef CONFIG_SLIRP - "-tftp prefix allow tftp access to files starting with prefix [-net user]\n" + "-tftp dir allow tftp access to files in dir [-net user]\n" "-bootp file advertise file in BOOTP replies\n" #ifndef _WIN32 "-smb dir allow SMB access to files in 'dir' [-net user]\n" --------------040508070006090301010104--