WebSVN – Kolibri OS – Diff – /kernel/trunk/network/socket.inc

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5584 $
+$Revision: 5842 $
 struct  SOCKET
         mutex                   MUTEX
         PID                     dd ? ; process ID
         TID                     dd ? ; thread ID
-        Domain                  dd ? ; INET/LOCAL/..
+        Domain                  dd ? ; INET4/INET6/LOCAL/..
         Type                    dd ? ; RAW/STREAM/DGRAM
-        Protocol                dd ? ; ICMP/IPv4/ARP/TCP/UDP
+        Protocol                dd ? ; UDP/TCP/ARP/ICMP
         errorcode               dd ?
         device                  dd ? ; driver pointer, socket pointer if it's an LOCAL socket
 struct  IP_SOCKET               SOCKET
+        LocalIP                 rd 4 ; network byte order
+        RemoteIP                rd 4 ; network byte order
-        LocalIP                 rd 4 ; network byte order
+        ttl                     db ?
-        RemoteIP                rd 4 ; network byte order
+                                rb 3 ; align
         LocalPort               dw ? ; network byte order
         RemotePort              dw ? ; network byte order
-ends
-struct  ICMP_SOCKET             IP_SOCKET
-        Identifier              dw ?
-ends
 ends
 struct  RING_BUFFER
         mov     [eax + SOCKET.connect_proc], connect_notsupp
         cmp     ecx, AF_INET4
+        jne     .no_inet4
-        jne     .no_inet4
+        mov     [eax + IP_SOCKET.ttl], 128
         cmp     edx, SOCK_DGRAM
         je      .udp
         jmp     .unsupported
+align 4
+  .udp:
+        push    eax
+        init_queue (eax + SOCKET_QUEUE_LOCATION)        ; Set up data receiving queue
-align 4
+        pop     eax
   .udp:
         mov     [eax + SOCKET.Protocol], IP_PROTO_UDP
         mov     [eax + SOCKET.snd_proc], SOCKET_send_udp
         mov     [eax + SOCKET.rcv_proc], SOCKET_receive_dgram
         ret
+align 4
+  .raw_ip:
+        push    eax
+        init_queue (eax + SOCKET_QUEUE_LOCATION)        ; Set up data receiving queue
-align 4
+        pop     eax
   .raw_ip:
         mov     [eax + SOCKET.snd_proc], SOCKET_send_ip
         mov     [eax + SOCKET.rcv_proc], SOCKET_receive_dgram
         mov     [eax + SOCKET.connect_proc], IPv4_connect
         ret
+align 4
+  .raw_icmp:
         push    eax
         init_queue (eax + SOCKET_QUEUE_LOCATION)        ; Set up data receiving queue
-align 4
+        pop     eax
   .raw_icmp:
 SOCKET_send_ip:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_send: IPv4\n"
         mov     [esp+32], ecx
-        call    IPv4_output_raw         ; FIXME: IPv4_output_raw should return error codes!
+        call    IPv4_output_raw
         cmp     eax, -1
         je      .error
         ret
   .error:
-        mov     dword[esp+32], -1
+        mov     dword[esp+32], eax
-        mov     dword[esp+20], EMSGSIZE
+        mov     dword[esp+20], ebx
         ret
 align 4
 SOCKET_send_icmp:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_send: ICMP\n"
         mov     [esp+32], ecx
-        call    ICMP_output_raw         ; FIXME: errorcodes
+        call    ICMP_output_raw
         cmp     eax, -1
         je      .error
         mov     dword[esp+32], -1
         mov     dword[esp+20], EINVAL
         ret
 ;-----------------------------------------------------------------
+;
 ; SOCKET_set_options
 ;
-;  IN:  ecx = socket number
-;       edx = pointer to the options:
+;  IN:  ecx = socket number
-;               dd      level, optname, optlen, optval
+;       edx = pointer to socket_options
 ;  OUT: -1 on error
+;
+;-----------------------------------------------------------------
+struct socket_options
+        level   dd ?
+        optname dd ?
+        optlen  dd ?
+        optval  dd ?
 ends
 ;-----------------------------------------------------------------
 align 4
 SOCKET_set_opt:
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_set_opt\n"
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_set_opt\n"
+        call    SOCKET_num_to_ptr
         jz      .invalid
-        call    SOCKET_num_to_ptr
-        jz      .invalid
-        cmp     dword [edx], SOL_SOCKET
-        jne     .invalid
+        cmp     [edx + socket_options.level], IP_PROTO_IP
-        cmp     dword [edx+4], SO_BINDTODEVICE
+        je      .ip
-        je      .bind
+        cmp     [edx + socket_options.level], SOL_SOCKET
+        jne     .invalid
   .invalid:
-        mov     dword[esp+32], -1
+  .socket:
-        mov     dword[esp+20], EINVAL
+        cmp     [edx + socket_options.optname], SO_BINDTODEVICE
-        ret
+        jne     .invalid
   .bind:
         mov     [eax + SOCKET.device], 0
         mov     dword[esp+32], 0        ; success!
+        ret
+  .ip:
+        cmp     [edx + socket_options.optname], IP_TTL
+        jne     .invalid
+  .ttl:
+        mov     bl, byte[edx + socket_options.optval]
+        mov     [eax + IP_SOCKET.ttl], bl
+        mov     dword[esp+32], 0        ; success!
         ret
   .already:
         mov     dword[esp+20], EALREADY
+        mov     dword[esp+32], -1
+        ret
+  .invalid:
+        mov     dword[esp+20], EINVAL
         mov     dword[esp+32], -1
         ret
         pusha
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_unlock
         popa
         add     esp, 8
         call    NET_BUFF_free
         ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/socket.inc – Rev 5584 → 5842