diff options
author | Martin Xu <martin.xu@intel.com> | 2010-11-12 17:07:31 +0100 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-11-13 23:35:38 +0100 |
commit | 5dcabcf4a70d58a862990ba3235882c4e47ebcc4 (patch) | |
tree | 16d9240c1af02db72ac28fc9eb370d742302ebe8 /gdhcp/client.c | |
parent | 18151aa9ff937fe04abea3af39fbbe442565dc31 (diff) | |
download | connman-5dcabcf4a70d58a862990ba3235882c4e47ebcc4.tar.gz connman-5dcabcf4a70d58a862990ba3235882c4e47ebcc4.tar.bz2 connman-5dcabcf4a70d58a862990ba3235882c4e47ebcc4.zip |
gdhcp: Move get_interface_name and interface_is_up to common.c
This is needed for the dhcp server implementation.
Diffstat (limited to 'gdhcp/client.c')
-rw-r--r-- | gdhcp/client.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/gdhcp/client.c b/gdhcp/client.c index b9a0e7fc..e3ae0dbb 100644 --- a/gdhcp/client.c +++ b/gdhcp/client.c @@ -33,7 +33,6 @@ #include <netpacket/packet.h> #include <net/ethernet.h> -#include <net/if_arp.h> #include <linux/if.h> #include <linux/filter.h> @@ -268,70 +267,7 @@ static int send_release(GDHCPClient *dhcp_client, server, SERVER_PORT); } -static gboolean interface_is_up(int index) -{ - int sk, err; - struct ifreq ifr; - gboolean ret = FALSE; - - sk = socket(PF_INET, SOCK_DGRAM, 0); - if (sk < 0) { - perror("Open socket error"); - return FALSE; - } - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = index; - - err = ioctl(sk, SIOCGIFNAME, &ifr); - if (err < 0) { - perror("Get interface name error"); - goto done; - } - - err = ioctl(sk, SIOCGIFFLAGS, &ifr); - if (err < 0) { - perror("Get interface flags error"); - goto done; - } - - if (ifr.ifr_flags & IFF_UP) - ret = TRUE; - -done: - close(sk); - - return ret; -} - -static char *get_interface_name(int index) -{ - struct ifreq ifr; - int sk, err; - - if (index < 0) - return NULL; - - sk = socket(PF_INET, SOCK_DGRAM, 0); - if (sk < 0) { - perror("Open socket error"); - return NULL; - } - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = index; - - err = ioctl(sk, SIOCGIFNAME, &ifr); - if (err < 0) { - perror("Get interface name error"); - close(sk); - return NULL; - } - - close(sk); - - return g_strdup(ifr.ifr_name); -} static void get_interface_mac_address(int index, uint8_t *mac_address) { |