radius: Fix list traversal in rc_avpair_insert

[ppp.git] / pppd / plugins / minconn.c

diff --git a/pppd/plugins/minconn.c b/pppd/plugins/minconn.c
index c12216a0a7d81d55a86e424b74a3756682cbf194..9e9735f623b4a1033aece347c10832503505b9a6 100644 (file)
--- a/pppd/plugins/minconn.c
+++ b/pppd/plugins/minconn.c
@@ -32,15 +32,28 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 #include <stddef.h>
 #include <time.h>
-#include "pppd.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include <sys/types.h>
+
+#include <pppd/pppd.h>
+#include <pppd/options.h>
+
+#if !defined(SOL2)
+#include <linux/ppp_defs.h>
+#else
+#include <net/ppp_defs.h>
+#endif
 
-char pppd_version[] = VERSION;
+char pppd_version[] = PPPD_VERSION;
 
 static int minconnect = 0;
 
-static option_t my_options[] = {
+static struct option my_options[] = {
        { "minconnect", o_int, &minconnect,
          "Set minimum connect time before idle timeout applies" },
        { NULL }
@@ -51,16 +64,16 @@ static int my_get_idle(struct ppp_idle *idle)
        time_t t;
 
        if (idle == NULL)
-               return minconnect? minconnect: idle_time_limit;
+               return minconnect ? minconnect: ppp_get_max_idle_time();
        t = idle->xmit_idle;
        if (idle->recv_idle < t)
                t = idle->recv_idle;
-       return idle_time_limit - t;
+       return ppp_get_max_idle_time() - t;
 }
 
 void plugin_init(void)
 {
        info("plugin_init");
-       add_options(my_options);
+       ppp_add_options(my_options);
        idle_time_hook = my_get_idle;
 }