WebSVN – Kolibri OS – Diff – /programs/network/ircc/serverparser.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;   Written by hidnplayr@kolibrios.org                            ;;
 ;;                                                                 ;;
 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
         dd      '366 ', cmd_366         ; end of names list
         dd      '372 ', cmd_372         ; motd
         dd      '375 ', cmd_375         ; start of motd
         dd      '376 ', cmd_376         ; end of motd
         dd      '421 ', cmd_421         ; unknown command
+        dd      '433 ', cmd_433         ; nickname already in use
         dd      'join', cmd_join
         dd      'kick', cmd_kick
         dd      'mode', cmd_mode
         dd      'nick', cmd_nick
         dd      'part', cmd_part
         mov     esi, user_nick
   .loop:
         lodsb
         cmp     al, ' '
         jbe     .done
+        test    al, al
+        jz      .done
         cmp     al, 'a'
         jb      .ok
         cmp     al, 'z'
         ja      .ok
         sub     al, 0x20
         ret
 align 4
-skip_nick:
+skip_parameter:
-; First: skip the NICK (maybe we should verify it?)
+; First: skip the parameter
-  .nick:
+  .part1:
-        lodsb
-        cmp     al, ' '
+        lodsb
-        je      .skip
+        cmp     al, ' '
-        cmp     al, ':'
+        je      .part2
-        je      .skip
+        cmp     al, ':'
-        jmp     .nick
+        jne     .part1
-; skip all leading spaces and semicolons
+; Now, skip all trailing spaces and semicolons
-  .skip:
+  .part2:
         lodsb
         cmp     al, ' '
 cmd_328:
 cmd_421:
 cmd_372:
 cmd_375:
 cmd_376:
+cmd_433:
         add     esi, 4
         jmp     cmd_notice.loop
         mov     eax, dword[esi+4]
         or      eax, 0x20202020
         cmp     eax, 'msg '
         jne     .fail
         add     esi, 8          ; skip 'PRIVMSG '
+        mov     edi, esi
+        call    compare_to_nick
+        jne     .channel
+; private chat message
+        push    esi
+        mov     esi, servercommand+1
+        call    window_open
+        pop     esi
-        call    window_open     ; esi now points to end of destination name
+        call    skip_parameter  ; our own nickname
         cmp     byte[esi], 1    ; Client to Client protocol?
+        je      cmd_ctcp
+        jmp     .print
+  .channel:
+        call    window_open
         je      cmd_ctcp
   .print:
 ; nope, just plain old privmsg, print it using ' message' format
         if TIMESTAMP
 cmd_ctcp:
-        cmp     byte [esi+4], ' '
+cmd_ctcp:
         jne     .fail
         je      .time
         cmp     eax, 'ping'
         je      .ping
         cmp     eax, 'acti'
         je      .action
-;        cmp     eax, 'dcc '    ; TODO
+        cmp     eax, 'dcc '    ; TODO
-;        je      cmd_dcc
+        je      cmd_dcc
 ; Unknown CTCP command: TODO: just print to window??
         ret
+  .send:
         call    window_open
-  .send:
+        mov     [ebx + window.type], WINDOWTYPE_DCC
         add     esi, 5  ; skip 'PART '
 ; Is it me who parted?
         mov     edi, servercommand+1
         call    compare_to_nick
-        jne     .dont_close
+        jne     .not_me
 ; yes, close the window (if its open)
         call    window_find
         ret
-; somebody else parted, just print message
-  .dont_close:
+; somebody else parted, just print message
+  .not_me:
+        push    esi
+        call    window_open
-        push    esi
+        if TIMESTAMP
-        call    skip_nick
+        call    print_timestamp
-        call    window_open
+        end if
         add     esi, 5  ; skip 'JOIN '
 ; compare nick: did we join a channel?
         mov     edi, servercommand+1
-        call    compare_to_nick
-        jne     .no_new_window
-; create channel window - search for empty slot
-        mov     ebx, windows
-        mov     ecx, MAX_WINDOWS
-  .loop:
-        cmp     [ebx + window.data_ptr], 0
-        je      .free_found
-        add     ebx, sizeof.window
-        dec     ecx
+        call    compare_to_nick
-        jnz     .loop
-; Error: no more available windows!! ;;;;; TODO
-        ret
+        jne     .not_me
-  .free_found:
+        push    esi
-        call    window_create
+        call    window_open
         test    eax, eax
-        jz      .fail
-        mov     [ebx + window.type], WINDOWTYPE_CHANNEL
-        call    window_set_name
+        jz      .fail
-        mov     [window_active], ebx
+        mov     [ebx + window.type], WINDOWTYPE_CHANNEL
-        mov     [window_print], ebx
+        mov     [window_active], ebx
-        if TIMESTAMP
-        call    print_timestamp
+        if TIMESTAMP
-        end if
+        call    print_timestamp
         end if
         push    esi
         call    draw_window
         ret
-  .no_new_window:
+  .not_me:
         push    esi
         mov     ebx, [window_print]
         mov     esi, servercommand+1
         call    user_add
+        ret
 ; TODO: mark channel as disconnected
   .not_me:
 ; find the channel user has been kicked from
         push    esi
-        call    skip_nick
+        call    skip_parameter
         call    window_open
         if TIMESTAMP
         jne     .fail
         add     esi, 5  ; skip 'MODE '
         call    window_find
         test    ebx, ebx
         jz      .fail
-; skip channel name
-  @@:
-        lodsb
-        test    al, al
-        jz      .fail
-        cmp     al, 10
-        je      .fail
-        cmp     al, 13
-        je      .fail
-        cmp     al, ' '
+        mov     [window_print], ebx
-        jne     @r
         push    esi
         if TIMESTAMP
         call    print_timestamp
 cmd_353:                ; channel usernames reply
         add     esi, 4  ; skip '353 '
-        call    skip_nick
+        call    skip_parameter
         inc     esi     ; channel type '*', '=' or '@'
 cmd_366:        ; channel usernames end
         add     esi, 4          ; skip '366 '
-        call    skip_nick
+        call    skip_parameter
 cmd_topic:
         add     esi, 4          ; skip '332 '
-        call    skip_nick
+        call    skip_parameter
         call    window_open
         call    print_text2
         pop     esi
         call    print_text2
-        mov     esi, str_newline
+        mov     esi, str_topic_end
         call    print_text2
         ret
-cmd_333:
-        add     esi, 4          ; skip '333 '
-        call    skip_nick               ;;;;
-        call    window_open
-;        mov     ecx, 2  ; number of spaces to find    ;;; CHECKME
-;  .loop:
-;        lodsb
 ;        test    al, al
-;        je      .fail
+cmd_333:
 ;        cmp     al, ' '
-;        jne     .loop
+        add     esi, 4          ; skip '333 '
 cmd_322:        ; LIST
         add     esi, 4
         mov     [window_print], windows         ; FIXME
-        call    skip_nick
+        call    skip_parameter
         mov     eax, esi
         mov     dl, 13
         call    print_text

Subversion Repositories Kolibri OS

(root)/programs/network/ircc/serverparser.inc – Rev 4143 → 4477