WebSVN – Kolibri OS – Path Comparison – / – /kernel/branches/net/applications/ Rev 1541 and /kernel/branches/net/applications/ Rev 1542

Regard whitespace Rev 1541 → Rev 1542

/kernel/branches/net/applications/network_lib/network.inc
File deleted

Property changes:
Deleted: svn:keywords
-Revision
\ No newline at end of property
Deleted: svn:mergeinfo

 /kernel/branches/net/applications/network_lib/network.asm
 ,7 → 7,7
 include '../macros.inc'
 purge section,mov,add,sub
-include 'network.inc'
+include '../network.inc'
 section '.flat' code readable align 16
 ,7 → 29,8
         mov     [dll.load], edx
         mov     [DNSrequestID], 1
         stdcall edx, @IMPORT
-        ret     4
+        xor     eax, eax
+        ret
 ;;===========================================================================;;
 ;; in_addr_t __stdcall inet_addr(__in const char* hostname);                 ;;
 ,7 → 258,7
         ret
 struct __gai_reqdata
-        socket  dd      ?
+        socketnum  dd      ?
 ; external code should not look on rest of this structure,
 ; it is internal for getaddrinfo_start/process/abort
         reqid           dw      ?       ; DNS request ID
 ,7 → 280,7
 ;;---------------------------------------------------------------------------;;
 ;> first parameter (optional) = host name                                    ;;
 ;> second parameter (optional) = service name (decimal number for now)       ;;
-;> third parameter (optional) = hints for socket type                        ;;
+;> third parameter (optional) = hints for socketnum type                        ;;
 ;> fourth parameter = pointer to result (head of L1-list)                    ;;
 ;;---------------------------------------------------------------------------;;
 ;< eax = 0 on success / one of EAI_ codes on error                           ;;
 ,14 → 426,14
         jecxz   @f
         cmp     [ecx+addrinfo.ai_family], edi
         jz      @f
-        cmp     [ecx+addrinfo.ai_family], PF_INET
+        cmp     [ecx+addrinfo.ai_family], AF_INET4
         jnz     .ret
 @@:
 ; 1e. Valid combinations for ai_socktype/ai_protocol: 0/0 for any or
 ;       SOCK_STREAM/IPPROTO_TCP, SOCK_DGRAM/IPPROTO_UDP
-;       (raw sockets are not yet supported by the kernel)
+;       (raw socketnums are not yet supported by the kernel)
         xor     edx, edx        ; assume 0=any if no hints
-        jecxz   .socket_type_ok
+        jecxz   .socketnum_type_ok
         mov     edx, [ecx+addrinfo.ai_socktype]
         mov     esi, [ecx+addrinfo.ai_protocol]
 ; 1f. Test for ai_socktype=0 and ai_protocol=0.
 ,16 → 440,16
         test    edx, edx
         jnz     .check_socktype
         test    esi, esi
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
 ; 1g. ai_socktype=0, ai_protocol is nonzero.
         push    EAI_SERVICE
         pop     eax
         inc     edx     ; edx = SOCK_STREAM
         cmp     esi, IPPROTO_TCP
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
         inc     edx     ; edx = SOCK_DGRAM
         cmp     esi, IPPROTO_UDP
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
 .ret:
 ; Restore saved registers, destroy stack frame and return.
         mov     esp, ebp
 ,16 → 465,16
         cmp     edx, SOCK_DGRAM
         jnz     .ret
         test    esi, esi
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
         cmp     esi, IPPROTO_UDP
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
         jmp     .ret
 .check_tcp:
         test    esi, esi
-        jz      .socket_type_ok
+        jz      .socketnum_type_ok
         cmp     esi, IPPROTO_TCP
         jnz     .ret
-.socket_type_ok:
+.socketnum_type_ok:
         mov     [ebx+__gai_reqdata.socktype], dl
 ; 2. Resolve service.
 ; 2a. If no name is given, remember value -1.
 ,7 → 514,7
 ; 3. Process host name.
         mov     esi, [.hostname]
 ; 3a. If hostname is not given,
