From 7afd9fdfe025a5c448d737a23d2e635e9cf6bd2d Mon Sep 17 00:00:00 2001 From: Russell Coker Date: Wed, 30 Dec 2020 11:37:44 +0100 Subject: [PATCH] Add option to specify ip-up script From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=101587 Signed-off-by: Samuel Thibault --- pppd/ipcp.c | 8 ++++---- pppd/main.c | 3 +++ pppd/options.c | 9 +++++++++ pppd/pppd.h | 2 ++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 7357ac8..f8942a9 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -1922,7 +1922,7 @@ ipcp_up(fsm *f) */ if (ipcp_script_state == s_down && ipcp_script_pid == 0) { ipcp_script_state = s_up; - ipcp_script(_PATH_IPUP, 0); + ipcp_script(path_ipup, 0); } } @@ -1971,7 +1971,7 @@ ipcp_down(fsm *f) /* Execute the ip-down script */ if (ipcp_script_state == s_up && ipcp_script_pid == 0) { ipcp_script_state = s_down; - ipcp_script(_PATH_IPDOWN, 0); + ipcp_script(path_ipdown, 0); } } @@ -2020,13 +2020,13 @@ ipcp_script_done(void *arg) case s_up: if (ipcp_fsm[0].state != OPENED) { ipcp_script_state = s_down; - ipcp_script(_PATH_IPDOWN, 0); + ipcp_script(path_ipdown, 0); } break; case s_down: if (ipcp_fsm[0].state == OPENED) { ipcp_script_state = s_up; - ipcp_script(_PATH_IPUP, 0); + ipcp_script(path_ipup, 0); } break; } diff --git a/pppd/main.c b/pppd/main.c index 099c050..2b53936 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -293,6 +293,9 @@ main(int argc, char *argv[]) struct protent *protp; char numbuf[16]; + strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); + strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown)); + link_stats_valid = 0; new_phase(PHASE_INITIALIZE); diff --git a/pppd/options.c b/pppd/options.c index c45f7cc..108e2b8 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -115,6 +115,8 @@ char linkname[MAXPATHLEN]; /* logical name for link */ 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_ipup[MAXPATHLEN]; /* pathname of ip-up script */ +char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ char req_ifname[MAXIFNAMELEN]; /* requested interface name */ bool multilink = 0; /* Enable multilink operation */ char *bundle_name = NULL; /* bundle name for multilink */ @@ -315,6 +317,13 @@ option_t general_options[] = { "Metric to use for the default route (Linux only; -1 for default behavior)", OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 }, + { "ip-up-script", o_string, path_ipup, + "Set pathname of ip-up script", + OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, + { "ip-down-script", o_string, path_ipdown, + "Set pathname of ip-down script", + OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, + #ifdef HAVE_MULTILINK { "multilink", o_bool, &multilink, "Enable multilink operation", OPT_PRIO | 1 }, diff --git a/pppd/pppd.h b/pppd/pppd.h index b5f3ad2..32b914e 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -325,6 +325,8 @@ extern bool tune_kernel; /* May alter kernel settings as necessary */ 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_ipup[MAXPATHLEN]; /* pathname of ip-up script */ +extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ extern bool multilink; /* enable multilink operation */ extern bool noendpoint; /* don't send or accept endpt. discrim. */ -- 2.39.2