diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-09-01 16:52:17 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-09-01 16:52:17 +0200 |
| commit | 9fc3b98112217f2d92a67977dbde0987cc7a1803 (patch) | |
| tree | 29fcc8654ee65d9dd89ade797bea2f3d9dfd9cfd /src/openvpn/packet_id.c | |
| parent | a8758c0e03eed188dcb9da0e4fd781a67c25bf1e (diff) | |
| parent | 69b02b1f7fd609d84ace13ab04697158de2418a9 (diff) | |
Merge branch 'debian/experimental-2.5'
Diffstat (limited to 'src/openvpn/packet_id.c')
| -rw-r--r-- | src/openvpn/packet_id.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/openvpn/packet_id.c b/src/openvpn/packet_id.c index d58761b..0c74487 100644 --- a/src/openvpn/packet_id.c +++ b/src/openvpn/packet_id.c @@ -38,8 +38,6 @@ #include "syshead.h" -#ifdef ENABLE_CRYPTO - #include "packet_id.h" #include "misc.h" #include "integer.h" @@ -349,7 +347,7 @@ packet_id_send_update(struct packet_id_send *p, bool long_form) bool packet_id_write(struct packet_id_send *p, struct buffer *buf, bool long_form, - bool prepend) + bool prepend) { if (!packet_id_send_update(p, long_form)) { @@ -608,14 +606,14 @@ packet_id_debug_print(int msglevel, } buf_printf(&out, "%c", c); } - buf_printf(&out, "] " time_format ":" packet_id_format, (time_type)p->time, (packet_id_print_type)p->id); + buf_printf(&out, "] %" PRIi64 ":" packet_id_format, (int64_t)p->time, (packet_id_print_type)p->id); if (pin) { - buf_printf(&out, " " time_format ":" packet_id_format, (time_type)pin->time, (packet_id_print_type)pin->id); + buf_printf(&out, " %" PRIi64 ":" packet_id_format, (int64_t)pin->time, (packet_id_print_type)pin->id); } - buf_printf(&out, " t=" time_format "[%d]", - (time_type)prev_now, + buf_printf(&out, " t=%" PRIi64 "[%d]", + (int64_t)prev_now, (int)(prev_now - tv.tv_sec)); buf_printf(&out, " r=[%d,%d,%d,%d,%d]", @@ -668,8 +666,8 @@ packet_id_interactive_test(void) { packet_id_reap_test(&pid.rec); test = packet_id_test(&pid.rec, &pin); - printf("packet_id_test (" time_format ", " packet_id_format ") returned %d\n", - (time_type)pin.time, + printf("packet_id_test (%" PRIi64 ", " packet_id_format ") returned %d\n", + (int64_t)pin.time, (packet_id_print_type)pin.id, test); if (test) @@ -681,8 +679,8 @@ packet_id_interactive_test(void) { long_form = (count < 20); packet_id_alloc_outgoing(&pid.send, &pin, long_form); - printf("(" time_format "(" packet_id_format "), %d)\n", - (time_type)pin.time, + printf("(%" PRIi64 "(" packet_id_format "), %d)\n", + (int64_t)pin.time, (packet_id_print_type)pin.id, long_form); if (pid.send.id == 10) @@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); } #endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */ |