WebSVN – Kolibri OS – Diff – /programs/network/netstat/ipcfg.inc

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-enum_callback:
 ipcfg:
 ; If settings not found, use default settings from 'ip?' section
         mov     dword[str_ini_int], 'ip?'
   @@:
 ; Read ip/subnet/gateway type
-        mov     [option_ip], op_ip_static
+        mov     [option_ip], op_ip_disabled
         invoke  ini.get_str, net_ini, str_ini_int, str_ini_ip_type, ini_buf, 16, sz_0
-;        test    eax, eax
+        test    eax, eax
-;        jz      .disabled
+        jnz     .ip_type_loaded
         mov     eax, dword[ini_buf]
         or      eax, 0x20202020
-        cmp     eax, 'stat'
+        cmp     eax, 'auto'
+        jne     @f
+;        cmp     byte[ini_buf+4], 0
-        je      @f
+;        jne     @f
+        mov     [option_ip], op_ip_auto
-        mov     [option_ip], op_ip_auto
+        jmp     .ip_type_loaded
+  @@:
+        cmp     eax, 'dhcp'
+        jne     @f
+;        cmp     byte[ini_buf+4], 0
+;        jne     @f
+        mov     [option_ip], op_ip_auto
+        jmp     .ip_type_loaded
+  @@:
+        cmp     eax, 'stat'
+        jne     @f
+;        mov     eax, dword[ini_buf+3]
+;        or      eax, 0x202020
+;        cmp     eax, 'tic'
+;        jne     @f
+        mov     [option_ip], op_ip_static
+;        jmp     .ip_type_loaded
+  @@:
-  @@:
+  .ip_type_loaded:
 ; Read DNS type
+        mov     [option_dns], op_dns_auto
+        invoke  ini.get_str, net_ini, str_ini_int, str_ini_dns_type, ini_buf, 16, sz_0
-        mov     [option_dns], op_dns_static
+        test    eax, eax
-        invoke  ini.get_str, net_ini, str_ini_int, str_ini_dns_type, ini_buf, 16, sz_0
+        jnz     @f
         mov     eax, dword[ini_buf]
         or      eax, 0x20202020
+        cmp     eax, 'stat'
+        jne     @f
+;        mov     eax, dword[ini_buf+3]
+;        or      eax, 0x202020
-        cmp     eax, 'stat'
+;        cmp     eax, 'tic'
-        je      @f
+;        jne     @f
-        mov     [option_dns], op_dns_auto
+        mov     [option_dns], op_dns_static
   @@:
         mov     edi, str_title
         mcall   0, 50 shl 16 + 200, 30 shl 16 + 200
         mov     ecx, 0x80000000
         or      ecx, [sc.work_text]
-;        mov     ebx, 47 shl 16 + 10
+;        mov     ebx, 47 shl 16 + 25
 ;        mov     edx, str_mode
 ;        mcall
-        mov     ebx, 59 shl 16 + 35
+        mov     ebx, 59 shl 16 + 50
         mov     edx, sz_ip
         mcall   4
-        mov     ebx, 5 shl 16 + 55
+        mov     ebx, 5 shl 16 + 70
         mov     edx, sz_subnet
         mcall
-        mov     ebx, 29 shl 16 + 75
+        mov     ebx, 29 shl 16 + 90
         mov     edx, sz_gateway
         mcall
-;        mov     ebx, 47 shl 16 + 80
+;        mov     ebx, 47 shl 16 + 95
 ;        mov     edx, str_mode
 ;        mcall
-        mov     ebx, 53 shl 16 + 120
+        mov     ebx, 53 shl 16 + 135
         mov     edx, sz_dns
         mcall
         invoke  edit_box_draw, edit_dns
         invoke  option_box_draw, Option_boxs1
         invoke  option_box_draw, Option_boxs2
-        mcall   8, 80 shl 16 + 100, 150 shl 16 + 16, 2, [sc.work_button]
+        mcall   8, 80 shl 16 + 100, 155 shl 16 + 16, 2, [sc.work_button]
         mov     ecx, 0x80000000
         or      ecx, [sc.work_button_text]
-        mov     ebx, 112 shl 16 + 155
+        mov     ebx, 112 shl 16 + 160
 ; Settings look valid, save them to the ini file
 ; Re-create 'ip..' string, we dont want to save to 'ip?' section.
         call    create_str_ini_int
         cmp     [option_ip], op_ip_auto
-        jne     .ip_static
+        jne     @f
-        invoke  ini.set_str, net_ini, str_ini_int, str_ini_ip_type, sz_dhcp, 4
+        invoke  ini.set_str, net_ini, str_ini_int, str_ini_ip_type, sz_auto, 4
-        jmp     @f
-  .ip_static:
-        invoke  ini.set_str, net_ini, str_ini_int, str_ini_ip_type, sz_static2, 6
+        jmp     .ip_type_ok
+  @@:
+        cmp     [option_ip], op_ip_static
+        jne     @f
+        invoke  ini.set_str, net_ini, str_ini_int, str_ini_ip_type, sz_static, 6
+        jmp     .ip_type_ok
+  @@:
+;        cmp     [option_ip], op_ip_disabled
+;        jne     @f
+        invoke  ini.set_str, net_ini, str_ini_int, str_ini_ip_type, sz_disabled, 8
+;  @@:
-  @@:
+  .ip_type_ok:
         cmp     [option_dns], op_dns_auto
