Mercurial > dovecot > core-2.2
annotate src/lib/network.c @ 11794:5ea9394b5ced
liblib: Added net_connect_ip_blocking().
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 12 Jul 2010 00:32:30 +0100 |
| parents | c24ee1ebb159 |
| children | 4fb7e5327efc |
| rev | line source |
|---|---|
|
10582
615eef3139c2
Updated copyright notices to include year 2010.
Timo Sirainen <tss@iki.fi>
parents:
10158
diff
changeset
|
1 /* Copyright (c) 1999-2010 Dovecot authors, see the included COPYING file */ |
| 0 | 2 |
| 3 #include "lib.h" | |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
4 #include "close-keep-errno.h" |
|
3621
3ae2df67459c
Added fd_set_nonblock() and changed net_set_nonblock() to use it.
Timo Sirainen <tss@iki.fi>
parents:
3577
diff
changeset
|
5 #include "fd-set-nonblock.h" |
|
10158
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
6 #include "time-util.h" |
| 0 | 7 #include "network.h" |
| 8 | |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
9 #include <stdlib.h> |
| 0 | 10 #include <unistd.h> |
| 11 #include <fcntl.h> | |
| 12 #include <ctype.h> | |
| 13 #include <sys/un.h> | |
| 14 #include <netinet/tcp.h> | |
| 15 | |
| 16 union sockaddr_union { | |
| 17 struct sockaddr sa; | |
| 18 struct sockaddr_in sin; | |
| 19 #ifdef HAVE_IPV6 | |
| 20 struct sockaddr_in6 sin6; | |
| 21 #endif | |
| 22 }; | |
| 23 | |
| 24 #ifdef HAVE_IPV6 | |
| 25 # define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \ | |
| 26 sizeof(so.sin6) : sizeof(so.sin)) | |
| 27 #else | |
| 28 # define SIZEOF_SOCKADDR(so) (sizeof(so.sin)) | |
| 29 #endif | |
| 30 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
31 bool net_ip_compare(const struct ip_addr *ip1, const struct ip_addr *ip2) |
| 0 | 32 { |
| 10789 | 33 return net_ip_cmp(ip1, ip2) == 0; |
| 34 } | |
| 35 | |
| 36 int net_ip_cmp(const struct ip_addr *ip1, const struct ip_addr *ip2) | |
| 37 { | |
| 0 | 38 if (ip1->family != ip2->family) |
| 10789 | 39 return ip1->family - ip2->family; |
| 0 | 40 |
| 41 #ifdef HAVE_IPV6 | |
| 10789 | 42 if (ip1->family == AF_INET6) |
| 43 return memcmp(&ip1->u.ip6, &ip2->u.ip6, sizeof(ip1->u.ip6)); | |
| 0 | 44 #endif |
| 45 | |
| 10789 | 46 return memcmp(&ip1->u.ip4, &ip2->u.ip4, sizeof(ip1->u.ip4)); |
| 0 | 47 } |
| 48 | |
| 5865 | 49 unsigned int net_ip_hash(const struct ip_addr *ip) |
| 50 { | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
51 const unsigned char *p; |
| 5865 | 52 unsigned int len, g, h = 0; |
| 53 | |
| 54 #ifdef HAVE_IPV6 | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
55 if (ip->family == AF_INET6) { |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
56 p = ip->u.ip6.s6_addr; |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
57 len = sizeof(ip->u.ip6); |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
58 } else |
| 5865 | 59 #endif |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
60 { |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
61 return ip->u.ip4.s_addr; |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
62 } |
| 5865 | 63 |
| 64 for (; len > 0; len--, p++) { | |
| 65 h = (h << 4) + *p; | |
| 66 if ((g = h & 0xf0000000UL)) { | |
| 67 h = h ^ (g >> 24); | |
| 68 h = h ^ g; | |
| 69 } | |
| 70 } | |
| 71 | |
| 72 return h; | |
| 73 } | |
| 0 | 74 |
| 75 /* copy IP to sockaddr */ | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
76 static inline void |
|
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
77 sin_set_ip(union sockaddr_union *so, const struct ip_addr *ip) |
| 0 | 78 { |
| 79 if (ip == NULL) { | |
| 80 #ifdef HAVE_IPV6 | |
| 81 so->sin6.sin6_family = AF_INET6; | |
| 82 so->sin6.sin6_addr = in6addr_any; | |
| 83 #else | |
| 84 so->sin.sin_family = AF_INET; | |
| 85 so->sin.sin_addr.s_addr = INADDR_ANY; | |
| 86 #endif | |
| 87 return; | |
| 88 } | |
| 89 | |
| 90 so->sin.sin_family = ip->family; | |
| 91 #ifdef HAVE_IPV6 | |
| 92 if (ip->family == AF_INET6) | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
93 memcpy(&so->sin6.sin6_addr, &ip->u.ip6, sizeof(ip->u.ip6)); |
| 0 | 94 else |
| 95 #endif | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
96 memcpy(&so->sin.sin_addr, &ip->u.ip4, sizeof(ip->u.ip4)); |
| 0 | 97 } |
| 98 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
99 static inline void |
|
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
100 sin_get_ip(const union sockaddr_union *so, struct ip_addr *ip) |
| 0 | 101 { |
| 102 ip->family = so->sin.sin_family; | |
| 103 | |
| 104 #ifdef HAVE_IPV6 | |
| 105 if (ip->family == AF_INET6) | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
106 memcpy(&ip->u.ip6, &so->sin6.sin6_addr, sizeof(ip->u.ip6)); |
| 0 | 107 else |
| 108 #endif | |
|
3400
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
109 if (ip->family == AF_INET) |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
110 memcpy(&ip->u.ip4, &so->sin.sin_addr, sizeof(ip->u.ip4)); |
|
3400
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
111 else |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
112 memset(&ip->u, 0, sizeof(ip->u)); |
| 0 | 113 } |
| 114 | |
| 349 | 115 static inline void sin_set_port(union sockaddr_union *so, unsigned int port) |
| 0 | 116 { |
| 117 #ifdef HAVE_IPV6 | |
| 118 if (so->sin.sin_family == AF_INET6) | |
| 119 so->sin6.sin6_port = htons((unsigned short) port); | |
| 120 else | |
| 121 #endif | |
| 122 so->sin.sin_port = htons((unsigned short) port); | |
| 123 } | |
| 124 | |
| 349 | 125 static inline unsigned int sin_get_port(union sockaddr_union *so) |
| 0 | 126 { |
| 127 #ifdef HAVE_IPV6 | |
| 128 if (so->sin.sin_family == AF_INET6) | |
| 129 return ntohs(so->sin6.sin6_port); | |
| 130 #endif | |
|
3400
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
131 if (so->sin.sin_family == AF_INET) |
|
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
132 return ntohs(so->sin.sin_port); |
|
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
133 |
|
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
134 return 0; |
| 0 | 135 } |
| 136 | |
|
6876
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
137 #ifdef __FreeBSD__ |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
138 static int net_connect_ip_freebsd(const struct ip_addr *ip, unsigned int port, |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
139 const struct ip_addr *my_ip); |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
140 |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
141 int net_connect_ip(const struct ip_addr *ip, unsigned int port, |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
142 const struct ip_addr *my_ip) |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
143 { |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
144 int fd, try; |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
145 |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
146 for (try = 0;;) { |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
147 fd = net_connect_ip_freebsd(ip, port, my_ip); |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
148 if (fd != -1 || ++try == 5 || |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
149 (errno != EADDRINUSE && errno != EACCES)) |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
150 break; |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
151 /* |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
152 This may be just a temporary problem: |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
153 |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
154 EADDRINUSE: busy |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
155 EACCES: pf may cause this if another connection used |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
156 the same port recently |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
157 */ |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
158 } |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
159 return fd; |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
160 } |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
161 /* then some kludging: */ |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
162 #define net_connect_ip net_connect_ip_freebsd |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
163 static |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
164 #endif |
|
ed6693fc06d6
FreeBSD: If connect() fails with EADDRINUSE or EACCES, try again max. 3 times.
Timo Sirainen <tss@iki.fi>
parents:
6825
diff
changeset
|
165 |
|
11794
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
166 static int net_connect_ip_full(const struct ip_addr *ip, unsigned int port, |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
167 const struct ip_addr *my_ip, bool blocking) |
| 0 | 168 { |
| 169 union sockaddr_union so; | |
| 170 int fd, ret, opt = 1; | |
| 171 | |
| 172 if (my_ip != NULL && ip->family != my_ip->family) { | |
| 173 i_warning("net_connect_ip(): ip->family != my_ip->family"); | |
| 174 my_ip = NULL; | |
| 175 } | |
| 176 | |
| 177 /* create the socket */ | |
| 178 memset(&so, 0, sizeof(so)); | |
| 179 so.sin.sin_family = ip->family; | |
| 180 fd = socket(ip->family, SOCK_STREAM, 0); | |
| 181 | |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
182 if (fd == -1) { |
|
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
183 i_error("socket() failed: %m"); |
| 0 | 184 return -1; |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
185 } |
| 0 | 186 |
| 187 /* set socket options */ | |
| 188 setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); | |
| 189 setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); | |
|
11794
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
190 if (!blocking) |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
191 net_set_nonblock(fd, TRUE); |
| 0 | 192 |
| 193 /* set our own address */ | |
| 194 if (my_ip != NULL) { | |
| 195 sin_set_ip(&so, my_ip); | |
| 196 if (bind(fd, &so.sa, SIZEOF_SOCKADDR(so)) == -1) { | |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
197 i_error("bind(%s) failed: %m", net_ip2addr(my_ip)); |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
198 close_keep_errno(fd); |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
199 return -1; |
| 0 | 200 } |
| 201 } | |
| 202 | |
| 203 /* connect */ | |
| 204 sin_set_ip(&so, ip); | |
| 205 sin_set_port(&so, port); | |
| 206 ret = connect(fd, &so.sa, SIZEOF_SOCKADDR(so)); | |
| 207 | |
| 208 #ifndef WIN32 | |
| 209 if (ret < 0 && errno != EINPROGRESS) | |
| 210 #else | |
| 211 if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) | |
| 212 #endif | |
| 213 { | |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
214 close_keep_errno(fd); |
| 0 | 215 return -1; |
| 216 } | |
| 217 | |
| 218 return fd; | |
| 219 } | |
| 220 | |
|
11794
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
221 int net_connect_ip(const struct ip_addr *ip, unsigned int port, |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
222 const struct ip_addr *my_ip) |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
223 { |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
224 return net_connect_ip_full(ip, port, my_ip, FALSE); |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
225 } |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
226 |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
227 int net_connect_ip_blocking(const struct ip_addr *ip, unsigned int port, |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
228 const struct ip_addr *my_ip) |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
229 { |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
230 return net_connect_ip_full(ip, port, my_ip, TRUE); |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
231 } |
|
5ea9394b5ced
liblib: Added net_connect_ip_blocking().
Timo Sirainen <tss@iki.fi>
parents:
11564
diff
changeset
|
232 |
| 11340 | 233 int net_try_bind(const struct ip_addr *ip) |
| 234 { | |
| 235 union sockaddr_union so; | |
| 236 int fd; | |
| 237 | |
| 238 /* create the socket */ | |
| 239 memset(&so, 0, sizeof(so)); | |
| 240 so.sin.sin_family = ip->family; | |
| 241 fd = socket(ip->family, SOCK_STREAM, 0); | |
| 242 if (fd == -1) { | |
| 243 i_error("socket() failed: %m"); | |
| 244 return -1; | |
| 245 } | |
| 246 | |
| 247 sin_set_ip(&so, ip); | |
| 248 if (bind(fd, &so.sa, SIZEOF_SOCKADDR(so)) == -1) { | |
| 249 close_keep_errno(fd); | |
| 250 return -1; | |
| 251 } | |
| 252 (void)close(fd); | |
| 253 return 0; | |
| 254 } | |
| 255 | |
| 0 | 256 int net_connect_unix(const char *path) |
| 257 { | |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
258 union { |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
259 struct sockaddr sa; |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
260 struct sockaddr_un un; |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
261 } sa; |
| 0 | 262 int fd, ret; |
| 263 | |
|
807
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
264 memset(&sa, 0, sizeof(sa)); |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
265 sa.un.sun_family = AF_UNIX; |
|
6422
18173a52f721
Renamed strocpy() to i_strocpy().
Timo Sirainen <tss@iki.fi>
parents:
6411
diff
changeset
|
266 if (i_strocpy(sa.un.sun_path, path, sizeof(sa.un.sun_path)) < 0) { |
| 0 | 267 /* too long path */ |
| 268 errno = EINVAL; | |
| 269 return -1; | |
| 270 } | |
| 271 | |
| 272 /* create the socket */ | |
| 273 fd = socket(PF_UNIX, SOCK_STREAM, 0); | |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
274 if (fd == -1) { |
|
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
275 i_error("socket(%s) failed: %m", path); |
| 0 | 276 return -1; |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
277 } |
| 0 | 278 |
|
3076
8d15fea729c2
Use nonblocking connecting for unix sockets.
Timo Sirainen <tss@iki.fi>
parents:
3075
diff
changeset
|
279 net_set_nonblock(fd, TRUE); |
|
8d15fea729c2
Use nonblocking connecting for unix sockets.
Timo Sirainen <tss@iki.fi>
parents:
3075
diff
changeset
|
280 |
| 0 | 281 /* connect */ |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
282 ret = connect(fd, &sa.sa, sizeof(sa)); |
| 0 | 283 if (ret < 0 && errno != EINPROGRESS) { |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
284 close_keep_errno(fd); |
| 0 | 285 return -1; |
| 286 } | |
| 287 | |
| 288 return fd; | |
| 289 } | |
| 290 | |
|
10158
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
291 int net_connect_unix_with_retries(const char *path, unsigned int msecs) |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
292 { |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
293 struct timeval start, now; |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
294 int fd; |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
295 |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
296 if (gettimeofday(&start, NULL) < 0) |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
297 i_panic("gettimeofday() failed: %m"); |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
298 |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
299 do { |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
300 fd = net_connect_unix(path); |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
301 if (fd != -1 || (errno != EAGAIN && errno != ECONNREFUSED)) |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
302 break; |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
303 |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
304 /* busy. wait for a while. */ |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
305 usleep(((rand() % 10) + 1) * 10000); |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
306 if (gettimeofday(&now, NULL) < 0) |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
307 i_panic("gettimeofday() failed: %m"); |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
308 } while (timeval_diff_msecs(&now, &start) < (int)msecs); |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
309 return fd; |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
310 } |
|
1bc88aa1373f
Added net_connect_unix_with_retries().
Timo Sirainen <tss@iki.fi>
parents:
9843
diff
changeset
|
311 |
| 0 | 312 void net_disconnect(int fd) |
| 313 { | |
|
11564
c24ee1ebb159
net_disconnect(): Ignore ECONNRESET error.
Timo Sirainen <tss@iki.fi>
parents:
11448
diff
changeset
|
314 /* FreeBSD's close() fails with ECONNRESET if socket still has unsent |
|
c24ee1ebb159
net_disconnect(): Ignore ECONNRESET error.
Timo Sirainen <tss@iki.fi>
parents:
11448
diff
changeset
|
315 data in transmit buffer. We don't care. */ |
|
c24ee1ebb159
net_disconnect(): Ignore ECONNRESET error.
Timo Sirainen <tss@iki.fi>
parents:
11448
diff
changeset
|
316 if (close(fd) < 0 && errno != ECONNRESET) |
|
388
792fc5b3daa4
Send error message if close() fails in net_disconnect().
Timo Sirainen <tss@iki.fi>
parents:
349
diff
changeset
|
317 i_error("net_disconnect() failed: %m"); |
| 0 | 318 } |
| 319 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
320 void net_set_nonblock(int fd, bool nonblock) |
| 0 | 321 { |
|
3621
3ae2df67459c
Added fd_set_nonblock() and changed net_set_nonblock() to use it.
Timo Sirainen <tss@iki.fi>
parents:
3577
diff
changeset
|
322 if (fd_set_nonblock(fd, nonblock) < 0) |
|
3ae2df67459c
Added fd_set_nonblock() and changed net_set_nonblock() to use it.
Timo Sirainen <tss@iki.fi>
parents:
3577
diff
changeset
|
323 i_fatal("fd_set_nonblock(%d) failed: %m", fd); |
| 0 | 324 } |
| 325 | |
|
6411
6a64e64fa3a3
Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to ATTRS_DEFINED.
Timo Sirainen <tss@iki.fi>
parents:
5985
diff
changeset
|
326 int net_set_cork(int fd ATTR_UNUSED, bool cork ATTR_UNUSED) |
| 0 | 327 { |
| 328 #ifdef TCP_CORK | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
329 int val = cork; |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
330 |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
331 return setsockopt(fd, IPPROTO_TCP, TCP_CORK, &val, sizeof(val)); |
|
410
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
332 #else |
|
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
333 errno = ENOPROTOOPT; |
|
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
334 return -1; |
| 0 | 335 #endif |
| 336 } | |
| 337 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
338 void net_get_ip_any4(struct ip_addr *ip) |
|
780
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
339 { |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
340 ip->family = AF_INET; |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
341 ip->u.ip4.s_addr = INADDR_ANY; |
|
780
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
342 } |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
343 |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
344 void net_get_ip_any6(struct ip_addr *ip) |
|
780
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
345 { |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
346 #ifdef HAVE_IPV6 |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
347 ip->family = AF_INET6; |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
348 ip->u.ip6 = in6addr_any; |
|
780
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
349 #else |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
350 memset(ip, 0, sizeof(struct ip_addr)); |
|
780
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
351 #endif |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
352 } |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
353 |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
354 int net_listen(const struct ip_addr *my_ip, unsigned int *port, int backlog) |
| 0 | 355 { |
| 356 union sockaddr_union so; | |
| 357 int ret, fd, opt = 1; | |
| 358 socklen_t len; | |
| 359 | |
| 360 memset(&so, 0, sizeof(so)); | |
| 361 sin_set_port(&so, *port); | |
| 362 sin_set_ip(&so, my_ip); | |
| 363 | |
| 364 /* create the socket */ | |
| 365 fd = socket(so.sin.sin_family, SOCK_STREAM, 0); | |
| 366 #ifdef HAVE_IPV6 | |
| 367 if (fd == -1 && (errno == EINVAL || errno == EAFNOSUPPORT)) { | |
| 368 /* IPv6 is not supported by OS */ | |
| 369 so.sin.sin_family = AF_INET; | |
| 370 so.sin.sin_addr.s_addr = INADDR_ANY; | |
| 371 | |
| 372 fd = socket(AF_INET, SOCK_STREAM, 0); | |
| 373 } | |
| 374 #endif | |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
375 if (fd == -1) { |
|
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
376 i_error("socket() failed: %m"); |
| 0 | 377 return -1; |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
378 } |
| 0 | 379 |
| 380 /* set socket options */ | |
| 381 setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); | |
| 382 setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); | |
| 383 | |
|
7274
da971cec0395
[::] listens only for IPv6 addresses now. This gets rid of IPv4-mapped IPv6
Timo Sirainen <tss@iki.fi>
parents:
7086
diff
changeset
|
384 /* If using IPv6, bind only to IPv6 if possible. This avoids |
|
da971cec0395
[::] listens only for IPv6 addresses now. This gets rid of IPv4-mapped IPv6
Timo Sirainen <tss@iki.fi>
parents:
7086
diff
changeset
|
385 ambiguities with IPv4-mapped IPv6 addresses. */ |
|
3373
690dcc51cdc1
if using IPv6, bind both on the IPv4 and IPv6 addresses if IPV6_V6ONLY is
Timo Sirainen <tss@iki.fi>
parents:
3076
diff
changeset
|
386 #ifdef IPV6_V6ONLY |
|
690dcc51cdc1
if using IPv6, bind both on the IPv4 and IPv6 addresses if IPV6_V6ONLY is
Timo Sirainen <tss@iki.fi>
parents:
3076
diff
changeset
|
387 if (so.sin.sin_family == AF_INET6) { |
|
7274
da971cec0395
[::] listens only for IPv6 addresses now. This gets rid of IPv4-mapped IPv6
Timo Sirainen <tss@iki.fi>
parents:
7086
diff
changeset
|
388 opt = 1; |
|
3373
690dcc51cdc1
if using IPv6, bind both on the IPv4 and IPv6 addresses if IPV6_V6ONLY is
Timo Sirainen <tss@iki.fi>
parents:
3076
diff
changeset
|
389 setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt)); |
|
690dcc51cdc1
if using IPv6, bind both on the IPv4 and IPv6 addresses if IPV6_V6ONLY is
Timo Sirainen <tss@iki.fi>
parents:
3076
diff
changeset
|
390 } |
|
690dcc51cdc1
if using IPv6, bind both on the IPv4 and IPv6 addresses if IPV6_V6ONLY is
Timo Sirainen <tss@iki.fi>
parents:
3076
diff
changeset
|
391 #endif |
| 0 | 392 /* specify the address/port we want to listen in */ |
| 393 ret = bind(fd, &so.sa, SIZEOF_SOCKADDR(so)); | |
|
3537
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
394 if (ret < 0) { |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
395 if (errno != EADDRINUSE) { |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
396 i_error("bind(%s, %u) failed: %m", |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
397 net_ip2addr(my_ip), *port); |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
398 } |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
399 } else { |
| 0 | 400 /* get the actual port we started listen */ |
| 401 len = SIZEOF_SOCKADDR(so); | |
| 402 ret = getsockname(fd, &so.sa, &len); | |
| 403 if (ret >= 0) { | |
| 404 *port = sin_get_port(&so); | |
| 405 | |
| 406 /* start listening */ | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
407 if (listen(fd, backlog) >= 0) |
|
3537
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
408 return fd; |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
409 |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
410 if (errno != EADDRINUSE) |
|
5ff3b88db948
net_listen(): Print bind() errors only if it's not EADDRINUSE. Also do the
Timo Sirainen <tss@iki.fi>
parents:
3523
diff
changeset
|
411 i_error("listen() failed: %m"); |
| 0 | 412 } |
| 413 } | |
| 414 | |
| 415 /* error */ | |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
416 close_keep_errno(fd); |
| 0 | 417 return -1; |
| 418 } | |
| 419 | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
420 int net_listen_unix(const char *path, int backlog) |
| 0 | 421 { |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
422 union { |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
423 struct sockaddr sa; |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
424 struct sockaddr_un un; |
|
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
425 } sa; |
| 0 | 426 int fd; |
| 427 | |
|
807
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
428 memset(&sa, 0, sizeof(sa)); |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
429 sa.un.sun_family = AF_UNIX; |
|
6422
18173a52f721
Renamed strocpy() to i_strocpy().
Timo Sirainen <tss@iki.fi>
parents:
6411
diff
changeset
|
430 if (i_strocpy(sa.un.sun_path, path, sizeof(sa.un.sun_path)) < 0) { |
| 0 | 431 /* too long path */ |
| 432 errno = EINVAL; | |
| 433 return -1; | |
| 434 } | |
| 435 | |
| 436 /* create the socket */ | |
| 437 fd = socket(PF_UNIX, SOCK_STREAM, 0); | |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
438 if (fd == -1) { |
|
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
439 i_error("socket() failed: %m"); |
| 0 | 440 return -1; |
|
3523
d1ed3b3548db
Added some more error messages. Also if net_connect_ip() gives my_ip
Timo Sirainen <tss@iki.fi>
parents:
3400
diff
changeset
|
441 } |
| 0 | 442 |
| 443 /* bind */ | |
|
5985
8ae4b8d78a25
More union usage to avoid casting.
Timo Sirainen <tss@iki.fi>
parents:
5984
diff
changeset
|
444 if (bind(fd, &sa.sa, sizeof(sa)) < 0) { |
|
3545
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
445 if (errno != EADDRINUSE) |
|
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
446 i_error("bind(%s) failed: %m", path); |
|
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
447 } else { |
| 0 | 448 /* start listening */ |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
449 if (listen(fd, backlog) == 0) |
| 0 | 450 return fd; |
|
3545
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
451 |
|
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
452 if (errno != EADDRINUSE) |
|
0b6539bc22b9
Don't log extra bind() errors for net_listen_unix() either
Timo Sirainen <tss@iki.fi>
parents:
3537
diff
changeset
|
453 i_error("listen() failed: %m"); |
| 0 | 454 } |
| 455 | |
|
4011
323c09be5f00
Moved dupliated close_save_errno() code to public close_keep_errno() function.
Timo Sirainen <timo.sirainen@movial.fi>
parents:
3863
diff
changeset
|
456 close_keep_errno(fd); |
| 0 | 457 return -1; |
| 458 } | |
| 459 | |
|
8219
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
460 int net_listen_unix_unlink_stale(const char *path, int backlog) |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
461 { |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
462 unsigned int i = 0; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
463 int fd; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
464 |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
465 while ((fd = net_listen_unix(path, backlog)) == -1) { |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
466 if (errno != EADDRINUSE || ++i == 2) |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
467 return -1; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
468 |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
469 /* see if it really exists */ |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
470 fd = net_connect_unix(path); |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
471 if (fd != -1 || errno != ECONNREFUSED) { |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
472 if (fd != -1) (void)close(fd); |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
473 errno = EADDRINUSE; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
474 return -1; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
475 } |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
476 |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
477 /* delete and try again */ |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
478 if (unlink(path) < 0 && errno != ENOENT) { |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
479 i_error("unlink(%s) failed: %m", path); |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
480 errno = EADDRINUSE; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
481 return -1; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
482 } |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
483 } |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
484 return fd; |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
485 } |
|
ec83f6dcb585
Added net_listen_unix_unlink_stale() and use it where needed to avoid code duplication.
Timo Sirainen <tss@iki.fi>
parents:
7919
diff
changeset
|
486 |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
487 int net_accept(int fd, struct ip_addr *addr, unsigned int *port) |
| 0 | 488 { |
| 489 union sockaddr_union so; | |
| 490 int ret; | |
| 491 socklen_t addrlen; | |
| 492 | |
| 493 i_assert(fd >= 0); | |
| 494 | |
| 495 addrlen = sizeof(so); | |
| 496 ret = accept(fd, &so.sa, &addrlen); | |
| 497 | |
|
680
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
498 if (ret < 0) { |
|
5358
a977ad033903
net_listen_unix() API changed a bit. -1 is now returned for errors that can
Timo Sirainen <tss@iki.fi>
parents:
4745
diff
changeset
|
499 if (errno == EAGAIN || errno == ECONNABORTED) |
|
a977ad033903
net_listen_unix() API changed a bit. -1 is now returned for errors that can
Timo Sirainen <tss@iki.fi>
parents:
4745
diff
changeset
|
500 return -1; |
|
a977ad033903
net_listen_unix() API changed a bit. -1 is now returned for errors that can
Timo Sirainen <tss@iki.fi>
parents:
4745
diff
changeset
|
501 else |
|
680
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
502 return -2; |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
503 } |
| 0 | 504 |
| 505 if (addr != NULL) sin_get_ip(&so, addr); | |
| 506 if (port != NULL) *port = sin_get_port(&so); | |
| 507 | |
| 508 return ret; | |
| 509 } | |
| 510 | |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
511 ssize_t net_receive(int fd, void *buf, size_t len) |
| 0 | 512 { |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
513 ssize_t ret; |
| 0 | 514 |
| 515 i_assert(fd >= 0); | |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
516 i_assert(len <= SSIZE_T_MAX); |
| 0 | 517 |
|
3681
771cd6776d4b
Use read() instead of recv() in net_receive(), so it works even with
Timo Sirainen <tss@iki.fi>
parents:
3621
diff
changeset
|
518 ret = read(fd, buf, len); |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
519 if (ret == 0) { |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
520 /* disconnected */ |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
521 errno = 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
522 return -2; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
523 } |
| 0 | 524 |
|
6825
85385079b044
Use likely() and unlikely() macros to make commonly checked error handling
Timo Sirainen <tss@iki.fi>
parents:
6666
diff
changeset
|
525 if (unlikely(ret < 0)) { |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
526 if (errno == EINTR || errno == EAGAIN) |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
527 return 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
528 |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
529 if (errno == ECONNRESET || errno == ETIMEDOUT) { |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
530 /* treat as disconnection */ |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
531 return -2; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
532 } |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
533 } |
| 0 | 534 |
| 535 return ret; | |
| 536 } | |
| 537 | |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
538 ssize_t net_transmit(int fd, const void *data, size_t len) |
| 0 | 539 { |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
540 ssize_t ret; |
| 0 | 541 |
| 542 i_assert(fd >= 0); | |
|
183
4a7ab9e94f25
size_t fixes for lib/. Changed OFF_T_FORMAT to PRIuOFF_T which is more
Timo Sirainen <tss@iki.fi>
parents:
159
diff
changeset
|
543 i_assert(len <= SSIZE_T_MAX); |
| 0 | 544 |
|
64
83ae914a583a
added t_strdup_noconst() which can be used instead of (char *) t_strdup().
Timo Sirainen <tss@iki.fi>
parents:
34
diff
changeset
|
545 ret = send(fd, data, len, 0); |
|
6825
85385079b044
Use likely() and unlikely() macros to make commonly checked error handling
Timo Sirainen <tss@iki.fi>
parents:
6666
diff
changeset
|
546 if (unlikely(ret == -1 && (errno == EINTR || errno == EAGAIN))) |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
547 return 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
548 |
|
6825
85385079b044
Use likely() and unlikely() macros to make commonly checked error handling
Timo Sirainen <tss@iki.fi>
parents:
6666
diff
changeset
|
549 if (unlikely(errno == EPIPE)) |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
550 return -2; |
| 0 | 551 |
| 552 return ret; | |
| 553 } | |
| 554 | |
|
4745
7ee0bb1b2d97
Changed ips_count to unsigned int in net_gethostbyname(). Also removed
Timo Sirainen <tss@iki.fi>
parents:
4699
diff
changeset
|
555 int net_gethostbyname(const char *addr, struct ip_addr **ips, |
|
7ee0bb1b2d97
Changed ips_count to unsigned int in net_gethostbyname(). Also removed
Timo Sirainen <tss@iki.fi>
parents:
4699
diff
changeset
|
556 unsigned int *ips_count) |
| 0 | 557 { |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
558 /* @UNSAFE */ |
| 0 | 559 #ifdef HAVE_IPV6 |
| 560 union sockaddr_union *so; | |
| 561 struct addrinfo hints, *ai, *origai; | |
| 562 int host_error; | |
| 563 #else | |
| 564 struct hostent *hp; | |
| 565 #endif | |
| 566 int count; | |
| 567 | |
| 568 *ips = NULL; | |
| 569 *ips_count = 0; | |
| 570 | |
| 571 #ifdef HAVE_IPV6 | |
| 572 memset(&hints, 0, sizeof(struct addrinfo)); | |
| 573 hints.ai_socktype = SOCK_STREAM; | |
| 574 | |
| 575 /* save error to host_error for later use */ | |
| 576 host_error = getaddrinfo(addr, NULL, &hints, &ai); | |
| 577 if (host_error != 0) | |
| 578 return host_error; | |
| 579 | |
| 580 /* get number of IPs */ | |
| 581 origai = ai; | |
| 582 for (count = 0; ai != NULL; ai = ai->ai_next) | |
| 583 count++; | |
| 584 | |
| 585 *ips_count = count; | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
586 *ips = t_malloc(sizeof(struct ip_addr) * count); |
| 0 | 587 |
| 588 count = 0; | |
| 589 for (ai = origai; ai != NULL; ai = ai->ai_next, count++) { | |
| 590 so = (union sockaddr_union *) ai->ai_addr; | |
| 591 | |
|
2113
c5817f302aa6
net_gethostbyname() was broken with IPv6 enabled (wasn't really used with
Timo Sirainen <tss@iki.fi>
parents:
2098
diff
changeset
|
592 sin_get_ip(so, &(*ips)[count]); |
| 0 | 593 } |
| 594 freeaddrinfo(origai); | |
| 595 #else | |
| 596 hp = gethostbyname(addr); | |
| 597 if (hp == NULL) | |
| 598 return h_errno; | |
| 599 | |
| 600 /* get number of IPs */ | |
| 601 count = 0; | |
| 602 while (hp->h_addr_list[count] != NULL) | |
| 603 count++; | |
| 604 | |
| 605 *ips_count = count; | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
606 *ips = t_malloc(sizeof(struct ip_addr) * count); |
| 0 | 607 |
| 608 while (count > 0) { | |
| 609 count--; | |
| 610 | |
| 611 (*ips)[count].family = AF_INET; | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
612 memcpy(&(*ips)[count].u.ip4, hp->h_addr_list[count], |
|
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
613 sizeof((*ips)[count].u.ip4)); |
| 0 | 614 } |
| 615 #endif | |
| 616 | |
| 617 return 0; | |
| 618 } | |
| 619 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
620 int net_getsockname(int fd, struct ip_addr *addr, unsigned int *port) |
| 0 | 621 { |
| 622 union sockaddr_union so; | |
| 623 socklen_t addrlen; | |
| 624 | |
| 625 i_assert(fd >= 0); | |
| 626 | |
| 627 addrlen = sizeof(so); | |
|
4018
989dd95aa8b9
Enable -Wstrict-aliasing=2 warning and fixed a couple of warnings it gave.
Timo Sirainen <tss@iki.fi>
parents:
4011
diff
changeset
|
628 if (getsockname(fd, &so.sa, &addrlen) == -1) |
| 0 | 629 return -1; |
| 630 | |
| 631 if (addr != NULL) sin_get_ip(&so, addr); | |
| 632 if (port != NULL) *port = sin_get_port(&so); | |
| 633 | |
| 634 return 0; | |
| 635 } | |
| 636 | |
| 2098 | 637 int net_getpeername(int fd, struct ip_addr *addr, unsigned int *port) |
| 638 { | |
| 639 union sockaddr_union so; | |
| 640 socklen_t addrlen; | |
| 641 | |
| 642 i_assert(fd >= 0); | |
| 643 | |
| 644 addrlen = sizeof(so); | |
|
4018
989dd95aa8b9
Enable -Wstrict-aliasing=2 warning and fixed a couple of warnings it gave.
Timo Sirainen <tss@iki.fi>
parents:
4011
diff
changeset
|
645 if (getpeername(fd, &so.sa, &addrlen) == -1) |
| 2098 | 646 return -1; |
| 647 | |
| 648 if (addr != NULL) sin_get_ip(&so, addr); | |
| 649 if (port != NULL) *port = sin_get_port(&so); | |
| 650 | |
| 651 return 0; | |
| 652 } | |
| 653 | |
| 9843 | 654 int net_getunixname(int fd, const char **name_r) |
| 655 { | |
| 656 struct sockaddr_un sa; | |
| 657 socklen_t addrlen = sizeof(sa); | |
| 658 | |
| 659 if (getsockname(fd, (void *)&sa, &addrlen) < 0) | |
| 660 return -1; | |
| 661 if (sa.sun_family != AF_UNIX) { | |
| 662 errno = ENOTSOCK; | |
| 663 return -1; | |
| 664 } | |
| 665 *name_r = t_strdup(sa.sun_path); | |
| 666 return 0; | |
| 667 } | |
| 668 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
669 const char *net_ip2addr(const struct ip_addr *ip) |
| 0 | 670 { |
| 671 #ifdef HAVE_IPV6 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
672 char addr[MAX_IP_LEN+1]; |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
673 |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
674 addr[MAX_IP_LEN] = '\0'; |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
675 if (inet_ntop(ip->family, &ip->u.ip6, addr, MAX_IP_LEN) == NULL) |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
676 return NULL; |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
677 |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
678 return t_strdup(addr); |
| 0 | 679 #else |
| 680 unsigned long ip4; | |
| 681 | |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
682 if (ip->family != AF_INET) |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
683 return NULL; |
| 0 | 684 |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
685 ip4 = ntohl(ip->u.ip4.s_addr); |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
686 return t_strdup_printf("%lu.%lu.%lu.%lu", |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
687 (ip4 & 0xff000000UL) >> 24, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
688 (ip4 & 0x00ff0000) >> 16, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
689 (ip4 & 0x0000ff00) >> 8, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
690 (ip4 & 0x000000ff)); |
| 0 | 691 #endif |
| 692 } | |
| 693 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
694 int net_addr2ip(const char *addr, struct ip_addr *ip) |
| 0 | 695 { |
|
11448
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
696 int ret; |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
697 |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
698 if (strchr(addr, ':') != NULL) { |
| 0 | 699 /* IPv6 */ |
| 700 ip->family = AF_INET6; | |
| 701 #ifdef HAVE_IPV6 | |
|
11448
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
702 T_BEGIN { |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
703 if (addr[0] == '[') { |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
704 /* allow [ipv6 addr] */ |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
705 unsigned int len = strlen(addr); |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
706 if (addr[len-1] == ']') |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
707 addr = t_strndup(addr+1, len-2); |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
708 } |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
709 ret = inet_pton(AF_INET6, addr, &ip->u.ip6); |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
710 } T_END; |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
711 if (ret == 0) |
| 0 | 712 return -1; |
| 713 #else | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
714 ip->u.ip4.s_addr = 0; |
| 0 | 715 #endif |
| 716 } else { | |
| 717 /* IPv4 */ | |
| 718 ip->family = AF_INET; | |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
719 if (inet_aton(addr, &ip->u.ip4) == 0) |
| 0 | 720 return -1; |
| 721 } | |
| 722 | |
| 723 return 0; | |
| 724 } | |
| 725 | |
|
4684
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
726 int net_ipv6_mapped_ipv4_convert(const struct ip_addr *src, |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
727 struct ip_addr *dest) |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
728 { |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
729 #ifdef HAVE_IPV6 |
|
4699
9e4cc68b71b2
Fix net_ipv6_mapped_ipv4_convert() to be actually portable.
Timo Sirainen <tss@iki.fi>
parents:
4684
diff
changeset
|
730 static uint8_t v4_prefix[] = |
|
9e4cc68b71b2
Fix net_ipv6_mapped_ipv4_convert() to be actually portable.
Timo Sirainen <tss@iki.fi>
parents:
4684
diff
changeset
|
731 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff }; |
|
9e4cc68b71b2
Fix net_ipv6_mapped_ipv4_convert() to be actually portable.
Timo Sirainen <tss@iki.fi>
parents:
4684
diff
changeset
|
732 |
|
4684
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
733 if (!IPADDR_IS_V6(src)) |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
734 return -1; |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
735 if (memcmp(src->u.ip6.s6_addr, v4_prefix, sizeof(v4_prefix)) != 0) |
|
4684
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
736 return -1; |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
737 |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
738 dest->family = AF_INET; |
|
5984
74a6130211c2
Changed struct ip_addr to use union for ipv4/ipv6 structs so we don't have
Timo Sirainen <tss@iki.fi>
parents:
5865
diff
changeset
|
739 memcpy(&dest->u.ip6, &src->u.ip6.s6_addr[3*4], 4); |
|
4684
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
740 return 0; |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
741 #else |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
742 return -1; |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
743 #endif |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
744 } |
|
4f1df4b90500
Added net_ipv6_mapped_ipv4_convert().
Timo Sirainen <tss@iki.fi>
parents:
4018
diff
changeset
|
745 |
| 0 | 746 int net_geterror(int fd) |
| 747 { | |
| 748 int data; | |
| 749 socklen_t len = sizeof(data); | |
| 750 | |
| 751 if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &data, &len) == -1) | |
| 752 return -1; | |
| 753 | |
| 754 return data; | |
| 755 } | |
| 756 | |
| 757 const char *net_gethosterror(int error) | |
| 758 { | |
| 759 #ifdef HAVE_IPV6 | |
| 760 i_assert(error != 0); | |
| 761 | |
| 762 return gai_strerror(error); | |
| 763 #else | |
| 764 switch (error) { | |
| 765 case HOST_NOT_FOUND: | |
| 766 return "Host not found"; | |
| 767 case NO_ADDRESS: | |
| 768 return "No IP address found for name"; | |
| 769 case NO_RECOVERY: | |
| 6666 | 770 return "A non-recoverable name server error occurred"; |
| 0 | 771 case TRY_AGAIN: |
| 772 return "A temporary error on an authoritative name server"; | |
| 773 } | |
| 774 | |
| 775 /* unknown error */ | |
| 776 return NULL; | |
| 777 #endif | |
| 778 } | |
| 779 | |
| 780 int net_hosterror_notfound(int error) | |
| 781 { | |
| 782 #ifdef HAVE_IPV6 | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
783 #ifdef EAI_NODATA /* NODATA is depricated */ |
| 0 | 784 return error != 1 && (error == EAI_NONAME || error == EAI_NODATA); |
| 785 #else | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
786 return error != 1 && (error == EAI_NONAME); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
787 #endif |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
788 #else |
| 0 | 789 return error == HOST_NOT_FOUND || error == NO_ADDRESS; |
| 790 #endif | |
| 791 } | |
| 792 | |
|
2113
c5817f302aa6
net_gethostbyname() was broken with IPv6 enabled (wasn't really used with
Timo Sirainen <tss@iki.fi>
parents:
2098
diff
changeset
|
793 const char *net_getservbyport(unsigned short port) |
| 0 | 794 { |
| 795 struct servent *entry; | |
| 796 | |
| 349 | 797 entry = getservbyport(htons(port), "tcp"); |
| 0 | 798 return entry == NULL ? NULL : entry->s_name; |
| 799 } | |
| 800 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
801 bool is_ipv4_address(const char *addr) |
| 0 | 802 { |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
803 while (*addr != '\0') { |
|
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
804 if (*addr != '.' && !i_isdigit(*addr)) |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
805 return FALSE; |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
806 addr++; |
| 0 | 807 } |
| 808 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
809 return TRUE; |
| 0 | 810 } |
| 811 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
812 bool is_ipv6_address(const char *addr) |
| 0 | 813 { |
|
11448
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
814 bool have_prefix = FALSE; |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
815 |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
816 if (*addr == '[') { |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
817 have_prefix = TRUE; |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
818 addr++; |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
819 } |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
820 while (*addr != '\0') { |
|
11448
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
821 if (*addr != ':' && !i_isxdigit(*addr)) { |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
822 if (have_prefix && *addr == ']' && addr[1] == '\0') |
|
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
823 break; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
824 return FALSE; |
|
11448
bdb46ba87203
Added support for [] around ipv6 addresses everywhere.
Timo Sirainen <tss@iki.fi>
parents:
11340
diff
changeset
|
825 } |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
826 addr++; |
| 0 | 827 } |
| 828 | |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3681
diff
changeset
|
829 return TRUE; |
| 0 | 830 } |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
831 |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
832 int net_parse_range(const char *network, struct ip_addr *ip_r, |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
833 unsigned int *bits_r) |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
834 { |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
835 const char *p; |
|
11086
260e190306b0
Started using str_to_*() functions instead of libc's ones.
Timo Sirainen <tss@iki.fi>
parents:
10789
diff
changeset
|
836 unsigned int bits, max_bits; |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
837 |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
838 p = strchr(network, '/'); |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
839 if (p != NULL) |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
840 network = t_strdup_until(network, p++); |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
841 |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
842 if (net_addr2ip(network, ip_r) < 0) |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
843 return -1; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
844 |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
845 max_bits = IPADDR_IS_V4(ip_r) ? 32 : 128; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
846 if (p == NULL) { |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
847 /* full IP address must match */ |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
848 bits = max_bits; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
849 } else { |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
850 /* get the network mask */ |
|
11086
260e190306b0
Started using str_to_*() functions instead of libc's ones.
Timo Sirainen <tss@iki.fi>
parents:
10789
diff
changeset
|
851 if (str_to_uint(p, &bits) < 0 || bits > max_bits) |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
852 return -1; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
853 } |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
854 *bits_r = bits; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
855 return 0; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
856 } |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
857 |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
858 bool net_is_in_network(const struct ip_addr *ip, |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
859 const struct ip_addr *net_ip, unsigned int bits) |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
860 { |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
861 struct ip_addr tmp_ip; |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
862 const uint32_t *ip1, *ip2; |
|
7520
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
863 uint32_t mask, i1, i2; |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
864 unsigned int pos, i; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
865 |
|
7919
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
866 if (net_ipv6_mapped_ipv4_convert(ip, &tmp_ip) == 0) { |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
867 /* IPv4 address mapped disguised as IPv6 address */ |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
868 ip = &tmp_ip; |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
869 } |
|
423b8e3fedbb
Created net_parse_range() from auth code.
Timo Sirainen <tss@iki.fi>
parents:
7520
diff
changeset
|
870 |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
871 if (IPADDR_IS_V4(ip) != IPADDR_IS_V4(net_ip)) { |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
872 /* one is IPv6 and one is IPv4 */ |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
873 return FALSE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
874 } |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
875 i_assert(IPADDR_IS_V6(ip) == IPADDR_IS_V6(net_ip)); |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
876 |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
877 if (IPADDR_IS_V4(ip)) { |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
878 ip1 = &ip->u.ip4.s_addr; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
879 ip2 = &net_ip->u.ip4.s_addr; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
880 } else { |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
881 #ifdef HAVE_IPV6 |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
882 ip1 = (const void *)&ip->u.ip6; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
883 ip2 = (const void *)&net_ip->u.ip6; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
884 #else |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
885 /* shouldn't get here */ |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
886 return FALSE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
887 #endif |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
888 } |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
889 |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
890 /* check first the full 32bit ints */ |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
891 for (pos = 0, i = 0; pos + 32 <= bits; pos += 32, i++) { |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
892 if (ip1[i] != ip2[i]) |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
893 return FALSE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
894 } |
|
7520
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
895 i1 = htonl(ip1[i]); |
|
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
896 i2 = htonl(ip2[i]); |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
897 |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
898 /* check the last full bytes */ |
|
7520
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
899 for (mask = 0xff000000; pos + 8 <= bits; pos += 8, mask >>= 8) { |
|
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
900 if ((i1 & mask) != (i2 & mask)) |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
901 return FALSE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
902 } |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
903 |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
904 /* check the last bits, they're reversed in bytes */ |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
905 bits -= pos; |
|
7520
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
906 for (mask = 0x80000000 >> (pos % 32); bits > 0; bits--, mask >>= 1) { |
|
85203e817f90
net_is_in_network(): Fixed to work with big endian machines.
Timo Sirainen <tss@iki.fi>
parents:
7517
diff
changeset
|
907 if ((i1 & mask) != (i2 & mask)) |
|
7517
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
908 return FALSE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
909 } |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
910 return TRUE; |
|
e0007da64cdc
Moved net_is_in_network() to lib/network.c.
Timo Sirainen <tss@iki.fi>
parents:
7274
diff
changeset
|
911 } |