msuraev submitted this change.

View Change

Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, approved Jenkins Builder: Verified
socket: propagate error in osmo_sock_unix_init() to the caller

Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f
---
M src/core/socket.c
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/socket.c b/src/core/socket.c
index 43736e0..9e0f84e 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -249,7 +249,7 @@
if (rc < 0) {
LOGP(DLGLOBAL, LOGL_ERROR, "unable to listen on socket: %s\n",
strerror(errno));
- return rc;
+ return -errno;
}
break;
}
@@ -1393,7 +1393,7 @@

sfd = socket(AF_UNIX, type, proto);
if (sfd < 0)
- return -1;
+ return -errno;

if (flags & OSMO_SOCK_F_CONNECT) {
rc = connect(sfd, (struct sockaddr *)&local, namelen);
@@ -1413,13 +1413,13 @@
rc = osmo_sock_init_tail(sfd, type, flags);
if (rc < 0) {
close(sfd);
- sfd = -1;
+ sfd = rc;
}

return sfd;
err:
close(sfd);
- return -1;
+ return -errno;
}

/*! Initialize a unix domain socket and fill \ref osmo_fd

To view, visit change 31299. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f
Gerrit-Change-Number: 31299
Gerrit-PatchSet: 4
Gerrit-Owner: msuraev <msuraev@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: msuraev <msuraev@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-CC: neels <nhofmeyr@sysmocom.de>
Gerrit-MessageType: merged