|
@@ -1,5 +1,5 @@
|
|
|
---- ppp-2.4.6.orig/pppd/pppd.h 2014-01-02 05:42:08.000000000 +0100
|
|
|
-+++ ppp-2.4.6/pppd/pppd.h 2014-06-06 08:12:44.000000000 +0200
|
|
|
+--- ppp-2.4.7.orig/pppd/pppd.h 2014-08-09 14:31:39.000000000 +0200
|
|
|
++++ ppp-2.4.7/pppd/pppd.h 2015-06-09 13:01:25.000000000 +0200
|
|
|
@@ -198,8 +198,8 @@ struct epdisc {
|
|
|
#define EPD_MAGIC 4
|
|
|
#define EPD_PHONENUM 5
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
|
struct notifier {
|
|
|
struct notifier *next;
|
|
|
-@@ -396,34 +396,34 @@ extern int option_priority; /* priority
|
|
|
+@@ -397,34 +397,34 @@ extern int option_priority; /* priority
|
|
|
struct protent {
|
|
|
u_short protocol; /* PPP protocol number */
|
|
|
/* Initialization procedure */
|
|
@@ -59,7 +59,7 @@
|
|
|
};
|
|
|
|
|
|
/* Table of pointers to supported protocols */
|
|
|
-@@ -440,25 +440,25 @@ struct channel {
|
|
|
+@@ -441,25 +441,25 @@ struct channel {
|
|
|
/* set of options for this channel */
|
|
|
option_t *options;
|
|
|
/* find and process a per-channel options file */
|
|
@@ -95,7 +95,7 @@
|
|
|
};
|
|
|
|
|
|
extern struct channel *the_channel;
|
|
|
-@@ -483,117 +483,117 @@ extern struct userenv *userenv_list;
|
|
|
+@@ -484,117 +484,117 @@ extern struct userenv *userenv_list;
|
|
|
*/
|
|
|
|
|
|
/* Procedures exported from main.c. */
|
|
@@ -296,7 +296,7 @@
|
|
|
#else
|
|
|
#define mp_bundle_terminated() /* nothing */
|
|
|
#define mp_exit_bundle() /* nothing */
|
|
|
-@@ -602,145 +602,145 @@ int str_to_epdisc __P((struct epdisc *,
|
|
|
+@@ -603,147 +603,147 @@ int str_to_epdisc __P((struct epdisc *,
|
|
|
#endif
|
|
|
|
|
|
/* Procedures exported from sys-*.c */
|
|
@@ -396,7 +396,11 @@
|
|
|
/* Reset i/f IP addresses */
|
|
|
#ifdef INET6
|
|
|
int ether_to_eui64(eui64_t *p_eui64); /* convert eth0 hw address to EUI64 */
|
|
|
+-int sif6up __P((int)); /* Configure i/f up for IPv6 */
|
|
|
+-int sif6down __P((int)); /* Configure i/f down for IPv6 */
|
|
|
-int sif6addr __P((int, eui64_t, eui64_t));
|
|
|
++int sif6up (int); /* Configure i/f up for IPv6 */
|
|
|
++int sif6down (int); /* Configure i/f down for IPv6 */
|
|
|
+int sif6addr (int, eui64_t, eui64_t);
|
|
|
/* Configure IPv6 addresses for i/f */
|
|
|
-int cif6addr __P((int, eui64_t, eui64_t));
|
|
@@ -511,7 +515,7 @@
|
|
|
-extern void (*ipv6_up_hook) __P((void));
|
|
|
-extern void (*ipv6_down_hook) __P((void));
|
|
|
+ struct wordlist **popts);
|
|
|
-+extern void (*pap_logout_hook) (void);
|
|
|
++extern void (*pap_logout_hook)(void);
|
|
|
+extern int (*pap_passwd_hook) (char *user, char *passwd);
|
|
|
+extern int (*allowed_address_hook) (u_int32_t addr);
|
|
|
+extern void (*ip_up_hook) (void);
|