forked from KolibriOS/kolibrios
Quick-n-dirty fix for ZeroConf
git-svn-id: svn://kolibrios.org@2856 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr
parent
baa66d1a4c
commit
dfd433a9b9
@ -1,157 +0,0 @@
|
|||||||
;-----------------------------------------------------------------------------
|
|
||||||
proc mem.Alloc size ;/////////////////////////////////////////////////////////
|
|
||||||
;-----------------------------------------------------------------------------
|
|
||||||
push ebx ecx
|
|
||||||
mov eax,[size]
|
|
||||||
lea ecx,[eax+4+4095]
|
|
||||||
and ecx,not 4095
|
|
||||||
mcall 68,12
|
|
||||||
add ecx,-4
|
|
||||||
mov [eax],ecx
|
|
||||||
add eax,4
|
|
||||||
pop ecx ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
|
||||||
proc mem.ReAlloc mptr,size;///////////////////////////////////////////////////
|
|
||||||
;-----------------------------------------------------------------------------
|
|
||||||
push ebx ecx esi edi eax
|
|
||||||
mov eax,[mptr]
|
|
||||||
mov ebx,[size]
|
|
||||||
or eax,eax
|
|
||||||
jz @f
|
|
||||||
lea ecx,[ebx+4+4095]
|
|
||||||
and ecx,not 4095
|
|
||||||
add ecx,-4
|
|
||||||
cmp ecx,[eax-4]
|
|
||||||
je .exit
|
|
||||||
@@: mov eax,ebx
|
|
||||||
call mem.Alloc
|
|
||||||
xchg eax,[esp]
|
|
||||||
or eax,eax
|
|
||||||
jz .exit
|
|
||||||
mov esi,eax
|
|
||||||
xchg eax,[esp]
|
|
||||||
mov edi,eax
|
|
||||||
mov ecx,[esi-4]
|
|
||||||
cmp ecx,[edi-4]
|
|
||||||
jbe @f
|
|
||||||
mov ecx,[edi-4]
|
|
||||||
@@: add ecx,3
|
|
||||||
shr ecx,2
|
|
||||||
cld
|
|
||||||
rep movsd
|
|
||||||
xchg eax,[esp]
|
|
||||||
call mem.Free
|
|
||||||
.exit:
|
|
||||||
pop eax edi esi ecx ebx
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
|
||||||
proc mem.Free mptr ;//////////////////////////////////////////////////////////
|
|
||||||
;-----------------------------------------------------------------------------
|
|
||||||
mov eax,[mptr]
|
|
||||||
or eax,eax
|
|
||||||
jz @f
|
|
||||||
push ebx ecx
|
|
||||||
lea ecx,[eax-4]
|
|
||||||
mcall 68,13
|
|
||||||
pop ecx ebx
|
|
||||||
@@: ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
proc dll.Load, import_table:dword
|
|
||||||
mov esi,[import_table]
|
|
||||||
.next_lib: mov edx,[esi]
|
|
||||||
or edx,edx
|
|
||||||
jz .exit
|
|
||||||
push esi
|
|
||||||
mov esi,[esi+4]
|
|
||||||
mov edi,s_libdir.fname
|
|
||||||
@@: lodsb
|
|
||||||
stosb
|
|
||||||
or al,al
|
|
||||||
jnz @b
|
|
||||||
mcall 68,19,s_libdir
|
|
||||||
or eax,eax
|
|
||||||
jz .fail
|
|
||||||
stdcall dll.Link,eax,edx
|
|
||||||
stdcall dll.Init,[eax+4]
|
|
||||||
pop esi
|
|
||||||
add esi,8
|
|
||||||
jmp .next_lib
|
|
||||||
.exit: xor eax,eax
|
|
||||||
ret
|
|
||||||
.fail: add esp,4
|
|
||||||
xor eax,eax
|
|
||||||
inc eax
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc dll.Link, exp:dword,imp:dword
|
|
||||||
push eax
|
|
||||||
mov esi,[imp]
|
|
||||||
test esi,esi
|
|
||||||
jz .done
|
|
||||||
.next: lodsd
|
|
||||||
test eax,eax
|
|
||||||
jz .done
|
|
||||||
stdcall dll.GetProcAddress,[exp],eax
|
|
||||||
or eax,eax
|
|
||||||
jz @f
|
|
||||||
mov [esi-4],eax
|
|
||||||
jmp .next
|
|
||||||
@@: mov dword[esp],0
|
|
||||||
.done: pop eax
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc dll.Init, dllentry:dword
|
|
||||||
pushad
|
|
||||||
mov eax,mem.Alloc
|
|
||||||
mov ebx,mem.Free
|
|
||||||
mov ecx,mem.ReAlloc
|
|
||||||
mov edx,dll.Load
|
|
||||||
stdcall [dllentry]
|
|
||||||
popad
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc dll.GetProcAddress, exp:dword,sz_name:dword
|
|
||||||
mov edx,[exp]
|
|
||||||
xor eax,eax
|
|
||||||
.next: or edx,edx
|
|
||||||
jz .end
|
|
||||||
cmp dword[edx],0
|
|
||||||
jz .end
|
|
||||||
stdcall strcmp,[edx],[sz_name]
|
|
||||||
test eax,eax
|
|
||||||
jz .ok
|
|
||||||
add edx,8
|
|
||||||
jmp .next
|
|
||||||
.ok: mov eax,[edx+4]
|
|
||||||
.end: ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
proc strcmp, str1:dword,str2:dword
|
|
||||||
push esi edi
|
|
||||||
mov esi,[str1]
|
|
||||||
mov edi,[str2]
|
|
||||||
xor eax,eax
|
|
||||||
@@: lodsb
|
|
||||||
scasb
|
|
||||||
jne .fail
|
|
||||||
or al,al
|
|
||||||
jnz @b
|
|
||||||
jmp .ok
|
|
||||||
.fail: or eax,-1
|
|
||||||
.ok: pop edi esi
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
s_libdir:
|
|
||||||
db '/sys/lib/'
|
|
||||||
.fname rb 32
|
|
||||||
@ -5,41 +5,43 @@
|
|||||||
;
|
;
|
||||||
; Written by HidnPlayr & Derpenguin
|
; Written by HidnPlayr & Derpenguin
|
||||||
|
|
||||||
use32
|
format binary as ""
|
||||||
org 0x0
|
|
||||||
|
|
||||||
db 'MENUET01' ; 8 byte id
|
use32
|
||||||
dd 0x01 ; header version
|
org 0x0
|
||||||
dd START ; start of code
|
|
||||||
dd IM_END ; size of image
|
db 'MENUET01' ; 8 byte id
|
||||||
dd (I_END+0x100) ; memory for app
|
dd 0x01 ; header version
|
||||||
dd (I_END+0x100) ; esp
|
dd START ; start of code
|
||||||
dd 0x0 , path ; I_Param , I_Icon
|
dd IM_END ; size of image
|
||||||
|
dd (I_END+0x100) ; memory for app
|
||||||
|
dd (I_END+0x100) ; esp
|
||||||
|
dd 0x0 , path ; I_Param , I_Icon
|
||||||
|
|
||||||
; CONFIGURATION
|
; CONFIGURATION
|
||||||
|
|
||||||
|
|
||||||
TIMEOUT equ 60 ; in seconds
|
TIMEOUT equ 60 ; in seconds
|
||||||
BUFFER equ 1024 ; in bytes
|
BUFFER equ 1024 ; in bytes
|
||||||
__DEBUG__ equ 1 ; enable/disable
|
__DEBUG__ equ 1 ; enable/disable
|
||||||
__DEBUG_LEVEL__ equ 1 ; 1 = all, 2 = errors
|
__DEBUG_LEVEL__ equ 1 ; 1 = all, 2 = errors
|
||||||
|
|
||||||
; CONFIGURATION FOR LINK-LOCAL
|
; CONFIGURATION FOR LINK-LOCAL
|
||||||
|
|
||||||
PROBE_WAIT equ 1 ; second (initial random delay)
|
PROBE_WAIT equ 1 ; second (initial random delay)
|
||||||
PROBE_MIN equ 1 ; second (minimum delay till repeated probe)
|
PROBE_MIN equ 1 ; second (minimum delay till repeated probe)
|
||||||
PROBE_MAX equ 2 ; seconds (maximum delay till repeated probe)
|
PROBE_MAX equ 2 ; seconds (maximum delay till repeated probe)
|
||||||
PROBE_NUM equ 3 ; (number of probe packets)
|
PROBE_NUM equ 3 ; (number of probe packets)
|
||||||
|
|
||||||
ANNOUNCE_NUM equ 2 ; (number of announcement packets)
|
ANNOUNCE_NUM equ 2 ; (number of announcement packets)
|
||||||
ANNOUNCE_INTERVAL equ 2 ; seconds (time between announcement packets)
|
ANNOUNCE_INTERVAL equ 2 ; seconds (time between announcement packets)
|
||||||
ANNOUNCE_WAIT equ 2 ; seconds (delay before announcing)
|
ANNOUNCE_WAIT equ 2 ; seconds (delay before announcing)
|
||||||
|
|
||||||
MAX_CONFLICTS equ 10 ; (max conflicts before rate limiting)
|
MAX_CONFLICTS equ 10 ; (max conflicts before rate limiting)
|
||||||
|
|
||||||
RATE_LIMIT_INTERVAL equ 60 ; seconds (delay between successive attempts)
|
RATE_LIMIT_INTERVAL equ 60 ; seconds (delay between successive attempts)
|
||||||
|
|
||||||
DEFEND_INTERVAL equ 10 ; seconds (min. wait between defensive ARPs)
|
DEFEND_INTERVAL equ 10 ; seconds (min. wait between defensive ARPs)
|
||||||
|
|
||||||
|
|
||||||
include '../proc32.inc'
|
include '../proc32.inc'
|
||||||
@ -47,7 +49,7 @@ include '../macros.inc'
|
|||||||
include '../debug-fdo.inc'
|
include '../debug-fdo.inc'
|
||||||
include '../network.inc'
|
include '../network.inc'
|
||||||
include 'dhcp.inc'
|
include 'dhcp.inc'
|
||||||
include 'dll.inc'
|
include '../dll.inc'
|
||||||
|
|
||||||
|
|
||||||
Ip2dword:
|
Ip2dword:
|
||||||
@ -55,40 +57,40 @@ Ip2dword:
|
|||||||
|
|
||||||
; This code validates if the query is an IP containing 4 numbers and 3 dots
|
; This code validates if the query is an IP containing 4 numbers and 3 dots
|
||||||
|
|
||||||
xor al, al ; make al (dot count) zero
|
xor al, al ; make al (dot count) zero
|
||||||
|
|
||||||
@@:
|
@@:
|
||||||
cmp byte[edx],'0' ; check if this byte is a number, if not jump to no_IP
|
cmp byte[edx],'0' ; check if this byte is a number, if not jump to no_IP
|
||||||
jl no_IP ;
|
jl no_IP ;
|
||||||
cmp byte[edx],'9' ;
|
cmp byte[edx],'9' ;
|
||||||
jg no_IP ;
|
jg no_IP ;
|
||||||
|
|
||||||
inc edx ; the byte was a number, so lets check the next byte
|
inc edx ; the byte was a number, so lets check the next byte
|
||||||
|
|
||||||
cmp byte[edx],0 ; is this byte zero? (have we reached end of query?)
|
cmp byte[edx],0 ; is this byte zero? (have we reached end of query?)
|
||||||
jz @f ; jump to next @@ then
|
jz @f ; jump to next @@ then
|
||||||
cmp byte[edx],':'
|
cmp byte[edx],':'
|
||||||
jz @f
|
jz @f
|
||||||
|
|
||||||
cmp byte[edx],'.' ; is this byte a dot?
|
cmp byte[edx],'.' ; is this byte a dot?
|
||||||
jne @r ; if not, jump to previous @@
|
jne @r ; if not, jump to previous @@
|
||||||
|
|
||||||
inc al ; the byte was a dot so increment al(dot count)
|
inc al ; the byte was a dot so increment al(dot count)
|
||||||
inc edx ; next byte
|
inc edx ; next byte
|
||||||
jmp @r ; lets check for numbers again (jump to previous @@)
|
jmp @r ; lets check for numbers again (jump to previous @@)
|
||||||
|
|
||||||
@@: ; we reach this when end of query reached
|
@@: ; we reach this when end of query reached
|
||||||
cmp al,3 ; check if there where 3 dots
|
cmp al,3 ; check if there where 3 dots
|
||||||
jnz no_IP ; if not, jump to no_IP
|
jnz no_IP ; if not, jump to no_IP
|
||||||
|
|
||||||
; The following code will convert this IP into a dword and output it in eax
|
; The following code will convert this IP into a dword and output it in eax
|
||||||
; If there is also a port number specified, this will be returned in ebx, otherwise ebx is -1
|
; If there is also a port number specified, this will be returned in ebx, otherwise ebx is -1
|
||||||
|
|
||||||
pop esi ; edx (query address) was pushed onto stack and is now popped in esi
|
pop esi ; edx (query address) was pushed onto stack and is now popped in esi
|
||||||
|
|
||||||
xor edx, edx ; result
|
xor edx, edx ; result
|
||||||
xor eax, eax ; current character
|
xor eax, eax ; current character
|
||||||
xor ebx, ebx ; current byte
|
xor ebx, ebx ; current byte
|
||||||
|
|
||||||
.outer_loop:
|
.outer_loop:
|
||||||
shl edx, 8
|
shl edx, 8
|
||||||
@ -97,9 +99,9 @@ Ip2dword:
|
|||||||
.inner_loop:
|
.inner_loop:
|
||||||
lodsb
|
lodsb
|
||||||
test eax, eax
|
test eax, eax
|
||||||
jz .finish
|
jz .finish
|
||||||
cmp al, '.'
|
cmp al, '.'
|
||||||
jz .outer_loop
|
jz .outer_loop
|
||||||
sub eax, '0'
|
sub eax, '0'
|
||||||
imul ebx, 10
|
imul ebx, 10
|
||||||
add ebx, eax
|
add ebx, eax
|
||||||
@ -108,7 +110,7 @@ Ip2dword:
|
|||||||
shl edx, 8
|
shl edx, 8
|
||||||
add edx, ebx
|
add edx, ebx
|
||||||
|
|
||||||
bswap edx ; we want little endian order
|
bswap edx ; we want little endian order
|
||||||
|
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -123,186 +125,186 @@ no_IP:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
START: ; start of execution
|
START: ; start of execution
|
||||||
|
|
||||||
mcall 40, 1 shl 7 ; network event
|
mcall 40, 1 shl 7 ; network event
|
||||||
|
|
||||||
DEBUGF 1,">Zero-config service:\n"
|
DEBUGF 1,">Zero-config service:\n"
|
||||||
|
|
||||||
mcall 76, 1337 shl 16 + 4
|
mcall 76, API_ETH + 4
|
||||||
|
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je exit
|
je exit
|
||||||
|
|
||||||
mov word[MAC], bx
|
mov word[MAC], bx
|
||||||
mov dword[MAC+2], eax
|
mov dword[MAC+2], eax
|
||||||
|
|
||||||
DEBUGF 1,"->MAC: %x-%x-%x-%x-%x-%x\n",[MAC]:2,[MAC+1]:2,[MAC+2]:2,[MAC+3]:2,[MAC+4]:2,[MAC+5]:2
|
DEBUGF 1,"->MAC: %x-%x-%x-%x-%x-%x\n",[MAC]:2,[MAC+1]:2,[MAC+2]:2,[MAC+3]:2,[MAC+4]:2,[MAC+5]:2
|
||||||
|
|
||||||
cld
|
cld
|
||||||
mov edi, path ; Calculate the length of zero-terminated string
|
mov edi, path ; Calculate the length of zero-terminated string
|
||||||
xor al , al
|
xor al , al
|
||||||
mov ecx, 1024
|
mov ecx, 1024
|
||||||
repnz scas byte[es:edi]
|
repnz scas byte[es:edi]
|
||||||
dec edi
|
dec edi
|
||||||
|
|
||||||
mov esi, filename
|
mov esi, filename
|
||||||
movsd
|
movsd
|
||||||
movsb
|
movsb
|
||||||
|
|
||||||
DEBUGF 1,"->path to ini: %s\n", path
|
DEBUGF 1,"->path to ini: %s\n", path
|
||||||
|
|
||||||
mcall 68,11
|
mcall 68,11
|
||||||
|
|
||||||
stdcall dll.Load,@IMPORT
|
stdcall dll.Load,@IMPORT
|
||||||
or eax,eax
|
or eax,eax
|
||||||
jnz skip_ini
|
jnz skip_ini
|
||||||
|
|
||||||
|
|
||||||
invoke ini.get_str, path, str_ipconfig, str_type, inibuf, 16, 0
|
invoke ini.get_str, path, str_ipconfig, str_type, inibuf, 16, 0
|
||||||
|
|
||||||
mov eax,dword[inibuf]
|
mov eax,dword[inibuf]
|
||||||
|
|
||||||
cmp eax,'stat'
|
cmp eax,'stat'
|
||||||
jne skip_ini
|
jne skip_ini
|
||||||
|
|
||||||
invoke ini.get_str, path, str_ipconfig, str_ip, inibuf, 16, 0
|
invoke ini.get_str, path, str_ipconfig, str_ip, inibuf, 16, 0
|
||||||
mov edx, inibuf
|
mov edx, inibuf
|
||||||
call Ip2dword
|
call Ip2dword
|
||||||
mcall 76, 3, edx
|
mcall 76, API_IPv4 + 3, edx
|
||||||
|
|
||||||
invoke ini.get_str, path, str_ipconfig, str_gateway, inibuf, 16, 0
|
invoke ini.get_str, path, str_ipconfig, str_gateway, inibuf, 16, 0
|
||||||
mov edx, inibuf
|
mov edx, inibuf
|
||||||
call Ip2dword
|
call Ip2dword
|
||||||
mcall 76, 9, edx
|
mcall 76, API_IPv4 + 9, edx
|
||||||
|
|
||||||
invoke ini.get_str, path, str_ipconfig, str_dns, inibuf, 16, 0
|
invoke ini.get_str, path, str_ipconfig, str_dns, inibuf, 16, 0
|
||||||
mov edx, inibuf
|
mov edx, inibuf
|
||||||
call Ip2dword
|
call Ip2dword
|
||||||
mcall 76, 5, edx
|
mcall 76, API_IPv4 + 5, edx
|
||||||
|
|
||||||
invoke ini.get_str, path, str_ipconfig, str_subnet, inibuf, 16, 0
|
invoke ini.get_str, path, str_ipconfig, str_subnet, inibuf, 16, 0
|
||||||
mov edx, inibuf
|
mov edx, inibuf
|
||||||
call Ip2dword
|
call Ip2dword
|
||||||
mcall 76, 7, edx
|
mcall 76, API_IPv4 + 7, edx
|
||||||
|
|
||||||
|
|
||||||
mcall -1
|
mcall -1
|
||||||
|
|
||||||
|
|
||||||
skip_ini:
|
skip_ini:
|
||||||
|
|
||||||
DEBUGF 1,"->Skip ini\n"
|
DEBUGF 1,"->Skip ini\n"
|
||||||
|
|
||||||
mcall 75, 0, AF_INET4, SOCK_DGRAM, 0 ; open socket (parameters: domain, type, reserved)
|
mcall 75, 0, AF_INET4, SOCK_DGRAM, 0 ; open socket (parameters: domain, type, reserved)
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je error
|
je error
|
||||||
mov [socketNum], eax
|
mov [socketNum], eax
|
||||||
|
|
||||||
DEBUGF 1,"->socket %x opened\n", eax
|
DEBUGF 1,"->socket %x opened\n", eax
|
||||||
|
|
||||||
mcall 75, 2, [socketNum], sockaddr1, 18 ; bind socket to local port 68
|
mcall 75, 2, [socketNum], sockaddr1, 18 ; bind socket to local port 68
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je error
|
je error
|
||||||
|
|
||||||
DEBUGF 1,"->Socket Bound to local port 68\n"
|
DEBUGF 1,"->Socket Bound to local port 68\n"
|
||||||
|
|
||||||
mcall 75, 4, [socketNum], sockaddr2, 18 ; connect to 255.255.255.255 on port 67
|
mcall 75, 4, [socketNum], sockaddr2, 18 ; connect to 255.255.255.255 on port 67
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je error
|
je error
|
||||||
|
|
||||||
DEBUGF 1,"->Connected to 255.255.255.255 on port 67\n"
|
DEBUGF 1,"->Connected to 255.255.255.255 on port 67\n"
|
||||||
|
|
||||||
mov byte [dhcpMsgType], 0x01 ; DHCP discover
|
mov byte [dhcpMsgType], 0x01 ; DHCP discover
|
||||||
mov dword [dhcpLease], esi ; esi is still -1 (-1 = forever)
|
mov dword [dhcpLease], esi ; esi is still -1 (-1 = forever)
|
||||||
|
|
||||||
mcall 26, 9
|
mcall 26, 9
|
||||||
imul eax,100
|
imul eax,100
|
||||||
mov [currTime],eax
|
mov [currTime],eax
|
||||||
|
|
||||||
buildRequest: ; Creates a DHCP request packet.
|
buildRequest: ; Creates a DHCP request packet.
|
||||||
|
|
||||||
DEBUGF 1,"->Building request\n"
|
DEBUGF 1,"->Building request\n"
|
||||||
|
|
||||||
stdcall mem.Alloc, BUFFER
|
stdcall mem.Alloc, BUFFER
|
||||||
mov [dhcpMsg], eax
|
mov [dhcpMsg], eax
|
||||||
test eax,eax
|
test eax,eax
|
||||||
jz apipa
|
jz apipa
|
||||||
|
|
||||||
;;; todo: skip this bullcrap
|
;;; todo: skip this bullcrap
|
||||||
|
|
||||||
mov edi, eax
|
mov edi, eax
|
||||||
mov ecx, BUFFER
|
mov ecx, BUFFER
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
cld
|
cld
|
||||||
rep stosb
|
rep stosb
|
||||||
|
|
||||||
;; todo: put this in a buffer instead of writing bytes and words!
|
;; todo: put this in a buffer instead of writing bytes and words!
|
||||||
|
|
||||||
mov edx,[dhcpMsg]
|
mov edx,[dhcpMsg]
|
||||||
|
|
||||||
mov [edx], byte 0x01 ; Boot request
|
mov [edx], byte 0x01 ; Boot request
|
||||||
mov [edx+1], byte 0x01 ; Ethernet
|
mov [edx+1], byte 0x01 ; Ethernet
|
||||||
mov [edx+2], byte 0x06 ; Ethernet h/w len
|
mov [edx+2], byte 0x06 ; Ethernet h/w len
|
||||||
mov [edx+4], dword 0x11223344 ; xid ;;;;;;;
|
mov [edx+4], dword 0x11223344 ; xid ;;;;;;;
|
||||||
mov eax,[currTime]
|
mov eax,[currTime]
|
||||||
mov [edx+8], eax ; secs, our uptime
|
mov [edx+8], eax ; secs, our uptime
|
||||||
mov [edx+10], byte 0x80 ; broadcast flag set
|
mov [edx+10], byte 0x80 ; broadcast flag set
|
||||||
mov eax, dword [MAC] ; first 4 bytes of MAC
|
mov eax, dword [MAC] ; first 4 bytes of MAC
|
||||||
mov [edx+28],dword eax
|
mov [edx+28],dword eax
|
||||||
mov ax, word [MAC+4] ; last 2 bytes of MAC
|
mov ax, word [MAC+4] ; last 2 bytes of MAC
|
||||||
mov [edx+32],word ax
|
mov [edx+32],word ax
|
||||||
mov [edx+236], dword 0x63538263 ; magic cookie
|
mov [edx+236], dword 0x63538263 ; magic cookie
|
||||||
mov [edx+240], word 0x0135 ; option DHCP msg type
|
mov [edx+240], word 0x0135 ; option DHCP msg type
|
||||||
mov al, [dhcpMsgType]
|
mov al, [dhcpMsgType]
|
||||||
mov [edx+240+2], al
|
mov [edx+240+2], al
|
||||||
mov [edx+240+3], word 0x0433 ; option Lease time = infinity
|
mov [edx+240+3], word 0x0433 ; option Lease time = infinity
|
||||||
mov eax, [dhcpLease]
|
mov eax, [dhcpLease]
|
||||||
mov [edx+240+5], eax
|
mov [edx+240+5], eax
|
||||||
mov [edx+240+9], word 0x0432 ; option requested IP address
|
mov [edx+240+9], word 0x0432 ; option requested IP address
|
||||||
mov eax, [dhcpClientIP]
|
mov eax, [dhcpClientIP]
|
||||||
mov [edx+240+11], eax
|
mov [edx+240+11], eax
|
||||||
mov [edx+240+15], word 0x0437 ; option request list
|
mov [edx+240+15], word 0x0437 ; option request list
|
||||||
mov [edx+240+17], dword 0x0f060301
|
mov [edx+240+17], dword 0x0f060301
|
||||||
|
|
||||||
cmp [dhcpMsgType], byte 0x01 ; Check which msg we are sending
|
cmp [dhcpMsgType], byte 0x01 ; Check which msg we are sending
|
||||||
jne request_options
|
jne request_options
|
||||||
|
|
||||||
mov [edx+240+21], byte 0xff ; "Discover" options
|
mov [edx+240+21], byte 0xff ; "Discover" options
|
||||||
|
|
||||||
mov [dhcpMsgLen], dword 262 ; end of options marker
|
mov [dhcpMsgLen], dword 262 ; end of options marker
|
||||||
jmp send_request
|
jmp send_request
|
||||||
|
|
||||||
request_options:
|
request_options:
|
||||||
mov [edx+240+21], word 0x0436 ; server IP
|
mov [edx+240+21], word 0x0436 ; server IP
|
||||||
mov eax, [dhcpServerIP]
|
mov eax, [dhcpServerIP]
|
||||||
mov [edx+240+23], eax
|
mov [edx+240+23], eax
|
||||||
|
|
||||||
mov [edx+240+27], byte 0xff ; end of options marker
|
mov [edx+240+27], byte 0xff ; end of options marker
|
||||||
|
|
||||||
mov [dhcpMsgLen], dword 268
|
mov [dhcpMsgLen], dword 268
|
||||||
|
|
||||||
send_request:
|
send_request:
|
||||||
mcall 75, 6, [socketNum], [dhcpMsg], [dhcpMsgLen] ; write to socket ( send broadcast request )
|
mcall 75, 6, [socketNum], [dhcpMsg], [dhcpMsgLen] ; write to socket ( send broadcast request )
|
||||||
|
|
||||||
mov eax, [dhcpMsg] ; Setup the DHCP buffer to receive response
|
mov eax, [dhcpMsg] ; Setup the DHCP buffer to receive response
|
||||||
mov [dhcpMsgLen], eax ; Used as a pointer to the data
|
mov [dhcpMsgLen], eax ; Used as a pointer to the data
|
||||||
|
|
||||||
mcall 23, TIMEOUT*10 ; wait for data
|
mcall 23, TIMEOUT*10 ; wait for data
|
||||||
|
|
||||||
read_data: ; we have data - this will be the response
|
read_data: ; we have data - this will be the response
|
||||||
mcall 75, 7, [socketNum], [dhcpMsg], BUFFER ; read data from socket
|
mcall 75, 7, [socketNum], [dhcpMsg], BUFFER ; read data from socket
|
||||||
|
|
||||||
DEBUGF 1,"->%d bytes received\n", eax
|
DEBUGF 1,"->%d bytes received\n", eax
|
||||||
|
|
||||||
push eax
|
push eax
|
||||||
mcall 75, 1, [socketNum] ; exit the socket
|
mcall 75, 1, [socketNum] ; exit the socket
|
||||||
pop eax
|
pop eax
|
||||||
|
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je error
|
je error
|
||||||
|
|
||||||
mov [dhcpMsgLen], eax
|
mov [dhcpMsgLen], eax
|
||||||
|
|
||||||
; depending on which msg we sent, handle the response
|
; depending on which msg we sent, handle the response
|
||||||
; accordingly.
|
; accordingly.
|
||||||
@ -314,28 +316,28 @@ read_data: ; we have data - this will be the response
|
|||||||
; 1) If the response is DHCP ACK then
|
; 1) If the response is DHCP ACK then
|
||||||
; 1.1) extract the DNS & subnet fields. Set them in the stack
|
; 1.1) extract the DNS & subnet fields. Set them in the stack
|
||||||
|
|
||||||
cmp [dhcpMsgType], byte 0x01 ; did we send a discover?
|
cmp [dhcpMsgType], byte 0x01 ; did we send a discover?
|
||||||
je discover
|
je discover
|
||||||
cmp [dhcpMsgType], byte 0x03 ; did we send a request?
|
cmp [dhcpMsgType], byte 0x03 ; did we send a request?
|
||||||
je request
|
je request
|
||||||
|
|
||||||
jmp exit ; really unknown, what we did
|
jmp exit ; really unknown, what we did
|
||||||
|
|
||||||
discover:
|
discover:
|
||||||
call parseResponse
|
call parseResponse
|
||||||
|
|
||||||
cmp [dhcpMsgType], byte 0x02 ; Was the response an offer?
|
cmp [dhcpMsgType], byte 0x02 ; Was the response an offer?
|
||||||
jne apipa ; NO - so we do zeroconf
|
jne apipa ; NO - so we do zeroconf
|
||||||
mov [dhcpMsgType], byte 0x03 ; DHCP request
|
mov [dhcpMsgType], byte 0x03 ; DHCP request
|
||||||
jmp buildRequest
|
jmp buildRequest
|
||||||
|
|
||||||
request:
|
request:
|
||||||
call parseResponse
|
call parseResponse
|
||||||
|
|
||||||
cmp [dhcpMsgType], byte 0x05 ; Was the response an ACK? It should be
|
cmp [dhcpMsgType], byte 0x05 ; Was the response an ACK? It should be
|
||||||
jne apipa ; NO - so we do zeroconf
|
jne apipa ; NO - so we do zeroconf
|
||||||
|
|
||||||
jmp exit
|
jmp exit
|
||||||
|
|
||||||
;***************************************************************************
|
;***************************************************************************
|
||||||
; Function
|
; Function
|
||||||
@ -355,36 +357,36 @@ parseResponse:
|
|||||||
mov edx, [dhcpMsg]
|
mov edx, [dhcpMsg]
|
||||||
|
|
||||||
pusha
|
pusha
|
||||||
mcall 76, 3, [edx+16]
|
mcall 76, API_IPv4 + 3, [edx+16]
|
||||||
mov eax,[edx]
|
mov eax,[edx]
|
||||||
mov [dhcpClientIP],eax
|
mov [dhcpClientIP],eax
|
||||||
DEBUGF 1,"Client: %u.%u.%u.%u\n",[edx+16]:1,[edx+17]:1,[edx+18]:1,[edx+19]:1
|
DEBUGF 1,"Client: %u.%u.%u.%u\n",[edx+16]:1,[edx+17]:1,[edx+18]:1,[edx+19]:1
|
||||||
popa
|
popa
|
||||||
|
|
||||||
add edx, 240 ; Point to first option
|
add edx, 240 ; Point to first option
|
||||||
xor ecx, ecx
|
xor ecx, ecx
|
||||||
|
|
||||||
next_option:
|
next_option:
|
||||||
add edx, ecx
|
add edx, ecx
|
||||||
pr001:
|
pr001:
|
||||||
mov al, [edx]
|
mov al, [edx]
|
||||||
cmp al, 0xff ; End of options?
|
cmp al, 0xff ; End of options?
|
||||||
je pr_exit
|
je pr_exit
|
||||||
|
|
||||||
cmp al, dhcp_msg_type ; Msg type is a single byte option
|
cmp al, dhcp_msg_type ; Msg type is a single byte option
|
||||||
jne @f
|
jne @f
|
||||||
|
|
||||||
mov al, [edx+2]
|
mov al, [edx+2]
|
||||||
mov [dhcpMsgType], al
|
mov [dhcpMsgType], al
|
||||||
add edx, 3
|
add edx, 3
|
||||||
jmp pr001 ; Get next option
|
jmp pr001 ; Get next option
|
||||||
|
|
||||||
@@:
|
@@:
|
||||||
inc edx
|
inc edx
|
||||||
movzx ecx, byte [edx]
|
movzx ecx, byte [edx]
|
||||||
inc edx ; point to data
|
inc edx ; point to data
|
||||||
|
|
||||||
cmp al, dhcp_dhcp_server_id ; server ip
|
cmp al, dhcp_dhcp_server_id ; server ip
|
||||||
jne @f
|
jne @f
|
||||||
mov eax, [edx]
|
mov eax, [edx]
|
||||||
mov [dhcpServerIP], eax
|
mov [dhcpServerIP], eax
|
||||||
@ -409,7 +411,7 @@ pr001:
|
|||||||
jne @f
|
jne @f
|
||||||
|
|
||||||
pusha
|
pusha
|
||||||
mcall 76, 7, [edx]
|
mcall 76, API_IPv4 + 7, [edx]
|
||||||
DEBUGF 1,"Subnet: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
DEBUGF 1,"Subnet: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
||||||
popa
|
popa
|
||||||
|
|
||||||
@ -420,7 +422,7 @@ pr001:
|
|||||||
jne @f
|
jne @f
|
||||||
|
|
||||||
pusha
|
pusha
|
||||||
mcall 76, 9, [edx]
|
mcall 76, API_IPv4 + 9, [edx]
|
||||||
DEBUGF 1,"Gateway: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
DEBUGF 1,"Gateway: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
||||||
popa
|
popa
|
||||||
|
|
||||||
@ -432,7 +434,7 @@ pr001:
|
|||||||
jne next_option
|
jne next_option
|
||||||
|
|
||||||
pusha
|
pusha
|
||||||
mcall 76, 5, [edx]
|
mcall 76, API_IPv4 + 5, [edx]
|
||||||
DEBUGF 1,"DNS: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
DEBUGF 1,"DNS: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
|
||||||
popa
|
popa
|
||||||
|
|
||||||
@ -440,33 +442,34 @@ pr001:
|
|||||||
|
|
||||||
pr_exit:
|
pr_exit:
|
||||||
|
|
||||||
|
ret
|
||||||
|
|
||||||
; DEBUGF 1,"Sending ARP announce\n"
|
; DEBUGF 1,"Sending ARP announce\n"
|
||||||
;;;
|
;;;
|
||||||
|
|
||||||
jmp exit
|
|
||||||
|
|
||||||
apipa:
|
apipa:
|
||||||
stdcall mem.Free, [dhcpMsg]
|
stdcall mem.Free, [dhcpMsg]
|
||||||
|
|
||||||
link_local:
|
link_local:
|
||||||
call random
|
call random
|
||||||
mov ecx,0xfea9 ; IP 169.254.0.0 link local net, see RFC3927
|
mov ecx,0xfea9 ; IP 169.254.0.0 link local net, see RFC3927
|
||||||
mov cx,ax
|
mov cx,ax
|
||||||
mcall 76, 3, ecx ; mask is 255.255.0.0
|
mcall 76, API_IPv4 + 3, ecx ; mask is 255.255.0.0
|
||||||
DEBUGF 1,"Link Local IP assinged: 169.254.%u.%u\n",[generator+2]:1,[generator+3]:1
|
DEBUGF 1,"Link Local IP assinged: 169.254.%u.%u\n",[generator+2]:1,[generator+3]:1
|
||||||
mcall 76, 5, 0xffff
|
mcall 76, API_IPv4 + 5, 0xffff
|
||||||
mcall 76, 9, 0x0
|
mcall 76, API_IPv4 + 9, 0x0
|
||||||
mcall 76, 7, 0x0
|
mcall 76, API_IPv4 + 7, 0x0
|
||||||
|
|
||||||
mcall 5, PROBE_WAIT*100
|
mcall 5, PROBE_WAIT*100
|
||||||
|
|
||||||
xor esi,esi
|
xor esi,esi
|
||||||
probe_loop:
|
probe_loop:
|
||||||
call random ; create a pseudo random number in eax (seeded by MAC)
|
call random ; create a pseudo random number in eax (seeded by MAC)
|
||||||
|
|
||||||
cmp al,PROBE_MIN*100 ; check if al is bigger then PROBE_MIN
|
cmp al,PROBE_MIN*100 ; check if al is bigger then PROBE_MIN
|
||||||
jge @f ; all ok
|
jge @f ; all ok
|
||||||
add al,(PROBE_MAX-PROBE_MIN)*100 ; al is too small
|
add al,(PROBE_MAX-PROBE_MIN)*100 ; al is too small
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
cmp al,PROBE_MAX*100
|
cmp al,PROBE_MAX*100
|
||||||
@ -483,7 +486,7 @@ link_local:
|
|||||||
inc esi
|
inc esi
|
||||||
|
|
||||||
cmp esi,PROBE_NUM
|
cmp esi,PROBE_NUM
|
||||||
jl probe_loop
|
jl probe_loop
|
||||||
|
|
||||||
; now we wait further ANNOUNCE_WAIT seconds and send ANNOUNCE_NUM ARP announces. If any other host has assingned
|
; now we wait further ANNOUNCE_WAIT seconds and send ANNOUNCE_NUM ARP announces. If any other host has assingned
|
||||||
; IP within this time, we should create another adress, that have to be done later
|
; IP within this time, we should create another adress, that have to be done later
|
||||||
@ -498,7 +501,7 @@ link_local:
|
|||||||
|
|
||||||
inc esi
|
inc esi
|
||||||
cmp esi,ANNOUNCE_NUM
|
cmp esi,ANNOUNCE_NUM
|
||||||
je @f
|
je @f
|
||||||
|
|
||||||
DEBUGF 1,"Waiting %us\n",ANNOUNCE_INTERVAL
|
DEBUGF 1,"Waiting %us\n",ANNOUNCE_INTERVAL
|
||||||
mcall 5, ANNOUNCE_INTERVAL*100
|
mcall 5, ANNOUNCE_INTERVAL*100
|
||||||
@ -530,10 +533,10 @@ align 16
|
|||||||
@IMPORT:
|
@IMPORT:
|
||||||
|
|
||||||
library \
|
library \
|
||||||
libini,'libini.obj'
|
libini,'libini.obj'
|
||||||
|
|
||||||
import libini, \
|
import libini, \
|
||||||
ini.get_str,'ini_get_str'
|
ini.get_str,'ini_get_str'
|
||||||
|
|
||||||
include_debug_strings
|
include_debug_strings
|
||||||
|
|
||||||
@ -548,46 +551,46 @@ str_type db 'type',0
|
|||||||
|
|
||||||
sockaddr1:
|
sockaddr1:
|
||||||
|
|
||||||
dw AF_INET4
|
dw AF_INET4
|
||||||
dw 68 ; local port
|
dw 68 ; local port
|
||||||
dd 0 ; local IP
|
dd 0 ; local IP
|
||||||
|
|
||||||
rb 10
|
rb 10
|
||||||
|
|
||||||
|
|
||||||
sockaddr2:
|
sockaddr2:
|
||||||
|
|
||||||
dw AF_INET4
|
dw AF_INET4
|
||||||
dw 67 ; destination port
|
dw 67 ; destination port
|
||||||
dd -1 ; destination IP
|
dd -1 ; destination IP
|
||||||
|
|
||||||
rb 10
|
rb 10
|
||||||
|
|
||||||
|
|
||||||
IM_END:
|
IM_END:
|
||||||
|
|
||||||
inibuf rb 16
|
inibuf rb 16
|
||||||
|
|
||||||
dhcpClientIP dd ?
|
dhcpClientIP dd ?
|
||||||
dhcpMsgType db ?
|
dhcpMsgType db ?
|
||||||
dhcpLease dd ?
|
dhcpLease dd ?
|
||||||
dhcpServerIP dd ?
|
dhcpServerIP dd ?
|
||||||
|
|
||||||
dhcpMsgLen dd ?
|
dhcpMsgLen dd ?
|
||||||
socketNum dd ?
|
socketNum dd ?
|
||||||
|
|
||||||
MAC dp ?
|
MAC dp ?
|
||||||
|
|
||||||
currTime dd ?
|
currTime dd ?
|
||||||
renewTime dd ?
|
renewTime dd ?
|
||||||
generator dd ?
|
generator dd ?
|
||||||
|
|
||||||
dhcpMsg dd ?
|
dhcpMsg dd ?
|
||||||
|
|
||||||
I_END_2:
|
I_END_2:
|
||||||
|
|
||||||
path rb 1024+5
|
path rb 1024+5
|
||||||
|
|
||||||
rb 65536
|
rb 65536
|
||||||
|
|
||||||
I_END:
|
I_END:
|
||||||
Loading…
x
Reference in New Issue
Block a user