badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Zeroconfig: dont assume first received packet is the correct one.

Browse Source 
Also fixed link-local IP assignment.

git-svn-id: svn://kolibrios.org@3361 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-03-11 17:17:07 +00:00
parent a63322d121
commit 71d9f3dce2
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/branches/net/applications/zeroconf/zeroconf.asm
View File

@ -239,7 +239,7 @@ build_request: ; Creates a DHCP request
stdcall mem.Alloc, BUFFER stdcall mem.Alloc, BUFFER
mov [dhcpMsg], eax mov [dhcpMsg], eax
test eax, eax test eax, eax
jz apipa jz dhcp_error
;;; todo: skip this bullcrap ;;; todo: skip this bullcrap
@ -252,6 +252,7 @@ build_request: ; Creates a DHCP request
mov edx, [dhcpMsg] mov edx, [dhcpMsg]
; Boot protocol legacy
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
@ -263,6 +264,8 @@ build_request: ; Creates a DHCP request
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
; DHCP extension
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]
@ -307,7 +310,7 @@ read_data: ; we have data - this wi
DEBUGF 1,"->%d bytes received\n", eax DEBUGF 1,"->%d bytes received\n", eax
cmp eax, -1 cmp eax, -1
je error je dhcp_error
mov [dhcpMsgLen], eax mov [dhcpMsgLen], eax
@ -345,10 +348,11 @@ send_request:
request: request:
call parse_response call parse_response
call dhcp_end
cmp [dhcpMsgType], 0x05 ; Was the response an ACK? It should be cmp [dhcpMsgType], 0x05 ; Was the response an ACK? It should be
jne link_local ; NO - so we do link-local jne read_data ; NO - read next packets
call dhcp_end
mcall 76, API_IPv4 + 3, [dhcp.ip] ; ip mcall 76, API_IPv4 + 3, [dhcp.ip] ; ip
mcall 76, API_IPv4 + 5, [dhcp.dns] ; dns mcall 76, API_IPv4 + 5, [dhcp.dns] ; dns
@ -479,20 +483,19 @@ parse_response:
apipa: dhcp_error:
mcall close, [socketNum] call dhcp_end
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 cx, ax mov cx, ax
mcall 76, API_IPv4 + 3, ecx ; mask is 255.255.0.0 shl ecx, 16
mov cx, 0xfea9 ; IP 169.254.0.0 link local net, see RFC3927
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, API_IPv4 + 5, 0xffff mcall 76, API_IPv4 + 7, 0xffff
mcall 76, API_IPv4 + 9, 0x0 mcall 76, API_IPv4 + 9, 0x0
mcall 76, API_IPv4 + 7, 0x0 mcall 76, API_IPv4 + 5, 0x0
mcall 5, PROBE_WAIT*100 mcall 5, PROBE_WAIT*100