]> git.ozlabs.org Git - ppp.git/commitdiff
Merge branch 'net-scripts' of https://github.com/tpaukrt/ppp
authorPaul Mackerras <paulus@ozlabs.org>
Tue, 10 Sep 2024 10:18:27 +0000 (20:18 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Tue, 10 Sep 2024 10:18:27 +0000 (20:18 +1000)
1  2 
pppd/main.c
pppd/options.c
pppd/pppd-private.h

diff --cc pppd/main.c
index cdd8a7f362c0a30e8b07fdea1c841edd3ceacc85,acc1b634cb4977cf85df4b698a758d918fa39e5c..7f73e0dac1e47b958db600384d4ad7a9984567a7
@@@ -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 2cdfaf271243337a0c930cd7d51852c2b4bc3c1f,9dbc88396cc4cfb801ab47ae0ff2b09f88d03c33..36f59a943910bc182844eb5fd0682aff268bc419
@@@ -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 */
index e0762007c1276156efb70c4385cf74632184a00b,442c688eba9d5a83445a204b0838bb682c25c9e1..561c541332f2034a0c11776822116b9f2dc5ae01
@@@ -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. */