cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1299?usp=email )
Change subject: ssl: Change update argument of compute_earliest_wakeup to time_t ...................................................................... ssl: Change update argument of compute_earliest_wakeup to time_t Since we usually input a diff of two time_t values here the input value will be officially time_t. So avoid conversion warnings at almost every caller site. We can safely cast it to interval_t here because we checked that it is smaller than the interval_t value earliest. And all negative values are treated equal, so exact value doesn't matter. Change-Id: I6bc3147d10ca50291110335cd9fc3be961280c1b Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1299 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34482.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/ssl.c 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 2d24f5e..92a68d0 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1107,11 +1107,11 @@ * called again. */ static inline void -compute_earliest_wakeup(interval_t *earliest, interval_t seconds_from_now) +compute_earliest_wakeup(interval_t *earliest, time_t seconds_from_now) { if (seconds_from_now < *earliest) { - *earliest = seconds_from_now; + *earliest = (interval_t)seconds_from_now; } if (*earliest < 0) { @@ -1119,11 +1119,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /* * Return true if "lame duck" or retiring key has expired and can * no longer be used. @@ -1338,7 +1333,7 @@ /* For now we hardcode this to be 16 for the software based data channel * DCO based implementations/HW implementation might adjust this number * based on their expected speed */ - const int future_key_count = 16; + const uint8_t future_key_count = 16; int key_direction = server ? KEY_DIRECTION_INVERSE : KEY_DIRECTION_NORMAL; struct key_direction_state kds; @@ -1785,6 +1780,11 @@ return true; } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif + static bool write_string(struct buffer *buf, const char *str, const int maxlen) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1299?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I6bc3147d10ca50291110335cd9fc3be961280c1b Gerrit-Change-Number: 1299 Gerrit-PatchSet: 6 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
