aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

union { .. } addr removed from IPADDR - it hasn't been actually used

Browse Source 
for a long time..


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1339 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-03-04 03:00:35 +00:00 committed by cras
parent 38fbd48712
commit 62bd2045bb
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/network.c
View File

@ -57,10 +57,10 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ip1->family == AF_INET6) if (ip1->family == AF_INET6)
return memcmp(&ip1->addr, &ip2->addr, sizeof(ip1->addr)) == 0; return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0;
#endif #endif
return memcmp(&ip1->addr, &ip2->addr, 4) == 0; return memcmp(&ip1->ip, &ip2->ip, 4) == 0;
} }
@ -86,10 +86,10 @@ void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
so->sin.sin_family = ip->family; so->sin.sin_family = ip->family;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ip->family == AF_INET6) if (ip->family == AF_INET6)
memcpy(&so->sin6.sin6_addr, &ip->addr, sizeof(ip->addr.ip6)); memcpy(&so->sin6.sin6_addr, &ip->ip, sizeof(ip->ip));
else else
#endif #endif
memcpy(&so->sin.sin_addr, &ip->addr, 4); memcpy(&so->sin.sin_addr, &ip->ip, 4);
} }
void sin_get_ip(const union sockaddr_union *so, IPADDR *ip) void sin_get_ip(const union sockaddr_union *so, IPADDR *ip)
@ -98,10 +98,10 @@ void sin_get_ip(const union sockaddr_union *so, IPADDR *ip)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ip->family == AF_INET6) if (ip->family == AF_INET6)
memcpy(&ip->addr, &so->sin6.sin6_addr, sizeof(ip->addr.ip6)); memcpy(&ip->ip, &so->sin6.sin6_addr, sizeof(ip->ip));
else else
#endif #endif
memcpy(&ip->addr, &so->sin.sin_addr, 4); memcpy(&ip->ip, &so->sin.sin_addr, 4);
} }
#ifdef G_CAN_INLINE #ifdef G_CAN_INLINE
@ -409,7 +409,7 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
if (hp == NULL) return h_errno; if (hp == NULL) return h_errno;
ip4->family = AF_INET; ip4->family = AF_INET;
memcpy(&ip4->addr, hp->h_addr, 4); memcpy(&ip4->ip, hp->h_addr, 4);
#endif #endif
return 0; return 0;
@ -458,12 +458,12 @@ int net_gethostbyaddr(IPADDR *ip, char **name)
int net_ip2host(IPADDR *ip, char *host) int net_ip2host(IPADDR *ip, char *host)
{ {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (!inet_ntop(ip->family, &ip->addr, host, MAX_IP_LEN)) if (!inet_ntop(ip->family, &ip->ip, host, MAX_IP_LEN))
return -1; return -1;
#else #else
unsigned long ip4; unsigned long ip4;
ip4 = ntohl(ip->addr.ip.s_addr); ip4 = ntohl(ip->ip.s_addr);
g_snprintf(host, MAX_IP_LEN, "%lu.%lu.%lu.%lu", g_snprintf(host, MAX_IP_LEN, "%lu.%lu.%lu.%lu",
(ip4 & 0xff000000UL) >> 24, (ip4 & 0xff000000UL) >> 24,
(ip4 & 0x00ff0000) >> 16, (ip4 & 0x00ff0000) >> 16,
@ -481,7 +481,7 @@ int net_host2ip(const char *host, IPADDR *ip)
if (strchr(host, ':') != NULL) { if (strchr(host, ':') != NULL) {
/* IPv6 */ /* IPv6 */
ip->family = AF_INET6; ip->family = AF_INET6;
if (inet_pton(AF_INET6, host, &ip->addr) == 0) if (inet_pton(AF_INET6, host, &ip->ip) == 0)
return -1; return -1;
} else } else
#endif #endif
@ -489,14 +489,14 @@ int net_host2ip(const char *host, IPADDR *ip)
/* IPv4 */ /* IPv4 */
ip->family = AF_INET; ip->family = AF_INET;
#ifdef HAVE_INET_ATON #ifdef HAVE_INET_ATON
if (inet_aton(host, &ip->addr.ip.s_addr) == 0) if (inet_aton(host, &ip->ip.s_addr) == 0)
return -1; return -1;
#else #else
addr = inet_addr(host); addr = inet_addr(host);
if (addr == INADDR_NONE) if (addr == INADDR_NONE)
return -1; return -1;
memcpy(&ip->addr, &addr, 4); memcpy(&ip->ip, &addr, 4);
#endif #endif
} }

6
src/core/network.h
View File

@ -17,13 +17,11 @@
struct _IPADDR { struct _IPADDR {
unsigned short family; unsigned short family;
union {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct in6_addr ip6; struct in6_addr ip;
#else #else
struct in_addr ip; struct in_addr ip;
#endif #endif
} addr;
}; };
/* maxmimum string length of IP address */ /* maxmimum string length of IP address */

4
src/irc/dcc/dcc.c
View File

@ -158,7 +158,7 @@ void dcc_ip2str(IPADDR *ip, char *host)
/* IPv6 */ /* IPv6 */
net_ip2host(ip, host); net_ip2host(ip, host);
} else { } else {
memcpy(&addr, &ip->addr, 4); memcpy(&addr, &ip->ip, 4);
g_snprintf(host, MAX_IP_LEN, "%lu", g_snprintf(host, MAX_IP_LEN, "%lu",
(unsigned long) htonl(addr)); (unsigned long) htonl(addr));
} }
@ -173,7 +173,7 @@ void dcc_str2ip(const char *str, IPADDR *ip)
addr = strtoul(str, NULL, 10); addr = strtoul(str, NULL, 10);
ip->family = AF_INET; ip->family = AF_INET;
addr = (unsigned long) ntohl(addr); addr = (unsigned long) ntohl(addr);
memcpy(&ip->addr, &addr, 4); memcpy(&ip->ip, &addr, 4);
} else { } else {
/* IPv6 - in standard form */ /* IPv6 - in standard form */
net_host2ip(str, ip); net_host2ip(str, ip);