From: Paul Mackerras <paulus@ozlabs.org>
Date: Tue, 10 Sep 2024 10:18:27 +0000 (+1000)
Subject: Merge branch 'net-scripts' of https://github.com/tpaukrt/ppp
X-Git-Tag: v2.5.1~11
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=f891b35364e05fc40cc2221b7caaec4805c7e57d;p=ppp.git

Merge branch 'net-scripts' of https://github.com/tpaukrt/ppp
---

f891b35364e05fc40cc2221b7caaec4805c7e57d
diff --cc pppd/main.c
index cdd8a7f,acc1b63..7f73e0d
--- a/pppd/main.c
+++ b/pppd/main.c
@@@ -363,12 -363,12 +363,16 @@@ main(int argc, char *argv[]
      struct protent *protp;
      char numbuf[16];
  
 +    strlcpy(path_upapfile, PPP_PATH_UPAPFILE, MAXPATHLEN);
 +    strlcpy(path_chapfile, PPP_PATH_CHAPFILE, MAXPATHLEN);
 +
+     strlcpy(path_net_init, PPP_PATH_NET_INIT, MAXPATHLEN);
+     strlcpy(path_net_preup, PPP_PATH_NET_PREUP, MAXPATHLEN);
+     strlcpy(path_net_down, PPP_PATH_NET_DOWN, MAXPATHLEN);
+ 
      strlcpy(path_ipup, PPP_PATH_IPUP, MAXPATHLEN);
      strlcpy(path_ipdown, PPP_PATH_IPDOWN, MAXPATHLEN);
 +    strlcpy(path_ippreup, PPP_PATH_IPPREUP, MAXPATHLEN);
  
  #ifdef PPP_WITH_IPV6CP
      strlcpy(path_ipv6up, PPP_PATH_IPV6UP, MAXPATHLEN);
diff --cc pppd/options.c
index 2cdfaf2,9dbc883..36f59a9
--- a/pppd/options.c
+++ b/pppd/options.c
@@@ -121,9 -121,11 +121,12 @@@ char	linkname[MAXPATHLEN];	/* logical n
  bool	tune_kernel;		/* may alter kernel settings */
  int	connect_delay = 1000;	/* wait this many ms after connect script */
  int	req_unit = -1;		/* requested interface unit */
+ char	path_net_init[MAXPATHLEN]; /* pathname of net-init script */
+ char	path_net_preup[MAXPATHLEN];/* pathname of net-pre-up script */
+ char	path_net_down[MAXPATHLEN]; /* pathname of net-down script */
  char	path_ipup[MAXPATHLEN];	/* pathname of ip-up script */
  char	path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
 +char	path_ippreup[MAXPATHLEN]; /* pathname of ip-pre-up script */
  char	req_ifname[IFNAMSIZ];	/* requested interface name */
  bool	multilink = 0;		/* Enable multilink operation */
  char	*bundle_name = NULL;	/* bundle name for multilink */
diff --cc pppd/pppd-private.h
index e076200,442c688..561c541
--- a/pppd/pppd-private.h
+++ b/pppd/pppd-private.h
@@@ -194,9 -192,11 +194,12 @@@ extern bool	tune_kernel;	/* May alter k
  extern int	connect_delay;	/* Time to delay after connect script */
  extern int	max_data_rate;	/* max bytes/sec through charshunt */
  extern int	req_unit;	/* interface unit number to use */
+ extern char	path_net_init[]; /* pathname of net-init script */
+ extern char	path_net_preup[];/* pathname of net-pre-up script */
+ extern char	path_net_down[]; /* pathname of net-down script */
  extern char	path_ipup[]; 	/* pathname of ip-up script */
  extern char	path_ipdown[];	/* pathname of ip-down script */
 +extern char	path_ippreup[];	/* pathname of ip-pre-up script */
  extern char	req_ifname[]; /* interface name to use (IFNAMSIZ) */
  extern bool	multilink;	/* enable multilink operation (options.c) */
  extern bool	noendpoint;	/* don't send or accept endpt. discrim. */