This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10805 )
Change subject: layer23: Use osmo_sock_unix_init_ofd() from libosmocore
......................................................................
layer23: Use osmo_sock_unix_init_ofd() from libosmocore
We don't need to hand-code unix domain socket initialization but
can simply use our library function for it. As an added benefit,
the library code already contains corner case handling for non-NUL
terminated unix domain socket path.
Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703
---
M src/host/layer23/src/common/l1l2_interface.c
M src/host/layer23/src/common/sap_interface.c
M src/host/layer23/src/mobile/mncc_sock.c
3 files changed, 11 insertions(+), 105 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c
index 3e9cee4..e21b07e 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -1,7 +1,7 @@
/* Layer 1 socket interface of layer2/3 stack */
/* (C) 2010 by Holger Hans Peter Freyther
- * (C) 2010 by Harald Welte <laforge at gnumonks.org>
+ * (C) 2010,2018 by Harald Welte <laforge at gnumonks.org>
*
* All Rights Reserved
*
@@ -27,6 +27,7 @@
#include <osmocom/bb/common/l1l2_interface.h>
#include <osmocom/core/utils.h>
+#include <osmocom/core/socket.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -105,39 +106,18 @@
int layer2_open(struct osmocom_ms *ms, const char *socket_path)
{
int rc;
- struct sockaddr_un local;
- ms->l2_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (ms->l2_wq.bfd.fd < 0) {
- fprintf(stderr, "Failed to create unix domain socket.\n");
- return ms->l2_wq.bfd.fd;
- }
-
- local.sun_family = AF_UNIX;
- osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path));
-
- rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local,
- sizeof(local));
+ rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT);
if (rc < 0) {
- fprintf(stderr, "Failed to connect to '%s': %s\n", local.sun_path,
- strerror(errno));
- close(ms->l2_wq.bfd.fd);
+ fprintf(stderr, "Failed to create unix domain socket.\n");
return rc;
}
osmo_wqueue_init(&ms->l2_wq, 100);
ms->l2_wq.bfd.data = ms;
- ms->l2_wq.bfd.when = BSC_FD_READ;
ms->l2_wq.read_cb = layer2_read;
ms->l2_wq.write_cb = layer2_write;
- rc = osmo_fd_register(&ms->l2_wq.bfd);
- if (rc != 0) {
- fprintf(stderr, "Failed to register fd.\n");
- close(ms->l2_wq.bfd.fd);
- return rc;
- }
-
return 0;
}
diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c
index e18bb31..da03c0f 100644
--- a/src/host/layer23/src/common/sap_interface.c
+++ b/src/host/layer23/src/common/sap_interface.c
@@ -1,7 +1,7 @@
/* BTSAP socket interface of layer2/3 stack */
/* (C) 2010 by Holger Hans Peter Freyther
- * (C) 2010 by Harald Welte <laforge at gnumonks.org>
+ * (C) 2010,2018 by Harald Welte <laforge at gnumonks.org>
* (C) 2010 by Andreas Eversberg <jolly at eversberg.eu>
* (C) 2011 by Nico Golde <nico at ngolde.de>
*
@@ -29,6 +29,7 @@
#include <osmocom/core/utils.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/core/socket.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -499,37 +500,19 @@
int sap_open(struct osmocom_ms *ms, const char *socket_path)
{
ssize_t rc;
- struct sockaddr_un local;
- ms->sap_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (ms->sap_wq.bfd.fd < 0) {
- fprintf(stderr, "Failed to create unix domain socket.\n");
- return ms->sap_wq.bfd.fd;
- }
-
- local.sun_family = AF_UNIX;
- osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path));
-
- rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local));
+ rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT);
if (rc < 0) {
- fprintf(stderr, "Failed to connect to '%s'\n", local.sun_path);
+ fprintf(stderr, "Failed to create unix domain socket.\n");
ms->sap_entity.sap_state = SAP_SOCKET_ERROR;
- close(ms->sap_wq.bfd.fd);
return rc;
}
osmo_wqueue_init(&ms->sap_wq, 100);
ms->sap_wq.bfd.data = ms;
- ms->sap_wq.bfd.when = BSC_FD_READ;
ms->sap_wq.read_cb = sap_read;
ms->sap_wq.write_cb = sap_write;
- rc = osmo_fd_register(&ms->sap_wq.bfd);
- if (rc != 0) {
- fprintf(stderr, "Failed to register fd.\n");
- return rc;
- }
-
sap_connect(ms);
return 0;
diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c
index 39eb7bc..d7d56cc 100644
--- a/src/host/layer23/src/mobile/mncc_sock.c
+++ b/src/host/layer23/src/mobile/mncc_sock.c
@@ -1,6 +1,6 @@
/* mncc_sock.c: Tie the MNCC interface to a unix domain socket */
-/* (C) 2008-2010 by Harald Welte <laforge at gnumonks.org>
+/* (C) 2008-2011,2018 by Harald Welte <laforge at gnumonks.org>
* (C) 2009,2011 by Andreas Eversberg <andreas at eversberg.eu>
* All Rights Reserved
*
@@ -34,6 +34,7 @@
#include <osmocom/core/select.h>
#include <osmocom/core/timer.h>
#include <osmocom/core/msgb.h>
+#include <osmocom/core/socket.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/bb/common/logging.h>
@@ -80,9 +81,6 @@
state->conn_bfd.when |= BSC_FD_WRITE;
}
-/* FIXME: move this to libosmocore */
-int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path);
-
static void mncc_sock_close(struct mncc_sock_state *state)
{
struct osmo_fd *bfd = &state->conn_bfd;
@@ -268,7 +266,7 @@
bfd = &state->listen_bfd;
- rc = osmo_unixsock_listen(bfd, SOCK_SEQPACKET, name);
+ rc = osmo_sock_unix_init_ofd(bfd, SOCK_SEQPACKET, 0, name, OSMO_SOCK_F_BIND);
if (rc < 0) {
LOGP(DMNCC, LOGL_ERROR, "Could not create unix socket: %s\n",
strerror(errno));
@@ -276,18 +274,9 @@
return NULL;
}
- bfd->when = BSC_FD_READ;
bfd->cb = mncc_sock_accept;
bfd->data = state;
- rc = osmo_fd_register(bfd);
- if (rc < 0) {
- LOGP(DMNCC, LOGL_ERROR, "Could not register listen fd: %d\n", rc);
- close(bfd->fd);
- talloc_free(state);
- return NULL;
- }
-
return state;
}
@@ -299,49 +288,3 @@
close(state->listen_bfd.fd);
talloc_free(state);
}
-
-/* FIXME: move this to libosmocore */
-int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path)
-{
- struct sockaddr_un local;
- unsigned int namelen;
- int rc;
-
- bfd->fd = socket(AF_UNIX, type, 0);
-
- if (bfd->fd < 0) {
- fprintf(stderr, "Failed to create Unix Domain Socket.\n");
- return -1;
- }
-
- local.sun_family = AF_UNIX;
- osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path));
- local.sun_path[sizeof(local.sun_path) - 1] = '\0';
- unlink(local.sun_path);
-
- /* we use the same magic that X11 uses in Xtranssock.c for
- * calculating the proper length of the sockaddr */
-#if defined(BSD44SOCKETS) || defined(__UNIXWARE__)
- local.sun_len = strlen(local.sun_path);
-#endif
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
- namelen = SUN_LEN(&local);
-#else
- namelen = strlen(local.sun_path) +
- offsetof(struct sockaddr_un, sun_path);
-#endif
-
- rc = bind(bfd->fd, (struct sockaddr *) &local, namelen);
- if (rc != 0) {
- fprintf(stderr, "Failed to bind the unix domain socket. '%s'\n",
- local.sun_path);
- return -1;
- }
-
- if (listen(bfd->fd, 0) != 0) {
- fprintf(stderr, "Failed to listen.\n");
- return -1;
- }
-
- return 0;
-}
--
To view, visit https://gerrit.osmocom.org/10805
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I57c724c78dbbbce0546ebe914e370f32c8c89703
Gerrit-Change-Number: 10805
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-CC: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180906/a8ac9257/attachment.htm>