Mercurial > dovecot > core-2.2
annotate src/lib/network.c @ 3400:ddfa507bb74f HEAD
Don't return random data if net_getpeername() or net_getsockname() is used
for non-inet/inet6 socket.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 29 May 2005 03:26:19 +0300 |
| parents | 690dcc51cdc1 |
| children | d1ed3b3548db |
| rev | line source |
|---|---|
|
1741
9df02b1533b3
Removed most of the license comments from src/lib/*.c. It's just fine to
Timo Sirainen <tss@iki.fi>
parents:
1564
diff
changeset
|
1 /* Copyright (c) 1999-2003 Timo Sirainen */ |
| 0 | 2 |
| 3 #include "lib.h" | |
| 4 #include "network.h" | |
| 5 | |
| 6 #include <unistd.h> | |
| 7 #include <fcntl.h> | |
| 8 #include <ctype.h> | |
| 9 #include <sys/un.h> | |
| 10 #include <netinet/tcp.h> | |
| 11 | |
| 12 union sockaddr_union { | |
| 13 struct sockaddr sa; | |
| 14 struct sockaddr_in sin; | |
| 15 #ifdef HAVE_IPV6 | |
| 16 struct sockaddr_in6 sin6; | |
| 17 #endif | |
| 18 }; | |
| 19 | |
| 20 #ifdef HAVE_IPV6 | |
| 21 # define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \ | |
| 22 sizeof(so.sin6) : sizeof(so.sin)) | |
| 23 #else | |
| 24 # define SIZEOF_SOCKADDR(so) (sizeof(so.sin)) | |
| 25 #endif | |
| 26 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
27 int net_ip_compare(const struct ip_addr *ip1, const struct ip_addr *ip2) |
| 0 | 28 { |
| 29 if (ip1->family != ip2->family) | |
| 30 return 0; | |
| 31 | |
| 32 #ifdef HAVE_IPV6 | |
| 33 if (ip1->family == AF_INET6) | |
| 34 return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0; | |
| 35 #endif | |
| 36 | |
| 37 return memcmp(&ip1->ip, &ip2->ip, 4) == 0; | |
| 38 } | |
| 39 | |
| 40 | |
| 41 /* 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
|
42 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
|
43 sin_set_ip(union sockaddr_union *so, const struct ip_addr *ip) |
| 0 | 44 { |
| 45 if (ip == NULL) { | |
| 46 #ifdef HAVE_IPV6 | |
| 47 so->sin6.sin6_family = AF_INET6; | |
| 48 so->sin6.sin6_addr = in6addr_any; | |
| 49 #else | |
| 50 so->sin.sin_family = AF_INET; | |
| 51 so->sin.sin_addr.s_addr = INADDR_ANY; | |
| 52 #endif | |
| 53 return; | |
| 54 } | |
| 55 | |
| 56 so->sin.sin_family = ip->family; | |
| 57 #ifdef HAVE_IPV6 | |
| 58 if (ip->family == AF_INET6) | |
| 59 memcpy(&so->sin6.sin6_addr, &ip->ip, sizeof(ip->ip)); | |
| 60 else | |
| 61 #endif | |
| 62 memcpy(&so->sin.sin_addr, &ip->ip, 4); | |
| 63 } | |
| 64 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
65 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
|
66 sin_get_ip(const union sockaddr_union *so, struct ip_addr *ip) |
| 0 | 67 { |
| 68 ip->family = so->sin.sin_family; | |
| 69 | |
| 70 #ifdef HAVE_IPV6 | |
| 71 if (ip->family == AF_INET6) | |
| 72 memcpy(&ip->ip, &so->sin6.sin6_addr, sizeof(ip->ip)); | |
| 73 else | |
| 74 #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
|
75 if (ip->family == AF_INET) |
| 0 | 76 memcpy(&ip->ip, &so->sin.sin_addr, 4); |
|
3400
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
77 else |
|
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
78 memset(&ip->ip, 0, sizeof(ip->ip)); |
| 0 | 79 } |
| 80 | |
| 349 | 81 static inline void sin_set_port(union sockaddr_union *so, unsigned int port) |
| 0 | 82 { |
| 83 #ifdef HAVE_IPV6 | |
| 84 if (so->sin.sin_family == AF_INET6) | |
| 85 so->sin6.sin6_port = htons((unsigned short) port); | |
| 86 else | |
| 87 #endif | |
| 88 so->sin.sin_port = htons((unsigned short) port); | |
| 89 } | |
| 90 | |
| 349 | 91 static inline unsigned int sin_get_port(union sockaddr_union *so) |
| 0 | 92 { |
| 93 #ifdef HAVE_IPV6 | |
| 94 if (so->sin.sin_family == AF_INET6) | |
| 95 return ntohs(so->sin6.sin6_port); | |
| 96 #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
|
97 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
|
98 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
|
99 |
|
ddfa507bb74f
Don't return random data if net_getpeername() or net_getsockname() is used
Timo Sirainen <tss@iki.fi>
parents:
3373
diff
changeset
|
100 return 0; |
| 0 | 101 } |
| 102 | |
| 103 static inline void close_save_errno(int fd) | |
| 104 { | |
| 105 int old_errno = errno; | |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
106 (void)close(fd); |
| 0 | 107 errno = old_errno; |
| 108 } | |
| 109 | |
| 110 /* Connect to socket with ip address */ | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
111 int net_connect_ip(const struct ip_addr *ip, unsigned int port, |
|
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
112 const struct ip_addr *my_ip) |
| 0 | 113 { |
| 114 union sockaddr_union so; | |
| 115 int fd, ret, opt = 1; | |
| 116 | |
| 117 if (my_ip != NULL && ip->family != my_ip->family) { | |
| 118 i_warning("net_connect_ip(): ip->family != my_ip->family"); | |
| 119 my_ip = NULL; | |
| 120 } | |
| 121 | |
| 122 /* create the socket */ | |
| 123 memset(&so, 0, sizeof(so)); | |
| 124 so.sin.sin_family = ip->family; | |
| 125 fd = socket(ip->family, SOCK_STREAM, 0); | |
| 126 | |
| 127 if (fd == -1) | |
| 128 return -1; | |
| 129 | |
| 130 /* set socket options */ | |
| 131 setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); | |
| 132 setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); | |
|
2639
a307ddd22a3a
net_connect() should be nonblocking (currently unused in Dovecot)
Timo Sirainen <tss@iki.fi>
parents:
2113
diff
changeset
|
133 net_set_nonblock(fd, TRUE); |
| 0 | 134 |
| 135 /* set our own address */ | |
| 136 if (my_ip != NULL) { | |
| 137 sin_set_ip(&so, my_ip); | |
| 138 if (bind(fd, &so.sa, SIZEOF_SOCKADDR(so)) == -1) { | |
| 139 /* failed, set it back to INADDR_ANY */ | |
| 140 sin_set_ip(&so, NULL); | |
| 141 bind(fd, &so.sa, SIZEOF_SOCKADDR(so)); | |
| 142 } | |
| 143 } | |
| 144 | |
| 145 /* connect */ | |
| 146 sin_set_ip(&so, ip); | |
| 147 sin_set_port(&so, port); | |
| 148 ret = connect(fd, &so.sa, SIZEOF_SOCKADDR(so)); | |
| 149 | |
| 150 #ifndef WIN32 | |
| 151 if (ret < 0 && errno != EINPROGRESS) | |
| 152 #else | |
| 153 if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) | |
| 154 #endif | |
| 155 { | |
| 156 close_save_errno(fd); | |
| 157 return -1; | |
| 158 } | |
| 159 | |
| 160 return fd; | |
| 161 } | |
| 162 | |
| 163 int net_connect_unix(const char *path) | |
| 164 { | |
| 165 struct sockaddr_un sa; | |
| 166 int fd, ret; | |
| 167 | |
|
807
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
168 memset(&sa, 0, sizeof(sa)); |
|
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
169 sa.sun_family = AF_UNIX; |
|
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
170 if (strocpy(sa.sun_path, path, sizeof(sa.sun_path)) < 0) { |
| 0 | 171 /* too long path */ |
| 172 errno = EINVAL; | |
| 173 return -1; | |
| 174 } | |
| 175 | |
| 176 /* create the socket */ | |
| 177 fd = socket(PF_UNIX, SOCK_STREAM, 0); | |
| 178 if (fd == -1) | |
| 179 return -1; | |
| 180 | |
|
3076
8d15fea729c2
Use nonblocking connecting for unix sockets.
Timo Sirainen <tss@iki.fi>
parents:
3075
diff
changeset
|
181 net_set_nonblock(fd, TRUE); |
|
8d15fea729c2
Use nonblocking connecting for unix sockets.
Timo Sirainen <tss@iki.fi>
parents:
3075
diff
changeset
|
182 |
| 0 | 183 /* connect */ |
| 184 ret = connect(fd, (struct sockaddr *) &sa, sizeof(sa)); | |
| 185 if (ret < 0 && errno != EINPROGRESS) { | |
| 186 close_save_errno(fd); | |
| 187 return -1; | |
| 188 } | |
| 189 | |
| 190 return fd; | |
| 191 } | |
| 192 | |
| 193 /* Disconnect socket */ | |
| 194 void net_disconnect(int fd) | |
| 195 { | |
|
388
792fc5b3daa4
Send error message if close() fails in net_disconnect().
Timo Sirainen <tss@iki.fi>
parents:
349
diff
changeset
|
196 if (close(fd) < 0) |
|
792fc5b3daa4
Send error message if close() fails in net_disconnect().
Timo Sirainen <tss@iki.fi>
parents:
349
diff
changeset
|
197 i_error("net_disconnect() failed: %m"); |
| 0 | 198 } |
| 199 | |
| 200 /* Set socket blocking/nonblocking */ | |
|
34
a3d77e73f99b
fixed compile warnings with some systems
Timo Sirainen <tss@iki.fi>
parents:
0
diff
changeset
|
201 void net_set_nonblock(int fd __attr_unused__, int nonblock __attr_unused__) |
| 0 | 202 { |
| 203 #ifdef HAVE_FCNTL | |
|
1871
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
204 int flags; |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
205 |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
206 flags = fcntl(fd, F_GETFL, 0); |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
207 if (flags == -1) |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
208 i_fatal("net_set_nonblock() failed: %m"); |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
209 |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
210 if (nonblock) |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
211 flags |= O_NONBLOCK; |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
212 else |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
213 flags &= ~O_NONBLOCK; |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
214 |
|
638944ab7753
net_set_nonblock(): don't replace flags in fd, change the existing ones
Timo Sirainen <tss@iki.fi>
parents:
1741
diff
changeset
|
215 if (fcntl(fd, F_SETFL, flags) < 0) |
| 628 | 216 i_fatal("net_set_nonblock() failed: %m"); |
| 0 | 217 #endif |
| 218 } | |
| 219 | |
|
410
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
220 int net_set_cork(int fd __attr_unused__, int cork __attr_unused__) |
| 0 | 221 { |
| 222 #ifdef TCP_CORK | |
|
410
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
223 return setsockopt(fd, SOL_TCP, TCP_CORK, &cork, sizeof(cork)); |
|
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
224 #else |
|
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
225 errno = ENOPROTOOPT; |
|
1f0e7229ee58
Split IOBuffer into mmaped IBuffer, file IBuffer, memory data IBuffer and
Timo Sirainen <tss@iki.fi>
parents:
404
diff
changeset
|
226 return -1; |
| 0 | 227 #endif |
| 228 } | |
| 229 | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
230 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
|
231 { |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
232 struct in_addr *in_ip = (struct in_addr *) &ip->ip; |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
233 |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
234 ip->family = AF_INET; |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
235 in_ip->s_addr = INADDR_ANY; |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
236 } |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
237 |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
238 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
|
239 { |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
240 #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
|
241 ip->family = AF_INET6; |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
242 ip->ip = in6addr_any; |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
243 #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
|
244 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
|
245 #endif |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
246 } |
|
1cc947617c8b
imap_listen and imaps_listen accepts now "*" as "all IPv4 interfaces" and
Timo Sirainen <tss@iki.fi>
parents:
680
diff
changeset
|
247 |
| 0 | 248 /* Listen for connections on a socket. if `my_ip' is NULL, listen in any |
| 249 address. */ | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
250 int net_listen(const struct ip_addr *my_ip, unsigned int *port, int backlog) |
| 0 | 251 { |
| 252 union sockaddr_union so; | |
| 253 int ret, fd, opt = 1; | |
| 254 socklen_t len; | |
| 255 | |
| 256 i_assert(port != NULL); | |
| 257 | |
| 258 memset(&so, 0, sizeof(so)); | |
| 259 sin_set_port(&so, *port); | |
| 260 sin_set_ip(&so, my_ip); | |
| 261 | |
| 262 /* create the socket */ | |
| 263 fd = socket(so.sin.sin_family, SOCK_STREAM, 0); | |
| 264 #ifdef HAVE_IPV6 | |
| 265 if (fd == -1 && (errno == EINVAL || errno == EAFNOSUPPORT)) { | |
| 266 /* IPv6 is not supported by OS */ | |
| 267 so.sin.sin_family = AF_INET; | |
| 268 so.sin.sin_addr.s_addr = INADDR_ANY; | |
| 269 | |
| 270 fd = socket(AF_INET, SOCK_STREAM, 0); | |
| 271 } | |
| 272 #endif | |
| 273 if (fd == -1) | |
| 274 return -1; | |
| 275 | |
| 276 /* set socket options */ | |
| 277 setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); | |
| 278 setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); | |
| 279 | |
|
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
|
280 /* if using IPv6, bind both on the IPv4 and IPv6 addresses */ |
|
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
|
281 #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
|
282 if (so.sin.sin_family == AF_INET6) { |
|
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
|
283 opt = 0; |
|
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
|
284 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
|
285 } |
|
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
|
286 #endif |
| 0 | 287 /* specify the address/port we want to listen in */ |
| 288 ret = bind(fd, &so.sa, SIZEOF_SOCKADDR(so)); | |
| 289 if (ret >= 0) { | |
| 290 /* get the actual port we started listen */ | |
| 291 len = SIZEOF_SOCKADDR(so); | |
| 292 ret = getsockname(fd, &so.sa, &len); | |
| 293 if (ret >= 0) { | |
| 294 *port = sin_get_port(&so); | |
| 295 | |
| 296 /* start listening */ | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
297 if (listen(fd, backlog) >= 0) |
| 0 | 298 return fd; |
| 299 } | |
| 300 | |
| 301 } | |
| 302 | |
| 303 /* error */ | |
| 304 close_save_errno(fd); | |
| 305 return -1; | |
| 306 } | |
| 307 | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
308 int net_listen_unix(const char *path, int backlog) |
| 0 | 309 { |
| 310 struct sockaddr_un sa; | |
| 311 int fd; | |
| 312 | |
|
807
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
313 memset(&sa, 0, sizeof(sa)); |
|
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
314 sa.sun_family = AF_UNIX; |
|
35abd7a5d381
Buffer related cleanups. Use PATH_MAX instead of hardcoded 1024 for paths.
Timo Sirainen <tss@iki.fi>
parents:
805
diff
changeset
|
315 if (strocpy(sa.sun_path, path, sizeof(sa.sun_path)) < 0) { |
| 0 | 316 /* too long path */ |
| 317 errno = EINVAL; | |
| 318 return -1; | |
| 319 } | |
| 320 | |
| 321 /* create the socket */ | |
| 322 fd = socket(PF_UNIX, SOCK_STREAM, 0); | |
| 323 if (fd == -1) | |
| 324 return -1; | |
| 325 | |
| 326 /* bind */ | |
| 327 if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) == 0) { | |
| 328 /* start listening */ | |
|
3075
9cb91ed5a110
Added backlog parameter for net_listen*().
Timo Sirainen <tss@iki.fi>
parents:
2639
diff
changeset
|
329 if (listen(fd, backlog) == 0) |
| 0 | 330 return fd; |
| 331 } | |
| 332 | |
| 333 close_save_errno(fd); | |
| 334 return -1; | |
| 335 } | |
| 336 | |
| 337 /* Accept a connection on a socket */ | |
|
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 int net_accept(int fd, struct ip_addr *addr, unsigned int *port) |
| 0 | 339 { |
| 340 union sockaddr_union so; | |
| 341 int ret; | |
| 342 socklen_t addrlen; | |
| 343 | |
| 344 i_assert(fd >= 0); | |
| 345 | |
| 346 addrlen = sizeof(so); | |
| 347 ret = accept(fd, &so.sa, &addrlen); | |
| 348 | |
|
680
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
349 if (ret < 0) { |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
350 if (errno == EBADF || errno == ENOTSOCK || |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
351 errno == EOPNOTSUPP || errno == EFAULT || errno == EINVAL) |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
352 return -2; |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
353 else |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
354 return -1; |
|
84e398270f7f
net_accept() returns now -2 for fatal failures.
Timo Sirainen <tss@iki.fi>
parents:
628
diff
changeset
|
355 } |
| 0 | 356 |
| 357 if (addr != NULL) sin_get_ip(&so, addr); | |
| 358 if (port != NULL) *port = sin_get_port(&so); | |
| 359 | |
| 360 return ret; | |
| 361 } | |
| 362 | |
| 363 /* Read data from socket, return number of bytes read, -1 = error */ | |
|
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
|
364 ssize_t net_receive(int fd, void *buf, size_t len) |
| 0 | 365 { |
|
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
|
366 ssize_t ret; |
| 0 | 367 |
| 368 i_assert(fd >= 0); | |
| 369 i_assert(buf != NULL); | |
|
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
|
370 i_assert(len <= SSIZE_T_MAX); |
| 0 | 371 |
| 372 ret = recv(fd, buf, len, 0); | |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
373 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
|
374 /* disconnected */ |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
375 errno = 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
376 return -2; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
377 } |
| 0 | 378 |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
379 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
|
380 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
|
381 return 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
382 |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
383 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
|
384 /* 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
|
385 return -2; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
386 } |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
387 } |
| 0 | 388 |
| 389 return ret; | |
| 390 } | |
| 391 | |
| 392 /* Transmit data, return number of bytes sent, -1 = error */ | |
|
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
|
393 ssize_t net_transmit(int fd, const void *data, size_t len) |
| 0 | 394 { |
|
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
|
395 ssize_t ret; |
| 0 | 396 |
| 397 i_assert(fd >= 0); | |
| 398 i_assert(data != NULL); | |
|
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
|
399 i_assert(len <= SSIZE_T_MAX); |
| 0 | 400 |
|
64
83ae914a583a
added t_strdup_noconst() which can be used instead of (char *) t_strdup().
Timo Sirainen <tss@iki.fi>
parents:
34
diff
changeset
|
401 ret = send(fd, data, len, 0); |
|
781
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
402 if (ret == -1 && (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
|
403 return 0; |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
404 |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
405 if (errno == EPIPE) |
|
9cb7022749e7
net_receive, net_transmit: Return -2 for regular disconnection errors. Don't
Timo Sirainen <tss@iki.fi>
parents:
780
diff
changeset
|
406 return -2; |
| 0 | 407 |
| 408 return ret; | |
| 409 } | |
| 410 | |
| 411 /* Get IP addresses for host. ips contains ips_count of IPs, they don't need | |
| 412 to be free'd. Returns 0 = ok, others = error code for net_gethosterror() */ | |
|
903
fd8888f6f037
Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents:
807
diff
changeset
|
413 int net_gethostbyname(const char *addr, struct ip_addr **ips, int *ips_count) |
| 0 | 414 { |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
415 /* @UNSAFE */ |
| 0 | 416 #ifdef HAVE_IPV6 |
| 417 union sockaddr_union *so; | |
| 418 struct addrinfo hints, *ai, *origai; | |
| 419 char hbuf[NI_MAXHOST]; | |
| 420 int host_error; | |
| 421 #else | |
| 422 struct hostent *hp; | |
| 423 #endif | |
| 424 int count; | |
| 425 | |
| 426 i_assert(addr != NULL); | |
| 427 i_assert(ips != NULL); | |
| 428 i_assert(ips_count != NULL); | |
| 429 | |
| 430 *ips = NULL; | |
| 431 *ips_count = 0; | |
| 432 | |
| 433 #ifdef HAVE_IPV6 | |
| 434 memset(&hints, 0, sizeof(struct addrinfo)); | |
| 435 hints.ai_socktype = SOCK_STREAM; | |
| 436 | |
| 437 /* save error to host_error for later use */ | |
| 438 host_error = getaddrinfo(addr, NULL, &hints, &ai); | |
| 439 if (host_error != 0) | |
| 440 return host_error; | |
| 441 | |
| 442 if (getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, | |
| 443 sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) | |
| 444 return 1; | |
| 445 | |
| 446 | |
| 447 /* get number of IPs */ | |
| 448 origai = ai; | |
| 449 for (count = 0; ai != NULL; ai = ai->ai_next) | |
| 450 count++; | |
| 451 | |
| 452 *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
|
453 *ips = t_malloc(sizeof(struct ip_addr) * count); |
| 0 | 454 |
| 455 count = 0; | |
| 456 for (ai = origai; ai != NULL; ai = ai->ai_next, count++) { | |
| 457 so = (union sockaddr_union *) ai->ai_addr; | |
| 458 | |
|
2113
c5817f302aa6
net_gethostbyname() was broken with IPv6 enabled (wasn't really used with
Timo Sirainen <tss@iki.fi>
parents:
2098
diff
changeset
|
459 sin_get_ip(so, &(*ips)[count]); |
| 0 | 460 } |
| 461 freeaddrinfo(origai); | |
| 462 #else | |
| 463 hp = gethostbyname(addr); | |
| 464 if (hp == NULL) | |
| 465 return h_errno; | |
| 466 | |
| 467 /* get number of IPs */ | |
| 468 count = 0; | |
| 469 while (hp->h_addr_list[count] != NULL) | |
| 470 count++; | |
| 471 | |
| 472 *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
|
473 *ips = t_malloc(sizeof(struct ip_addr) * count); |
| 0 | 474 |
| 475 while (count > 0) { | |
| 476 count--; | |
| 477 | |
| 478 (*ips)[count].family = AF_INET; | |
| 479 memcpy(&(*ips)[count].ip, hp->h_addr_list[count], 4); | |
| 480 } | |
| 481 #endif | |
| 482 | |
| 483 return 0; | |
| 484 } | |
| 485 | |
| 486 /* Get socket address/port */ | |
|
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_getsockname(int fd, struct ip_addr *addr, unsigned int *port) |
| 0 | 488 { |
| 489 union sockaddr_union so; | |
| 490 socklen_t addrlen; | |
| 491 | |
| 492 i_assert(fd >= 0); | |
| 493 | |
| 494 addrlen = sizeof(so); | |
| 495 if (getsockname(fd, (struct sockaddr *) &so, &addrlen) == -1) | |
| 496 return -1; | |
| 497 | |
| 498 if (addr != NULL) sin_get_ip(&so, addr); | |
| 499 if (port != NULL) *port = sin_get_port(&so); | |
| 500 | |
| 501 return 0; | |
| 502 } | |
| 503 | |
| 2098 | 504 int net_getpeername(int fd, struct ip_addr *addr, unsigned int *port) |
| 505 { | |
| 506 union sockaddr_union so; | |
| 507 socklen_t addrlen; | |
| 508 | |
| 509 i_assert(fd >= 0); | |
| 510 | |
| 511 addrlen = sizeof(so); | |
| 512 if (getpeername(fd, (struct sockaddr *) &so, &addrlen) == -1) | |
| 513 return -1; | |
| 514 | |
| 515 if (addr != NULL) sin_get_ip(&so, addr); | |
| 516 if (port != NULL) *port = sin_get_port(&so); | |
| 517 | |
| 518 return 0; | |
| 519 } | |
| 520 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
521 const char *net_ip2addr(const struct ip_addr *ip) |
| 0 | 522 { |
| 523 #ifdef HAVE_IPV6 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
524 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
|
525 |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
526 addr[MAX_IP_LEN] = '\0'; |
|
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
527 if (inet_ntop(ip->family, &ip->ip, 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
|
528 return NULL; |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
529 |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
530 return t_strdup(addr); |
| 0 | 531 #else |
| 532 unsigned long ip4; | |
| 533 | |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
534 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
|
535 return NULL; |
| 0 | 536 |
| 537 ip4 = ntohl(ip->ip.s_addr); | |
|
805
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
538 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
|
539 (ip4 & 0xff000000UL) >> 24, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
540 (ip4 & 0x00ff0000) >> 16, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
541 (ip4 & 0x0000ff00) >> 8, |
|
5ac361acb316
Marked all non-trivial buffer modifications with @UNSAFE tag. Several
Timo Sirainen <tss@iki.fi>
parents:
781
diff
changeset
|
542 (ip4 & 0x000000ff)); |
| 0 | 543 #endif |
| 544 } | |
| 545 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
546 int net_addr2ip(const char *addr, struct ip_addr *ip) |
| 0 | 547 { |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
548 if (strchr(addr, ':') != NULL) { |
| 0 | 549 /* IPv6 */ |
| 550 ip->family = AF_INET6; | |
| 551 #ifdef HAVE_IPV6 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
552 if (inet_pton(AF_INET6, addr, &ip->ip) == 0) |
| 0 | 553 return -1; |
| 554 #else | |
| 555 ip->ip.s_addr = 0; | |
| 556 #endif | |
| 557 } else { | |
| 558 /* IPv4 */ | |
| 559 ip->family = AF_INET; | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
560 if (inet_aton(addr, (struct in_addr *) &ip->ip) == 0) |
| 0 | 561 return -1; |
| 562 } | |
| 563 | |
| 564 return 0; | |
| 565 } | |
| 566 | |
| 567 /* Get socket error */ | |
| 568 int net_geterror(int fd) | |
| 569 { | |
| 570 int data; | |
| 571 socklen_t len = sizeof(data); | |
| 572 | |
| 573 if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &data, &len) == -1) | |
| 574 return -1; | |
| 575 | |
| 576 return data; | |
| 577 } | |
| 578 | |
| 579 /* get error of net_gethostname() */ | |
| 580 const char *net_gethosterror(int error) | |
| 581 { | |
| 582 #ifdef HAVE_IPV6 | |
| 583 i_assert(error != 0); | |
| 584 | |
| 585 if (error == 1) { | |
| 586 /* getnameinfo() failed */ | |
| 587 return strerror(errno); | |
| 588 } | |
| 589 | |
| 590 return gai_strerror(error); | |
| 591 #else | |
| 592 switch (error) { | |
| 593 case HOST_NOT_FOUND: | |
| 594 return "Host not found"; | |
| 595 case NO_ADDRESS: | |
| 596 return "No IP address found for name"; | |
| 597 case NO_RECOVERY: | |
| 598 return "A non-recovable name server error occurred"; | |
| 599 case TRY_AGAIN: | |
| 600 return "A temporary error on an authoritative name server"; | |
| 601 } | |
| 602 | |
| 603 /* unknown error */ | |
| 604 return NULL; | |
| 605 #endif | |
| 606 } | |
| 607 | |
| 608 /* return TRUE if host lookup failed because it didn't exist (ie. not | |
| 609 some error with name server) */ | |
| 610 int net_hosterror_notfound(int error) | |
| 611 { | |
| 612 #ifdef HAVE_IPV6 | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
613 #ifdef EAI_NODATA /* NODATA is depricated */ |
| 0 | 614 return error != 1 && (error == EAI_NONAME || error == EAI_NODATA); |
| 615 #else | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
616 return error != 1 && (error == EAI_NONAME); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
617 #endif |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
1871
diff
changeset
|
618 #else |
| 0 | 619 return error == HOST_NOT_FOUND || error == NO_ADDRESS; |
| 620 #endif | |
| 621 } | |
| 622 | |
| 623 /* Get name of TCP service */ | |
|
2113
c5817f302aa6
net_gethostbyname() was broken with IPv6 enabled (wasn't really used with
Timo Sirainen <tss@iki.fi>
parents:
2098
diff
changeset
|
624 const char *net_getservbyport(unsigned short port) |
| 0 | 625 { |
| 626 struct servent *entry; | |
| 627 | |
| 349 | 628 entry = getservbyport(htons(port), "tcp"); |
| 0 | 629 return entry == NULL ? NULL : entry->s_name; |
| 630 } | |
| 631 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
632 int is_ipv4_address(const char *addr) |
| 0 | 633 { |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
634 while (*addr != '\0') { |
|
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
635 if (*addr != '.' && !i_isdigit(*addr)) |
| 0 | 636 return 0; |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
637 addr++; |
| 0 | 638 } |
| 639 | |
| 640 return 1; | |
| 641 } | |
| 642 | |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
643 int is_ipv6_address(const char *addr) |
| 0 | 644 { |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
645 while (*addr != '\0') { |
|
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
646 if (*addr != ':' && !i_isxdigit(*addr)) |
| 0 | 647 return 0; |
|
1485
8c28289a15a1
s/host/addr/ in a few network functions
Timo Sirainen <tss@iki.fi>
parents:
1268
diff
changeset
|
648 addr++; |
| 0 | 649 } |
| 650 | |
| 651 return 1; | |
| 652 } |