Changeset ac729becd4e99890a9fc4e6f543c0ae46fd92b05

Timestamp:

10/27/09 15:29:02 (3 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

486ec64c19b8c5d7eca7abfd34bcf696b7701261

Parents:

c45ffb669e96ed42d563831d13f3d113f7e18ebf, 18d726587536701801d2109396f8c74f5d33f3c1

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-10-27T16:29:02Z+0100

Message:

Merge branch 'master' of  ssh://terminus.zytor.com//pub/git/users/erwan/hdt

Files:

• MCONFIG (modified) (1 diff)
• com32/hdt/Makefile (modified) (3 diffs)
• com32/mboot/map.c (modified) (1 diff)
• core/pxelinux.asm (modified) (7 diffs)

MCONFIG

@@ -55 +55 @@
 MCOPY    = mcopy
 MFORMAT  = mformat
+MKISOFS  = mkisofs
 
 com32    = $(topdir)/com32

com32/hdt/Makefile

@@ -31 +31 @@
 MODULES_ALIAS_FILE      ?= /lib/modules/$(KERNEL_VERSION)/modules.alias
 MODULES_PCIMAP_FILE     ?= /lib/modules/$(KERNEL_VERSION)/modules.pcimap
-PCI_IDS_FILE            ?= $(PWD)/floppy/pci.ids
-ISO_DIR                 ?= iso/isolinux
+ISO_DIR                 ?= iso
+ISOLINUX_DIR            ?= isolinux
+FLOPPY_DIR              ?= floppy
+PCI_IDS_FILE            ?= $(PWD)/$(FLOPPY_DIR)/pci.ids
 
 all: $(MODULES) $(TESTFILES)
@@ -39 +41 @@
         $(LD) $(LDFLAGS) -o $@ $^
 
-hdt.img: hdt.c32 floppy/hdt.cfg floppy/mtools.conf $(topdir)/mtools/syslinux 
+hdt.img: hdt.c32 $(FLOPPY_DIR)/hdt.cfg $(FLOPPY_DIR)/mtools.conf $(topdir)/mtools/syslinux
         rm -f hdt.img
-        MTOOLSRC=$(PWD)/floppy/mtools.conf $(MFORMAT) -v HDT -f 2880 -C a:
+        MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MFORMAT) -v HDT -f 2880 -C a:
         $(topdir)/mtools/syslinux hdt.img
         -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(PCI_IDS_FILE)
         -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(PCI_IDS_FILE)
-        -[ -f $(MODULES_ALIAS_FILE) ] && MTOOLSRC=$(PWD)/floppy/mtools.conf $(MCOPY) $(MODULES_ALIAS_FILE) a:
-        -[ -f $(MODULES_PCIMAP_FILE) ] && MTOOLSRC=$(PWD)/floppy/mtools.conf $(MCOPY) $(MODULES_PCIMAP_FILE) a:
-        MTOOLSRC=$(PWD)/floppy/mtools.conf $(MCOPY) hdt.c32 a:
-        @ [ -f $(PCI_IDS_FILE) ] && MTOOLSRC=$(PWD)/floppy/mtools.conf $(MCOPY) $(PCI_IDS_FILE) a: || printf "\nThe floppy/pci.ids file is missing and can be downloaded from http://pciids.sourceforge.net and put in\nthe ./com32/hdt/floppy directory of the extracted Syslinux source.\n\n"
-        MTOOLSRC=$(PWD)/floppy/mtools.conf $(MCOPY) floppy/hdt.cfg a:syslinux.cfg
+        -[ -f $(MODULES_ALIAS_FILE) ] && MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(MODULES_ALIAS_FILE) a:
+        -[ -f $(MODULES_PCIMAP_FILE) ] && MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(MODULES_PCIMAP_FILE) a:
+        MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) hdt.c32 a:
+        @ [ -f $(PCI_IDS_FILE) ] && MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(PCI_IDS_FILE) a: || printf "\nThe $(FLOPPY_DIR)/pci.ids file is missing and can be downloaded from http://pciids.sourceforge.net and put in\nthe ./com32/hdt/$(FLOPPY_DIR) directory of the extracted Syslinux source.\n\n"
+        MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(FLOPPY_DIR)/hdt.cfg a:syslinux.cfg
 
-hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin floppy/hdt.cfg
+hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg
         rm -rf $(ISO_DIR)
