WebSVN – Kolibri OS – Diff – /programs/network/zeroconf/zeroconf.asm

         cmp     eax, -1
         je      socket_error
         DEBUGF  1,"Connected to 255.255.255.255 on port 67\n"
+        mov     [dhcpMsgType_tx], 0x01                  ; DHCP discover
+        mov     [dhcpLease], esi                        ; esi is still -1 (-1 = forever)
+        call    random
+        mov     [dhcpXID], eax
+build_request:                                          ; Creates a DHCP request packet.
         mov     [dhcpMsgType], 0x01                     ; DHCP discover
-        mov     [dhcpLease], esi                        ; esi is still -1 (-1 = forever)
+        DEBUGF  1,"Building request\n"
-        mcall   26, 9                                   ; Get system time
-        imul    eax, 100
-        mov     [currTime], eax
+        mcall   26, 9                                   ; Get system time
-build_request:                                          ; Creates a DHCP request packet.
         imul    eax, 100
-        mov     [tries], DHCP_TRIES
+        mov     [currTime], eax
-        DEBUGF  1,"Building request\n"
+        mov     [tries], DHCP_TRIES
         stdcall mem.Alloc, BUFFER
-        stdcall mem.Alloc, BUFFER
+        test    eax, eax
-        test    eax, eax
+        jz      dhcp_fail2
-        jz      dhcp_fail2
+        mov     [dhcpMsg], eax
-        mov     [dhcpMsg], eax
         mov     edi, eax
-        mov     ecx, BUFFER
+        ; Fill buffer with zeros
-        xor     eax, eax
+        mov     edi, eax
-        rep     stosb
+        mov     ecx, BUFFER
         xor     eax, eax
+        rep     stosb
-            ;; todo: put this in one buffer we can copy, instead of writing bytes and words!
         mov     edx, [dhcpMsg]
         mov     edx, [dhcpMsg]
         ; Boot protocol legacy
-        ; Boot protocol legacy
+        mov     [edx], byte 0x01                ; Boot request
-        mov     [edx], byte 0x01                ; Boot request
+        mov     [edx+1], byte 0x01              ; Ethernet
         mov     [edx+32],word ax
         ; DHCP extension
         mov     [edx+236], dword 0x63538263     ; magic cookie
         mov     [edx+240], word 0x0135          ; option DHCP msg type
-        mov     al, [dhcpMsgType]
+        mov     al, [dhcpMsgType_tx]
         mov     [edx+240+2], al
         mov     [edx+240+3], word 0x0433        ; option Lease time = infinity
         mov     eax, [dhcpLease]
         mov     [edx+240+5], eax
         mov     [edx+240+9], word 0x0432        ; option requested IP address
         mov     eax, [dhcp.ip]
         mov     [edx+240+11], eax
         mov     [edx+240+15], word 0x0437       ; option request list
         mov     [edx+240+17], dword 0x0f060301
-        cmp     [dhcpMsgType], 0x01             ; Check which msg we are sending
+        cmp     [dhcpMsgType_tx], 0x01          ; Check which msg we are sending
-        jne     request_options
+        jne     .options
         mov     [edx+240+21], byte 0xff         ; end of options marker
         mov     [dhcpMsgLen], 262               ; length
         jmp     send_dhcpmsg
         mov     [dhcpMsgLen], 268               ; length
 send_dhcpmsg:
         DEBUGF  1,"Sending DHCP discover/request\n"
+        mcall   75, 6, [socketNum], [dhcpMsg], [dhcpMsgLen]             ; write to socket (send broadcast request)
-        mcall   75, 6, [socketNum], [dhcpMsg], [dhcpMsgLen]             ; write to socket (send broadcast request)
+; Wait for data
         mcall   26, 9
         add     eax, TIMEOUT*100
         mov     [timeout], eax
   .wait:
-        mcall   23, TIMEOUT                                             ; wait for data (with timeout)
+        mcall   23, TIMEOUT
 read_data:                                                              ; we have data - this will be the response
         mcall   75, 7, [socketNum], [dhcpMsg], BUFFER, MSG_DONTWAIT     ; read data from socket
         cmp     eax, -1
-        jne     @f
+        jne     .got_data
         mcall   26, 9
         cmp     eax, [timeout]
         jb      send_dhcpmsg.wait
         DEBUGF  2,"No answer from DHCP server\n"
