| 61,9 → 61,10 |
|---|
| ; fatal error(console error) |
| ;jnz exit |
| |
| |
| ; setup params |
| call parse_params |
| ;clear eax |
| |
| call tz_validate |
| ; is TZ correct? |
| cmp ebx,0 |
| 188,9 → 189,6 |
|---|
| jne @f |
| cmp [tz_m],0 |
| jne @f |
| mov eax, str_tz |
| add eax, 9 |
| cinvoke con_printf, eax ; \n\0 |
| jmp .no_bias |
| |
| @@: |
| 214,6 → 212,7 |
|---|
| cinvoke con_printf, str_tz, eax, ebx |
| |
| .no_bias: |
| |
| cmp [sync],0 |
| je exit |
| cmp [sync], SYNC_S |
| 226,8 → 225,8 |
|---|
| mov eax, str_st |
| jmp .sync_ok |
| @@: |
| cmp [sync], SYNC_SS |
| jne exit ; Fixed (24.04.2019): incorrect display with -ss |
| cmp [sync], SYNC_ST |
| jne .sync_ok |
| mov eax, str_ss |
| |
| .sync_ok: |
| 317,7 → 316,6 |
|---|
| parse_params: |
| mov esi, params |
| mov ebx, esi |
| clear ecx ; 26.04.2018 Fixed |
| .f00: |
| lodsb |
| cmp al, 0 |
| 331,8 → 329,6 |
|---|
| ret |
| |
| .exit: |
| cmp ecx,0 ; 26.04.2018 Fixed |
| je @f |
| ; mark end of TZ |
| mov byte [ecx+1], 0 |
| ; now esi = start of TZ |
| 397,7 → 393,6 |
|---|
| ; jz .invalid |
| ; mov [port], bx |
| ; jmp .param_loop |
| jmp .invalid |
| |
| .tz: |
| ; tz setup |
| 449,7 → 444,6 |
|---|
| mov eax, 10 |
| ret |
| |
| |
| ; Helper to convert char to number |
| ; Input: |
| ; esi - ptr to char of digit |
| 504,7 → 498,7 |
|---|
| |
| ; Sync worker |
| ; Input: |
| ; setuped sockaddr1 |
| ; eax - in_addr (IPv4) |
| ; Output: |
| ; eax - error_code |
| ; ebx - error_string |
| 516,22 → 510,8 |
|---|
| ;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 .new_hour? |
| @@: |
| ; jmp .test |
| |
| ; Create socket |
| mcall socket, AF_INET4, SOCK_DGRAM, IPPROTO_IP |
| cmp eax, -1 |
| 554,6 → 534,10 |
|---|
| ;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 |
| 652,9 → 636,9 |
|---|
| @@: |
| .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 |
| 697,6 → 681,7 |
|---|
| ; FIXED: do sync before display!!! |
| ; It's need to do sync fast ASAP |
| ; Take out any printf from sntp_query_time! |
| |
| ; sync > 0 ? |
| cmp [sync], 0 |
| je .nosync |
| 706,8 → 691,6 |
|---|
| ; FIXME: Go it from sntp_query_time! |
| ;}} |
| |
| |
| |
| ; Convert time to BCD |
| clear eax, edx |
| mov al, [esi + DateTime.sec] |
| 717,17 → 700,8 |
|---|
| mov al, [esi + DateTime.min] |
| b2bcd |
| mov ch, al |
| |
| cmp [sync], SYNC_SS |
| jne @f |
| ; if -ss ignore timezone for hour |
| ; Query system time |
| mcall 3 |
| jmp .ss_done |
| @@: |
| mov al, [esi + DateTime.hour] |
| b2bcd |
| .ss_done: |
| mov cl, al |
| |
| ; Display BCD time |
| 877,7 → 851,7 |
|---|
| rb 10 |
| |
| SIZEOF_SNTP_PACKET = 48 |
| sntp_packet db 0x23 ; Li = 0 Vn = 4 Mode = 3 (client) |
| sntp_packet db 0x23 ; Li = 0 Vn = 4 Mode = 3 (client) FIX: Why 0x0b? |
| .Stratum db 0 |
| .Pool db 0 |
| .Precision db 0 |
| 894,6 → 868,7 |
|---|
| @IMPORT: |
| |
| library network, 'network.obj', console, 'console.obj' |
| ;library network, 'network.obj', console, 'console.obj' |
| import network, \ |
| inet_addr, 'inet_addr', \ |
| getaddrinfo, 'getaddrinfo', \ |