-        invoke  ini.set_str, net_ini, str_ini_int, str_ini_dns_type, sz_dhcp, 4
+        invoke  ini.set_str, net_ini, str_ini_int, str_ini_dns_type, sz_auto, 4
         jmp     @f
   .dns_static:
-        invoke  ini.set_str, net_ini, str_ini_int, str_ini_dns_type, sz_static2, 6
+        invoke  ini.set_str, net_ini, str_ini_int, str_ini_dns_type, sz_static, 6
   @@:
         mov     [edit_ip.color], 0xcacaca
         mov     [edit_subnet.color], 0xcacaca
         mov     [edit_gateway.color], 0xcacaca
   @@:
-        mov     [edit_dns.color], 0xffffff
-        cmp     [option_dns], op_dns_static
         je      @f
+        mov     [edit_dns.color], 0xcacaca
+        cmp     [option_ip], op_ip_disabled
+        je      @f
+        cmp     [option_dns], op_dns_static
+        jne     @f
-        mov     [edit_dns.color], 0xcacaca
+        mov     [edit_dns.color], 0xffffff
   @@:
 ;-------------------------
 ; DATA
-edit_ip         edit_box 100, 80, 30, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_ip, mouse_dd, 0, 0, 1
+edit_ip         edit_box 100, 80, 45, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_ip, mouse_dd, 0, 0, 1
-edit_subnet     edit_box 100, 80, 50, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_subnet, mouse_dd, 0, 0, 1
+edit_subnet     edit_box 100, 80, 65, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_subnet, mouse_dd, 0, 0, 1
+edit_gateway    edit_box 100, 80, 85, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_gateway, mouse_dd, 0, 0, 1
+edit_dns        edit_box 100, 80, 130, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_dns, mouse_dd, 0, 0, 1
-edit_gateway    edit_box 100, 80, 70, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_gateway, mouse_dd, 0, 0, 1
-edit_dns        edit_box 100, 80, 115, 0xffffff, 0x6f9480, 0, 0, 0, 15, str_edit_dns, mouse_dd, 0, 0, 1
+op_ip_disabled  option_box option_ip, 15, 5, 6, 12, 0xffffff, 0, 0, sz_disabled, 9
-op_ip_auto      option_box option_ip, 15, 10, 6, 12, 0xffffff, 0, 0, sz_auto, 5
+op_ip_auto      option_box option_ip, 15, 25, 6, 12, 0xffffff, 0, 0, sz_auto, 5
-op_ip_static    option_box option_ip, 80, 10, 6, 12, 0xffffff, 0, 0, sz_static, 7
+op_ip_static    option_box option_ip, 80, 25, 6, 12, 0xffffff, 0, 0, sz_static, 7
-op_dns_auto     option_box option_dns, 15, 95, 6, 12, 0xffffff, 0, 0, sz_auto, 5
+op_dns_auto     option_box option_dns, 15, 110, 6, 12, 0xffffff, 0, 0, sz_auto, 5
-op_dns_static   option_box option_dns, 80, 95, 6, 12, 0xffffff, 0, 0, sz_static, 7
+op_dns_static   option_box option_dns, 80, 110, 6, 12, 0xffffff, 0, 0, sz_static, 7
 option_ip       dd op_ip_auto
 option_dns      dd op_dns_auto
-Option_boxs1    dd op_ip_auto, op_ip_static, 0
+Option_boxs1    dd op_ip_disabled, op_ip_auto, op_ip_static, 0
 Option_boxs2    dd op_dns_auto, op_dns_static, 0
 net_ini         db '/sys/settings/network.ini', 0
 str_ini_int     db 'ip1', 0
-                rb 10
-str_ini_ip      db 'ip', 0
-str_ini_subnet  db 'subnet', 0
-str_ini_gateway db 'gateway', 0
-str_ini_dns     db 'dns1', 0
+                rb 10
+str_ini_ip      db 'ip', 0
-str_ini_ip_type db 'ip_type', 0
+str_ini_subnet  db 'subnet', 0
-str_ini_dns_type db 'dns_type', 0
+str_ini_gateway db 'gateway', 0
 str_ini_dns     db 'dns', 0
-sz_0            db 0
+str_ini_ip_type db 'ip_type', 0
-sz_dhcp         db 'dhcp', 0
+str_ini_dns_type db 'dns_type', 0
 sz_static2      db 'static', 0
+str_title       db 'IP settings', 0
 sz_0            db 0
-str_title       db 'IP settings', 0
+sz_ip           db 'IP:', 0
-sz_ip           db 'IP:', 0
+sz_subnet       db 'Subnet mask:', 0
-sz_subnet       db 'Subnet mask:', 0
+sz_gateway      db 'Gateway:', 0

Subversion Repositories Kolibri OS

(root)/programs/network/netstat/ipcfg.inc – Rev 5589 → 5610