Subversion Repositories Kolibri OS

Rev

Rev 5587 | Rev 5842 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5587 Rev 5610
Line 84... Line 84...
84 
ends
 84 
ends
Line 85... Line 85...
85 
 
 85 
 
86 
struct  interface
 86 
struct  interface
87 
        number          dd ?
 87 
        number          dd ?
88 
        state           dd ?    ; 0 - disconnected, 1 - connected
 88 
        state           dd ?    ; 0 - disconnected, 1 - connected
89 
        mode            dd ?    ; 0 - static, 1 - dhcp, 2 - auto (zero config)
 89 
        mode            dd ?    ; 0 - disabled, 1 - static, 2 - dhcp, 3 - auto (zero config)
90 
        tries           dd ?
 90 
        tries           dd ?
91 
        lease           dd ?
 91 
        lease           dd ?
92 
        ServerIP        dd ?
 92 
        ServerIP        dd ?
93 
        ip              dd ?
 93 
        ip              dd ?
Line 173... Line 173...
173 
        [tx_msg.chaddr+0]:2, [tx_msg.chaddr+1]:2, [tx_msg.chaddr+2]:2, \
 173 
        [tx_msg.chaddr+0]:2, [tx_msg.chaddr+1]:2, [tx_msg.chaddr+2]:2, \
174 
        [tx_msg.chaddr+3]:2, [tx_msg.chaddr+4]:2, [tx_msg.chaddr+5]:2
 174 
        [tx_msg.chaddr+3]:2, [tx_msg.chaddr+4]:2, [tx_msg.chaddr+5]:2
Line 175... Line 175...
175 
 
 175 
 
176 
        invoke  ini.get_str, ini_path, str_ini_int, str_ip_type, inibuf, 16, str_null
 176 
        invoke  ini.get_str, ini_path, str_ini_int, str_ip_type, inibuf, 16, str_null
177 
        test    eax, eax
 177 
        test    eax, eax
178 
        jnz     .fail
 178 
        jnz     .invalid
179 
        mov     eax, dword[inibuf]
 179 
        mov     eax, dword[inibuf]
180 
        or      eax, 0x20202020
 180 
        or      eax, 0x20202020
- 
 
 181 
        mov     [ebp + interface.mode], 0
- 
 
 182 
        cmp     eax, 'disa'
- 
 
 183 
        je      .next
181 
        mov     [ebp + interface.mode], 0
 184 
        mov     [ebp + interface.mode], 1
182 
        cmp     eax, 'stat'
 185 
        cmp     eax, 'stat'
183 
        je      static
 186 
        je      static
184 
        mov     [ebp + interface.mode], 1
 187 
        mov     [ebp + interface.mode], 2
185 
        cmp     eax, 'dhcp'
 188 
        cmp     eax, 'dhcp'
186 
        je      dhcp
 189 
        je      dhcp
187 
        mov     [ebp + interface.mode], 2
 190 
        mov     [ebp + interface.mode], 3
188 
        cmp     eax, 'auto'
 191 
        cmp     eax, 'auto'
Line 189... Line 192...
189 
        je      dhcp
 192 
        je      dhcp
190 
 
 193 
 
191 
  .fail:
 194 
  .invalid:
Line 192... Line 195...
192 
        DEBUGF  2, "Invalid network.ini settings\n"
 195 
        DEBUGF  2, "Invalid settings for interface: %s.\n", str_ini_int
Line 193... Line 196...
193 
        mcall   -1                      ; Give up
 196 
        jmp     .next
194 
 
 197 
 
Line 591... Line 594...
591 
dhcp_fail:
 594 
dhcp_fail:
592 
        mcall   close, [ebp + interface.socketNum]
 595 
        mcall   close, [ebp + interface.socketNum]
Line 593... Line 596...
593 
 
 596 
 
594 
dhcp_error:
 597 
dhcp_error:
595 
        DEBUGF  1, "DHCP failed\n"
 598 
        DEBUGF  1, "DHCP failed\n"
596 
        cmp     [ebp + interface.mode], 2               ; zero config mode?
 599 
        cmp     [ebp + interface.mode], 3               ; zero config mode?
Line 597... Line 600...
597 
        jne     link_up
 600 
        jne     link_up
Line 598... Line 601...
598 
 
 601