Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (12 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/dhcpd.h

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/* dhcpd.h */
    23#ifndef _DHCPD_H
    34#define _DHCPD_H
    4 
    5 #include <netinet/ip.h>
    6 #include <netinet/udp.h>
    7 
    8 #include "libbb_udhcp.h"
    9 #include "leases.h"
    105
    116/************************************/
     
    2015#define DHCPD_CONF_FILE         "/etc/udhcpd.conf"
    2116
    22 /*****************************************************************/
    23 /* Do not modify below here unless you know what you are doing!! */
    24 /*****************************************************************/
    25 
    26 /* DHCP protocol -- see RFC 2131 */
    27 #define SERVER_PORT     67
    28 #define CLIENT_PORT     68
    29 
    30 #define DHCP_MAGIC      0x63825363
    31 
    32 /* DHCP option codes (partial list) */
    33 #define DHCP_PADDING        0x00
    34 #define DHCP_SUBNET     0x01
    35 #define DHCP_TIME_OFFSET    0x02
    36 #define DHCP_ROUTER     0x03
    37 #define DHCP_TIME_SERVER    0x04
    38 #define DHCP_NAME_SERVER    0x05
    39 #define DHCP_DNS_SERVER     0x06
    40 #define DHCP_LOG_SERVER     0x07
    41 #define DHCP_COOKIE_SERVER  0x08
    42 #define DHCP_LPR_SERVER     0x09
    43 #define DHCP_HOST_NAME      0x0c
    44 #define DHCP_BOOT_SIZE      0x0d
    45 #define DHCP_DOMAIN_NAME    0x0f
    46 #define DHCP_SWAP_SERVER    0x10
    47 #define DHCP_ROOT_PATH      0x11
    48 #define DHCP_IP_TTL     0x17
    49 #define DHCP_MTU        0x1a
    50 #define DHCP_BROADCAST      0x1c
    51 #define DHCP_NTP_SERVER     0x2a
    52 #define DHCP_WINS_SERVER    0x2c
    53 #define DHCP_REQUESTED_IP   0x32
    54 #define DHCP_LEASE_TIME     0x33
    55 #define DHCP_OPTION_OVER    0x34
    56 #define DHCP_MESSAGE_TYPE   0x35
    57 #define DHCP_SERVER_ID      0x36
    58 #define DHCP_PARAM_REQ      0x37
    59 #define DHCP_MESSAGE        0x38
    60 #define DHCP_MAX_SIZE       0x39
    61 #define DHCP_T1         0x3a
    62 #define DHCP_T2         0x3b
    63 #define DHCP_VENDOR     0x3c
    64 #define DHCP_CLIENT_ID      0x3d
    65 #define DHCP_FQDN       0x51
    66 
    67 #define DHCP_END        0xFF
    68 
    69 
    70 #define BOOTREQUEST     1
    71 #define BOOTREPLY       2
    72 
    73 #define ETH_10MB        1
    74 #define ETH_10MB_LEN        6
    75 
    76 #define DHCPDISCOVER        1
    77 #define DHCPOFFER       2
    78 #define DHCPREQUEST     3
    79 #define DHCPDECLINE     4
    80 #define DHCPACK         5
    81 #define DHCPNAK         6
    82 #define DHCPRELEASE     7
    83 #define DHCPINFORM      8
    84 
    85 #define BROADCAST_FLAG      0x8000
    86 
    87 #define OPTION_FIELD        0
    88 #define FILE_FIELD      1
    89 #define SNAME_FIELD     2
    90 
    91 /* miscellaneous defines */
    92 #define MAC_BCAST_ADDR      (uint8_t *) "\xff\xff\xff\xff\xff\xff"
    93 #define OPT_CODE 0
    94 #define OPT_LEN 1
    95 #define OPT_DATA 2
    96 
    9717struct option_set {
    9818    uint8_t *data;
     
    10121
    10222struct static_lease {
     23    struct static_lease *next;
    10324    uint8_t *mac;
    10425    uint32_t *ip;
    105     struct static_lease *next;
    10626};
    10727
    10828struct server_config_t {
    109     uint32_t server;        /* Our IP, in network order */
    110     uint32_t start;         /* Start address of leases, network order */
    111     uint32_t end;           /* End of leases, network order */
    112     struct option_set *options; /* List of DHCP options loaded from the config file */
    113     char *interface;        /* The name of the interface to use */
    114     int ifindex;            /* Index number of the interface to use */
    115     uint8_t arp[6];         /* Our arp address */
    116     unsigned long lease;        /* lease time in seconds (host order) */
    117     unsigned long max_leases;   /* maximum number of leases (including reserved address) */
    118     char remaining;         /* should the lease file be interpreted as lease time remaining, or
    119                      * as the time the lease expires */
    120     unsigned long auto_time;    /* how long should udhcpd wait before writing a config file.
    121                      * if this is zero, it will only write one on SIGUSR1 */
    122     unsigned long decline_time; /* how long an address is reserved if a client returns a
    123                      * decline message */
    124     unsigned long conflict_time;    /* how long an arp conflict offender is leased for */
    125     unsigned long offer_time;   /* how long an offered address is reserved */
    126     unsigned long min_lease;    /* minimum lease a client can request*/
     29    uint32_t server;                /* Our IP, in network order */
     30    /* start,end are in host order: we need to compare start <= ip <= end */
     31    uint32_t start_ip;              /* Start address of leases, in host order */
     32    uint32_t end_ip;                /* End of leases, in host order */
     33    struct option_set *options;     /* List of DHCP options loaded from the config file */
     34    char *interface;                /* The name of the interface to use */
     35    int ifindex;                    /* Index number of the interface to use */
     36    uint8_t arp[6];                 /* Our arp address */
     37    char remaining;                 /* should the lease file be interpreted as lease time remaining, or
     38                                     * as the time the lease expires */
     39    uint32_t lease;                 /* lease time in seconds (host order) */
     40    uint32_t max_leases;            /* maximum number of leases (including reserved address) */
     41    uint32_t auto_time;             /* how long should udhcpd wait before writing a config file.
     42                                     * if this is zero, it will only write one on SIGUSR1 */
     43    uint32_t decline_time;          /* how long an address is reserved if a client returns a
     44                                     * decline message */
     45    uint32_t conflict_time;         /* how long an arp conflict offender is leased for */
     46    uint32_t offer_time;            /* how long an offered address is reserved */
     47    uint32_t min_lease;             /* minimum lease a client can request */
    12748    char *lease_file;
    12849    char *pidfile;
    129     char *notify_file;      /* What to run whenever leases are written */
    130     uint32_t siaddr;        /* next server bootp option */
    131     char *sname;            /* bootp server name */
    132     char *boot_file;        /* bootp boot file option */
     50    char *notify_file;              /* What to run whenever leases are written */
     51    uint32_t siaddr;                /* next server bootp option */
     52    char *sname;                    /* bootp server name */
     53    char *boot_file;                /* bootp boot file option */
    13354    struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */
    13455};
     
    13859
    13960
     61/*** leases.h ***/
     62
     63struct dhcpOfferedAddr {
     64    uint8_t chaddr[16];
     65    uint32_t yiaddr;    /* network order */
     66    uint32_t expires;   /* host order */
     67};
     68
     69struct dhcpOfferedAddr *add_lease(const uint8_t *chaddr, uint32_t yiaddr, unsigned long lease);
     70int lease_expired(struct dhcpOfferedAddr *lease);
     71struct dhcpOfferedAddr *find_lease_by_chaddr(const uint8_t *chaddr);
     72struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr);
     73uint32_t find_address(int check_expired);
     74
     75
     76/*** static_leases.h ***/
     77
     78/* Config file will pass static lease info to this function which will add it
     79 * to a data structure that can be searched later */
     80int addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t *ip);
     81/* Check to see if a mac has an associated static lease */
     82uint32_t getIpByMac(struct static_lease *lease_struct, void *arg);
     83/* Check to see if an ip is reserved as a static ip */
     84uint32_t reservedIp(struct static_lease *lease_struct, uint32_t ip);
     85/* Print out static leases just to check what's going on (debug code) */
     86void printStaticLeases(struct static_lease **lease_struct);
     87
     88
     89/*** serverpacket.h ***/
     90
     91int sendOffer(struct dhcpMessage *oldpacket);
     92int sendNAK(struct dhcpMessage *oldpacket);
     93int sendACK(struct dhcpMessage *oldpacket, uint32_t yiaddr);
     94int send_inform(struct dhcpMessage *oldpacket);
     95
     96
     97/*** files.h ***/
     98
     99int read_config(const char *file);
     100void write_leases(void);
     101void read_leases(const char *file);
     102struct option_set *find_option(struct option_set *opt_list, char code);
     103
     104
    140105#endif
Note: See TracChangeset for help on using the changeset viewer.