diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 19:39:01 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 19:39:01 +0000 |
| commit | 53091e3bce487ee82e2805a0231e780551561717 (patch) | |
| tree | f0fa36ff8eadaf1f01d4510597b5e3a310764dc7 /src/clock/s6-taiclock.c | |
| parent | f85b8a70f3b44510a5cf3895bf7357ae90655f65 (diff) | |
| download | s6-networking-53091e3bce487ee82e2805a0231e780551561717.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/clock/s6-taiclock.c')
| -rw-r--r-- | src/clock/s6-taiclock.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/clock/s6-taiclock.c b/src/clock/s6-taiclock.c index bece37d..8ea58c1 100644 --- a/src/clock/s6-taiclock.c +++ b/src/clock/s6-taiclock.c @@ -1,16 +1,13 @@ /* ISC license. */ -#include <sys/types.h> +#include <string.h> #include <stdint.h> #include <unistd.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/uint16.h> -#include <skalibs/uint32.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/allreadwrite.h> -#include <skalibs/bytestr.h> #include <skalibs/strerr2.h> #include <skalibs/tai.h> #include <skalibs/djbtime.h> @@ -27,7 +24,7 @@ static unsigned int verbosity = 1 ; #define N 28 -int tain_exchange (int s, ip46_t const *ip, uint16 port, tain_t *serversays, tain_t const *deadline) +int tain_exchange (int s, ip46_t const *ip, uint16_t port, tain_t *serversays, tain_t const *deadline) { char query[N] = "ctai" ; char answer[N] ; @@ -42,8 +39,8 @@ int tain_exchange (int s, ip46_t const *ip, uint16 port, tain_t *serversays, tai r = socket_recvnb46_g(s, answer, N, &dummyip, &dummyport, deadline) ; if (r < 0) return 0 ; if (r < N) return (errno = EPROTO, 0) ; - if (byte_diff(answer, 4, "stai")) return (errno = EPROTO, 0) ; - if (byte_diff(query+20, N-20, answer+20)) return (errno = EPROTO, 0) ; + if (memcmp(answer, "stai", 4)) return (errno = EPROTO, 0) ; + if (memcmp(query+20, answer+20, N-20)) return (errno = EPROTO, 0) ; tain_unpack(answer+4, serversays) ; return 1 ; } @@ -72,7 +69,7 @@ int main (int argc, char const *const *argv) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "fv:r:t:h:T:e:p:", &l) ; + int opt = subgetopt_r(argc, argv, "fv:r:t:h:T:e:p:", &l) ; if (opt == -1) break ; switch (opt) { |