Changeset 1770 in MondoRescue for branches/stable/mindi-busybox/libbb/xconnect.c

Timestamp:

Nov 6, 2007, 11:01:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Better output for mindi-busybox revision
• Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
• strace useful for debug
• fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
• fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
• fix typo in label-partitions-as-necessary which doesn't seem to work
• Update to busybox 1.7.2
• perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

• next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
• small optimization in mindi on keyboard handling (one single find instead of multiple)
• better interaction for USB device when launching mindi manually
• attempt to automatically guess block disk size for ramdisk
• fix typos in bkphw
• Fix the remaining problem with UUID support for swap partitions
• Updates mondoarchive man page for USB support
• Adds preliminary Hardware support to mindi (Proliant SSSTK)
• Tries to add udev support also for rhel4
• Fix UUID support which was still broken.
• Be conservative in test for the start-nfs script
• Update config file for mindi-busybox for 1.7.2 migration
• Try to run around a busybox bug (1.2.2 pb on inexistant links)
• Add build content for mindi-busybox in pb
• Remove distributions content for mindi-busybox
• Fix a warning on inexistant raidtab
• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start
• Really never try to eject a USB device
• Fix a issue with &> usage (replaced with 1> and 2>)
• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here
• usb detection place before /dev detection in device name at restore time
• Fix when restoring from USB: media is asked in interactive mode
• Adds USB support for mondorestore
• mount_cdrom => mount_media
• elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot
• Adds group and tty link to udev conf
• Always load usb-torage (even 2.6) to initiate USB bus discovery
• Better printing of messages
• Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
• Links were not correctly done as non relative for modules in mindi
• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic should now really be excluded
• Fix a bug in major number for tty
• If udev then adds modprobe/insmod to rootfs
• tty0 is also cretaed with udev
• ide-generic put rather in DENY_MODS
• udevd remove from deplist s handled in mindi directly
• better default for mindi when using --usb
• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
• Improvement in udev support (do not use cl options not available in busybox)
• Udev in mindi
  • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
  • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
  • add support for 64 bits udev
• Try to render MyInsmod silent at boot time
• Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
• We also need vaft format support for USB boot
• Adds libusual support (Ubuntu 7.10 needs it for USB)
• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again
• Tries to fix lack of files in deb mindi package
• Verify should now work for USB devices
• More log/mesages improvement for USB support
• - Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
• Improve mindi-busybox build
• In conformity with pb 0.8.9
• Add support for Ubuntu 7.10 in build process
• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
• Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
• Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
• Put mondorescue in conformity with new pb filtering rules
• Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
• Unmounting USB device before removal of temporary scratchdir
• Stil refining USB copy back to mondo (one command was not executed)
• No need to have the image subdor in the csratchdir when USB.
• umount the USB partition before attempting to use it
• Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:

• branches/stable/mindi-busybox/libbb/xconnect.c (modified) (2 diffs)

branches/stable/mindi-busybox/libbb/xconnect.c

@@ -7 +7 @@
  */
 
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <netdb.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include "libbb.h"
 
