WebSVN – Kolibri OS – Diff – /programs/network/sntp/sntp.asm

 	call	[con_init]
   ;test	eax, eax
   ; fatal error(console error)
 	;jnz	exit
   ; setup params
   call parse_params
   ;clear eax
   call tz_validate
   ; is TZ correct?
   cmp ebx,0
   je @f
   cmp [tz_h],0
   jne @f
   cmp [tz_m],0
+  jne @f
+  mov eax, str_tz
+  add eax, 9
-  jne @f
+  cinvoke con_printf, eax ; \n\0
   jmp .no_bias
 @@:
   mov bl, [tz_m]
   cinvoke con_printf, str_tz, eax, ebx
 .no_bias:
 .no_bias:
   cmp [sync],0
   je  exit
   cmp [sync], SYNC_S
   cmp [sync], SYNC_ST
   jne @f
   mov eax, str_st
   jmp .sync_ok
   @@:
-  cmp [sync], SYNC_ST
+  cmp [sync], SYNC_SS
-  jne .sync_ok
+  jne exit ; Fixed (24.04.2019): incorrect display with -ss
   mov eax, str_ss
-  .sync_ok:
+.sync_ok:
 SYNC_ST   = 3
 parse_params:
   mov	  esi, params
+  mov   ebx, esi
-  mov   ebx, esi
+  clear ecx ; 26.04.2018 Fixed
 .f00:
 	lodsb
   cmp	 al, 0
   ;no params
   mov eax, -1
   ret
+.exit:
+  cmp ecx,0 ; 26.04.2018 Fixed
-.exit:
+  je @f
   ; mark end of TZ
   mov	  byte [ecx+1],  0
   ; now esi = start of TZ
 ;	call	c2n
 ;	test	ebx, ebx
 ; jz	  .invalid
 ; mov	  [port], bx
 ;	jmp .param_loop
+jmp .invalid
 .tz:
   ; tz setup
 	lodsb
 .invalid:
 	mov eax, 10
+	ret
 	ret
 ; Helper to convert char to number
 ; Input:
 ; esi  - ptr to char of digit
   ret
 ; Sync worker
 ; Input:
-; eax  - in_addr (IPv4)
+; setuped sockaddr1
 ; Output:
 ; eax - error_code
 ; ebx - error_string
+;
 ;sntp_sync_time:
   ;mov	   edx, eax
 sntp_query_time:
+  ; if -ss & 59:59 => waiting for new hour
+  cmp [sync], SYNC_SS
+  jne @f
+.new_hour?:
+  ; Query system time
+  mcall   3
+  cmp ah, 59h ; 59 min. ?
+  jne @f
+  shr eax, 16
+  cmp al, 59h ; 59 sec. ?
+  jne @f
+  ;DEBUGF  1, "SNTP: Waiting for new hour.\n"
+  ; Wait 100 msec.
+  mcall 5,10
-;  jmp .test
+  jmp .new_hour?
 @@:
   ; Create socket
   mcall   socket, AF_INET4, SOCK_DGRAM, IPPROTO_IP
   cmp	  eax, -1
   jne   @f
   mov   edi, str_err4
   jmp .error ; Connection error (2)
   ;DEBUGF  1, "Socket connected.\n"
-@@:
-  ; Query system time
-  ;mcall   3
-  ;mov [SystemTime], eax
 @@:
   mcall   send, ebp, sntp_packet, SIZEOF_SNTP_PACKET, 0
   cmp	  eax, -1
   jne   @f
   mov   edx, 43
   ;mov [TimeZone], cx
   ;@@:
 @@:
 .tz_h:
   ; correct hour
-  cmp [sync], SYNC_SS
+;  cmp [sync], SYNC_SS
   ; if -ss ignore timezone for hour
-  je .tz_done
+;  je .tz_done
   clear eax
   mov al, [tz_h]
   add al, cl
   add [esi + DateTime.hour], al ;3 ; MSK = GMT +3
   ;}}
   ; FIXED:  do sync before display!!!
   ;         It's need to do sync fast ASAP
-  ;         Take out any printf from sntp_query_time!
   ;         Take out any printf from sntp_query_time!
   ; sync > 0 ?
   cmp [sync], 0
   je .nosync
   ;{{
   ; Removed block 2
+  ; FIXME: Go it from sntp_query_time!
+  ;}}
   ; FIXME: Go it from sntp_query_time!
   ;}}
 	; Convert time to BCD
   clear eax, edx
   mov al, [esi + DateTime.sec]
   b2bcd
   mov ecx, eax
   shl ecx, 16
+  mov al, [esi + DateTime.min]
+  b2bcd
+  mov ch, al
+  cmp [sync], SYNC_SS
+  jne @f
+  ; if -ss ignore timezone for hour
+  ; Query system time
-  mov al, [esi + DateTime.min]
+  mcall   3
-  b2bcd
+  jmp .ss_done
+@@:
-  mov ch, al
+  mov al, [esi + DateTime.hour]
-  mov al, [esi + DateTime.hour]
+  b2bcd
-  b2bcd
+.ss_done:
 .port	dw 0x7b00     ; 123 in network order (big endian)
 .ip	dd 0
 	rb 10
 SIZEOF_SNTP_PACKET  = 48
-sntp_packet	        db 0x23 ; Li = 0 Vn = 4 Mode = 3 (client) FIX: Why	0x0b?
+sntp_packet	        db 0x23 ; Li = 0 Vn = 4 Mode = 3 (client)
   .Stratum	        db 0
 	.Pool		          db 0
 	.Precision	      db 0
 	.RootDelay	      dd 0
 ; import
 align 4
 @IMPORT:
-library network, 'network.obj', console, 'console.obj'
-;library network, 'network.obj', console, 'console.obj'
+library network, 'network.obj', console, 'console.obj'
 import network, \
   inet_addr, 'inet_addr',  \
   getaddrinfo,	'getaddrinfo',	\
 	freeaddrinfo,	'freeaddrinfo', \

Subversion Repositories Kolibri OS

(root)/programs/network/sntp/sntp.asm – Rev 7638 → 7642