From fcfe20d3e007292e6c4c641e40d571e8ab416322 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 6 Sep 2018 15:09:28 +0200 Subject: 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 --- src/host/layer23/src/common/l1l2_interface.c | 28 ++----------- src/host/layer23/src/common/sap_interface.c | 25 ++--------- src/host/layer23/src/mobile/mncc_sock.c | 63 ++-------------------------- 3 files changed, 11 insertions(+), 105 deletions(-) diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 3e9cee4b..e21b07ee 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 + * (C) 2010,2018 by Harald Welte * * All Rights Reserved * @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -105,39 +106,18 @@ static int layer2_write(struct osmo_fd *fd, struct msgb *msg) 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 e18bb317..da03c0f2 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 + * (C) 2010,2018 by Harald Welte * (C) 2010 by Andreas Eversberg * (C) 2011 by Nico Golde * @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -499,37 +500,19 @@ static void sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) 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 39eb7bcc..d7d56cc0 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 +/* (C) 2008-2011,2018 by Harald Welte * (C) 2009,2011 by Andreas Eversberg * All Rights Reserved * @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -80,9 +81,6 @@ void mncc_sock_write_pending(struct mncc_sock_state *state) 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 @@ struct mncc_sock_state *mncc_sock_init(void *inst, const char *name) 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 @@ struct mncc_sock_state *mncc_sock_init(void *inst, const char *name) 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 @@ void mncc_sock_exit(struct mncc_sock_state *state) 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; -} -- cgit v1.2.3