diff options
author | Max <msuraev@sysmocom.de> | 2018-01-30 18:10:53 +0100 |
---|---|---|
committer | Max <msuraev@sysmocom.de> | 2018-01-30 18:12:52 +0100 |
commit | cd31f7a34f196bf7dd36915c8cf86f1b1e6d2641 (patch) | |
tree | 9b197fb4c0faf61af6c2268adb18ffec30ddfb9d | |
parent | 327c2f5beb90c4642b979fb6117856fd2a2d0d8d (diff) |
Remove unused code
The socket.* is unused leftover from pre-split time.
Fixes: CID57645
Change-Id: Ibf3b539fcbd7f311caa2291af23b8f18ebc6c2e0
-rw-r--r-- | include/osmocom/msc/Makefile.am | 1 | ||||
-rw-r--r-- | include/osmocom/msc/socket.h | 14 | ||||
-rw-r--r-- | src/libcommon/Makefile.am | 1 | ||||
-rw-r--r-- | src/libcommon/socket.c | 111 |
4 files changed, 0 insertions, 127 deletions
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index ec231d068..88305dbb4 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -29,7 +29,6 @@ noinst_HEADERS = \ silent_call.h \ smpp.h \ sms_queue.h \ - socket.h \ transaction.h \ ussd.h \ vlr.h \ diff --git a/include/osmocom/msc/socket.h b/include/osmocom/msc/socket.h deleted file mode 100644 index 0fd85f104..000000000 --- a/include/osmocom/msc/socket.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _BSC_SOCKET_H -#define _BSC_SOCKET_H - -#include <osmocom/core/select.h> - -#ifndef IPPROTO_GRE -#define IPPROTO_GRE 47 -#endif - -int make_sock(struct osmo_fd *bfd, int proto, - uint32_t ip, uint16_t port, int priv_nr, - int (*cb)(struct osmo_fd *fd, unsigned int what), void *data); - -#endif /* _BSC_SOCKET_H */ diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 8f70da769..30f37d450 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -26,7 +26,6 @@ libcommon_a_SOURCES = \ gsm_data.c \ gsup_client.c \ oap_client.c \ - socket.c \ talloc_ctx.c \ gsm_subscriber_base.c \ $(NULL) diff --git a/src/libcommon/socket.c b/src/libcommon/socket.c deleted file mode 100644 index 2793bcfd9..000000000 --- a/src/libcommon/socket.c +++ /dev/null @@ -1,111 +0,0 @@ -/* OpenBSC sokcet code, taken from Abis input driver for ip.access */ - -/* (C) 2009 by Harald Welte <laforge@gnumonks.org> - * (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by On-Waves - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <errno.h> -#include <string.h> -#include <time.h> -#include <sys/fcntl.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <arpa/inet.h> - -#include <osmocom/core/select.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/core/msgb.h> -#include <osmocom/msc/debug.h> -#include <osmocom/msc/gsm_data.h> -#include <osmocom/core/talloc.h> - -int make_sock(struct osmo_fd *bfd, int proto, - uint32_t ip, uint16_t port, int priv_nr, - int (*cb)(struct osmo_fd *fd, unsigned int what), void *data) -{ - struct sockaddr_in addr; - int ret, on = 1; - int type = SOCK_STREAM; - - switch (proto) { - case IPPROTO_TCP: - type = SOCK_STREAM; - break; - case IPPROTO_UDP: - type = SOCK_DGRAM; - break; -#ifdef IPPROTO_GRE - case IPPROTO_GRE: - type = SOCK_RAW; - break; -#endif - default: - return -EINVAL; - } - - bfd->fd = socket(AF_INET, type, proto); - bfd->cb = cb; - bfd->when = BSC_FD_READ; - bfd->data = data; - bfd->priv_nr = priv_nr; - - if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, "could not create socket.\n"); - return -EIO; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - if (ip != INADDR_ANY) - addr.sin_addr.s_addr = htonl(ip); - else - addr.sin_addr.s_addr = INADDR_ANY; - - setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - - ret = bind(bfd->fd, (struct sockaddr *) &addr, sizeof(addr)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not bind socket %s\n", - strerror(errno)); - close(bfd->fd); - return -EIO; - } - - if (proto == IPPROTO_TCP) { - ret = listen(bfd->fd, 1); - if (ret < 0) { - perror("listen"); - close(bfd->fd); - return ret; - } - } - - ret = osmo_fd_register(bfd); - if (ret < 0) { - perror("register_listen_fd"); - close(bfd->fd); - return ret; - } - return 0; -} |