From f5b1c3f98bf082d4ecf57e8f2e3c61fc993d80e7 Mon Sep 17 00:00:00 2001 From: Simon Chopin Date: Fri, 28 Feb 2020 11:28:07 +0100 Subject: net: new function get_ifindex The index of a given interface is an operation that highly depends on the network namespace we're in. This patch simply cuts out a function to get the index for a given interface name from the session initialization code, and expose it in the ap_net structure. This function can then be used to refresh the index when moving interfaces around. Signed-off-by: Simon Chopin --- accel-pppd/session.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'accel-pppd/session.c') diff --git a/accel-pppd/session.c b/accel-pppd/session.c index 8ef569e..1411f24 100644 --- a/accel-pppd/session.c +++ b/accel-pppd/session.c @@ -88,21 +88,11 @@ void __export ap_session_set_ifindex(struct ap_session *ses) int __export ap_session_starting(struct ap_session *ses) { - struct ifreq ifr; - if (ap_shutdown) return -1; - if (ses->ifindex == -1 && ses->ifname[0]) { - memset(&ifr, 0, sizeof(ifr)); - strcpy(ifr.ifr_name, ses->ifname); - - if (net->sock_ioctl(SIOCGIFINDEX, &ifr)) { - log_ppp_error("ioctl(SIOCGIFINDEX): %s\n", strerror(errno)); - return -1; - } - ses->ifindex = ifr.ifr_ifindex; - } + if (ses->ifindex == -1 && ses->ifname[0]) + ses->ifindex = net->get_ifindex(ses->ifname); if (ses->ifindex != -1) ap_session_set_ifindex(ses); -- cgit v1.2.3