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

 ;;          GNU GENERAL PUBLIC LICENSE                          ;;
 ;;             Version 2, June 1991                             ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5522 $
+$Revision: 6011 $
         PPPoE_SID       dw ?
         PPPoE_MAC       dp ?
 endg
-;-----------------------------------------------------------------
-;
-; PPPoE_init
+;-----------------------------------------------------------------;
-;
+;                                                                 ;
-;  This function resets all IP variables
+; pppoe_init: Reset all pppoe variables                           ;
-;
+;                                                                 ;
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------;
-macro   PPPoE_init {
+macro   pppoe_init {
-        call    PPPoE_stop_connection
+        call    pppoe_stop_connection
-}
+}
-;-----------------------------------------------------------------
-;
-; PPPoE discovery input
-;
+;-----------------------------------------------------------------;
+;                                                                 ;
-; Handler of received Ethernet packet with type = Discovery
+; pppoe_discovery_input                                           ;
-;
+;                                                                 ;
-;
+;  IN:  [esp] = ptr to buffer                                     ;
-;  IN:  Pointer to buffer in [esp]
+;       [esp+4] = size of buffer                                  ;
-;       size of buffer in [esp+4]
+;       ebx = ptr to device struct                                ;
-;       pointer to device struct in ebx
+;       ecx = size of PPP packet                                  ;
-;       pointer to PPP header in edx
+;       edx = ptr to PPP header                                   ;
-;       size of PPP packet in ecx
+;                                                                 ;
-;  OUT: /
+;  OUT: /                                                         ;
 ; Now, send it to the this socket
         mov     ecx, [esp + 4]
         mov     esi, [esp]
-        jmp     SOCKET_input
+        jmp     socket_input
   .dump:
         pusha
         mov     ecx, socket_mutex
         call    mutex_unlock
         popa
-        DEBUGF  DEBUG_NETWORK_VERBOSE, 'PPPoE_discovery_input: dumping\n'
+        DEBUGF  DEBUG_NETWORK_VERBOSE, 'PPPoE_discovery_input: dumping\n'
-        call    NET_BUFF_free
+        call    net_buff_free
-        ret
+        ret
-;--------------------------------------
+;-----------------------------------------------------------------;
-;
+;                                                                 ;
-; Send discovery packet
+; pppoe_discovery_output                                          ;
-;
-; IN: eax = socket pointer
+;                                                                 ;
-;     ecx = number of bytes to send
+;  IN:  eax = socket pointer                                      ;
-;     esi = pointer to data
+;       ecx = number of bytes to send                             ;
 ;       esi = pointer to data                                     ;
-;--------------------------------------
+;                                                                 ;
         DEBUGF  DEBUG_NETWORK_VERBOSE, "PPPoE_discovery_output: device=%x\n", ebx
 ; Create packet.
         push    ecx esi
-        stdcall kernel_alloc, 1500
+;;;; FIXME        stdcall kernel_alloc, 1500
         pop     esi ecx
         test    eax, eax
   .bad:
         or      eax, -1
         ret
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------;
-;
-; PPPoE session input
+;                                                                 ;
-;
-; Handler of received Ethernet packet with type = Session
-;
+; pppoe_session_input                                             ;
-;
+;                                                                 ;
-;  IN:  Pointer to buffer in [esp]
+;  IN:  [esp] = ptr to buffer                                     ;
-;       size of buffer in [esp+4]
+;       [esp+4] = size of buffer                                  ;
-;       pointer to device struct in ebx
+;       ebx = ptr to device struct                                ;
+;       edx = ptr to PPP header                                   ;
-;       pointer to PPP header in edx
+;       ecx = size of PPP packet                                  ;
-;       size of PPP packet in ecx
+;                                                                 ;
-;  OUT: /
+;  OUT: /                                                         ;
 ;                                                                 ;
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------;
 align 4
-PPPoE_session_input:
+pppoe_session_input:
         mov     ax, word [edx + PPPoE_frame.Payload]
         add     edx, PPPoE_frame.Payload + 2
         cmp     ax, PPP_PROTO_IPv4
-        je      IPv4_input
+        je      ipv4_input
 ;        cmp     ax, PPP_PROTO_IPv6
-;        je      IPv6_input
+;        je      ipv6_input
-        jmp     PPPoE_discovery_input   ; Send LCP,CHAP,CBCP,... packets to the PPP dialer
+        jmp     pppoe_discovery_input   ; Send LCP,CHAP,CBCP,... packets to the PPP dialer
         DEBUGF  DEBUG_NETWORK_VERBOSE, "PPPoE_input: Unknown protocol=%x\n", ax
-  .dump:
+  .dump:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "PPPoE_input: dumping\n"
-        call    NET_BUFF_free
+        call    net_buff_free
         ret
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------;
+;                                                                 ;
-;
+; pppoe_output                                                    ;
-; PPPoE_output
+;                                                                 ;
-;
+;  IN:  ax = protocol                                             ;
-; IN:  ax = protocol
+;       ebx = device ptr                                          ;
-;     ebx = device ptr
+;       ecx = packet size                                         ;
-;     ecx = packet size
+;                                                                 ;
 ; OUT:  eax = buffer start                                        ;
-; OUT: eax = buffer start / 0 on error
+;       eax = 0 on error                                          ;
-;      ebx = device ptr
+;       ebx = device ptr                                          ;
-;      ecx = packet size
+;       ecx = packet size                                         ;
-;      edx = size of complete buffer
+;       edx = size of complete buffer                             ;
-;      edi = start of PPP payload
+;       edi = start of PPP payload                                ;
 ;                                                                 ;
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------;
 align 4
-PPPoE_output:
+pppoe_output:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "PPPoE_output: size=%u device=%x\n", ecx, ebx
   .eth_error:
         add     esp, 4
         xor     eax, eax
         ret
+align 4
-PPPoE_start_connection:
+pppoe_start_connection:
         DEBUGF  DEBUG_NETWORK_VERBOSE, "PPPoE_start_connection: %x\n", cx
         or      eax, -1
         ret
 align 4
-PPPoE_stop_connection:
+pppoe_stop_connection:
         mov     word [PPPoE_MAC + 4], ax
         ret
-;---------------------------------------------------------------------------
-;
-; PPPoE API
+;-----------------------------------------------------------------;
-;
+;                                                                 ;
-; This function is called by system function 75
+; pppoe_api: Part of system function 76                           ;
-;
+;                                                                 ;
-; IN:  subfunction number in bl
+; IN:  subfunction number in bl                                   ;
-;      device number in bh
+;      device number in bh                                        ;
-;      ecx, edx, .. depends on subfunction
+;      ecx, edx, .. depends on subfunction                        ;
-;
+;                                                                 ;
-; OUT:
+; OUT:                                                            ;
-;
+;                                                                 ;
-;---------------------------------------------------------------------------
+;-----------------------------------------------------------------;
 align 4
-PPPoE_api:
+pppoe_api:
         movzx   eax, bh
         shl     eax, 2
         and     ebx, 0xff
         cmp     ebx, .number
         ja      .error
         jmp     dword [.table + 4*ebx]
   .table:

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/PPPoE.inc – Rev 5522 → 6011