-;       use localhost for active sockets and INADDR_ANY for passive sockets.
+;       use localhost for active socketnums and INADDR_ANY for passive socketnums.
         mov     eax, 0x0100007F ; 127.0.0.1 in network byte order
         test    byte [ebx+__gai_reqdata.flags], AI_PASSIVE
         jz      @f
 ,17 → 680,17
         cmp     eax, -1
         je      .ret.dnserr
         mov     esi, eax        ; put server address to esi
-; 8. Open UDP socket to DNS server, port 53.
-; 8a. Create new socket.
-        mcall   74, 0, AF_INET, IPPROTO_UDP
+; 8. Open UDP socketnum to DNS server, port 53.
+; 8a. Create new socketnum.
+        mcall   74, 0, AF_INET4, SOCK_DGRAM
         cmp     eax, -1 ; error?
         jz      .ret.dnserr
-        mov     ecx, eax        ; put socket handle to ecx
+        mov     ecx, eax        ; put socketnum handle to ecx
 ; 8b. Create sockaddr structure on the stack.
         push    0
         push    0        ; sin_zero
         push    esi     ; sin_addr
-        push    AF_INET + (53 shl 16)
+        push    AF_INET4 + (53 shl 16)
                         ; sin_family and sin_port in network byte order
 ; 8c. Connect.
         mcall   74, 4, , esp, sizeof.sockaddr_in
 ,7 → 707,7
         cmp     eax, -1
         jz      .ret.close
         mov     eax, [.reqdata]
-        mov     [eax+__gai_reqdata.socket], ecx
+        mov     [eax+__gai_reqdata.socketnum], ecx
         push    -1
         pop     eax     ; return status: more processing required
         jmp     .ret.dns
 ,11 → 760,11
         push    ebx esi edi
         mov     edi, [.reqdata]
 ; 2. Read UDP datagram.
-        mov     ecx, [edi+__gai_reqdata.socket]
+        mov     ecx, [edi+__gai_reqdata.socketnum]
         push    edi
         mcall   74, 7, , , 512, 0
         pop     edi
-; 3. Ignore events for other sockets (return if no data read)
+; 3. Ignore events for other socketnums (return if no data read)
         test    eax, eax
         jz      .ret.more_processing_required
 ; 4. Sanity check: discard too short packets.
 ,10 → 919,10
 @@:
         pop     eax
 .ret.close:
-; 15. Close socket.
+; 15. Close socketnum.
         push    eax
         mov     ecx, [.reqdata]
-        mov     ecx, [ecx+__gai_reqdata.socket]
+        mov     ecx, [ecx+__gai_reqdata.socketnum]
         mcall   74, 1
         pop     eax
 ; 16. Restore used registers, destroy stack frame and return.
 ,12 → 1171,12
 ; 4. Fill struct addrinfo.
         mov     eax, [ebx+__gai_reqdata.flags]
         mov     [edi+addrinfo.ai_flags], eax
-        mov     byte [edi+addrinfo.ai_family], PF_INET
+        mov     byte [edi+addrinfo.ai_family], AF_INET4
         mov     byte [edi+addrinfo.ai_addrlen], sizeof.sockaddr_in
         lea     ecx, [edi+sizeof.addrinfo]
         mov     [edi+addrinfo.ai_addr], ecx
 ; 5. Fill struct sockaddr_in.
-        mov     byte [ecx+sockaddr_in.sin_family], PF_INET
+        mov     byte [ecx+sockaddr_in.sin_family], AF_INET4
         pop     eax
         mov     [ecx+sockaddr_in.sin_addr], eax
 ; 6. Append new item to the list.
 ,7 → 1190,7
         ret
 .set_socktype:
-; Set ai_socktype and ai_protocol fields by given socket type.
+; Set ai_socktype and ai_protocol fields by given socketnum type.
         mov     byte [edi+addrinfo.ai_socktype], cl
         dec     cl
         jnz     .set_udp
 ,9 → 1220,9
 ;;===========================================================================;;
 ; 0. Save used registers for __stdcall.
         push    ebx
