April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-uecups[master]: Move several objects outside of main.c

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/27747 to look at the new patch set (#2). Change subject: Move several objects outside of main.c ...................................................................... Move several objects outside of main.c This makes it far more easy to understand the data model and find stuff in code. Change-Id: I4613361dc40518edd94f2d4128ba412337690736 --- M daemon/Makefile.am A daemon/cups_client.c A daemon/gtp_daemon.c M daemon/internal.h M daemon/main.c 5 files changed, 726 insertions(+), 659 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/47/27747/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4613361dc40518edd94f2d4128ba412337690736 Gerrit-Change-Number: 27747 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Add optarg support

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/27746 to look at the new patch set (#2). Change subject: Add optarg support ...................................................................... Add optarg support Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 --- M daemon/main.c 1 file changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/46/27746/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 Gerrit-Change-Number: 27746 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Move several objects outside of main.c

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27747 ) Change subject: Move several objects outside of main.c ...................................................................... Move several objects outside of main.c This makes it far more easy to understand the data model and find stuff in code. Change-Id: I4613361dc40518edd94f2d4128ba412337690736 --- M daemon/Makefile.am A daemon/cups_client.c A daemon/gtp_daemon.c M daemon/internal.h M daemon/main.c 5 files changed, 726 insertions(+), 659 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/47/27747/1 diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7d41766..2d62f11 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -36,10 +36,12 @@ $(NULL) osmo_uecups_daemon_SOURCES = \ + cups_client.c \ utility.c \ netdev.c \ netns.c \ tun_device.c \ + gtp_daemon.c \ gtp_endpoint.c \ gtp_tunnel.c \ daemon_vty.c \ diff --git a/daemon/cups_client.c b/daemon/cups_client.c new file mode 100644 index 0000000..8b136ec --- /dev/null +++ b/daemon/cups_client.c @@ -0,0 +1,612 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <unistd.h> +#include <stdint.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <pthread.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/exec.h> + +#include "internal.h" + +#include <netinet/sctp.h> + +/*********************************************************************** + * Client (Contol/User Plane Separation) Socket + ***********************************************************************/ + +#define CUPS_MSGB_SIZE 1024 + +#define LOGCC(cc, lvl, fmt, args ...) \ + LOGP(DUECUPS, lvl, "%s: " fmt, (cc)->sockname, ## args) + +struct subprocess { + /* member in daemon->cups_clients */ + struct llist_head list; + /* pointer to the client that started us */ + struct cups_client *cups_client; + /* PID of the process */ + pid_t pid; +}; + +static json_t *gen_uecups_term_ind(pid_t pid, int status); + +/* kill the specified subprocess and forget about it */ +static void subprocess_destroy(struct subprocess *p, int signal) +{ + LOGCC(p->cups_client, LOGL_DEBUG, "Kill subprocess pid %llu with signal %u\n", + (unsigned long long)p->pid, signal); + kill(p->pid, signal); + llist_del(&p->list); + talloc_free(p); +} + +static struct subprocess *subprocess_by_pid(struct gtp_daemon *d, pid_t pid) +{ + struct subprocess *sproc; + llist_for_each_entry(sproc, &d->subprocesses, list) { + if (sproc->pid == pid) + return sproc; + } + return NULL; +} + +void child_terminated(struct gtp_daemon *d, int pid, int status) +{ + struct subprocess *sproc; + json_t *jterm_ind; + + LOGP(DUECUPS, LOGL_DEBUG, "SIGCHLD receive from pid %u; status=%d\n", pid, status); + + sproc = subprocess_by_pid(d, pid); + if (!sproc) { + LOGP(DUECUPS, LOGL_NOTICE, "subprocess %u terminated (status=%d) but we don't know it?\n", + pid, status); + return; + } + + /* generate prog_term_ind towards control plane */ + jterm_ind = gen_uecups_term_ind(pid, status); + if (!jterm_ind) + return; + + cups_client_tx_json(sproc->cups_client, jterm_ind); + + llist_del(&sproc->list); + talloc_free(sproc); +} + +/* Send JSON to a given client/connection */ +int cups_client_tx_json(struct cups_client *cc, json_t *jtx) +{ + struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); + char *json_str = json_dumps(jtx, JSON_SORT_KEYS); + char *out; + int json_strlen; + + json_decref(jtx); + if (!json_str) { + LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n"); + return 0; + } + json_strlen = strlen(json_str); + + LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); + + if (json_strlen > msgb_tailroom(msg)) { + LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); + free(json_str); + return 0; + } + + out = (char *)msgb_put(msg, json_strlen); + memcpy(out, json_str, json_strlen); + free(json_str); + osmo_stream_srv_send(cc->srv, msg); + + return 0; +} + +json_t *gen_uecups_result(const char *name, const char *res) +{ + json_t *jres = json_object(); + json_t *jret = json_object(); + + json_object_set_new(jres, "result", json_string(res)); + json_object_set_new(jret, name, jres); + + return jret; +} + +static int parse_ep(struct sockaddr_storage *out, json_t *in) +{ + json_t *jaddr_type, *jport, *jip; + const char *addr_type, *ip; + uint8_t buf[16]; + + /* {"addr_type":"IPV4","ip":"31323334","Port":2152} */ + + if (!json_is_object(in)) + return -EINVAL; + + jaddr_type = json_object_get(in, "addr_type"); + jport = json_object_get(in, "Port"); + jip = json_object_get(in, "ip"); + + if (!jaddr_type || !jport || !jip) + return -EINVAL; + + if (!json_is_string(jaddr_type) || !json_is_integer(jport) || !json_is_string(jip)) + return -EINVAL; + + addr_type = json_string_value(jaddr_type); + ip = json_string_value(jip); + + memset(out, 0, sizeof(*out)); + + if (!strcmp(addr_type, "IPV4")) { + struct sockaddr_in *sin = (struct sockaddr_in *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) + return -EINVAL; + memcpy(&sin->sin_addr, buf, 4); + sin->sin_family = AF_INET; + sin->sin_port = htons(json_integer_value(jport)); + } else if (!strcmp(addr_type, "IPV6")) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) + return -EINVAL; + memcpy(&sin6->sin6_addr, buf, 16); + sin6->sin6_family = AF_INET6; + sin6->sin6_port = htons(json_integer_value(jport)); + } else + return -EINVAL; + + return 0; +} + +static int parse_eua(struct sockaddr_storage *out, json_t *jip, json_t *jaddr_type) +{ + const char *addr_type, *ip; + uint8_t buf[16]; + + if (!json_is_string(jip) || !json_is_string(jaddr_type)) + return -EINVAL; + + addr_type = json_string_value(jaddr_type); + ip = json_string_value(jip); + + memset(out, 0, sizeof(*out)); + + if (!strcmp(addr_type, "IPV4")) { + struct sockaddr_in *sin = (struct sockaddr_in *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) + return -EINVAL; + memcpy(&sin->sin_addr, buf, 4); + sin->sin_family = AF_INET; + } else if (!strcmp(addr_type, "IPV6")) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) + return -EINVAL; + memcpy(&sin6->sin6_addr, buf, 16); + sin6->sin6_family = AF_INET6; + } else + return -EINVAL; + + return 0; +} + + +static int parse_create_tun(struct gtp_tunnel_params *out, json_t *ctun) +{ + json_t *jlocal_gtp_ep, *jremote_gtp_ep; + json_t *jrx_teid, *jtx_teid; + json_t *jtun_dev_name, *jtun_netns_name; + json_t *juser_addr, *juser_addr_type; + int rc; + + /* '{"create_tun":{"tx_teid":1234,"rx_teid":5678,"user_addr_type":"IPV4","user_addr":"21222324","local_gtp_ep":{"addr_type":"IPV4","ip":"31323334","Port":2152},"remote_gtp_ep":{"addr_type":"IPV4","ip":"41424344","Port":2152},"tun_dev_name":"tun23","tun_netns_name":"foo"}}' */ + + if (!json_is_object(ctun)) + return -EINVAL; + + /* mandatory IEs */ + jlocal_gtp_ep = json_object_get(ctun, "local_gtp_ep"); + jremote_gtp_ep = json_object_get(ctun, "remote_gtp_ep"); + jrx_teid = json_object_get(ctun, "rx_teid"); + jtx_teid = json_object_get(ctun, "tx_teid"); + jtun_dev_name = json_object_get(ctun, "tun_dev_name"); + juser_addr = json_object_get(ctun, "user_addr"); + juser_addr_type = json_object_get(ctun, "user_addr_type"); + + if (!jlocal_gtp_ep || !jremote_gtp_ep || !jrx_teid || !jtx_teid || !jtun_dev_name || + !juser_addr || !juser_addr_type) + return -EINVAL; + if (!json_is_object(jlocal_gtp_ep) || !json_is_object(jremote_gtp_ep) || + !json_is_integer(jrx_teid) || !json_is_integer(jtx_teid) || + !json_is_string(jtun_dev_name) || + !json_is_string(juser_addr) || !json_is_string(juser_addr_type)) + return -EINVAL; + + memset(out, 0, sizeof(*out)); + + rc = parse_ep(&out->local_udp, jlocal_gtp_ep); + if (rc < 0) + return rc; + rc = parse_ep(&out->remote_udp, jremote_gtp_ep); + if (rc < 0) + return rc; + rc = parse_eua(&out->user_addr, juser_addr, juser_addr_type); + if (rc < 0) + return rc; + out->rx_teid = json_integer_value(jrx_teid); + out->tx_teid = json_integer_value(jtx_teid); + out->tun_name = talloc_strdup(out, json_string_value(jtun_dev_name)); + + /* optional IEs */ + jtun_netns_name = json_object_get(ctun, "tun_netns_name"); + if (jtun_netns_name) { + if (!json_is_string(jtun_netns_name)) + return -EINVAL; + out->tun_netns_name = talloc_strdup(out, json_string_value(jtun_netns_name)); + } + + return 0; +} + + +static int cups_client_handle_create_tun(struct cups_client *cc, json_t *ctun) +{ + int rc; + struct gtp_tunnel_params *tpars = talloc_zero(cc, struct gtp_tunnel_params); + struct gtp_tunnel *t; + + rc = parse_create_tun(tpars, ctun); + if (rc < 0) { + talloc_free(tpars); + return rc; + } + + t = gtp_tunnel_alloc(g_daemon, tpars); + if (!t) { + LOGCC(cc, LOGL_NOTICE, "Failed to allocate tunnel\n"); + cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "ERR_NOT_FOUND")); + } else { + cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "OK")); + } + + talloc_free(tpars); + return 0; +} + +static int cups_client_handle_destroy_tun(struct cups_client *cc, json_t *dtun) +{ + struct sockaddr_storage local_ep_addr; + json_t *jlocal_gtp_ep, *jrx_teid; + uint32_t rx_teid; + int rc; + + jlocal_gtp_ep = json_object_get(dtun, "local_gtp_ep"); + jrx_teid = json_object_get(dtun, "rx_teid"); + + if (!jlocal_gtp_ep || !jrx_teid) + return -EINVAL; + + if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) + return -EINVAL; + + rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); + if (rc < 0) + return rc; + rx_teid = json_integer_value(jrx_teid); + + rc = gtp_tunnel_destroy(g_daemon, &local_ep_addr, rx_teid); + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Failed to destroy tunnel\n"); + cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "ERR_NOT_FOUND")); + } else { + cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "OK")); + } + + return 0; +} + +static json_t *gen_uecups_term_ind(pid_t pid, int status) +{ + json_t *jterm = json_object(); + json_t *jret = json_object(); + + json_object_set_new(jterm, "pid", json_integer(pid)); + json_object_set_new(jterm, "exit_code", json_integer(status)); + + json_object_set_new(jret, "program_term_ind", jterm); + + return jret; +} + +static json_t *gen_uecups_start_res(pid_t pid, const char *result) +{ + json_t *ret = gen_uecups_result("start_program_res", result); + json_object_set_new(json_object_get(ret, "start_program_res"), "pid", json_integer(pid)); + + return ret; +} + +static int cups_client_handle_start_program(struct cups_client *cc, json_t *sprog) +{ + json_t *juser, *jcmd, *jenv, *jnetns, *jres; + struct gtp_daemon *d = cc->d; + const char *cmd, *user; + char **addl_env = NULL; + sigset_t oldmask; + int nsfd = -1, rc; + + juser = json_object_get(sprog, "run_as_user"); + jcmd = json_object_get(sprog, "command"); + jenv = json_object_get(sprog, "environment"); + jnetns = json_object_get(sprog, "tun_netns_name"); + + /* mandatory parts */ + if (!juser || !jcmd) + return -EINVAL; + if (!json_is_string(juser) || !json_is_string(jcmd)) + return -EINVAL; + + /* optional parts */ + if (jenv && !json_is_array(jenv)) + return -EINVAL; + if (jnetns && !json_is_string(jnetns)) + return -EINVAL; + + cmd = json_string_value(jcmd); + user = json_string_value(juser); + if (jnetns) { + struct tun_device *tun = tun_device_find_netns(d, json_string_value(jnetns)); + if (!tun) + return -ENODEV; + nsfd = tun->netns_fd; + } + + /* build environment */ + if (jenv) { + json_t *j; + int i; + addl_env = talloc_zero_array(cc, char *, json_array_size(jenv)+1); + if (!addl_env) + return -ENOMEM; + json_array_foreach(jenv, i, j) { + addl_env[i] = talloc_strdup(addl_env, json_string_value(j)); + } + } + + if (jnetns) { + rc = switch_ns(nsfd, &oldmask); + if (rc < 0) { + talloc_free(addl_env); + return -EIO; + } + } + + rc = osmo_system_nowait2(cmd, osmo_environment_whitelist, addl_env, user); + + if (jnetns) { + OSMO_ASSERT(restore_ns(&oldmask) == 0); + } + + talloc_free(addl_env); + + if (rc > 0) { + /* create a record about the subprocess we started, so we can notify the + * client that crated it upon termination */ + struct subprocess *sproc = talloc_zero(cc, struct subprocess); + if (!sproc) + return -ENOMEM; + + sproc->cups_client = cc; + sproc->pid = rc; + llist_add_tail(&sproc->list, &d->subprocesses); + jres = gen_uecups_start_res(sproc->pid, "OK"); + } else { + jres = gen_uecups_start_res(0, "ERR_INVALID_DATA"); + } + + cups_client_tx_json(cc, jres); + + return 0; +} + +static int cups_client_handle_reset_all_state(struct cups_client *cc, json_t *sprog) +{ + struct gtp_daemon *d = cc->d; + struct gtp_tunnel *t, *t2; + struct subprocess *p, *p2; + json_t *jres; + + LOGCC(cc, LOGL_DEBUG, "Destroying all tunnels\n"); + pthread_rwlock_wrlock(&d->rwlock); + llist_for_each_entry_safe(t, t2, &d->gtp_tunnels, list) { + _gtp_tunnel_destroy(t); + } + pthread_rwlock_unlock(&d->rwlock); + + /* no locking needed as this list is only used by main thread */ + LOGCC(cc, LOGL_DEBUG, "Destroying all subprocesses\n"); + llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { + subprocess_destroy(p, SIGKILL); + } + + if (d->reset_all_state_tun_remaining == 0) { + jres = gen_uecups_result("reset_all_state_res", "OK"); + cups_client_tx_json(cc, jres); + } else { + cc->reset_all_state_res_pending = true; + } + + return 0; +} + +static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) +{ + void *iter; + const char *key; + json_t *cmd; + int rc; + + if (!json_is_object(jroot)) + return -EINVAL; + + iter = json_object_iter(jroot); + key = json_object_iter_key(iter); + cmd = json_object_iter_value(iter); + if (!iter || !key || !cmd) + return -EINVAL; + + if (!strcmp(key, "create_tun")) { + rc = cups_client_handle_create_tun(cc, cmd); + } else if (!strcmp(key, "destroy_tun")) { + rc = cups_client_handle_destroy_tun(cc, cmd); + } else if (!strcmp(key, "start_program")) { + rc = cups_client_handle_start_program(cc, cmd); + } else if (!strcmp(key, "reset_all_state")) { + rc = cups_client_handle_reset_all_state(cc, cmd); + } else { + LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); + return -EINVAL; + } + + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Error %d handling '%s' command\n", rc, key); + char buf[64]; + snprintf(buf, sizeof(buf), "%s_res", key); + cups_client_tx_json(cc, gen_uecups_result(buf, "ERR_INVALID_DATA")); + return -EINVAL; + } + + return 0; +} + +/* control/user plane separation per-client read cb */ +static int cups_client_read_cb(struct osmo_stream_srv *conn) +{ + struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); + struct cups_client *cc = osmo_stream_srv_get_data(conn); + struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Rx JSON"); + struct sctp_sndrcvinfo sinfo; + json_error_t jerr; + json_t *jroot; + int flags = 0; + int rc = 0; + + /* Read message from socket */ + /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from + * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use + * it here as well as in libosmo-sigtran and osmo-msc */ + rc = sctp_recvmsg(ofd->fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo,&flags); + if (rc <= 0) { + osmo_stream_srv_destroy(conn); + rc = -1; + goto out; + } else + msgb_put(msg, rc); + + if (flags & MSG_NOTIFICATION) { + union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); + switch (notif->sn_header.sn_type) { + case SCTP_SHUTDOWN_EVENT: + osmo_stream_srv_destroy(conn); + rc = -EBADF; + goto out; + default: + break; + } + goto out; + } + + LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); + + /* Parse the JSON */ + jroot = json_loadb((const char *) msgb_data(msg), msgb_length(msg), 0, &jerr); + if (!jroot) { + LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)", jerr.text); + rc = -1; + goto out; + } + + /* Dispatch */ + rc = cups_client_handle_json(cc, jroot); + + json_decref(jroot); + msgb_free(msg); + + return 0; +out: + msgb_free(msg); + return rc; +} + +static int cups_client_closed_cb(struct osmo_stream_srv *conn) +{ + struct cups_client *cc = osmo_stream_srv_get_data(conn); + struct gtp_daemon *d = cc->d; + struct subprocess *p, *p2; + + /* kill + forget about all subprocesses of this client */ + /* We need no locking here as the subprocess list is only used from the main thread */ + llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { + if (p->cups_client == cc) + subprocess_destroy(p, SIGKILL); + } + + LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); + llist_del(&cc->list); + return 0; +} + + +/* the control/user plane separation server bind/accept fd */ +static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) +{ + struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); + struct cups_client *cc; + + cc = talloc_zero(d, struct cups_client); + if (!cc) + return -1; + + cc->d = d; + osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); + cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); + if (!cc->srv) { + talloc_free(cc); + return -1; + } + LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); + + llist_add_tail(&cc->list, &d->cups_clients); + + return 0; +} + +struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d) +{ + struct osmo_stream_srv_link *srv_link; + srv_link = osmo_stream_srv_link_create(g_daemon); + if (!srv_link) + return NULL; + + /* UECUPS socket for control from control plane side */ + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_addr(srv_link, g_daemon->cfg.cups_local_ip); + osmo_stream_srv_link_set_port(srv_link, g_daemon->cfg.cups_local_port); + osmo_stream_srv_link_set_proto(srv_link, IPPROTO_SCTP); + osmo_stream_srv_link_set_data(srv_link, g_daemon); + osmo_stream_srv_link_set_accept_cb(srv_link, cups_accept_cb); + osmo_stream_srv_link_open(srv_link); + return srv_link; +} diff --git a/daemon/gtp_daemon.c b/daemon/gtp_daemon.c new file mode 100644 index 0000000..b5b7ac8 --- /dev/null +++ b/daemon/gtp_daemon.c @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <unistd.h> +#include <stdint.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> + +#include <pthread.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> + +#include "internal.h" + + +/*********************************************************************** + * GTP Daemon + ***********************************************************************/ + +#ifndef OSMO_VTY_PORT_UECUPS +#define OSMO_VTY_PORT_UECUPS 4268 +#endif + +struct gtp_daemon *g_daemon; + +static void gtp_daemon_itq_read_cb(struct osmo_it_q *q, struct llist_head *item) +{ + struct gtp_daemon *d = (struct gtp_daemon *)q->data; + struct gtp_daemon_itq_msg *itq_msg = container_of(item, struct gtp_daemon_itq_msg, list); + + LOGP(DTUN, LOGL_DEBUG, "Rx new itq message from %s\n", + itq_msg->tun_released.tun->devname); + + _tun_device_destroy(itq_msg->tun_released.tun); + if (d->reset_all_state_tun_remaining > 0) { + d->reset_all_state_tun_remaining--; + if (d->reset_all_state_tun_remaining == 0) { + struct cups_client *cc; + llist_for_each_entry(cc, &d->cups_clients, list) { + json_t *jres; + if (!cc->reset_all_state_res_pending) + continue; + cc->reset_all_state_res_pending = false; + jres = gen_uecups_result("reset_all_state_res", "OK"); + cups_client_tx_json(cc, jres); + } + } + } +} + +struct gtp_daemon *gtp_daemon_alloc(void *ctx) +{ + struct gtp_daemon *d = talloc_zero(ctx, struct gtp_daemon); + if (!d) + return NULL; + + INIT_LLIST_HEAD(&d->gtp_endpoints); + INIT_LLIST_HEAD(&d->tun_devices); + INIT_LLIST_HEAD(&d->gtp_tunnels); + INIT_LLIST_HEAD(&d->subprocesses); + pthread_rwlock_init(&d->rwlock, NULL); + d->main_thread = pthread_self(); + + d->itq = osmo_it_q_alloc(d, "itq", 4096, gtp_daemon_itq_read_cb, d); + osmo_fd_register(&d->itq->event_ofd); + + INIT_LLIST_HEAD(&d->cups_clients); + + d->cfg.cups_local_ip = talloc_strdup(d, "localhost"); + d->cfg.cups_local_port = UECUPS_SCTP_PORT; + + return d; +} diff --git a/daemon/internal.h b/daemon/internal.h index fc5708d..a3ef40c 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -1,14 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0 */ #pragma once +#include "netns.h" + #include <stdint.h> #include <stdbool.h> #include <pthread.h> #include <sys/socket.h> + +#include <jansson.h> + #include <osmocom/core/linuxlist.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/it_q.h> #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> + +#include <osmocom/netif/stream.h> struct nl_sock; struct osmo_stream_srv_link; @@ -140,6 +148,25 @@ bool tun_device_release(struct tun_device *tun); +/*********************************************************************** + * Client (Contol/User Plane Separation) Socket + ***********************************************************************/ + +struct cups_client { + /* member in daemon->cups_clients */ + struct llist_head list; + /* back-pointer to daemon */ + struct gtp_daemon *d; + /* client socket */ + struct osmo_stream_srv *srv; + char sockname[OSMO_SOCK_NAME_MAXLEN]; + bool reset_all_state_res_pending; +}; + +struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d); +void child_terminated(struct gtp_daemon *d, int pid, int status); +json_t *gen_uecups_result(const char *name, const char *res); +int cups_client_tx_json(struct cups_client *cc, json_t *jtx); /*********************************************************************** * GTP Tunnel @@ -247,4 +274,6 @@ }; extern struct gtp_daemon *g_daemon; +struct gtp_daemon *gtp_daemon_alloc(void *ctx); + int gtpud_vty_init(void); diff --git a/daemon/main.c b/daemon/main.c index 14ba330..da194f5 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -24,7 +24,6 @@ #include <osmocom/core/stats.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/socket.h> -#include <osmocom/core/exec.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> #include <osmocom/vty/stats.h> @@ -33,7 +32,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/netif/stream.h> -#include <netinet/sctp.h> #include <jansson.h> @@ -41,330 +39,13 @@ #include "netns.h" #include "gtp.h" -/*********************************************************************** - * Client (Contol/User Plane Separation) Socket - ***********************************************************************/ +static void *g_tall_ctx; +static char *g_config_file = "osmo-uecups-daemon.cfg"; +static int g_daemonize; +extern struct vty_app_info g_vty_info; #include <pwd.h> -#define CUPS_MSGB_SIZE 1024 - -#define LOGCC(cc, lvl, fmt, args ...) \ - LOGP(DUECUPS, lvl, "%s: " fmt, (cc)->sockname, ## args) - -struct cups_client { - /* member in daemon->cups_clients */ - struct llist_head list; - /* back-pointer to daemon */ - struct gtp_daemon *d; - /* client socket */ - struct osmo_stream_srv *srv; - char sockname[OSMO_SOCK_NAME_MAXLEN]; - bool reset_all_state_res_pending; -}; - -struct subprocess { - /* member in daemon->cups_clients */ - struct llist_head list; - /* pointer to the client that started us */ - struct cups_client *cups_client; - /* PID of the process */ - pid_t pid; -}; - -/* kill the specified subprocess and forget about it */ -static void subprocess_destroy(struct subprocess *p, int signal) -{ - LOGCC(p->cups_client, LOGL_DEBUG, "Kill subprocess pid %llu with signal %u\n", - (unsigned long long)p->pid, signal); - kill(p->pid, signal); - llist_del(&p->list); - talloc_free(p); -} - -/* Send JSON to a given client/connection */ -static int cups_client_tx_json(struct cups_client *cc, json_t *jtx) -{ - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); - char *json_str = json_dumps(jtx, JSON_SORT_KEYS); - char *out; - int json_strlen; - - json_decref(jtx); - if (!json_str) { - LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n"); - return 0; - } - json_strlen = strlen(json_str); - - LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); - - if (json_strlen > msgb_tailroom(msg)) { - LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); - free(json_str); - return 0; - } - - out = (char *)msgb_put(msg, json_strlen); - memcpy(out, json_str, json_strlen); - free(json_str); - osmo_stream_srv_send(cc->srv, msg); - - return 0; -} - -static json_t *gen_uecups_result(const char *name, const char *res) -{ - json_t *jres = json_object(); - json_t *jret = json_object(); - - json_object_set_new(jres, "result", json_string(res)); - json_object_set_new(jret, name, jres); - - return jret; -} - -static int parse_ep(struct sockaddr_storage *out, json_t *in) -{ - json_t *jaddr_type, *jport, *jip; - const char *addr_type, *ip; - uint8_t buf[16]; - - /* {"addr_type":"IPV4","ip":"31323334","Port":2152} */ - - if (!json_is_object(in)) - return -EINVAL; - - jaddr_type = json_object_get(in, "addr_type"); - jport = json_object_get(in, "Port"); - jip = json_object_get(in, "ip"); - - if (!jaddr_type || !jport || !jip) - return -EINVAL; - - if (!json_is_string(jaddr_type) || !json_is_integer(jport) || !json_is_string(jip)) - return -EINVAL; - - addr_type = json_string_value(jaddr_type); - ip = json_string_value(jip); - - memset(out, 0, sizeof(*out)); - - if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) - return -EINVAL; - memcpy(&sin->sin_addr, buf, 4); - sin->sin_family = AF_INET; - sin->sin_port = htons(json_integer_value(jport)); - } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) - return -EINVAL; - memcpy(&sin6->sin6_addr, buf, 16); - sin6->sin6_family = AF_INET6; - sin6->sin6_port = htons(json_integer_value(jport)); - } else - return -EINVAL; - - return 0; -} - -static int parse_eua(struct sockaddr_storage *out, json_t *jip, json_t *jaddr_type) -{ - const char *addr_type, *ip; - uint8_t buf[16]; - - if (!json_is_string(jip) || !json_is_string(jaddr_type)) - return -EINVAL; - - addr_type = json_string_value(jaddr_type); - ip = json_string_value(jip); - - memset(out, 0, sizeof(*out)); - - if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) - return -EINVAL; - memcpy(&sin->sin_addr, buf, 4); - sin->sin_family = AF_INET; - } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) - return -EINVAL; - memcpy(&sin6->sin6_addr, buf, 16); - sin6->sin6_family = AF_INET6; - } else - return -EINVAL; - - return 0; -} - - -static int parse_create_tun(struct gtp_tunnel_params *out, json_t *ctun) -{ - json_t *jlocal_gtp_ep, *jremote_gtp_ep; - json_t *jrx_teid, *jtx_teid; - json_t *jtun_dev_name, *jtun_netns_name; - json_t *juser_addr, *juser_addr_type; - int rc; - - /* '{"create_tun":{"tx_teid":1234,"rx_teid":5678,"user_addr_type":"IPV4","user_addr":"21222324","local_gtp_ep":{"addr_type":"IPV4","ip":"31323334","Port":2152},"remote_gtp_ep":{"addr_type":"IPV4","ip":"41424344","Port":2152},"tun_dev_name":"tun23","tun_netns_name":"foo"}}' */ - - if (!json_is_object(ctun)) - return -EINVAL; - - /* mandatory IEs */ - jlocal_gtp_ep = json_object_get(ctun, "local_gtp_ep"); - jremote_gtp_ep = json_object_get(ctun, "remote_gtp_ep"); - jrx_teid = json_object_get(ctun, "rx_teid"); - jtx_teid = json_object_get(ctun, "tx_teid"); - jtun_dev_name = json_object_get(ctun, "tun_dev_name"); - juser_addr = json_object_get(ctun, "user_addr"); - juser_addr_type = json_object_get(ctun, "user_addr_type"); - - if (!jlocal_gtp_ep || !jremote_gtp_ep || !jrx_teid || !jtx_teid || !jtun_dev_name || - !juser_addr || !juser_addr_type) - return -EINVAL; - if (!json_is_object(jlocal_gtp_ep) || !json_is_object(jremote_gtp_ep) || - !json_is_integer(jrx_teid) || !json_is_integer(jtx_teid) || - !json_is_string(jtun_dev_name) || - !json_is_string(juser_addr) || !json_is_string(juser_addr_type)) - return -EINVAL; - - memset(out, 0, sizeof(*out)); - - rc = parse_ep(&out->local_udp, jlocal_gtp_ep); - if (rc < 0) - return rc; - rc = parse_ep(&out->remote_udp, jremote_gtp_ep); - if (rc < 0) - return rc; - rc = parse_eua(&out->user_addr, juser_addr, juser_addr_type); - if (rc < 0) - return rc; - out->rx_teid = json_integer_value(jrx_teid); - out->tx_teid = json_integer_value(jtx_teid); - out->tun_name = talloc_strdup(out, json_string_value(jtun_dev_name)); - - /* optional IEs */ - jtun_netns_name = json_object_get(ctun, "tun_netns_name"); - if (jtun_netns_name) { - if (!json_is_string(jtun_netns_name)) - return -EINVAL; - out->tun_netns_name = talloc_strdup(out, json_string_value(jtun_netns_name)); - } - - return 0; -} - - -static int cups_client_handle_create_tun(struct cups_client *cc, json_t *ctun) -{ - int rc; - struct gtp_tunnel_params *tpars = talloc_zero(cc, struct gtp_tunnel_params); - struct gtp_tunnel *t; - - rc = parse_create_tun(tpars, ctun); - if (rc < 0) { - talloc_free(tpars); - return rc; - } - - t = gtp_tunnel_alloc(g_daemon, tpars); - if (!t) { - LOGCC(cc, LOGL_NOTICE, "Failed to allocate tunnel\n"); - cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "ERR_NOT_FOUND")); - } else { - cups_client_tx_json(cc, gen_uecups_result("create_tun_res", "OK")); - } - - talloc_free(tpars); - return 0; -} - -static int cups_client_handle_destroy_tun(struct cups_client *cc, json_t *dtun) -{ - struct sockaddr_storage local_ep_addr; - json_t *jlocal_gtp_ep, *jrx_teid; - uint32_t rx_teid; - int rc; - - jlocal_gtp_ep = json_object_get(dtun, "local_gtp_ep"); - jrx_teid = json_object_get(dtun, "rx_teid"); - - if (!jlocal_gtp_ep || !jrx_teid) - return -EINVAL; - - if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) - return -EINVAL; - - rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); - if (rc < 0) - return rc; - rx_teid = json_integer_value(jrx_teid); - - rc = gtp_tunnel_destroy(g_daemon, &local_ep_addr, rx_teid); - if (rc < 0) { - LOGCC(cc, LOGL_NOTICE, "Failed to destroy tunnel\n"); - cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "ERR_NOT_FOUND")); - } else { - cups_client_tx_json(cc, gen_uecups_result("destroy_tun_res", "OK")); - } - - return 0; -} - -static json_t *gen_uecups_term_ind(pid_t pid, int status) -{ - json_t *jterm = json_object(); - json_t *jret = json_object(); - - json_object_set_new(jterm, "pid", json_integer(pid)); - json_object_set_new(jterm, "exit_code", json_integer(status)); - - json_object_set_new(jret, "program_term_ind", jterm); - - return jret; -} - - -static struct subprocess *subprocess_by_pid(struct gtp_daemon *d, pid_t pid) -{ - struct subprocess *sproc; - llist_for_each_entry(sproc, &d->subprocesses, list) { - if (sproc->pid == pid) - return sproc; - } - return NULL; -} - -static void child_terminated(struct gtp_daemon *d, int pid, int status) -{ - struct subprocess *sproc; - json_t *jterm_ind; - - LOGP(DUECUPS, LOGL_DEBUG, "SIGCHLD receive from pid %u; status=%d\n", pid, status); - - sproc = subprocess_by_pid(d, pid); - if (!sproc) { - LOGP(DUECUPS, LOGL_NOTICE, "subprocess %u terminated (status=%d) but we don't know it?\n", - pid, status); - return; - } - - /* generate prog_term_ind towards control plane */ - jterm_ind = gen_uecups_term_ind(pid, status); - if (!jterm_ind) - return; - - cups_client_tx_json(sproc->cups_client, jterm_ind); - - llist_del(&sproc->list); - talloc_free(sproc); -} - static void sigchild_cb(struct osmo_signalfd *osfd, const struct signalfd_siginfo *fdsi) { struct gtp_daemon *d = osfd->data; @@ -385,283 +66,6 @@ } -static json_t *gen_uecups_start_res(pid_t pid, const char *result) -{ - json_t *ret = gen_uecups_result("start_program_res", result); - json_object_set_new(json_object_get(ret, "start_program_res"), "pid", json_integer(pid)); - - return ret; -} - -static int cups_client_handle_start_program(struct cups_client *cc, json_t *sprog) -{ - json_t *juser, *jcmd, *jenv, *jnetns, *jres; - struct gtp_daemon *d = cc->d; - const char *cmd, *user; - char **addl_env = NULL; - sigset_t oldmask; - int nsfd = -1, rc; - - juser = json_object_get(sprog, "run_as_user"); - jcmd = json_object_get(sprog, "command"); - jenv = json_object_get(sprog, "environment"); - jnetns = json_object_get(sprog, "tun_netns_name"); - - /* mandatory parts */ - if (!juser || !jcmd) - return -EINVAL; - if (!json_is_string(juser) || !json_is_string(jcmd)) - return -EINVAL; - - /* optional parts */ - if (jenv && !json_is_array(jenv)) - return -EINVAL; - if (jnetns && !json_is_string(jnetns)) - return -EINVAL; - - cmd = json_string_value(jcmd); - user = json_string_value(juser); - if (jnetns) { - struct tun_device *tun = tun_device_find_netns(d, json_string_value(jnetns)); - if (!tun) - return -ENODEV; - nsfd = tun->netns_fd; - } - - /* build environment */ - if (jenv) { - json_t *j; - int i; - addl_env = talloc_zero_array(cc, char *, json_array_size(jenv)+1); - if (!addl_env) - return -ENOMEM; - json_array_foreach(jenv, i, j) { - addl_env[i] = talloc_strdup(addl_env, json_string_value(j)); - } - } - - if (jnetns) { - rc = switch_ns(nsfd, &oldmask); - if (rc < 0) { - talloc_free(addl_env); - return -EIO; - } - } - - rc = osmo_system_nowait2(cmd, osmo_environment_whitelist, addl_env, user); - - if (jnetns) { - OSMO_ASSERT(restore_ns(&oldmask) == 0); - } - - talloc_free(addl_env); - - if (rc > 0) { - /* create a record about the subprocess we started, so we can notify the - * client that crated it upon termination */ - struct subprocess *sproc = talloc_zero(cc, struct subprocess); - if (!sproc) - return -ENOMEM; - - sproc->cups_client = cc; - sproc->pid = rc; - llist_add_tail(&sproc->list, &d->subprocesses); - jres = gen_uecups_start_res(sproc->pid, "OK"); - } else { - jres = gen_uecups_start_res(0, "ERR_INVALID_DATA"); - } - - cups_client_tx_json(cc, jres); - - return 0; -} - -static int cups_client_handle_reset_all_state(struct cups_client *cc, json_t *sprog) -{ - struct gtp_daemon *d = cc->d; - struct gtp_tunnel *t, *t2; - struct subprocess *p, *p2; - json_t *jres; - - LOGCC(cc, LOGL_DEBUG, "Destroying all tunnels\n"); - pthread_rwlock_wrlock(&d->rwlock); - llist_for_each_entry_safe(t, t2, &d->gtp_tunnels, list) { - _gtp_tunnel_destroy(t); - } - pthread_rwlock_unlock(&d->rwlock); - - /* no locking needed as this list is only used by main thread */ - LOGCC(cc, LOGL_DEBUG, "Destroying all subprocesses\n"); - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - subprocess_destroy(p, SIGKILL); - } - - if (d->reset_all_state_tun_remaining == 0) { - jres = gen_uecups_result("reset_all_state_res", "OK"); - cups_client_tx_json(cc, jres); - } else { - cc->reset_all_state_res_pending = true; - } - - return 0; -} - -static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) -{ - void *iter; - const char *key; - json_t *cmd; - int rc; - - if (!json_is_object(jroot)) - return -EINVAL; - - iter = json_object_iter(jroot); - key = json_object_iter_key(iter); - cmd = json_object_iter_value(iter); - if (!iter || !key || !cmd) - return -EINVAL; - - if (!strcmp(key, "create_tun")) { - rc = cups_client_handle_create_tun(cc, cmd); - } else if (!strcmp(key, "destroy_tun")) { - rc = cups_client_handle_destroy_tun(cc, cmd); - } else if (!strcmp(key, "start_program")) { - rc = cups_client_handle_start_program(cc, cmd); - } else if (!strcmp(key, "reset_all_state")) { - rc = cups_client_handle_reset_all_state(cc, cmd); - } else { - LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); - return -EINVAL; - } - - if (rc < 0) { - LOGCC(cc, LOGL_NOTICE, "Error %d handling '%s' command\n", rc, key); - char buf[64]; - snprintf(buf, sizeof(buf), "%s_res", key); - cups_client_tx_json(cc, gen_uecups_result(buf, "ERR_INVALID_DATA")); - return -EINVAL; - } - - return 0; -} - -/* control/user plane separation per-client read cb */ -static int cups_client_read_cb(struct osmo_stream_srv *conn) -{ - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); - struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Rx JSON"); - struct sctp_sndrcvinfo sinfo; - json_error_t jerr; - json_t *jroot; - int flags = 0; - int rc = 0; - - /* Read message from socket */ - /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from - * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use - * it here as well as in libosmo-sigtran and osmo-msc */ - rc = sctp_recvmsg(ofd->fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo,&flags); - if (rc <= 0) { - osmo_stream_srv_destroy(conn); - rc = -1; - goto out; - } else - msgb_put(msg, rc); - - if (flags & MSG_NOTIFICATION) { - union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); - switch (notif->sn_header.sn_type) { - case SCTP_SHUTDOWN_EVENT: - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - default: - break; - } - goto out; - } - - LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); - - /* Parse the JSON */ - jroot = json_loadb((const char *) msgb_data(msg), msgb_length(msg), 0, &jerr); - if (!jroot) { - LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)", jerr.text); - rc = -1; - goto out; - } - - /* Dispatch */ - rc = cups_client_handle_json(cc, jroot); - - json_decref(jroot); - msgb_free(msg); - - return 0; -out: - msgb_free(msg); - return rc; -} - -static int cups_client_closed_cb(struct osmo_stream_srv *conn) -{ - struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct gtp_daemon *d = cc->d; - struct subprocess *p, *p2; - - /* kill + forget about all subprocesses of this client */ - /* We need no locking here as the subprocess list is only used from the main thread */ - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - if (p->cups_client == cc) - subprocess_destroy(p, SIGKILL); - } - - LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); - llist_del(&cc->list); - return 0; -} - - -/* the control/user plane separation server bind/accept fd */ -static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) -{ - struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); - struct cups_client *cc; - - cc = talloc_zero(d, struct cups_client); - if (!cc) - return -1; - - cc->d = d; - osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); - cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); - if (!cc->srv) { - talloc_free(cc); - return -1; - } - LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); - - llist_add_tail(&cc->list, &d->cups_clients); - - return 0; -} - -/*********************************************************************** - * GTP Daemon - ***********************************************************************/ - -#ifndef OSMO_VTY_PORT_UECUPS -#define OSMO_VTY_PORT_UECUPS 4268 -#endif - -static void *g_tall_ctx; -struct gtp_daemon *g_daemon; -static int g_daemonize; -static char *g_config_file = "osmo-uecups-daemon.cfg"; -extern struct vty_app_info g_vty_info; - static void signal_cb(struct osmo_signalfd *osfd, const struct signalfd_siginfo *fdsi) { switch (fdsi->ssi_signo) { @@ -676,55 +80,6 @@ } } -static void gtp_daemon_itq_read_cb(struct osmo_it_q *q, struct llist_head *item) -{ - struct gtp_daemon *d = (struct gtp_daemon *)q->data; - struct gtp_daemon_itq_msg *itq_msg = container_of(item, struct gtp_daemon_itq_msg, list); - - LOGP(DTUN, LOGL_DEBUG, "Rx new itq message from %s\n", - itq_msg->tun_released.tun->devname); - - _tun_device_destroy(itq_msg->tun_released.tun); - if (d->reset_all_state_tun_remaining > 0) { - d->reset_all_state_tun_remaining--; - if (d->reset_all_state_tun_remaining == 0) { - struct cups_client *cc; - llist_for_each_entry(cc, &d->cups_clients, list) { - json_t *jres; - if (!cc->reset_all_state_res_pending) - continue; - cc->reset_all_state_res_pending = false; - jres = gen_uecups_result("reset_all_state_res", "OK"); - cups_client_tx_json(cc, jres); - } - } - } -} - -static struct gtp_daemon *gtp_daemon_alloc(void *ctx) -{ - struct gtp_daemon *d = talloc_zero(ctx, struct gtp_daemon); - if (!d) - return NULL; - - INIT_LLIST_HEAD(&d->gtp_endpoints); - INIT_LLIST_HEAD(&d->tun_devices); - INIT_LLIST_HEAD(&d->gtp_tunnels); - INIT_LLIST_HEAD(&d->subprocesses); - pthread_rwlock_init(&d->rwlock, NULL); - d->main_thread = pthread_self(); - - d->itq = osmo_it_q_alloc(d, "itq", 4096, gtp_daemon_itq_read_cb, d); - osmo_fd_register(&d->itq->event_ofd); - - INIT_LLIST_HEAD(&d->cups_clients); - - d->cfg.cups_local_ip = talloc_strdup(d, "localhost"); - d->cfg.cups_local_port = UECUPS_SCTP_PORT; - - return d; -} - static const struct log_info_cat log_categories[] = { [DTUN] = { .name ="DTUN", @@ -883,22 +238,14 @@ if (rc < 0) exit(1); - g_daemon->cups_link = osmo_stream_srv_link_create(g_daemon); + /* UECUPS socket for control from control plane side */ + g_daemon->cups_link = cups_srv_link_create(g_daemon); if (!g_daemon->cups_link) { fprintf(stderr, "Failed to create CUPS socket %s:%u (%s)\n", g_daemon->cfg.cups_local_ip, g_daemon->cfg.cups_local_port, strerror(errno)); exit(1); } - /* UECUPS socket for control from control plane side */ - osmo_stream_srv_link_set_nodelay(g_daemon->cups_link, true); - osmo_stream_srv_link_set_addr(g_daemon->cups_link, g_daemon->cfg.cups_local_ip); - osmo_stream_srv_link_set_port(g_daemon->cups_link, g_daemon->cfg.cups_local_port); - osmo_stream_srv_link_set_proto(g_daemon->cups_link, IPPROTO_SCTP); - osmo_stream_srv_link_set_data(g_daemon->cups_link, g_daemon); - osmo_stream_srv_link_set_accept_cb(g_daemon->cups_link, cups_accept_cb); - osmo_stream_srv_link_open(g_daemon->cups_link); - /* block SIGCHLD via normal delivery; redirect it to signalfd */ sigset_t sigset; sigemptyset(&sigset); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4613361dc40518edd94f2d4128ba412337690736 Gerrit-Change-Number: 27747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Add optarg support

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27746 ) Change subject: Add optarg support ...................................................................... Add optarg support Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 --- M daemon/main.c 1 file changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/46/27746/1 diff --git a/daemon/main.c b/daemon/main.c index 014e28a..14ba330 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -1,4 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#define _GNU_SOURCE +#include <getopt.h> #include <unistd.h> #include <stdint.h> #include <stdbool.h> @@ -752,6 +754,98 @@ .num_cat = ARRAY_SIZE(log_categories), }; +static void print_help() +{ + printf("Some useful options:\n"); + printf(" -h --help is printing this text.\n"); + printf(" -c --config-file filename The config file to use.\n"); + printf(" -s --disable-color\n"); + printf(" -D --daemonize Fork the process into a background daemon\n"); + printf(" -V --version Print the version number\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static int long_option = 0; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'c'}, + {"daemonize", 0, 0, 'D'}, + {"version", 0, 0, 'V'}, + {"disable-color", 0, 0, 's'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, + {0, 0, 0, 0}, + }; + + c = getopt_long(argc, argv, "hc:sVD", long_options, &option_index); + + if (c == -1) + break; + + switch(c) { + case 'h': + print_help(); + exit(0); + break; + case 0: + handle_long_options(argv[0], long_option); + break; + case 'c': + g_config_file = talloc_strdup(g_tall_ctx, optarg); + break; + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'V': + print_version(1); + exit(0); + break; + case 'D': + g_daemonize = 1; + break; + default: + /* ignore */ + break; + }; + } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } +} + int main(int argc, char **argv) { int rc; @@ -775,6 +869,8 @@ rate_ctr_init(g_tall_ctx); gtpud_vty_init(); + handle_options(argc, argv); + init_netns(); rc = vty_read_config_file(g_config_file, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 Gerrit-Change-Number: 27746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): rework default multi-rate configuration

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27744 ) Change subject: bts: gsm_bts_alloc(): rework default multi-rate configuration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Gerrit-Change-Number: 27744 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 10:38:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27745 ) Change subject: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Gerrit-Change-Number: 27745 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 10:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: VTY: clarify help for the Adaptive Multi Rate settings

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27743 ) Change subject: VTY: clarify help for the Adaptive Multi Rate settings ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I996eae8aafeb2850e5e1a6f5a7764d745e1289b5 Gerrit-Change-Number: 27743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 10:36:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): rework default multi-rate configuration

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27744 to look at the new patch set (#2). Change subject: bts: gsm_bts_alloc(): rework default multi-rate configuration ...................................................................... bts: gsm_bts_alloc(): rework default multi-rate configuration This is cosmetic change making the default multi-rate configuration easier to read/understand and modify. Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts.c 1 file changed, 36 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/27744/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Gerrit-Change-Number: 27744 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: VTY: clarify help for the Adaptive Multi Rate settings

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27743 ) Change subject: VTY: clarify help for the Adaptive Multi Rate settings ...................................................................... VTY: clarify help for the Adaptive Multi Rate settings * Always say 'codec mode', not just 'codec'. * Suggest proper modes in AMR_{TH,HY}_HELP_STR. * Use 3GPP's definition of threshold and hysteresis. * Clarify that threshold and hysteresis values are in 0.5 dB steps. Change-Id: I996eae8aafeb2850e5e1a6f5a7764d745e1289b5 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts_vty.c 1 file changed, 34 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/27743/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index d675922..1411cd3 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2386,10 +2386,12 @@ #define AMR_TEXT "Adaptive Multi Rate settings\n" #define AMR_MODE_TEXT "Codec modes to use with AMR codec\n" -#define AMR_START_TEXT "Initial codec to use with AMR\n" \ - "Automatically\nFirst codec\nSecond codec\nThird codec\nFourth codec\n" -#define AMR_TH_TEXT "AMR threshold between codecs\nMS side\nBTS side\n" -#define AMR_HY_TEXT "AMR hysteresis between codecs\nMS side\nBTS side\n" +#define AMR_START_TEXT "Initial codec mode to use with AMR\n" \ + "Automatically\nFirst mode\nSecond mode\nThird mode\nFourth mode\n" +#define AMR_MS_BTS_TEXT "MS side\nBTS side\n" +#define AMR_TH_TEXT "Lower threshold(s) for switching between codec modes\n" AMR_MS_BTS_TEXT +#define AMR_HY_TEXT "Hysteresis value(s) to obtain the higher threshold(s) " \ + "for switching between codec modes\n" AMR_MS_BTS_TEXT static int get_amr_from_arg(struct vty *vty, int argc, const char *argv[], int full) { @@ -2546,8 +2548,10 @@ #define AMR_TCHH_PAR_STR " (0|1|2|3|4|5)" #define AMR_TCHH_HELP_STR "4,75k\n5,15k\n5,90k\n6,70k\n7,40k\n7,95k\n" -#define AMR_TH_HELP_STR "Threshold between codec 1 and 2\n" -#define AMR_HY_HELP_STR "Hysteresis between codec 1 and 2\n" +#define AMR_TH_HELP_STR(a, b) \ + "Threshold between codec mode " a " and " b " (in 0.5 dB steps)\n" +#define AMR_HY_HELP_STR(a, b) \ + "Hysteresis between codec mode " a " and " b " (in 0.5 dB steps)\n" DEFUN_USRATTR(cfg_bts_amr_fr_modes1, cfg_bts_amr_fr_modes1_cmd, @@ -2612,7 +2616,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2")) { get_amr_th_from_arg(vty, 2, argv, 1); return check_amr_config(vty); @@ -2623,7 +2627,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63> <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3")) { get_amr_th_from_arg(vty, 3, argv, 1); return check_amr_config(vty); @@ -2634,7 +2639,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63> <0-63> <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3") + AMR_TH_HELP_STR("3", "4")) { get_amr_th_from_arg(vty, 4, argv, 1); return check_amr_config(vty); @@ -2645,7 +2652,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2")) { get_amr_hy_from_arg(vty, 2, argv, 1); return check_amr_config(vty); @@ -2656,7 +2663,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15> <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3")) { get_amr_hy_from_arg(vty, 3, argv, 1); return CMD_SUCCESS; @@ -2667,7 +2675,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15> <0-15> <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3") + AMR_HY_HELP_STR("3", "4")) { get_amr_hy_from_arg(vty, 4, argv, 1); return check_amr_config(vty); @@ -2736,7 +2746,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2")) { get_amr_th_from_arg(vty, 2, argv, 0); return check_amr_config(vty); @@ -2747,7 +2757,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63> <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3")) { get_amr_th_from_arg(vty, 3, argv, 0); return check_amr_config(vty); @@ -2758,7 +2769,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63> <0-63> <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3") + AMR_TH_HELP_STR("3", "4")) { get_amr_th_from_arg(vty, 4, argv, 0); return check_amr_config(vty); @@ -2769,7 +2782,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2")) { get_amr_hy_from_arg(vty, 2, argv, 0); return check_amr_config(vty); @@ -2780,7 +2793,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15> <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3")) { get_amr_hy_from_arg(vty, 3, argv, 0); return check_amr_config(vty); @@ -2791,7 +2805,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15> <0-15> <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3") + AMR_HY_HELP_STR("3", "4")) { get_amr_hy_from_arg(vty, 4, argv, 0); return check_amr_config(vty); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I996eae8aafeb2850e5e1a6f5a7764d745e1289b5 Gerrit-Change-Number: 27743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27745 ) Change subject: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults ...................................................................... bts: gsm_bts_alloc(): use reasonable multi-rate config defaults The current multi-rate configuration uses the same threshold and the same hysteresis values for all modes: 32 and 8, respectively. This basically forces the AMR link adoptation loop in the BTS to stick to the initial codec mode during an lchan's lifetime. Let's use more reasonable default values from 3GPP TS 51.010-1 (version 13.11.0), sections 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. ^ C/I (dB) | FR / HR | | | | | MODE4 | | = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | | | | | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | MODE3 | | | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | | | | = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | MODE2 | | = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | | | | | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | MODE1 | | | | | | Change-Id: Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts.c 1 file changed, 59 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/27745/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 7855781..f4c90e0 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -169,7 +169,6 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); - int i; if (!bts) return NULL; @@ -335,51 +334,93 @@ }; /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. - * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ + * The values are taken from 3GPP TS 51.010-1 (version 13.11.0). + * See 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. */ static const struct gsm48_multi_rate_conf amr_fr_mr_cfg = { .m4_75 = 1, .m5_90 = 1, - .m7_40 = 1, + .m7_95 = 1, .m12_2 = 1 }; static const struct gsm48_multi_rate_conf amr_hr_mr_cfg = { .m4_75 = 1, .m5_90 = 1, - .m7_40 = 1, + .m6_70 = 1, + .m7_95 = 1, }; memcpy(bts->mr_full.gsm48_ie, &amr_fr_mr_cfg, sizeof(bts->mr_full.gsm48_ie)); memcpy(bts->mr_half.gsm48_ie, &amr_hr_mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - static const struct amr_mode amr_ms_bts_mode[] = { + /* ^ C/I (dB) | FR / HR | + * | | + * | | + * MODE4 | | + * = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | + * | | | + * | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | + * MODE3 | | + * | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | + * | | | + * = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | + * MODE2 | | + * = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | + * | | | + * | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | + * MODE1 | | + * | | + * | | + */ + static const struct amr_mode amr_fr_ms_bts_mode[] = { { .mode = 0, /* 4.75k */ - .threshold = 32, - .hysteresis = 8, + .threshold = 13, /* THR_MX_Dn(2): 6.5 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 8.5 dB */ }, { .mode = 2, /* 5.90k */ - .threshold = 32, - .hysteresis = 8, + .threshold = 25, /* THR_MX_Dn(3): 12.5 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.5 dB */ }, { - .mode = 4, /* 7.40k */ - .threshold = 32, - .hysteresis = 8, + .mode = 5, /* 7.95k */ + .threshold = 37, /* THR_MX_Dn(4): 18.5 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 20.5 dB */ }, { .mode = 7, /* 12.2k */ /* this is the last mode, so no threshold */ }, }; + static const struct amr_mode amr_hr_ms_bts_mode[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 16, /* THR_MX_Dn(2): 8.0 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 10.0 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 24, /* THR_MX_Dn(3): 12.0 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.0 dB */ + }, + { + .mode = 3, /* 6.70k */ + .threshold = 32, /* THR_MX_Dn(4): 16.0 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 18.0 dB */ + }, + { + .mode = 5, /* 7.95k */ + /* this is the last mode, so no threshold */ + }, + }; - memcpy(&bts->mr_full.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - memcpy(&bts->mr_full.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - bts->mr_full.num_modes = 4; + memcpy(&bts->mr_full.ms_mode[0], &amr_fr_ms_bts_mode[0], sizeof(amr_fr_ms_bts_mode)); + memcpy(&bts->mr_full.bts_mode[0], &amr_fr_ms_bts_mode[0], sizeof(amr_fr_ms_bts_mode)); + bts->mr_full.num_modes = ARRAY_SIZE(amr_fr_ms_bts_mode); - memcpy(&bts->mr_half.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - memcpy(&bts->mr_half.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - bts->mr_half.num_modes = 3; + memcpy(&bts->mr_half.ms_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); + memcpy(&bts->mr_half.bts_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); + bts->mr_half.num_modes = ARRAY_SIZE(amr_hr_ms_bts_mode); bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Gerrit-Change-Number: 27745 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022