From: Frank Lichtenheld <[email protected]> Use the atoi_constrained function.
Change-Id: Ic9ac18f730e6035126ccf1cf19799548e5fd9316 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1155 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1155 This mail reflects revision 8 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 9e7ad93..4c540a6 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -552,14 +552,10 @@ /* * Sanity checks. */ - if (o->keepalive_ping <= 0 || o->keepalive_timeout <= 0) - { - msg(M_USAGE, "--keepalive parameters must be > 0"); - } if (o->keepalive_ping * 2 > o->keepalive_timeout) { msg(M_USAGE, - "the second parameter to --keepalive (restart timeout=%d) must be at least twice the value of the first parameter (ping interval=%d). A ratio of 1:5 or 1:6 would be even better. Recommended setting is --keepalive 10 60.", + "The second parameter to --keepalive (restart timeout=%d) must be at least twice the value of the first parameter (ping interval=%d). A ratio of 1:5 or 1:6 would be even better. Recommended setting is --keepalive 10 60.", o->keepalive_timeout, o->keepalive_ping); } if (o->ping_send_timeout || o->ping_rec_timeout) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index e75b452..51d0418 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -6755,8 +6755,8 @@ else if (streq(p[0], "keepalive") && p[1] && p[2] && !p[3]) { VERIFY_PERMISSION(OPT_P_GENERAL); - options->keepalive_ping = atoi_warn(p[1], msglevel); - options->keepalive_timeout = atoi_warn(p[2], msglevel); + atoi_constrained(p[1], &options->keepalive_ping, "keepalive ping", 1, INT_MAX, msglevel); + atoi_constrained(p[2], &options->keepalive_timeout, "keepalive timeout", 1, INT_MAX, msglevel); } else if (streq(p[0], "ping") && p[1] && !p[2]) { _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