-; 1. Allocated resources: only socket, so close it and return.
+; 1. Allocated resources: only socketnum, so close it and return.
         mov     eax, [esp+8]
-        mov     ecx, [eax+__gai_reqdata.socket]
+        mov     ecx, [eax+__gai_reqdata.socketnum]
         mcall   74, 1
 ; 2. Restore used registers and return.
         pop     ebx

/kernel/branches/net/applications/nslookup/dll.inc
File deleted

Property changes:
Deleted: svn:keywords
-Revision
\ No newline at end of property

 /kernel/branches/net/applications/nslookup/nslookup.asm
 ,7 → 15,7
 include '../proc32.inc'
 include '../dll.inc'
-include '../network_lib/network.inc'
+include '../network.inc'
 ; entry point
 start:

 /kernel/branches/net/applications/synergyc/synergyc.asm
 ,7 → 86,7
         push    newline
         call    [con_write_asciiz]
-        mcall   socket, AF_INET4, IPPROTO_TCP, 0
+        mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
         je      error

 /kernel/branches/net/applications/telnet/telnet.asm
 ,7 → 92,7
         push    str4
         call    [con_write_asciiz]
-        mcall   socket, AF_INET4, IPPROTO_TCP, 0
+        mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
         jz      fail2
         mov     [socketnum], eax

 /kernel/branches/net/applications/tftpc/TFTP.asm
 ,7 → 226,7
         mov     esi, [esi + sockaddr_in.sin_addr]
         mov     dword [IP], esi
-        mcall   socket, AF_INET4, IP_PROTO_UDP, 0                ; socket_open
+        mcall   socket, AF_INET4, SOCK_DGRAM, 0                ; socket_open
         cmp     eax, -1
         je      still

 /kernel/branches/net/applications/zeroconf/zeroconf.asm
 ,14 → 42,10
 DEFEND_INTERVAL     equ 10                  ; seconds (min. wait between defensive ARPs)
-AF_INET4        equ 2  ;;;;;
-IP_PROTO_UDP    equ 17
 include '../proc32.inc'
 include '../macros.inc'
 include '../debug-fdo.inc'
+include '../network.inc'
 include 'dhcp.inc'
 include 'dll.inc'
 ,7 → 132,7
         mcall   75, 1337 shl 16 + 4
         cmp     eax, -1
-        je      close
+        je      exit
         mov     word[MAC], bx
         mov     dword[MAC+2], eax
 ,7 → 194,7
         DEBUGF  1,"->Skip ini\n"
-        mcall 74, 0, AF_INET4, IP_PROTO_UDP, 0      ; open socket (parameters: domain, type, reserved)
+        mcall 74, 0, AF_INET4, SOCK_DGRAM, 0      ; open socket (parameters: domain, type, reserved)
         cmp   eax, -1
         je    error
         mov   [socketNum], eax
 ,7 → 296,7
         DEBUGF  1,"->%d bytes received\n", eax
         push    eax
-        mcall   74, 1, [socketNum]                     ; close the socket
+        mcall   74, 1, [socketNum]                     ; exit the socket
         pop     eax
         cmp     eax, -1
 ,7 → 319,7
     cmp     [dhcpMsgType], byte 0x03        ; did we send a request?
     je      request
-        jmp     close                           ; really unknown, what we did
+        jmp     exit                           ; really unknown, what we did
 discover:
         call    parseResponse
 ,7 → 335,7
         cmp     [dhcpMsgType], byte 0x05        ; Was the response an ACK? It should be
         jne     apipa                           ; NO - so we do zeroconf
-        jmp     close
+        jmp     exit
 ;***************************************************************************
 ;   Function
 ,7 → 443,7
 ;    DEBUGF  1,"Sending ARP announce\n"
 ;;;
-    jmp close
+    jmp exit
 apipa:
     stdcall mem.Free, [dhcpMsg]
 ,7 → 507,7
     ; we should, instead of closing, detect ARP conflicts and detect if cable keeps connected ;)
 error:
-close:
+exit:
     mcall -1
 ,4 → 588,6
 path            rb  1024+5
+                rb  65536
 I_END:

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1541 → Rev 1542