From 4e24ba00aca6a3159e9ccb017f202321947967b8 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Tue, 28 Aug 2012 10:51:30 +0300 Subject: inet: Properly remove IPv4 address and set interface down The interface was not properly set down and thus the services were not removed. Fixes BMC#25659 --- src/inet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/inet.c b/src/inet.c index 75efc26e..1f9bd0dd 100644 --- a/src/inet.c +++ b/src/inet.c @@ -311,7 +311,7 @@ done: int connman_inet_ifdown(int index) { - struct ifreq ifr; + struct ifreq ifr, addr_ifr; struct sockaddr_in *addr; int sk, err; @@ -332,9 +332,11 @@ int connman_inet_ifdown(int index) goto done; } - addr = (struct sockaddr_in *)&ifr.ifr_addr; + memset(&addr_ifr, 0, sizeof(addr_ifr)); + memcpy(&addr_ifr.ifr_name, &ifr.ifr_name, sizeof(ifr.ifr_name)); + addr = (struct sockaddr_in *)&addr_ifr.ifr_addr; addr->sin_family = AF_INET; - if (ioctl(sk, SIOCSIFADDR, &ifr) < 0) + if (ioctl(sk, SIOCSIFADDR, &addr_ifr) < 0) connman_warn("Could not clear IPv4 address index %d", index); if (!(ifr.ifr_flags & IFF_UP)) { -- cgit v1.2.3