From 31db94f4f74809b687ef25e369b449b02964c6f8 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 19 Dec 2008 18:00:15 -0800 Subject: [PATCH] Support renaming interfaces from a pre-up script. This is useful for PPP server operators who want control over the naming of client interfaces. Originally implemented by Stephen Hemminger. Signed-off-by: Daniil Baturin --- pppd/ipcp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pppd/ipcp.c b/pppd/ipcp.c index e9738fe..48d7095 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -55,6 +55,7 @@ #include #include #include +#include #include "pppd.h" #include "fsm.h" @@ -1788,6 +1789,7 @@ ipcp_up(f) ipcp_options *ho = &ipcp_hisoptions[f->unit]; ipcp_options *go = &ipcp_gotoptions[f->unit]; ipcp_options *wo = &ipcp_wantoptions[f->unit]; + int ifindex; IPCPDEBUG(("ipcp: up")); @@ -1901,9 +1903,18 @@ ipcp_up(f) } #endif + ifindex = if_nametoindex(ifname); + /* run the pre-up script, if any, and wait for it to finish */ ipcp_script(_PATH_IPPREUP, 1); + /* check if preup script renamed the interface */ + if (!if_indextoname(ifindex, ifname)) { + error("Interface index %d failed to get renamed by a pre-up script", ifindex); + ipcp_close(f->unit, "Interface configuration failed"); + return; + } + /* bring the interface up for IP */ if (!sifup(f->unit)) { if (debug) -- 2.39.2