summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-10-10 17:38:16 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-10-10 17:41:27 +0200
commitff42852d2244002f60f835b2d9658b1aff1f022b (patch)
tree4fdd0983a3758e9692a13507dd6c2087739e3f89
parentd12f698dbb65df1079cc98605c8738aa8224d301 (diff)
socket.c: Move glibc workarounds to same place in addrinfo_helper()
Change-Id: Ifc3a30881f865f88bcfc1307a3c89c1ab79eecd4
-rw-r--r--src/socket.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/src/socket.c b/src/socket.c
index c50af55b..ef3bb58d 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -56,7 +56,7 @@
static struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t proto,
const char *host, uint16_t port, bool passive)
{
- struct addrinfo hints, *result;
+ struct addrinfo hints, *result, *rp;
char portbuf[6];
int rc;
@@ -66,6 +66,7 @@ static struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t
if (type == SOCK_RAW) {
/* Workaround for glibc, that returns EAI_SERVICE (-8) if
* SOCK_RAW and IPPROTO_GRE is used.
+ * http://sourceware.org/bugzilla/show_bug.cgi?id=15015
*/
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
@@ -84,6 +85,14 @@ static struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t
return NULL;
}
+ 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;
+ }
+ }
+
return result;
}
@@ -199,12 +208,6 @@ int osmo_sock_init2(uint16_t family, uint16_t type, uint8_t proto,
return -EINVAL;
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_helper(rp, flags);
if (sfd < 0)
continue;
@@ -253,12 +256,6 @@ int osmo_sock_init2(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;
- }
-
if (sfd < 0) {
sfd = socket_helper(rp, flags);
if (sfd < 0)
@@ -332,12 +329,6 @@ 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_helper(rp, flags);
if (sfd == -1)
continue;