|
|
|
|
@ -479,8 +479,10 @@ static void getInterfaceList(int sd, std::vector<std::pair<string,string> >& if_
|
|
|
|
|
for(int i=0; i<n_dev; i++){
|
|
|
|
|
if(ifrs[i].ifr_addr.sa_family==PF_INET){
|
|
|
|
|
struct sockaddr_in* sa = (struct sockaddr_in*)&ifrs[i].ifr_addr;
|
|
|
|
|
struct sockaddr_in sa4;
|
|
|
|
|
memcpy(&sa4, sa, sizeof(struct sockaddr_in));
|
|
|
|
|
if_list.push_back(make_pair((char*)ifrs[i].ifr_name,
|
|
|
|
|
inet_ntoa(sa->sin_addr)));
|
|
|
|
|
inet_ntoa(sa4.sin_addr)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else // defined(BSD44SOCKETS)
|
|
|
|
|
@ -534,8 +536,10 @@ static string getLocalIP(const string& dev_name)
|
|
|
|
|
|
|
|
|
|
if(ifr.ifr_addr.sa_family==PF_INET){
|
|
|
|
|
struct sockaddr_in* sa = (struct sockaddr_in*)&ifr.ifr_addr;
|
|
|
|
|
struct sockaddr_in sa4;
|
|
|
|
|
memcpy(&sa4, sa, sizeof(struct sockaddr_in));
|
|
|
|
|
if_list.push_back(make_pair((char*)ifr.ifr_name,
|
|
|
|
|
inet_ntoa(sa->sin_addr)));
|
|
|
|
|
inet_ntoa(sa4.sin_addr)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|