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/leases.c

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/*
    23 * leases.c -- tools to manage DHCP leases
     
    45 */
    56
    6 #include <time.h>
    7 #include <string.h>
    8 #include <sys/socket.h>
    9 #include <netinet/in.h>
    10 #include <arpa/inet.h>
    11 
     7#include "common.h"
    128#include "dhcpd.h"
    13 #include "files.h"
    14 #include "options.h"
    15 #include "leases.h"
    16 #include "arpping.h"
    17 #include "common.h"
    18 
    19 #include "static_leases.h"
    209
    2110
    22 uint8_t blank_chaddr[] = {[0 ... 15] = 0};
     11/* Find the oldest expired lease, NULL if there are no expired leases */
     12static struct dhcpOfferedAddr *oldest_expired_lease(void)
     13{
     14    struct dhcpOfferedAddr *oldest = NULL;
     15// TODO: use monotonic_sec()
     16    unsigned long oldest_lease = time(0);
     17    unsigned i;
     18
     19    for (i = 0; i < server_config.max_leases; i++)
     20        if (oldest_lease > leases[i].expires) {
     21            oldest_lease = leases[i].expires;
     22            oldest = &(leases[i]);
     23        }
     24    return oldest;
     25}
     26
    2327
    2428/* clear every lease out that chaddr OR yiaddr matches and is nonzero */
    25 void clear_lease(uint8_t *chaddr, uint32_t yiaddr)
     29static void clear_lease(const uint8_t *chaddr, uint32_t yiaddr)
    2630{
    27     unsigned int i, j;
     31    unsigned i, j;
    2832
    29     for (j = 0; j < 16 && !chaddr[j]; j++);
     33    for (j = 0; j < 16 && !chaddr[j]; j++)
     34        continue;
    3035
    3136    for (i = 0; i < server_config.max_leases; i++)
    32         if ((j != 16 && !memcmp(leases[i].chaddr, chaddr, 16)) ||
    33             (yiaddr && leases[i].yiaddr == yiaddr)) {
    34             memset(&(leases[i]), 0, sizeof(struct dhcpOfferedAddr));
     37        if ((j != 16 && memcmp(leases[i].chaddr, chaddr, 16) == 0)
     38         || (yiaddr && leases[i].yiaddr == yiaddr)
     39        ) {
     40            memset(&(leases[i]), 0, sizeof(leases[i]));
    3541        }
    3642}
     
    3844
    3945/* add a lease into the table, clearing out any old ones */
    40 struct dhcpOfferedAddr *add_lease(uint8_t *chaddr, uint32_t yiaddr, unsigned long lease)
     46struct dhcpOfferedAddr *add_lease(const uint8_t *chaddr, uint32_t yiaddr, unsigned long lease)
    4147{
    4248    struct dhcpOfferedAddr *oldest;
     
    6470
    6571
    66 /* Find the oldest expired lease, NULL if there are no expired leases */
    67 struct dhcpOfferedAddr *oldest_expired_lease(void)
     72/* Find the first lease that matches chaddr, NULL if no match */
     73struct dhcpOfferedAddr *find_lease_by_chaddr(const uint8_t *chaddr)
    6874{
    69     struct dhcpOfferedAddr *oldest = NULL;
    70     unsigned long oldest_lease = time(0);
    71     unsigned int i;
    72 
     75    unsigned i;
    7376
    7477    for (i = 0; i < server_config.max_leases; i++)
    75         if (oldest_lease > leases[i].expires) {
    76             oldest_lease = leases[i].expires;
    77             oldest = &(leases[i]);
    78         }
    79     return oldest;
    80 
    81 }
    82 
    83 
    84 /* Find the first lease that matches chaddr, NULL if no match */
    85 struct dhcpOfferedAddr *find_lease_by_chaddr(uint8_t *chaddr)
    86 {
    87     unsigned int i;
    88 
    89     for (i = 0; i < server_config.max_leases; i++)
    90         if (!memcmp(leases[i].chaddr, chaddr, 16)) return &(leases[i]);
     78        if (!memcmp(leases[i].chaddr, chaddr, 16))
     79            return &(leases[i]);
    9180
    9281    return NULL;
     
    9786struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr)
    9887{
    99     unsigned int i;
     88    unsigned i;
    10089
    10190    for (i = 0; i < server_config.max_leases; i++)
    102         if (leases[i].yiaddr == yiaddr) return &(leases[i]);
     91        if (leases[i].yiaddr == yiaddr)
     92            return &(leases[i]);
    10393
    10494    return NULL;
     
    10797
    10898/* check is an IP is taken, if it is, add it to the lease table */
    109 static int check_ip(uint32_t addr)
     99static int nobody_responds_to_arp(uint32_t addr)
    110100{
     101    static const uint8_t blank_chaddr[16]; /* 16 zero bytes */
     102
    111103    struct in_addr temp;
     104    int r;
    112105
    113     if (arpping(addr, server_config.server, server_config.arp, server_config.interface) == 0) {
    114         temp.s_addr = addr;
    115         LOG(LOG_INFO, "%s belongs to someone, reserving it for %ld seconds",
    116             inet_ntoa(temp), server_config.conflict_time);
    117         add_lease(blank_chaddr, addr, server_config.conflict_time);
    118         return 1;
    119     } else return 0;
     106    r = arpping(addr, server_config.server, server_config.arp, server_config.interface);
     107    if (r)
     108        return r;
     109
     110    temp.s_addr = addr;
     111    bb_info_msg("%s belongs to someone, reserving it for %u seconds",
     112        inet_ntoa(temp), (unsigned)server_config.conflict_time);
     113    add_lease(blank_chaddr, addr, server_config.conflict_time);
     114    return 0;
    120115}
    121116
    122117
    123 /* find an assignable address, it check_expired is true, we check all the expired leases as well.
     118/* find an assignable address, if check_expired is true, we check all the expired leases as well.
    124119 * Maybe this should try expired leases by age... */
    125120uint32_t find_address(int check_expired)
     
    128123    struct dhcpOfferedAddr *lease = NULL;
    129124
    130     addr = ntohl(server_config.start); /* addr is in host order here */
    131     for (;addr <= ntohl(server_config.end); addr++) {
    132 
     125    addr = server_config.start_ip; /* addr is in host order here */
     126    for (; addr <= server_config.end_ip; addr++) {
    133127        /* ie, 192.168.55.0 */
    134         if (!(addr & 0xFF)) continue;
    135 
     128        if (!(addr & 0xFF))
     129            continue;
    136130        /* ie, 192.168.55.255 */
    137         if ((addr & 0xFF) == 0xFF) continue;
    138 
    139         /* Only do if it isn't an assigned as a static lease */
    140         if(!reservedIp(server_config.static_leases, htonl(addr)))
    141         {
    142 
    143         /* lease is not taken */
     131        if ((addr & 0xFF) == 0xFF)
     132            continue;
     133        /* Only do if it isn't assigned as a static lease */
    144134        ret = htonl(addr);
    145         if ((!(lease = find_lease_by_yiaddr(ret)) ||
    146 
    147              /* or it expired and we are checking for expired leases */
    148              (check_expired  && lease_expired(lease))) &&
    149 
    150              /* and it isn't on the network */
    151              !check_ip(ret)) {
    152             return ret;
    153             break;
     135        if (!reservedIp(server_config.static_leases, ret)) {
     136            /* lease is not taken */
     137            lease = find_lease_by_yiaddr(ret);
     138            /* no lease or it expired and we are checking for expired leases */
     139            if ((!lease || (check_expired && lease_expired(lease)))
     140             && nobody_responds_to_arp(ret) /* it isn't used on the network */
     141            ) {
     142                return ret;
     143            }
    154144        }
    155     }
    156145    }
    157146    return 0;
Note: See TracChangeset for help on using the changeset viewer.