source: branches/stable/mindi-busybox/libbb/udp_io.c @ 1770

Last change on this file since 1770 was 1770, checked in by Bruno Cornec, 13 years ago
  • 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)

  • Property svn:eol-style set to native
File size: 4.5 KB
Line 
1/* vi: set sw=4 ts=4: */
2/*
3 * Utility routines.
4 *
5 * Copyright (C) 2007 Denis Vlasenko
6 *
7 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
8 */
9
10#include "libbb.h"
11
12/*
13 * This asks kernel to let us know dst addr/port of incoming packets
14 * We don't check for errors here. Not supported == won't be used
15 */
16void
17socket_want_pktinfo(int fd)
18{
19#ifdef IP_PKTINFO
20    setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &const_int_1, sizeof(int));
21#endif
22#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
23    setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &const_int_1, sizeof(int));
24#endif
25}
26
27
28#ifdef UNUSED
29ssize_t
30send_to_from(int fd, void *buf, size_t len, int flags,
31        const struct sockaddr *from, const struct sockaddr *to,
32        socklen_t tolen)
33{
34#ifndef IP_PKTINFO
35    return sendto(fd, buf, len, flags, to, tolen);
36#else
37    struct iovec iov[1];
38    struct msghdr msg;
39    char cbuf[sizeof(struct in_pktinfo)
40#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
41        | sizeof(struct in6_pktinfo) /* (a|b) is poor man's max(a,b) */
42#endif
43    ];
44    struct cmsghdr* cmsgptr;
45
46    if (from->sa_family != AF_INET
47#if ENABLE_FEATURE_IPV6
48     && from->sa_family != AF_INET6
49#endif
50    ) {
51        /* ANY local address */
52        return sendto(fd, buf, len, flags, to, tolen);
53    }
54
55    /* man recvmsg and man cmsg is needed to make sense of code below */
56
57    iov[0].iov_base = buf;
58    iov[0].iov_len = len;
59
60    memset(cbuf, 0, sizeof(cbuf));
61
62    memset(&msg, 0, sizeof(msg));
63    msg.msg_name = (void *)(struct sockaddr *)to; /* or compiler will annoy us */
64    msg.msg_namelen = tolen;
65    msg.msg_iov = iov;
66    msg.msg_iovlen = 1;
67    msg.msg_control = cbuf;
68    msg.msg_controllen = sizeof(cbuf);
69    msg.msg_flags = flags;
70
71    cmsgptr = CMSG_FIRSTHDR(&msg);
72    if (to->sa_family == AF_INET && from->sa_family == AF_INET) {
73        struct in_pktinfo *pktptr;
74        cmsgptr->cmsg_level = IPPROTO_IP;
75        cmsgptr->cmsg_type = IP_PKTINFO;
76        cmsgptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
77        pktptr = (struct in_pktinfo *)(CMSG_DATA(cmsgptr));
78        /* pktptr->ipi_ifindex = 0; -- already done by memset(cbuf...) */
79        pktptr->ipi_spec_dst = ((struct sockaddr_in*)from)->sin_addr;
80    }
81#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
82    else if (to->sa_family == AF_INET6 && from->sa_family == AF_INET6) {
83        struct in6_pktinfo *pktptr;
84        cmsgptr->cmsg_level = IPPROTO_IPV6;
85        cmsgptr->cmsg_type = IPV6_PKTINFO;
86        cmsgptr->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
87        pktptr = (struct in6_pktinfo *)(CMSG_DATA(cmsgptr));
88        /* pktptr->ipi6_ifindex = 0; -- already done by memset(cbuf...) */
89        pktptr->ipi6_addr = ((struct sockaddr_in6*)from)->sin6_addr;
90    }
91#endif
92    return sendmsg(fd, &msg, flags);
93#endif
94}
95#endif /* UNUSED */
96
97/* NB: this will never set port# in 'to'!
98 * _Only_ IP/IPv6 address part of 'to' is _maybe_ modified.
99 * Typical usage is to preinit 'to' with "default" value
100 * before calling recv_from_to(). */
101ssize_t
102recv_from_to(int fd, void *buf, size_t len, int flags,
103        struct sockaddr *from, struct sockaddr *to,
104        socklen_t sa_size)
105{
106#ifndef IP_PKTINFO
107    return recvfrom(fd, buf, len, flags, from, &sa_size);
108#else
109    /* man recvmsg and man cmsg is needed to make sense of code below */
110    struct iovec iov[1];
111    union {
112        char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
113        char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
114    } u;
115    struct cmsghdr *cmsgptr;
116    struct msghdr msg;
117    socklen_t recv_length;
118
119    iov[0].iov_base = buf;
120    iov[0].iov_len = len;
121
122    memset(&msg, 0, sizeof(msg));
123    msg.msg_name = (struct sockaddr *)from;
124    msg.msg_namelen = sa_size;
125    msg.msg_iov = iov;
126    msg.msg_iovlen = 1;
127    msg.msg_control = &u;
128    msg.msg_controllen = sizeof(u);
129
130    recv_length = recvmsg(fd, &msg, flags);
131    if (recv_length < 0)
132        return recv_length;
133
134    /* Here we try to retrieve destination IP and memorize it */
135    for (cmsgptr = CMSG_FIRSTHDR(&msg);
136            cmsgptr != NULL;
137            cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)
138    ) {
139        if (cmsgptr->cmsg_level == IPPROTO_IP
140         && cmsgptr->cmsg_type == IP_PKTINFO
141        ) {
142#define pktinfo(cmsgptr) ( (struct in_pktinfo*)(CMSG_DATA(cmsgptr)) )
143            to->sa_family = AF_INET;
144            ((struct sockaddr_in*)to)->sin_addr = pktinfo(cmsgptr)->ipi_addr;
145            /* ((struct sockaddr_in*)to)->sin_port = 123; */
146#undef pktinfo
147            break;
148        }
149#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
150        if (cmsgptr->cmsg_level == IPPROTO_IPV6
151         && cmsgptr->cmsg_type == IPV6_PKTINFO
152        ) {
153#define pktinfo(cmsgptr) ( (struct in6_pktinfo*)(CMSG_DATA(cmsgptr)) )
154            to->sa_family = AF_INET6;
155            ((struct sockaddr_in6*)to)->sin6_addr = pktinfo(cmsgptr)->ipi6_addr;
156            /* ((struct sockaddr_in6*)to)->sin6_port = 123; */
157#undef pktinfo
158            break;
159        }
160#endif
161    }
162    return recv_length;
163#endif
164}
Note: See TracBrowser for help on using the repository browser.