-/* Return network byte ordered port number for a service.
+void setsockopt_reuseaddr(int fd)
+{
+    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &const_int_1, sizeof(const_int_1));
+}
+int setsockopt_broadcast(int fd)
+{
+    return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
+}
+
+void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
+{
+    if (connect(s, s_addr, addrlen) < 0) {
+        if (ENABLE_FEATURE_CLEAN_UP)
+            close(s);
+        if (s_addr->sa_family == AF_INET)
+            bb_perror_msg_and_die("%s (%s)",
+                "cannot connect to remote host",
+                inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
+        bb_perror_msg_and_die("cannot connect to remote host");
+    }
+}
+
+/* Return port number for a service.
  * If "port" is a number use it as the port.
  * If "port" is a name it is looked up in /etc/services, if it isnt found return
- * default_port
- */
-unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port)
-{
-    unsigned short port_nr = htons(default_port);
+ * default_port */
+unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port)
+{
+    unsigned port_nr = default_port;
     if (port) {
-        char *endptr;
         int old_errno;
-        long port_long;
 
         /* Since this is a lib function, we're not allowed to reset errno to 0.
          * Doing so could break an app that is deferring checking of errno. */
         old_errno = errno;
-        errno = 0;
-        port_long = strtol(port, &endptr, 10);
-        if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) {
+        port_nr = bb_strtou(port, NULL, 10);
+        if (errno || port_nr > 65535) {
             struct servent *tserv = getservbyname(port, protocol);
-            if (tserv) {
-                port_nr = tserv->s_port;
-            }
-        } else {
-            port_nr = htons(port_long);
+            port_nr = default_port;
+            if (tserv)
+                port_nr = ntohs(tserv->s_port);
         }
         errno = old_errno;
     }
-    return port_nr;
-}
-
+    return (uint16_t)port_nr;
+}
+
+
+/* "Old" networking API - only IPv4 */
+
+/*
 void bb_lookup_host(struct sockaddr_in *s_in, const char *host)
 {
@@ -60 +71 @@
 }
 
-int xconnect(struct sockaddr_in *s_addr)
-{
-    int s = bb_xsocket(AF_INET, SOCK_STREAM, 0);
-    if (connect(s, (struct sockaddr *)s_addr, sizeof(struct sockaddr_in)) < 0)
-    {
-        if (ENABLE_FEATURE_CLEAN_UP) close(s);
-        bb_perror_msg_and_die("Unable to connect to remote host (%s)",
-                inet_ntoa(s_addr->sin_addr));
-    }
+
+int xconnect_tcp_v4(struct sockaddr_in *s_addr)
+{
+    int s = xsocket(AF_INET, SOCK_STREAM, 0);
+    xconnect(s, (struct sockaddr*) s_addr, sizeof(*s_addr));
     return s;
 }
+*/
+
+/* "New" networking API */
+
+
+int get_nport(const struct sockaddr *sa)
+{
+#if ENABLE_FEATURE_IPV6
+    if (sa->sa_family == AF_INET6) {
+        return ((struct sockaddr_in6*)sa)->sin6_port;
+    }
+#endif
+    if (sa->sa_family == AF_INET) {
+        return ((struct sockaddr_in*)sa)->sin_port;
+    }
+    /* What? UNIX socket? IPX?? :) */
+    return -1;
+}
+
+void set_nport(len_and_sockaddr *lsa, unsigned port)
+{
+#if ENABLE_FEATURE_IPV6
+    if (lsa->sa.sa_family == AF_INET6) {
+        lsa->sin6.sin6_port = port;
+        return;
+    }
+#endif
+    if (lsa->sa.sa_family == AF_INET) {
+        lsa->sin.sin_port = port;
+        return;
+    }
+    /* What? UNIX socket? IPX?? :) */
+}
+
+/* We hijack this constant to mean something else */
+/* It doesn't hurt because we will remove this bit anyway */
+#define DIE_ON_ERROR AI_CANONNAME
+
+/* host: "1.2.3.4[:port]", "www.google.com[:port]"
+ * port: if neither of above specifies port # */
+static len_and_sockaddr* str2sockaddr(
+        const char *host, int port,
+USE_FEATURE_IPV6(sa_family_t af,)
+        int ai_flags)
+{
+    int rc;
+    len_and_sockaddr *r = NULL;
+    struct addrinfo *result = NULL;
+    const char *org_host = host; /* only for error msg */
+    const char *cp;
+    struct addrinfo hint;
+
+    /* Ugly parsing of host:addr */
+    if (ENABLE_FEATURE_IPV6 && host[0] == '[') {
+        host++;
+        cp = strchr(host, ']');
+        if (!cp || cp[1] != ':') /* Malformed: must have [xx]:nn */
+            bb_error_msg_and_die("bad address '%s'", org_host);
+            //return r; /* return NULL */
+    } else {
+        cp = strrchr(host, ':');
+        if (ENABLE_FEATURE_IPV6 && cp && strchr(host, ':') != cp) {
+            /* There is more than one ':' (e.g. "::1") */
+            cp = NULL; /* it's not a port spec */
+        }
+    }
+    if (cp) {
+        int sz = cp - host + 1;
+        host = safe_strncpy(alloca(sz), host, sz);
+        if (ENABLE_FEATURE_IPV6 && *cp != ':')
+            cp++; /* skip ']' */
+        cp++; /* skip ':' */
+        port = xatou16(cp);
+    }
+
+    memset(&hint, 0 , sizeof(hint));
+#if !ENABLE_FEATURE_IPV6
+    hint.ai_family = AF_INET; /* do not try to find IPv6 */
+#else
+    hint.ai_family = af;
+#endif
+    /* Needed. Or else we will get each address thrice (or more)
+     * for each possible socket type (tcp,udp,raw...): */
+    hint.ai_socktype = SOCK_STREAM;
+    hint.ai_flags = ai_flags & ~DIE_ON_ERROR;
+    rc = getaddrinfo(host, NULL, &hint, &result);
+    if (rc || !result) {
+        bb_error_msg("bad address '%s'", org_host);
+        if (ai_flags & DIE_ON_ERROR)
+            xfunc_die();
+        goto ret;
+    }
+    r = xmalloc(offsetof(len_and_sockaddr, sa) + result->ai_addrlen);
+    r->len = result->ai_addrlen;
+    memcpy(&r->sa, result->ai_addr, result->ai_addrlen);
+    set_nport(r, htons(port));
+ ret:
+    freeaddrinfo(result);
+    return r;
+}
+#if !ENABLE_FEATURE_IPV6
+#define str2sockaddr(host, port, af, ai_flags) str2sockaddr(host, port, ai_flags)
+#endif
+
+#if ENABLE_FEATURE_IPV6
+len_and_sockaddr* host_and_af2sockaddr(const char *host, int port, sa_family_t af)
+{
+    return str2sockaddr(host, port, af, 0);
+}
+
+len_and_sockaddr* xhost_and_af2sockaddr(const char *host, int port, sa_family_t af)
+{
+    return str2sockaddr(host, port, af, DIE_ON_ERROR);
+}
+#endif
+
+len_and_sockaddr* host2sockaddr(const char *host, int port)
+{
+    return str2sockaddr(host, port, AF_UNSPEC, 0);
+}
+
+len_and_sockaddr* xhost2sockaddr(const char *host, int port)
+{
+    return str2sockaddr(host, port, AF_UNSPEC, DIE_ON_ERROR);
+}
+
+len_and_sockaddr* xdotted2sockaddr(const char *host, int port)
+{
+    return str2sockaddr(host, port, AF_UNSPEC, AI_NUMERICHOST | DIE_ON_ERROR);
+}
+
+int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int family,) int sock_type)
+{
+    SKIP_FEATURE_IPV6(enum { family = AF_INET };)
+    len_and_sockaddr *lsa;
+    int fd;
+    int len;
+
+#if ENABLE_FEATURE_IPV6
+    if (family == AF_UNSPEC) {
+        fd = socket(AF_INET6, sock_type, 0);
+        if (fd >= 0) {
+            family = AF_INET6;
+            goto done;
+        }
+        family = AF_INET;
+    }
+#endif
+    fd = xsocket(family, sock_type, 0);
+    len = sizeof(struct sockaddr_in);
+#if ENABLE_FEATURE_IPV6
+    if (family == AF_INET6) {
+ done:
+        len = sizeof(struct sockaddr_in6);
+    }
+#endif
+    lsa = xzalloc(offsetof(len_and_sockaddr, sa) + len);
+    lsa->len = len;
+    lsa->sa.sa_family = family;
+    *lsap = lsa;
+    return fd;
+}
+
+int xsocket_stream(len_and_sockaddr **lsap)
+{
+    return xsocket_type(lsap, USE_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+}
+
+static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
+{
+    int fd;
+    len_and_sockaddr *lsa;
+
+    if (bindaddr && bindaddr[0]) {
+        lsa = xdotted2sockaddr(bindaddr, port);
+        /* user specified bind addr dictates family */
+        fd = xsocket(lsa->sa.sa_family, sock_type, 0);
+    } else {
+        fd = xsocket_type(&lsa, USE_FEATURE_IPV6(AF_UNSPEC,) sock_type);
+        set_nport(lsa, htons(port));
+    }
+    setsockopt_reuseaddr(fd);
+    xbind(fd, &lsa->sa, lsa->len);
+    free(lsa);
+    return fd;
+}
+
+int create_and_bind_stream_or_die(const char *bindaddr, int port)
+{
+    return create_and_bind_or_die(bindaddr, port, SOCK_STREAM);
+}
+
+int create_and_bind_dgram_or_die(const char *bindaddr, int port)
+{
+    return create_and_bind_or_die(bindaddr, port, SOCK_DGRAM);
+}
+
+
+int create_and_connect_stream_or_die(const char *peer, int port)
+{
+    int fd;
+    len_and_sockaddr *lsa;
+
+    lsa = xhost2sockaddr(peer, port);
+    fd = xsocket(lsa->sa.sa_family, SOCK_STREAM, 0);
+    setsockopt_reuseaddr(fd);
+    xconnect(fd, &lsa->sa, lsa->len);
+    free(lsa);
+    return fd;
+}
+
+int xconnect_stream(const len_and_sockaddr *lsa)
+{
+    int fd = xsocket(lsa->sa.sa_family, SOCK_STREAM, 0);
+    xconnect(fd, &lsa->sa, lsa->len);
+    return fd;
+}
+
+/* We hijack this constant to mean something else */
+/* It doesn't hurt because we will add this bit anyway */
+#define IGNORE_PORT NI_NUMERICSERV
+static char* sockaddr2str(const struct sockaddr *sa, int flags)
+{
+    char host[128];
+    char serv[16];
+    int rc;
+    socklen_t salen;
+
+    salen = LSA_SIZEOF_SA;
+#if ENABLE_FEATURE_IPV6
+    if (sa->sa_family == AF_INET)
+        salen = sizeof(struct sockaddr_in);
+    if (sa->sa_family == AF_INET6)
+        salen = sizeof(struct sockaddr_in6);
+#endif
+    rc = getnameinfo(sa, salen,
+            host, sizeof(host),
+    /* can do ((flags & IGNORE_PORT) ? NULL : serv) but why bother? */
+            serv, sizeof(serv),
+            /* do not resolve port# into service _name_ */
+            flags | NI_NUMERICSERV
+    );
+    if (rc)
+        return NULL;
+    if (flags & IGNORE_PORT)
+        return xstrdup(host);
+#if ENABLE_FEATURE_IPV6
+    if (sa->sa_family == AF_INET6) {
+        if (strchr(host, ':')) /* heh, it's not a resolved hostname */
+            return xasprintf("[%s]:%s", host, serv);
+        /*return xasprintf("%s:%s", host, serv);*/
+        /* - fall through instead */
+    }
+#endif
+    /* For now we don't support anything else, so it has to be INET */
+    /*if (sa->sa_family == AF_INET)*/
+        return xasprintf("%s:%s", host, serv);
+    /*return xstrdup(host);*/
+}
+
+char* xmalloc_sockaddr2host(const struct sockaddr *sa)
+{
+    return sockaddr2str(sa, 0);
+}
+
+char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa)
+{
+    return sockaddr2str(sa, IGNORE_PORT);
+}
+
+char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa)
+{
+    return sockaddr2str(sa, NI_NAMEREQD | IGNORE_PORT);
+}
+char* xmalloc_sockaddr2dotted(const struct sockaddr *sa)
+{
+    return sockaddr2str(sa, NI_NUMERICHOST);
+}
+
+char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa)
+{
+    return sockaddr2str(sa, NI_NUMERICHOST | IGNORE_PORT);
+}