-        DEBUGF  2,"No answer from DHCP server\n"
+        dec     [tries]
-        dec     [tries]
+        jnz     send_dhcpmsg                    ; try again
-        jnz     send_dhcpmsg                    ; try again
+        stdcall mem.Free, [dhcpMsg]
         jmp     dhcp_fail
 ;  1.2) send a request packet
 ; If the response is to a dhcp request, then:
 ;  1) If the response is DHCP ACK then
 ;  1.1) extract the DNS & subnet fields. Set them in the stack
-        cmp     [dhcpMsgType], 0x01             ; did we send a discover?
+        cmp     [dhcpMsgType_tx], 0x01          ; did we send a discover?
-        je      discover
+        je      discover_sent
-        cmp     [dhcpMsgType], 0x03             ; did we send a request?
+        cmp     [dhcpMsgType_tx], 0x03          ; did we send a request?
+        je      request_sent
         je      request
+        ; we should never reach here ;)
-        ; we should never reach here ;)
+        stdcall mem.Free, [dhcpMsg]
-        jmp     fail
+        jmp     fail
-discover:
-        call    parse_response
+discover_sent:
+        call    parse_response
-        cmp     [dhcpMsgType2], 0x02            ; Was the response an offer?
+        cmp     [dhcpMsgType_rx], 0x02          ; Was the response an offer?
-        jne     dhcp_fail
+        jne     read_data
-        DEBUGF  1, "Got offer, making request\n"
-        mov     [dhcpMsgType], 0x03             ; make it a request
+        DEBUGF  1, "Got offer, making request\n"
-        jmp     build_request
+        mov     [dhcpMsgType_tx], 0x03          ; make it a request
         jmp     build_request
 request:
-        call    parse_response
+request_sent:
+        call    parse_response
+        cmp     [dhcpMsgType_rx], 0x05          ; Was the response an ACK? It should be
-        cmp     [dhcpMsgType2], 0x05            ; Was the response an ACK? It should be
+        jne     read_data                       ; NO - read next packets
         jne     read_data                       ; NO - read next packets
         DEBUGF  2, "IP assigned by DHCP server successfully\n"
         DEBUGF  2, "IP assigned by DHCP server successfully\n"
 ;      The message is stored in dhcpMsg
+;
 ;***************************************************************************
 parse_response:
-        DEBUGF  1,"Data received, parsing response\n"
+        DEBUGF  1,"Parsing response\n"
         mov     edx, [dhcpMsg]
+        mov     [dhcpMsgType_rx], 0
+; Verify if session ID matches
+        mov     eax, [dhcpXID]
+        cmp     dword[edx+4], eax
-        mov     [dhcpMsgType2], 0
+        jne     .done
         push    dword [edx+16]
         inc     ecx
         jmp     .next_option
   .msgtype:
         mov     al, [edx]
-        mov     [dhcpMsgType2], al
+        mov     [dhcpMsgType_rx], al
         DEBUGF  1,"DHCP Msg type: %u\n", al
         pop     [dhcp.dns]
         DEBUGF  1,"DNS: %u.%u.%u.%u\n",[edx]:1,[edx+1]:1,[edx+2]:1,[edx+3]:1
         jmp     .next_option
+  .done:
-  .done:
+        stdcall mem.Free, [dhcpMsg]
+        ret
         ret
-dhcp_fail:
 dhcp_fail:
         mcall   close, [socketNum]
+        mcall   close, [socketNum]
         stdcall mem.Free, [dhcpMsg]
 dhcp_fail2:
-dhcp_fail2:
+        DEBUGF  1,"DHCP failed\n"
         DEBUGF  1,"DHCP failed\n"
         dd 0
         dd 0
         db '/sys/@notify', 0
+str_connected   db '"You are now connected to the network." -N', 0
 str_connected   db '"You are now connected to the network." -N', 0
 path            db '/sys/settings/network.ini',0
 IM_END:
 device          db 1
 inibuf          rb 16
+tries           db ?
 tries           db ?
 dhcpMsgType_tx  db ?    ; sent
-dhcpMsgType     db ?    ; sent
+dhcpMsgType_rx  db ?    ; received
-dhcpMsgType2    db ?    ; received
+dhcpXID         dd ?

Subversion Repositories Kolibri OS

(root)/programs/network/zeroconf/zeroconf.asm – Rev 5391 → 5419