Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/networking/udhcp/packet.c

    r821 r1770  
    1 #include <unistd.h>
    2 #include <string.h>
     1/* vi: set sw=4 ts=4: */
     2
    33#include <netinet/in.h>
    4 #include <sys/types.h>
    5 #include <sys/socket.h>
    6 #include <features.h>
    7 #if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
     4#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
    85#include <netpacket/packet.h>
    96#include <net/ethernet.h>
     
    1310#include <linux/if_ether.h>
    1411#endif
    15 #include <errno.h>
    1612
    1713#include "common.h"
    18 #include "packet.h"
    1914#include "dhcpd.h"
    2015#include "options.h"
     
    4742int udhcp_get_packet(struct dhcpMessage *packet, int fd)
    4843{
     44#if 0
    4945    static const char broken_vendors[][8] = {
    5046        "MSFT 98",
    5147        ""
    5248    };
     49#endif
    5350    int bytes;
    54     int i;
    55     char unsigned *vendor;
    56 
    57     memset(packet, 0, sizeof(struct dhcpMessage));
    58     bytes = read(fd, packet, sizeof(struct dhcpMessage));
     51    unsigned char *vendor;
     52
     53    memset(packet, 0, sizeof(*packet));
     54    bytes = read(fd, packet, sizeof(*packet));
    5955    if (bytes < 0) {
    60         DEBUG(LOG_INFO, "couldn't read on listening socket, ignoring");
     56        DEBUG("cannot read on listening socket, ignoring");
    6157        return -1;
    6258    }
    6359
    6460    if (ntohl(packet->cookie) != DHCP_MAGIC) {
    65         LOG(LOG_ERR, "received bogus message, ignoring");
     61        bb_error_msg("received bogus message, ignoring");
    6662        return -2;
    6763    }
    68     DEBUG(LOG_INFO, "Received a packet");
    69 
    70     if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) {
    71         for (i = 0; broken_vendors[i][0]; i++) {
    72             if (vendor[OPT_LEN - 2] == (uint8_t) strlen(broken_vendors[i]) &&
    73                 !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
    74                 DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
    75                     broken_vendors[i]);
     64    DEBUG("Received a packet");
     65
     66    if (packet->op == BOOTREQUEST) {
     67        vendor = get_option(packet, DHCP_VENDOR);
     68        if (vendor) {
     69#if 0
     70            int i;
     71            for (i = 0; broken_vendors[i][0]; i++) {
     72                if (vendor[OPT_LEN - 2] == (uint8_t)strlen(broken_vendors[i])
     73                 && !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])
     74                ) {
     75                    DEBUG("broken client (%s), forcing broadcast",
     76                        broken_vendors[i]);
     77                    packet->flags |= htons(BROADCAST_FLAG);
     78                }
     79            }
     80#else
     81            if (vendor[OPT_LEN - 2] == (uint8_t)(sizeof("MSFT 98")-1)
     82             && memcmp(vendor, "MSFT 98", sizeof("MSFT 98")-1) == 0
     83            ) {
     84                DEBUG("broken client (%s), forcing broadcast", "MSFT 98");
    7685                packet->flags |= htons(BROADCAST_FLAG);
    7786            }
     87#endif
    7888        }
    7989    }
     
    8898     *         beginning at location "addr".
    8999     */
    90     register int32_t sum = 0;
     100    int32_t sum = 0;
    91101    uint16_t *source = (uint16_t *) addr;
    92102
     
    114124
    115125/* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
    116 int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
    117            uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex)
     126void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
     127int udhcp_raw_packet(struct dhcpMessage *payload,
     128        uint32_t source_ip, int source_port,
     129        uint32_t dest_ip, int dest_port, const uint8_t *dest_arp, int ifindex)
    118130{
    119131    int fd;
     
    122134    struct udp_dhcp_packet packet;
    123135
    124     if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
    125         DEBUG(LOG_ERR, "socket call failed: %m");
     136    fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
     137    if (fd < 0) {
     138        bb_perror_msg("socket");
    126139        return -1;
    127140    }
     
    136149    memcpy(dest.sll_addr, dest_arp, 6);
    137150    if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
    138         DEBUG(LOG_ERR, "bind call failed: %m");
     151        bb_perror_msg("bind");
    139152        close(fd);
    140153        return -1;
     
    157170    packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip));
    158171
    159     result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
     172    if (sizeof(struct udp_dhcp_packet) != 576)
     173        BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
     174
     175    result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0,
     176            (struct sockaddr *) &dest, sizeof(dest));
    160177    if (result <= 0) {
    161         DEBUG(LOG_ERR, "write on socket failed: %m");
     178        bb_perror_msg("sendto");
    162179    }
    163180    close(fd);
     
    167184
    168185/* Let the kernel do all the work for packet generation */
    169 int udhcp_kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
    170            uint32_t dest_ip, int dest_port)
    171 {
    172     int n = 1;
     186int udhcp_kernel_packet(struct dhcpMessage *payload,
     187        uint32_t source_ip, int source_port,
     188        uint32_t dest_ip, int dest_port)
     189{
    173190    int fd, result;
    174191    struct sockaddr_in client;
    175192
    176     if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
    177         return -1;
    178 
    179     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) {
    180         close(fd);
    181         return -1;
    182     }
     193    fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
     194    if (fd < 0)
     195        return -1;
     196
     197    setsockopt_reuseaddr(fd);
    183198
    184199    memset(&client, 0, sizeof(client));
     
    187202    client.sin_addr.s_addr = source_ip;
    188203
    189     if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) {
     204    if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
    190205        close(fd);
    191206        return -1;
Note: See TracChangeset for help on using the changeset viewer.