-        rm -rf hdt.iso
-        mkdir -p $(ISO_DIR)
-        cp $(topdir)/core/isolinux.bin $(ISO_DIR)
-        cp floppy/hdt.cfg $(ISO_DIR)/isolinux.cfg
-        cp hdt.c32 $(ISO_DIR)
-        -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(ISO_DIR)
-        -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(ISO_DIR)
-        -[ -f $(MODULES_ALIAS_FILE) ] && cp $(MODULES_ALIAS_FILE) $(ISO_DIR)
-        -[ -f $(MODULES_PCIMAP_FILE) ] && cp $(MODULES_PCIMAP_FILE) $(ISO_DIR)
-        -[ ! -f $(ISO_DIR)/pci.ids ] && printf "\nThe floppy/pci.ids file is missing and can be downloaded from http://pciids.sourceforge.net and put in\nthe ./com32/hdt/floppy directory of the extracted Syslinux source.\n\n"
-        mkisofs -o hdt.iso -b isolinux/isolinux.bin -c isolinux/boot.cat \
+        rm -f hdt.iso
+        mkdir -p $(ISO_DIR)/$(ISOLINUX_DIR)
+        cp $(topdir)/core/isolinux.bin $(ISO_DIR)/$(ISOLINUX_DIR)
+        cp $(FLOPPY_DIR)/hdt.cfg $(ISO_DIR)/$(ISOLINUX_DIR)/isolinux.cfg
+        cp hdt.c32 $(ISO_DIR)/$(ISOLINUX_DIR)
+        -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(ISO_DIR)/$(ISOLINUX_DIR)
+        -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(ISO_DIR)/$(ISOLINUX_DIR)
+        -[ -f $(MODULES_ALIAS_FILE) ] && cp $(MODULES_ALIAS_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)
+        -[ -f $(MODULES_PCIMAP_FILE) ] && cp $(MODULES_PCIMAP_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)
+        -[ ! -f $(ISO_DIR)/$(ISOLINUX_DIR)/pci.ids ] && printf "\nThe $(FLOPPY_DIR)/pci.ids file is missing and can be downloaded from http://pciids.sourceforge.net and put in\nthe ./com32/hdt/$(FLOPPY_DIR) directory of the extracted Syslinux source.\n\n"
+        $(MKISOFS) -o hdt.iso -b $(ISOLINUX_DIR)/isolinux.bin -c $(ISOLINUX_DIR)/boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
-                iso/
+                $(ISO_DIR)
 
 tidy dist:
@@ -75 +77 @@
 spotless: clean
         rm -f *.lss *.c32 *.com hdt.img hdt.iso
+        rm -rf $(ISO_DIR)
         rm -f *~ \#*
 

com32/mboot/map.c

@@ -128 +128 @@
             mbh_len = 12;
 
-        if (i + mbh_len < len)
+        if (i + mbh_len > len)
             mbh_len = 0;        /* Invalid... */
         else

core/pxelinux.asm

@@ -234 +234 @@
 
 hcdhcp_magic    dd 0x2983c8ac           ; Magic number
-                dd 5*4                  ; Size of this structure
-hcdhcp_offset   dd 0                    ; Offset (entered by patcher)
-hcdhcp_len      dd 0                    ; Length (entered by patcher)
+hcdhcp_len      dd 7*4                  ; Size of this structure
 hcdhcp_flags    dd 0                    ; Reserved for the future
+                ; Parameters to be parsed before the ones from PXE
+bdhcp_offset    dd 0                    ; Offset (entered by patcher)
+bdhcp_len       dd 0                    ; Length (entered by patcher)
+                ; Parameters to be parsed *after* the ones from PXE
+adhcp_offset    dd 0                    ; Offset (entered by patcher)
+adhcp_len       dd 0                    ; Length (entered by patcher)
 
 _start1:
@@ -269 +273 @@
 ; Move the hardwired DHCP options (if present) to a safe place...
 ;
-hcdhcp_copy:
-                mov cx,[hcdhcp_len]
-                mov ax,trackbufsize
+bdhcp_copy:
+                mov cx,[bdhcp_len]
+                mov ax,trackbufsize/2
                 jcxz .none
                 cmp cx,ax
                 jbe .oksize
                 mov cx,ax
-                mov [hcdhcp_len],ax
+                mov [bdhcp_len],ax
 .oksize:
-                mov eax,[hcdhcp_offset]
+                mov eax,[bdhcp_offset]
                 add eax,_start
                 mov si,ax
@@ -286 +290 @@
                 mov ds,ax
                 mov di,trackbuf
+                add cx,3
+                shr cx,2
+                rep movsd
+                pop ds
+.none:
+
+adhcp_copy:
+                mov cx,[adhcp_len]
+                mov ax,trackbufsize/2
+                jcxz .none
+                cmp cx,ax
+                jbe .oksize
+                mov cx,ax
+                mov [adhcp_len],ax
+.oksize:
+                mov eax,[adhcp_offset]
+                add eax,_start
+                mov si,ax
+                and si,000Fh
+                shr eax,4
+                push ds
+                mov ds,ax
+                mov di,trackbuf+trackbufsize/2
                 add cx,3
                 shr cx,2
@@ -578 +605 @@
 ; an option field.
 ;
-                mov cx,[hcdhcp_len]
+                mov cx,[bdhcp_len]
                 mov si,trackbuf
                 call parse_dhcp_options
@@ -635 +662 @@
                 call parse_dhcp                 ; Parse DHCP packet
                 call crlf
+
+;
+; Process any hardwired options the user may have specified.  This is
+; different than the actual packets in that there is no header, just
+; an option field.  This handles the "after" options
+;
+                mov cx,[adhcp_len]
+                mov si,trackbuf+trackbufsize/2
+                call parse_dhcp_options
 
 ;
@@ -2300 +2336 @@
 ;
 ; Get a DHCP packet from the PXE stack into the trackbuf.
+; Leaves the upper half of the trackbuf untouched.
 ;
 ; Input:
@@ -2320 +2357 @@
                 movzx ax,dl
                 stosw           ; Packet type
-                mov ax,trackbufsize
+                mov ax,trackbufsize/2
                 stosw           ; Buffer size
                 mov ax,trackbuf