From db3d073d65e0c5c52a5e72b67dabe10a7d6ac8a5 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Mon, 28 Dec 2009 21:02:54 +0000 Subject: [PATCH] Changes in net branch: More fixes in UDP added TFTP client git-svn-id: svn://kolibrios.org@1337 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/net/applications/dll.inc | 157 +++++ kernel/branches/net/applications/libio.inc | 112 +++ .../branches/net/applications/tftpc/TFTP.asm | 636 ++++++++++++++++++ .../net/applications/tftpc/editbox_ex.mac | 77 +++ kernel/branches/net/network/udp.inc | 9 +- 5 files changed, 988 insertions(+), 3 deletions(-) create mode 100644 kernel/branches/net/applications/dll.inc create mode 100644 kernel/branches/net/applications/libio.inc create mode 100644 kernel/branches/net/applications/tftpc/TFTP.asm create mode 100644 kernel/branches/net/applications/tftpc/editbox_ex.mac diff --git a/kernel/branches/net/applications/dll.inc b/kernel/branches/net/applications/dll.inc new file mode 100644 index 0000000000..6ceb2d514d --- /dev/null +++ b/kernel/branches/net/applications/dll.inc @@ -0,0 +1,157 @@ +;----------------------------------------------------------------------------- +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 diff --git a/kernel/branches/net/applications/libio.inc b/kernel/branches/net/applications/libio.inc new file mode 100644 index 0000000000..8c78927ced --- /dev/null +++ b/kernel/branches/net/applications/libio.inc @@ -0,0 +1,112 @@ +;;================================================================================================;; +;;//// libio.inc //// (c) mike.dld, 2007-2008 ////////////////////////////////////////////////////;; +;;================================================================================================;; +;; ;; +;; This file is part of Common development libraries (Libs-Dev). ;; +;; ;; +;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;; +;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;; +;; of the License, or (at your option) any later version. ;; +;; ;; +;; Libs-Dev is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ;; +;; even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; +;; Lesser General Public License for more details. ;; +;; ;; +;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev. ;; +;; If not, see . ;; +;; ;; +;;================================================================================================;; + + +O_BINARY = 00000000b +O_READ = 00000001b +O_WRITE = 00000010b +O_CREATE = 00000100b +O_SHARE = 00001000b +O_TEXT = 00010000b + +SEEK_SET = 0 +SEEK_CUR = 1 +SEEK_END = 2 + +struct FileDateTime + union + time dd ? + struct + sec db ? + min db ? + hour db ? + ends + ends + union + date dd ? + struct + day db ? + month db ? + year dw ? + ends + ends +ends + +struct FileInfoBlock + Function dd ? + Position dd ? + Flags dd ? + Count dd ? + Buffer dd ? + db ? + FileName dd ? +ends + +struct FileInfoHeader + Version dd ? + FilesRead dd ? + FilesCount dd ? + rd 5 +ends + +struct FileInfoA + Attributes dd ? + Flags dd ? + DateCreate FileDateTime + DateAccess FileDateTime + DateModify FileDateTime + union + FileSize dq ? + struct + FileSizeLow dd ? + FileSizeHigh dd ? + ends + ends + FileName rb 252 +ends + +struct FileInfoW + Attributes dd ? + Flags dd ? + DateCreate FileDateTime + DateAccess FileDateTime + DateModify FileDateTime + union + FileSize dq ? + struct + FileSizeLow dd ? + FileSizeHigh dd ? + ends + ends + FileName rw 260 +ends + +virtual at 0 + FileInfo FileInfoA + FileInfo fix FileInfoA + sizeof.FileInfo fix sizeof.FileInfoA +end virtual + +FA_READONLY = 00000001b +FA_HIDDEN = 00000010b +FA_SYSTEM = 00000100b +FA_LABEL = 00001000b +FA_FOLDER = 00010000b +FA_ARCHIVED = 00100000b +FA_ANY = 00111111b diff --git a/kernel/branches/net/applications/tftpc/TFTP.asm b/kernel/branches/net/applications/tftpc/TFTP.asm new file mode 100644 index 0000000000..924ab0b7d8 --- /dev/null +++ b/kernel/branches/net/applications/tftpc/TFTP.asm @@ -0,0 +1,636 @@ +use32 + + org 0x0 + + db 'MENUET01' + dd 1, START, I_END, IM_END+0x1000, IM_END+0x1000, 0, 0 + +include '../proc32.inc' +include '../macros.inc' +include '../dll.inc' +include '../libio.inc' +include 'editbox_ex.mac' + +include '../network.inc' + + +filebuffer_size equ 4*4096 ; 16kb (dont try to change it yet..) +TIMEOUT equ 500 +buffer_len equ 1500 + +AF_INET4 equ 2 +IP_PROTO_UDP equ 17 + +opcode_rrq equ 1 shl 8 +opcode_wrq equ 2 shl 8 +opcode_data equ 3 shl 8 +opcode_ack equ 4 shl 8 +opcode_error equ 5 shl 8 + +; read/write request packet +; +; 2 bytes string 1 byte string 1 byte +; ------------------------------------------------ +; | Opcode | Filename | 0 | Mode | 0 | +; ------------------------------------------------ + +; data packet +; +; 2 bytes 2 bytes n bytes +; ---------------------------------- +; | Opcode | Block # | Data | +; ---------------------------------- + +; acknowledgement packet +; +; 2 bytes 2 bytes +; --------------------- +; | Opcode | Block # | +; --------------------- + +; error packet +; +; 2 bytes 2 bytes string 1 byte +; ----------------------------------------- +; | Opcode | ErrorCode | ErrMsg | 0 | +; ----------------------------------------- + + +START: + +;; mcall 68, 11 + + stdcall dll.Load, @IMPORT + or eax, eax + jnz exit + +stop_transfer: + mcall 40, 00100111b + +red_win: + call draw_window + +align 4 +still: + mcall 10 + + dec eax + jz red_win + + dec eax + jz key + + dec eax + jz button + + push dword edit1 + call [edit_box_mouse] + + push dword edit2 + call [edit_box_mouse] + + push dword edit3 + call [edit_box_mouse] + + push dword edit4 + call [edit_box_mouse] + + push dword Option_boxs1 + call [option_box_mouse] + + push dword Option_boxs2 + call [option_box_mouse] + + jmp still + +button: + mcall 17 + + cmp ah,0x10 + je start_transfer + + + test ah , ah + jz still + +exit: mcall -1 +key: + mcall 2 + + push dword edit1 + call [edit_box_key] + + push dword edit2 + call [edit_box_key] + + push dword edit3 + call [edit_box_key] + + push dword edit4 + call [edit_box_key] + + jmp still + + +align 4 +draw_window: + mcall 12,1 + mcall 0,(50*65536+400),(30*65536+180),0x34AABBCC,0x085080DD,str_title + + mcall 4,35*65536+10,0x80000000, str_server + + mov ebx,5*65536+ 30 + mov edx, str_source + mcall + + mov ebx,11*65536+ 50 + mov edx, str_destination + mcall + + mov ebx,47*65536+72 + mov edx, str_mode + mcall + + mov ebx,160*65536+72 + mov edx, str_method + mcall + + mov ebx,270*65536+72 + mov edx, str_blocksize + mcall + + push dword edit1 + call [edit_box_draw] + + push dword edit2 + call [edit_box_draw] + + push dword edit3 + call [edit_box_draw] + + push dword edit4 + call [edit_box_draw] + + push dword Option_boxs1 + call [option_box_draw] + + push dword Option_boxs2 + call [option_box_draw] + + mcall 8,210*65536+170, 105*65536+16,0x00000010,0x085080DD + + mcall 4,260*65536+110, 0x80000000, str_transfer + + mcall 38,10*65536+380, 130*65536+130,0x00000000 + + mcall 4,350*65536+137, 0x80000000, str_kb_s + +; mcall 47,1 shl 31 + 7 shl 16 + 1,kbps,305*65536+137,0x00000000 + + mcall 4,20*65536+137, 0x80000000, [status] + +; mcall 47,1 shl 31 + 3 shl 16 + 1,done,25*65536+137,0x00000000 + + mcall 12,2 + + ret + + + + + + +start_transfer: + + ; first, resolve the hostname + + push esp ; reserve stack place + + push esp ; fourth parameter + push 0 ; third parameter + push 0 ; second parameter + push SRV ; first parameter + call [getaddrinfo] + + pop esi ; now we will have pointer to result in esi + +; test for error + test eax, eax + jnz still + + mov esi, [esi + addrinfo.ai_addr] + mov esi, [esi + sockaddr_in.sin_addr] + mov dword [IP], esi + + stdcall mem.Alloc, buffer_len + test eax, eax + jz stop_transfer + mov [packetbuff], eax + + invoke file_open, local_addr, O_READ + O_WRITE + O_CREATE + cmp eax, 32 + jb stop_transfer + + mov [fh], eax + + mcall socket, AF_INET4, IP_PROTO_UDP, 0 ; socket_open + cmp eax, -1 + je still + + mov [socketnum], eax + + mcall connect, [socketnum], sockaddr, sockaddr_len ; socket_connect + cmp eax, -1 + je still + + mov word [I_END], opcode_rrq + cmp [option_group2],op3 ; method = get? + jz @f + mov word [I_END], opcode_wrq + @@: + + xor al , al + mov edi, remote_addr + mov ecx, 250 + repnz scasb + sub edi, remote_addr + mov ecx, edi + mov edi, I_END+2 + mov esi, remote_addr + rep movsb + + cmp [option_group1], op1 + je .ascii + + mov esi, octet + movsd + movsb + + jmp .send_request + + .ascii: + + mov esi, netascii + movsd + movsd + + .send_request: + + xor al, al + stosb + + sub edi, I_END + mov esi, edi + mcall send, [socketnum], I_END + + mov [last_ack], 0 + +; mcall 26, 9 +; mov [last_time], eax + + mov [status], str_transfering + call draw_window + + mcall 40, 10000101b + + cmp [option_group2],op3 ; method = get? + jnz send_data_loop + + invoke file_truncate, [fh] + +receive_data_loop: + + mcall 23, TIMEOUT + + dec eax + jz .redraw + + dec eax + dec eax + jz .btn + + mcall recv, [socketnum], [packetbuff], buffer_len ; receive data + + mov esi, [packetbuff] + cmp word[esi], opcode_data + jne .error + + mov bx, [last_ack] + inc bx + rol bx, 8 + + cmp word [esi + 2], bx + jne .packet_got_lost + + inc [last_ack] + + + ; now, we need to store the data + + add esi, 4 + sub eax, 4 + mov ecx, eax + invoke file_write, [fh], esi ,ecx + + cmp ecx, 512 ; full data packet? + jge .continue + + ; last packet, or something else + + mov [status], str_success + +.kill_xfer: + + invoke file_close, [fh] + mcall close, [socketnum] + jmp stop_transfer + +.error: + + cmp word[esi], opcode_error + je .decode_error + + jmp .continue + +.packet_got_lost: + + +.continue: + +; mcall 26, 9 +; mov ebx, [last_time] +; mov [last_time], eax +; xor edx, edx +; sub eax, ebx +; xchg eax, ecx +; div ecx +; mov [kbps], eax +; mcall 47,1 shl 31 + 7 shl 16 + 1,kbps,305*65536+137,0x40000000, 0x00ffffff + + mov word [buffer], opcode_ack ; send ack + mov ax, [last_ack] + rol ax, 8 + mov word [buffer+2], ax + mcall send, [socketnum], buffer, 4, 0 + + jmp receive_data_loop + + +.btn: + mcall 17 + + jmp .kill_xfer + +.redraw: + call draw_window + jmp receive_data_loop + + +.decode_error: + movzx esi, word[esi + 2] + cmp esi, 7 + cmovg esi, [zero] + + mov esi, dword [4*esi + error_crosslist] + mov [status], esi + + jmp .kill_xfer + + + +;-------------------------------- + + +send_data_loop: + + mov word[buffer], opcode_data + +.read_chunk: + + inc [last_ack] + + mov ax, [last_ack] + xchg al, ah + mov word[buffer+2], ax + + invoke file_read, [fh], buffer + 4, 512 + cmp eax, -1 + je .kill_xfer + + add eax, 4 + mov [packetsize], eax + +.send_packet: + mcall send, [socketnum], buffer, [packetsize], 0 ; send data + +.loop: + mcall 23, TIMEOUT + + dec eax + jz .red + + dec eax + dec eax + jz .btn + + mcall recv, [socketnum], [packetbuff], buffer_len ; receive ack + cmp eax, -1 + je .kill_xfer + + mov esi, [packetbuff] + + cmp word[esi], opcode_error + je .decode_error + + cmp word[esi], opcode_ack + jne .send_packet + + mov ax, [last_ack] + xchg al, ah + cmp word[esi+2], ax + jne .send_packet + + cmp [packetsize], 512+4 + jne .xfer_ok ; transfer is done + + + + jmp .read_chunk + +.red: + call draw_window + jmp .loop + +.btn: + mcall 17 + + +.kill_xfer: + mov [status], str_fail + +.xfer_done: + invoke file_close, [fh] + mcall close, [socketnum] + jmp stop_transfer + + +.xfer_ok: + mov [status], str_success + jmp .xfer_done + + +.decode_error: + movzx esi, word[esi + 2] + cmp esi, 7 + cmovg esi, [zero] + + mov esi, dword [4*esi + error_crosslist] + mov [status], esi + + jmp .send_packet + + + +;------------------------- +; DATA + +socketnum dd 0 +kbps dd 0 +done dd 0 + +sockaddr: + dw AF_INET4 + dw 69 shl 8 +IP db 192,168,1,115 +sockaddr_len = $ - sockaddr + +align 16 +@IMPORT: + +library box_lib , 'box_lib.obj',\ + io_lib , 'libio.obj',\ + network , 'network.obj' + +import box_lib ,\ + edit_box_draw ,'edit_box' ,\ + edit_box_key ,'edit_box_key' ,\ + edit_box_mouse ,'edit_box_mouse' ,\ + version_ed ,'version_ed' ,\ + check_box_draw ,'check_box_draw' ,\ + check_box_mouse ,'check_box_mouse' ,\ + version_ch ,'version_ch' ,\ + option_box_draw ,'option_box_draw' ,\ + option_box_mouse ,'option_box_mouse' ,\ + version_op ,'version_op' + +import io_lib ,\ + file_find_first , 'file_find_first' ,\ + file_find_next , 'file_find_next' ,\ + file_find_close , 'file_find_close' ,\ + file_size , 'file_size' ,\ + file_open , 'file_open' ,\ + file_read , 'file_read' ,\ + file_write , 'file_write' ,\ + file_seek , 'file_seek' ,\ + file_tell , 'file_tell' ,\ + file_eof? , 'file_iseof' ,\ + file_seteof , 'file_seteof' ,\ + file_truncate , 'file_truncate' ,\ + file_close , 'file_close' + +import network ,\ + inet_ntoa , 'inet_ntoa' ,\ + getaddrinfo , 'getaddrinfo' ,\ + freeaddrinfo , 'freeaddrinfo' + + + +edit1 edit_box 300,80,5 ,0xffffff,0x6f9480,0,0,0,99 ,SRV,ed_focus, 13,13 +edit2 edit_box 300,80,25,0xffffff,0x6a9480,0,0,0,99 ,remote_addr,ed_figure_only, 5,5 +edit3 edit_box 300,80,45,0xffffff,0x6a9480,0,0,0,99 ,local_addr,ed_figure_only, 13,13 +edit4 edit_box 40,340,68,0xffffff,0x6a9480,0,0,0,5 ,BLK,ed_figure_only, 3, 3 + +op1 option_box option_group1,80,68,6,12,0xffffff,0,0,netascii,octet-netascii +op2 option_box option_group1,80,85,6,12,0xFFFFFF,0,0,octet,get-octet + +op3 option_box option_group2,210,68,6,12,0xffffff,0,0,get,put-get +op4 option_box option_group2,210,85,6,12,0xFFFFFF,0,0,put,BLK-put + +option_group1 dd op1 +option_group2 dd op3 + +Option_boxs1 dd op1,op2,0 +Option_boxs2 dd op3,op4,0 + +str_title db 'TFTP client for KolibriOS',0 +str_server db 'Server:',0 +str_source db 'Remote file:',0 +str_destination db 'Local file:',0 +str_mode db 'Mode:',0 +str_method db 'Method:',0 +str_blocksize db 'Blocksize:',0 +str_kb_s db 'kb/s',0 +str_complete db '% complete',0 +str_transfer db 'Transfer',0 +str_waiting db 'Welcome!',0 +str_transfering db 'Transfering...',0 + +str_success db 'Tranfser completed sucessfully',0 +str_fail db 'Transfer failed!',0 + +str_error: +._0 db 'Not defined, see error message (if any).',0 +._1 db 'File not found.',0 +._2 db 'Access violation.',0 +._3 db 'Disk full or allocation exceeded.',0 +._4 db 'Illegal TFTP operation.',0 +._5 db 'Unknown transfer ID.',0 +._6 db 'File already exists.',0 +._7 db 'No such user.',0 + + +error_crosslist: +dd str_error._0 +dd str_error._1 +dd str_error._2 +dd str_error._3 +dd str_error._4 +dd str_error._5 +dd str_error._6 +dd str_error._7 + + + +netascii db 'NetASCII' +octet db 'Octet' +get db 'GET' +put db 'PUT' + +BLK db "512",0,0,0 + +last_ack dw ? + +fh dd ? ; file handle + +last_time dd ? + +packetbuff dd ? +packetsize dd ? +status dd str_waiting +zero dd 0 + +SRV db "192.168.1.115",0 +times (SRV + 256 - $) db 0 + +remote_addr db "3.png",0 +times (remote_addr + 256 - $) db 0 + +local_addr db "/sys/test.png",0 +times (local_addr + 256 - $) db 0 + +I_END: + +buffer: +rb buffer_len + +IM_END: \ No newline at end of file diff --git a/kernel/branches/net/applications/tftpc/editbox_ex.mac b/kernel/branches/net/applications/tftpc/editbox_ex.mac new file mode 100644 index 0000000000..e9200b74bc --- /dev/null +++ b/kernel/branches/net/applications/tftpc/editbox_ex.mac @@ -0,0 +1,77 @@ +ed_struc_size=72 +struc edit_box width,left,top,color,shift_color,focus_border_color,\ + blur_border_color,text_color,max,text,flags,size,pos +{ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;Bit mask from editbox +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +ed_figure_only= 1000000000000000b ;одни символы +ed_always_focus= 100000000000000b +ed_focus= 10b ;фокус приложения +ed_shift_on= 1000b ;если не установлен -значит впервые нажат shift,если был установлен, значит мы уже что - то делали удерживая shift +ed_shift_on_off=1111111111110111b +ed_shift= 100b ;включается при нажатии на shift т.е. если нажимаю +ed_shift_off= 1111111111111011b +ed_shift_bac= 10000b ;бит для очистки выделеного shift т.е. при установке говорит что есть выделение +ed_shift_bac_cl=1111111111101111b ;очистка при удалении выделения +ed_shift_cl= 1111111111100011b +ed_shift_mcl= 1111111111111011b +ed_left_fl= 100000b +ed_right_fl= 1111111111011111b +ed_offset_fl= 1000000b +ed_offset_cl= 1111111110111111b +ed_insert= 10000000b +ed_insert_cl= 1111111101111111b +ed_mouse_on = 100000000b +ed_mous_adn_b= 100011000b +ed_mouse_on_off=1111111011111111b +ed_height=14 ; высота + +.width dd width +.left dd left +.top dd top +.color dd color +.shift_color dd shift_color +.focus_border_color dd focus_border_color +.blur_border_color dd blur_border_color +.text_color dd text_color +.max dd max +.text dd text +.flags dd flags+0 +.size dd size+0 +.pos dd pos+0 +.offset dd 0 +.cl_curs_x dd 0 +.cl_curs_y dd 0 +.shift dd 0 +.shift_old dd 0 +} +struc check_box left,top,ch_text_margin,ch_size,color,border_color,text_color,text,ch_text_length,flags +{ ;структура параметров для чек бокса +ch_flag_en=10b +.left: dw left ;+0 ;положение по х +.top: dw top ;положение по у +.ch_text_margin: dd ch_text_margin ;расстояние от прямоугольника чек бокса до надписи +.ch_size: dd ch_size ;размер квадрата чек бокса, для примера 12 +.color: dd color ;цвет внутри чекбокса +.border_color: dd border_color ;цвет рамки +.text_color: dd text_color ;цвет надписи +.text: dd text ;адрес в коде программы где расположен текст +.ch_text_length: dd ch_text_length ;длинна строки с символами +.flags: dd flags+0 ; флаги +} +struc option_box point_gr,left,top,op_text_margin,op_size,color,border_color,text_color,text,op_text_length,flags +{ ;структура параметров для чек бокса +op_flag_en=10b +.option_group: dd point_gr +.left: dw left ;+0 ;положение по х +.top: dw top ;положение по у +.ch_text_margin: dd op_text_margin ;расстояние от прямоугольника чек бокса до надписи +.ch_size: dd op_size ;размер квадрата чек бокса, для примера 12 +.color: dd color ;цвет внутри чекбокса +.border_color: dd border_color ;цвет рамки +.text_color: dd text_color ;цвет надписи +.text: dd text ;адрес в коде программы где расположен текст +.ch_text_length: dd op_text_length ;длинна строки с символами +.flags: dd flags+0 ; флаги +} diff --git a/kernel/branches/net/network/udp.inc b/kernel/branches/net/network/udp.inc index 6242f5437b..0462359dc1 100644 --- a/kernel/branches/net/network/udp.inc +++ b/kernel/branches/net/network/udp.inc @@ -140,9 +140,6 @@ UDP_handler: DEBUGF 1,"Remote Ip matches\n" .ok1: - lea ebx, [eax + SOCKET_head.lock] - call wait_mutex - cmp [eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.firstpacket], 0 jz .updateport @@ -150,6 +147,9 @@ UDP_handler: cmp [eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort], bx jne .dump + lea ebx, [eax + SOCKET_head.lock] + call wait_mutex + .ok2: DEBUGF 1,"Found valid UDP packet for socket %x\n", eax @@ -170,6 +170,9 @@ UDP_handler: .updateport: + lea ebx, [eax + SOCKET_head.lock] + call wait_mutex + mov bx, [edx + UDP_Packet.SourcePort] DEBUGF 1,"Changing remote port to: %x\n", bx mov [eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort], bx