X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fminconn.c;h=c12216a0a7d81d55a86e424b74a3756682cbf194;hb=HEAD;hp=d0514d32047f3d692e7263eb693b41f9d3eb3aeb;hpb=5951347a39047850943e0b0ee31d025c6560a47c;p=ppp.git

diff --git a/pppd/plugins/minconn.c b/pppd/plugins/minconn.c
index d0514d3..cd61ccd 100644
--- a/pppd/plugins/minconn.c
+++ b/pppd/plugins/minconn.c
@@ -1,22 +1,59 @@
 /*
  * minconn.c - pppd plugin to implement a `minconnect' option.
  *
- * Copyright 1999 Paul Mackerras.
+ * Copyright (c) 1999 Paul Mackerras. All rights reserved.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name(s) of the authors of this software must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Paul Mackerras
+ *     <paulus@ozlabs.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * 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 }
@@ -27,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;
 }