diff options
| author | hwspeedy <ns@bigbear.dk> | 2024-03-10 17:31:11 +0100 |
|---|---|---|
| committer | hwspeedy <ns@bigbear.dk> | 2024-03-10 17:31:11 +0100 |
| commit | de70603e7a490a20d6eeee923c7764e426880a86 (patch) | |
| tree | 0f104e581254c5d80b42c7edb2c1fdf80b322279 | |
| parent | 49e99e248466af07114e257d81d44face9aaac54 (diff) | |
FIX Deprecated inet_addr and inet_ntoa
| -rw-r--r-- | hardinfo2/socket.c | 2 | ||||
| -rw-r--r-- | modules/network.c | 2 | ||||
| -rw-r--r-- | modules/network/net.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hardinfo2/socket.c b/hardinfo2/socket.c index b94e43c2..1acd86de 100644 --- a/hardinfo2/socket.c +++ b/hardinfo2/socket.c @@ -40,7 +40,7 @@ Socket *sock_connect(gchar * host, gint port) if (sock > 0) { memset(&server, 0, sizeof(server)); server.sin_family = AF_INET; - server.sin_addr.s_addr = inet_addr(host); + inet_pton(AF_INET,host,&server.sin_addr.s_addr); server.sin_port = htons(port); if (connect(sock, (struct sockaddr *) (void *) &server, sizeof(server)) < 0) { diff --git a/modules/network.c b/modules/network.c index 4b65e0aa..a9f96b41 100644 --- a/modules/network.c +++ b/modules/network.c @@ -151,7 +151,7 @@ void scan_dns(gboolean reload) ip = g_strstrip(buffer + sizeof("nameserver")); sa.sin_family = AF_INET; - sa.sin_addr.s_addr = inet_addr(ip); + inet_pton(AF_INET,ip,&sa.sin_addr.s_addr); if (getnameinfo((struct sockaddr *)&sa, sizeof(sa), hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD)) { __nameservers = h_strdup_cprintf("%s=\n", diff --git a/modules/network/net.c b/modules/network/net.c index 9a5cb5f1..f584362b 100644 --- a/modules/network/net.c +++ b/modules/network/net.c @@ -200,9 +200,9 @@ void get_net_info(char *if_name, NetInfo * netinfo) if (ioctl(fd, SIOCGIFADDR, &ifr) < 0) { netinfo->ip[0] = 0; } else { - snprintf(netinfo->ip, sizeof(netinfo->ip), "%s", - inet_ntoa(((struct sockaddr_in *) &ifr.ifr_addr)-> - sin_addr)); + char ipstr[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr, ipstr, INET_ADDRSTRLEN); + snprintf(netinfo->ip, sizeof(netinfo->ip), "%s",ipstr); } /* Mask Address */ |