summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2013-01-14 00:12:28 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2013-01-15 20:06:39 +0100
commite04a14d9a23ed42178c405cb0c0afb9a2d2b93ab (patch)
tree2ea833b125c38fa2cb39e350679452da47297056 /src
parent06ddf8bd24ae1104f77498d4cd0c766c164d4525 (diff)
socket: fix osmo_sock_init with SOCK_RAW and IPPROTO_RAW
getaddrinfo returns EAI_SERVICE (-8) if that combination is used. More information available in here: http://sourceware.org/bugzilla/show_bug.cgi?id=15015 Reported by Holger Hans Peter Freyther. While at it, this patch also removes hints.ai_flags = 0 as memset to zero already happened just a bit before that.
Diffstat (limited to 'src')
-rw-r--r--src/socket.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/socket.c b/src/socket.c
index 53205cd2..a5530d0e 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -54,9 +54,16 @@ int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto,
sprintf(portbuf, "%u", port);
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = family;
- hints.ai_socktype = type;
- hints.ai_flags = 0;
- hints.ai_protocol = proto;
+ if (type == SOCK_RAW) {
+ /* Workaround for glibc, that returns EAI_SERVICE (-8) if
+ * SOCK_RAW and IPPROTO_GRE is used.
+ */
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_protocol = IPPROTO_UDP;
+ } else {
+ hints.ai_socktype = type;
+ hints.ai_protocol = proto;
+ }
if (flags & OSMO_SOCK_F_BIND)
hints.ai_flags |= AI_PASSIVE;
@@ -68,6 +75,12 @@ int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto,
}
for (rp = result; rp != NULL; rp = rp->ai_next) {
+ /* Workaround for glibc again */
+ if (type == SOCK_RAW) {
+ rp->ai_socktype = SOCK_RAW;
+ rp->ai_protocol = proto;
+ }
+
sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (sfd == -1)
continue;