X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=b4fb15e5ee073272f71aacbe6b39be4eb06acbb4;hp=0a3e64f57beb393b2a234dff0e764d91f10855ad;hb=8b91ee5e2d951ae467ac08421db89af48a642086;hpb=4513f2ec7b6aa843005ba886cdd1747b6ff00915 diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 0a3e64f..b4fb15e 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,41 +36,60 @@ #include #include #include +#include #include "daemon.h" static void usage (void); +static char *read_cmdline (void); /* Also in guestfs.c */ -#define VMCHANNEL_PORT "6666" -#define VMCHANNEL_ADDR "10.0.2.4" +#define GUESTFWD_ADDR "10.0.2.4" +#define GUESTFWD_PORT "6666" int verbose = 0; +static int print_shell_quote (FILE *stream, const struct printf_info *info, const void *const *args); +static int print_sysroot_shell_quote (FILE *stream, const struct printf_info *info, const void *const *args); +#ifdef HAVE_REGISTER_PRINTF_SPECIFIER +static int print_arginfo (const struct printf_info *info, size_t n, int *argtypes, int *size); +#else +#ifdef HAVE_REGISTER_PRINTF_FUNCTION +static int print_arginfo (const struct printf_info *info, size_t n, int *argtypes); +#else +#error "HAVE_REGISTER_PRINTF_{SPECIFIER|FUNCTION} not defined" +#endif +#endif + +/* Location to mount root device. */ +const char *sysroot = "/sysroot"; /* No trailing slash. */ +int sysroot_len = 8; + int main (int argc, char *argv[]) { - static const char *options = "fh:p:?"; - static struct option long_options[] = { + static const char *options = "f?"; + static const struct option long_options[] = { { "foreground", 0, 0, 'f' }, { "help", 0, 0, '?' }, - { "host", 1, 0, 'h' }, - { "port", 1, 0, 'p' }, { 0, 0, 0, 0 } }; - int c, n, r; + int c; int dont_fork = 0; - const char *host = NULL; - const char *port = NULL; - FILE *fp; - char buf[4096]; - char *p, *p2; - int sock; - struct addrinfo *res, *rr; - struct addrinfo hints; - XDR xdr; - uint32_t len; - struct sigaction sa; + char *cmdline; + +#ifdef HAVE_REGISTER_PRINTF_SPECIFIER + /* http://udrepper.livejournal.com/20948.html */ + register_printf_specifier ('Q', print_shell_quote, print_arginfo); + register_printf_specifier ('R', print_sysroot_shell_quote, print_arginfo); +#else +#ifdef HAVE_REGISTER_PRINTF_FUNCTION + register_printf_function ('Q', print_shell_quote, print_arginfo); + register_printf_function ('R', print_sysroot_shell_quote, print_arginfo); +#else +#error "HAVE_REGISTER_PRINTF_{SPECIFIER|FUNCTION} not defined" +#endif +#endif for (;;) { c = getopt_long (argc, argv, options, long_options, NULL); @@ -81,14 +100,6 @@ main (int argc, char *argv[]) dont_fork = 1; break; - case 'h': - host = optarg; - break; - - case 'p': - port = optarg; - break; - case '?': usage (); exit (0); @@ -104,48 +115,22 @@ main (int argc, char *argv[]) exit (1); } - /* If host and port aren't set yet, try /proc/cmdline. */ - if (!host || !port) { - fp = fopen ("/proc/cmdline", "r"); - if (fp == NULL) { - perror ("/proc/cmdline"); - goto next; - } - n = fread (buf, 1, sizeof buf - 1, fp); - fclose (fp); - buf[n] = '\0'; - - /* Set the verbose flag. Not quite right because this will only - * set the flag if host and port aren't set on the command line. - * Don't worry about this for now. (XXX) - */ - verbose = strstr (buf, "guestfs_verbose=1") != NULL; - if (verbose) - printf ("verbose daemon enabled\n"); - - p = strstr (buf, "guestfs="); - - if (p) { - p += 8; - p2 = strchr (p, ':'); - if (p2) { - *p2++ = '\0'; - host = p; - r = strcspn (p2, " \n"); - p2[r] = '\0'; - port = p2; - } - } - } + cmdline = read_cmdline (); + + /* Set the verbose flag. */ + verbose = cmdline && strstr (cmdline, "guestfs_verbose=1") != NULL; + if (verbose) + printf ("verbose daemon enabled\n"); - next: - /* Can't parse /proc/cmdline, so use built-in defaults. */ - if (!host || !port) { - host = VMCHANNEL_ADDR; - port = VMCHANNEL_PORT; + if (verbose) { + if (cmdline) + printf ("linux commmand line: %s\n", cmdline); + else + printf ("could not read linux command line\n"); } /* Make sure SIGPIPE doesn't kill us. */ + struct sigaction sa; memset (&sa, 0, sizeof sa); sa.sa_handler = SIG_IGN; sa.sa_flags = 0; @@ -158,28 +143,32 @@ main (int argc, char *argv[]) */ setenv ("PATH", "/usr/bin:/bin", 1); setenv ("SHELL", "/bin/sh", 1); - setenv ("LANG", "C", 1); + setenv ("LC_ALL", "C", 1); /* We document that umask defaults to 022 (it should be this anyway). */ umask (022); /* Resolve the hostname. */ + struct addrinfo *res, *rr; + struct addrinfo hints; + int r; memset (&hints, 0, sizeof hints); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_ADDRCONFIG; - r = getaddrinfo (host, port, &hints, &res); + r = getaddrinfo (GUESTFWD_ADDR, GUESTFWD_PORT, &hints, &res); if (r != 0) { - fprintf (stderr, "%s:%s: %s\n", host, port, gai_strerror (r)); + fprintf (stderr, "%s:%s: %s\n", + GUESTFWD_ADDR, GUESTFWD_PORT, gai_strerror (r)); exit (1); } /* Connect to the given TCP socket. */ - sock = -1; + int sock = -1; for (rr = res; rr != NULL; rr = rr->ai_next) { sock = socket (rr->ai_family, rr->ai_socktype, rr->ai_protocol); if (sock != -1) { if (connect (sock, rr->ai_addr, rr->ai_addrlen) == 0) - break; + break; perror ("connect"); close (sock); @@ -189,21 +178,22 @@ main (int argc, char *argv[]) freeaddrinfo (res); if (sock == -1) { - fprintf (stderr, "connection to %s:%s failed\n", host, port); + fprintf (stderr, "connection to %s:%s failed\n", + GUESTFWD_ADDR, GUESTFWD_PORT); exit (1); } /* Send the magic length message which indicates that * userspace is up inside the guest. */ - len = GUESTFS_LAUNCH_FLAG; - xdrmem_create (&xdr, buf, sizeof buf, XDR_ENCODE); - if (!xdr_uint32_t (&xdr, &len)) { - fprintf (stderr, "xdr_uint32_t failed\n"); - exit (1); - } + char lenbuf[4]; + XDR xdr; + uint32_t len = GUESTFS_LAUNCH_FLAG; + xdrmem_create (&xdr, lenbuf, sizeof lenbuf, XDR_ENCODE); + xdr_uint32_t (&xdr, &len); - (void) xwrite (sock, buf, xdr_getpos (&xdr)); + if (xwrite (sock, lenbuf, sizeof lenbuf) == -1) + exit (1); xdr_destroy (&xdr); @@ -221,10 +211,81 @@ main (int argc, char *argv[]) exit (0); } +/* Read /proc/cmdline. */ +static char * +read_cmdline (void) +{ + int fd = open ("/proc/cmdline", O_RDONLY); + if (fd == -1) { + perror ("/proc/cmdline"); + return NULL; + } + + size_t len = 0; + ssize_t n; + char buf[256]; + char *r = NULL; + + for (;;) { + n = read (fd, buf, sizeof buf); + if (n == -1) { + perror ("read"); + free (r); + close (fd); + return NULL; + } + if (n == 0) + break; + char *newr = realloc (r, len + n + 1); /* + 1 is for terminating NUL */ + if (newr == NULL) { + perror ("realloc"); + free (r); + close (fd); + return NULL; + } + r = newr; + memcpy (&r[len], buf, n); + len += n; + } + + if (r) + r[len] = '\0'; + + if (close (fd) == -1) { + perror ("close"); + free (r); + return NULL; + } + + return r; +} + +/* Turn "/path" into "/sysroot/path". + * + * Caller must check for NULL and call reply_with_perror ("malloc") + * if it is. Caller must also free the string. + * + * See also the custom %R printf formatter which does shell quoting too. + */ +char * +sysroot_path (const char *path) +{ + char *r; + int len = strlen (path) + sysroot_len + 1; + + r = malloc (len); + if (r == NULL) + return NULL; + + snprintf (r, len, "%s%s", sysroot, path); + return r; +} + int -xwrite (int sock, const void *buf, size_t len) +xwrite (int sock, const void *v_buf, size_t len) { int r; + const char *buf = v_buf; while (len > 0) { r = write (sock, buf, len); @@ -240,9 +301,10 @@ xwrite (int sock, const void *buf, size_t len) } int -xread (int sock, void *buf, size_t len) +xread (int sock, void *v_buf, size_t len) { int r; + char *buf = v_buf; while (len > 0) { r = read (sock, buf, len); @@ -264,7 +326,7 @@ xread (int sock, void *buf, size_t len) static void usage (void) { - fprintf (stderr, "guestfsd [-f] [-h host -p port]\n"); + fprintf (stderr, "guestfsd [-f]\n"); } int @@ -300,7 +362,7 @@ add_string (char ***argv, int *size, int *alloc, const char *str) } int -count_strings (char * const* const argv) +count_strings (char *const *argv) { int argc; @@ -352,7 +414,7 @@ int command (char **stdoutput, char **stderror, const char *name, ...) { va_list args; - char **argv, **p; + const char **argv; char *s; int i, r; @@ -369,7 +431,7 @@ command (char **stdoutput, char **stderror, const char *name, ...) va_start (args, name); while ((s = va_arg (args, char *)) != NULL) { - p = realloc (argv, sizeof (char *) * (++i)); + const char **p = realloc (argv, sizeof (char *) * (++i)); if (p == NULL) { perror ("realloc"); free (argv); @@ -383,7 +445,7 @@ command (char **stdoutput, char **stderror, const char *name, ...) va_end (args); - r = commandv (stdoutput, stderror, argv); + r = commandv (stdoutput, stderror, (char **) argv); /* NB: Mustn't free the strings which are on the stack. */ free (argv); @@ -399,7 +461,7 @@ int commandr (char **stdoutput, char **stderror, const char *name, ...) { va_list args; - char **argv, **p; + const char **argv; char *s; int i, r; @@ -416,7 +478,7 @@ commandr (char **stdoutput, char **stderror, const char *name, ...) va_start (args, name); while ((s = va_arg (args, char *)) != NULL) { - p = realloc (argv, sizeof (char *) * (++i)); + const char **p = realloc (argv, sizeof (char *) * (++i)); if (p == NULL) { perror ("realloc"); free (argv); @@ -440,11 +502,11 @@ commandr (char **stdoutput, char **stderror, const char *name, ...) /* Same as 'command', but passing an argv. */ int -commandv (char **stdoutput, char **stderror, char * const* const argv) +commandv (char **stdoutput, char **stderror, char *const *argv) { int r; - r = commandrv (stdoutput, stderror, argv); + r = commandrv (stdoutput, stderror, (void *) argv); if (r == 0) return 0; else @@ -452,7 +514,7 @@ commandv (char **stdoutput, char **stderror, char * const* const argv) } int -commandrv (char **stdoutput, char **stderror, char * const* const argv) +commandrv (char **stdoutput, char **stderror, char const* const *argv) { int so_size = 0, se_size = 0; int so_fd[2], se_fd[2]; @@ -496,7 +558,7 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv) close (so_fd[1]); close (se_fd[1]); - execvp (argv[0], argv); + execvp (argv[0], (void *) argv); perror (argv[0]); _exit (1); } @@ -527,40 +589,40 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv) if (FD_ISSET (so_fd[0], &rset2)) { /* something on stdout */ r = read (so_fd[0], buf, sizeof buf); if (r == -1) { - perror ("read"); - goto quit; + perror ("read"); + goto quit; } if (r == 0) { FD_CLR (so_fd[0], &rset); quit++; } if (r > 0 && stdoutput) { - so_size += r; - p = realloc (*stdoutput, so_size); - if (p == NULL) { - perror ("realloc"); - goto quit; - } - *stdoutput = p; - memcpy (*stdoutput + so_size - r, buf, r); + so_size += r; + p = realloc (*stdoutput, so_size); + if (p == NULL) { + perror ("realloc"); + goto quit; + } + *stdoutput = p; + memcpy (*stdoutput + so_size - r, buf, r); } } if (FD_ISSET (se_fd[0], &rset2)) { /* something on stderr */ r = read (se_fd[0], buf, sizeof buf); if (r == -1) { - perror ("read"); - goto quit; + perror ("read"); + goto quit; } if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; } if (r > 0 && stderror) { - se_size += r; - p = realloc (*stderror, se_size); - if (p == NULL) { - perror ("realloc"); - goto quit; - } - *stderror = p; - memcpy (*stderror + se_size - r, buf, r); + se_size += r; + p = realloc (*stderror, se_size); + if (p == NULL) { + perror ("realloc"); + goto quit; + } + *stderror = p; + memcpy (*stderror + se_size - r, buf, r); } } } @@ -572,23 +634,27 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv) * trailing \n characters from the error buffer (not from stdout). */ if (stdoutput) { - *stdoutput = realloc (*stdoutput, so_size+1); - if (*stdoutput == NULL) { + void *q = realloc (*stdoutput, so_size+1); + if (q == NULL) { perror ("realloc"); - *stdoutput = NULL; - } else + free (*stdoutput); + } + *stdoutput = q; + if (*stdoutput) (*stdoutput)[so_size] = '\0'; } if (stderror) { - *stderror = realloc (*stderror, se_size+1); - if (*stderror == NULL) { + void *q = realloc (*stderror, se_size+1); + if (q == NULL) { perror ("realloc"); - *stderror = NULL; - } else { + free (*stderror); + } + *stderror = q; + if (*stderror) { (*stderror)[se_size] = '\0'; se_size--; while (se_size >= 0 && (*stderror)[se_size] == '\n') - (*stderror)[se_size--] = '\0'; + (*stderror)[se_size--] = '\0'; } } @@ -658,45 +724,67 @@ split_lines (char *str) return lines; } -/* Quote 'in' for the shell, and write max len-1 bytes to out. The - * result will be NUL-terminated, even if it is truncated. - * - * Returns number of bytes needed, so if result >= len then the buffer - * should have been longer. - * - * XXX This doesn't quote \n correctly (but is still safe). +/* printf helper function so we can use %Q ("quoted") and %R to print + * shell-quoted strings. See HACKING file for more details. */ -int -shell_quote (char *out, int len, const char *in) +static int +print_shell_quote (FILE *stream, + const struct printf_info *info ATTRIBUTE_UNUSED, + const void *const *args) { #define SAFE(c) (isalnum((c)) || \ - (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.') - int i, j; - int outlen = strlen (in); - - /* Calculate how much output space this really needs. */ - for (i = 0; in[i]; ++i) - if (!SAFE (in[i])) outlen++; + (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.') + int i, len; + const char *str = *((const char **) (args[0])); + + for (i = len = 0; str[i]; ++i) { + if (!SAFE(str[i])) { + putc ('\\', stream); + len ++; + } + putc (str[i], stream); + len ++; + } - /* Now copy the string, but only up to len-1 bytes. */ - for (i = 0, j = 0; in[i]; ++i) { - int is_safe = SAFE (in[i]); + return len; +} - /* Enough space left to write this character? */ - if (j >= len-1 || (!is_safe && j >= len-2)) - break; +static int +print_sysroot_shell_quote (FILE *stream, + const struct printf_info *info, + const void *const *args) +{ + fputs (sysroot, stream); + return sysroot_len + print_shell_quote (stream, info, args); +} - if (!is_safe) out[j++] = '\\'; - out[j++] = in[i]; +#ifdef HAVE_REGISTER_PRINTF_SPECIFIER +static int +print_arginfo (const struct printf_info *info ATTRIBUTE_UNUSED, + size_t n, int *argtypes, int *size) +{ + if (n > 0) { + argtypes[0] = PA_STRING; + size[0] = sizeof (const char *); } - - out[j] = '\0'; - - return outlen; + return 1; +} +#else +#ifdef HAVE_REGISTER_PRINTF_FUNCTION +static int +print_arginfo (const struct printf_info *info, size_t n, int *argtypes) +{ + if (n > 0) + argtypes[0] = PA_STRING; + return 1; } +#else +#error "HAVE_REGISTER_PRINTF_{SPECIFIER|FUNCTION} not defined" +#endif +#endif /* Perform device name translation. Don't call this directly - - * use the IS_DEVICE macro. + * use the RESOLVE_DEVICE macro. * * See guestfs(3) for the algorithm. * @@ -741,3 +829,16 @@ device_name_translation (char *device, const char *func) device[5] = 's'; /* Restore original device name. */ goto error; } + +/* LVM and other commands aren't synchronous, especially when udev is + * involved. eg. You can create or remove some device, but the /dev + * device node won't appear until some time later. This means that + * you get an error if you run one command followed by another. + * Use 'udevadm settle' after certain commands, but don't be too + * fussed if it fails. + */ +void +udev_settle (void) +{ + command (NULL, NULL, "/sbin/udevadm", "settle", NULL); +}