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

[S] Change in libosmo-abis[master]: e1d: close fd when osmo_fd_setup fails

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32370 ) Change subject: e1d: close fd when osmo_fd_setup fails ...................................................................... e1d: close fd when osmo_fd_setup fails When osmo_fd_register() fails we just exit but the file descriptor stays open. A file descriptor in this state does not work. Let's close the file descriptor Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f --- M src/input/e1d.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/70/32370/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 1296b52..b91d02e 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -509,6 +509,8 @@ if (ret < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); talloc_free(ts_info); + close(bfd->fd); + bfd->fd = 0; return ret; } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6b41e5ad8511f2d4e524979631a91ab23dc0b23f Gerrit-Change-Number: 32370 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: better initialize g_e1d with NULL.

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32372 ) Change subject: e1d: better initialize g_e1d with NULL. ...................................................................... e1d: better initialize g_e1d with NULL. The global variable g_e1d is populated during the first line update and the line update checks if the variable is NULL. Let's better initialize the variable with NULL to be on the safe side. Change-Id: If3b808e5489bf6a1f5fa4326d7b0277cc66d1334 --- M src/input/e1d.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/72/32372/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index ba7791f..1fd18c9 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -42,7 +42,7 @@ #define TS_SIGN_ALLOC_SIZE 300 -struct osmo_e1dp_client *g_e1d; +struct osmo_e1dp_client *g_e1d = NULL; static int invertbits = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If3b808e5489bf6a1f5fa4326d7b0277cc66d1334 Gerrit-Change-Number: 32372 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: set fd number back to 0 on failure

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32371 ) Change subject: e1d: set fd number back to 0 on failure ...................................................................... e1d: set fd number back to 0 on failure When osmo_e1dp_client_ts_open fails to return a valid file descriptor, let's set bfd->fd back to 0. This will not change the current behavior but leaves bfd->fd in a clean state. Change-Id: Ic49e93550f0cff1a30644408ef7dc0648be768df --- M src/input/e1d.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/71/32371/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index b91d02e..ba7791f 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -444,6 +444,7 @@ if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); + bfd->fd = 0; return -EIO; } bfd->when = OSMO_FD_READ; @@ -474,6 +475,7 @@ if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); + bfd->fd = 0; return -EIO; } bfd->when = OSMO_FD_READ; @@ -498,6 +500,7 @@ if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); + bfd->fd = 0; return -EIO; } bfd->when = OSMO_FD_READ; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic49e93550f0cff1a30644408ef7dc0648be768df Gerrit-Change-Number: 32371 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: cosmetic: remove double whitespace

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32373 ) Change subject: e1d: cosmetic: remove double whitespace ...................................................................... e1d: cosmetic: remove double whitespace Change-Id: If29ace652b71b33c3240f4dcb5eceeffb513d970 --- M src/input/e1d.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/73/32373/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 1fd18c9..15169f1 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -40,7 +40,7 @@ #include <osmocom/e1d/proto_clnt.h> -#define TS_SIGN_ALLOC_SIZE 300 +#define TS_SIGN_ALLOC_SIZE 300 struct osmo_e1dp_client *g_e1d = NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If29ace652b71b33c3240f4dcb5eceeffb513d970 Gerrit-Change-Number: 32373 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[L] Change in libosmo-abis[master]: e1d: reconnect to osmo-e1d after connection loss

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32374 ) Change subject: e1d: reconnect to osmo-e1d after connection loss ...................................................................... e1d: reconnect to osmo-e1d after connection loss When osmo-e1d crashes while a line is in use the client process may experience not only a lost connection, it may also hang up in an endless loop that would also spam the logfile. The reason for this is that the e1d driver in libosmo-abis lacks mechanisms to detect when the connection to osmo-e1d gets lost. When osmo-e1d goes down the effects should be similar to those of a normal connection loss of an e1 line (cable pulled). So let's add an FSM that takes care of the recovery of the connection when it is lost. Also make sure that no havoc happens when the connection gets lost. Related: OS#5983 Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 --- M src/input/e1d.c 1 file changed, 256 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/74/32374/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 15169f1..9c9b4ab 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -29,6 +29,7 @@ #include <osmocom/core/bits.h> #include <osmocom/core/logging.h> +#include <osmocom/core/fsm.h> #include <osmocom/vty/vty.h> @@ -41,15 +42,198 @@ #define TS_SIGN_ALLOC_SIZE 300 +#define S(x) (1 << (x)) struct osmo_e1dp_client *g_e1d = NULL; +struct osmo_fsm_inst *g_e1d_fsm_inst = NULL; static int invertbits = 1; /* pre-declaration */ extern struct e1inp_driver e1d_driver; static int e1d_want_write(struct e1inp_ts *e1i_ts); +static int e1d_fd_cb(struct osmo_fd *bfd, unsigned int what); +static int e1d_line_update(struct e1inp_line *line); +/* flag array to remember which lines are handled by osmo-e1d */ +bool lines[256]; + +enum fsm_mgcp_client_states { + ST_DISCONNECTED, + ST_CONNECTED, +}; + +enum fsm_mgcp_client_evt { + EV_CONN_LOST, + EV_CONNECT, +}; + +static const struct value_string fsm_e1d_client_evt_names[] = { + OSMO_VALUE_STRING(EV_CONN_LOST), + OSMO_VALUE_STRING(EV_CONNECT), + { 0, NULL } +}; + +static int fsm_e1_client_timer_cb(struct osmo_fsm_inst *fi) +{ + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONNECT, NULL); + return 0; +} + +static void fsm_e1d_client_disconnected_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case EV_CONNECT: + if (!g_e1d) { + g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); + if (!g_e1d) { + LOGPFSML(fi, LOGL_ERROR, "Unable to (re)connect to osmo-e1d daemon, retrying...\n"); + osmo_fsm_inst_state_chg(g_e1d_fsm_inst, ST_DISCONNECTED, 1, 0); + return; + } + } + + LOGPFSML(fi, LOGL_NOTICE, "Sucessfully (re)connected to osmo-e1d daemon!\n"); + osmo_fsm_inst_state_chg(g_e1d_fsm_inst, ST_CONNECTED, 0, 0); + break; + default: + OSMO_ASSERT(false); + break; + } + + return; +} + +static void loose_line(struct e1inp_line *line) +{ + int ts; + + /* There should be technically no way to get a non e1d line into our private memory */ + OSMO_ASSERT(line->driver == &e1d_driver); + + for (ts = 1; ts < line->num_ts; ts++) { + unsigned int idx = ts - 1; + struct e1inp_ts *e1i_ts = &line->ts[idx]; + struct osmo_fd *bfd = &e1i_ts->driver.e1d.fd; + + /* Only affect file descriptors that are currently in use (do not reset file descriptor value since we + * will use this value to detect if the file descriptor was in use when the connection broke.) */ + if (bfd->fd > 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Loosing osmo-e1d connection to timeslot: %d\n", ts); + + if (bfd->list.next && bfd->list.next != LLIST_POISON1) + osmo_fd_unregister(bfd); + + close(bfd->fd); + bfd->fd = 0; + } + } +} + +static void fsm_e1d_client_connected_onenter_cb(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + unsigned int i; + struct e1inp_line *line; + int ret; + + /* Run a line update to re-establish lost connections */ + for (i = 0; i < ARRAY_SIZE(lines); i++) { + if (!lines[i]) + continue; + + line = e1inp_line_find(i); + if (!line) { + /* Apparantly we lost a line - this should not happen */ + lines[i] = false; + continue; + } + + ret = e1d_line_update(line); + if (ret < 0) + LOGPFSML(fi, LOGL_ERROR, "Line update failed after (re)connecting to osmo-e1d daemon!\n"); + } +} + +static void fsm_e1d_client_connected_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + unsigned int i; + struct e1inp_line *line; + + switch (event) { + case EV_CONN_LOST: + LOGPFSML(fi, LOGL_ERROR, "Lost connection to osmo-e1d daemon!\n"); + + /* Destroy e1d clinet */ + if (g_e1d) { + osmo_e1dp_client_destroy(g_e1d); + g_e1d = NULL; + } + + /* Loose all lines at once */ + for (i = 0; i < ARRAY_SIZE(lines); i++) { + if (!lines[i]) + continue; + line = e1inp_line_find(i); + if (!line) { + /* Apparantly we lost a line - this should not happen */ + lines[i] = false; + continue; + } + loose_line(line); + } + + osmo_fsm_inst_state_chg(fi, ST_DISCONNECTED, 1, 0); + break; + default: + OSMO_ASSERT(false); + break; + } + + return; +} + +static bool e1d_connected(void) +{ + if (g_e1d_fsm_inst && g_e1d_fsm_inst->state == ST_CONNECTED) + return true; + + LOGPFSML(g_e1d_fsm_inst, LOGL_ERROR, "No connection to osmo-e1d daemon!\n"); + return false; +} + +static struct osmo_fsm_state fsm_e1d_client_states[] = { + + /* Initial CRCX state. This state is immediately entered and executed + * when the FSM is started. The rationale is that we first have to + * create a connectin before we can execute other operations on that + * connection. */ + [ST_DISCONNECTED] = { + .in_event_mask = S(EV_CONNECT), + .out_state_mask = S(ST_CONNECTED) | S(ST_DISCONNECTED), + .name = OSMO_STRINGIFY(ST_DISCONNECTED), + .action = fsm_e1d_client_disconnected_cb, + }, + + /* Wait for the response to a CRCX operation, check and process the + * results, change to ST_READY afterwards. */ + [ST_CONNECTED] = { + .in_event_mask = S(EV_CONN_LOST), + .out_state_mask = S(ST_DISCONNECTED), + .name = OSMO_STRINGIFY(ST_CONNECTED), + .action = fsm_e1d_client_connected_cb, + .onenter = fsm_e1d_client_connected_onenter_cb, + }, + +}; + +static struct osmo_fsm fsm_e1d_client = { + .name = "e1d_client", + .states = fsm_e1d_client_states, + .num_states = ARRAY_SIZE(fsm_e1d_client_states), + .log_subsys = DLINP, + .event_names = fsm_e1d_client_evt_names, + .timer_cb = fsm_e1_client_timer_cb, +}; static int handle_ts_sign_read(struct osmo_fd *bfd) { @@ -66,6 +250,7 @@ if (ret < 1) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "%s read error: %d %s\n", __func__, ret, ret < 0 ? strerror(errno) : "bytes read"); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); return ret; } @@ -158,6 +343,7 @@ if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "%s read error: %d %s\n", __func__, ret, ret < 0 ? strerror(errno) : "bytes read"); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); return ret; } @@ -206,8 +392,10 @@ osmo_revbytebits_buf(msg->data, msg->len); ret = write(bfd->fd, msg->data, msg->len); - if (ret < msg->len) + if (ret < msg->len) { LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); + } msgb_free(msg); return ret; @@ -229,6 +417,7 @@ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "%s read error: %d %s\n", __func__, ret, ret < 0 ? strerror(errno) : "bytes read"); msgb_free(msg); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); return ret; } @@ -263,8 +452,10 @@ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "HDLC CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); ret = write(bfd->fd, msg->data, msg->len); - if (ret < msg->len) + if (ret < msg->len) { LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "send returns %d instead of %d\n", ret, msg->len); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); + } msgb_free(msg); return ret; @@ -288,6 +479,7 @@ if (ret < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "%s read error: %d %s\n", __func__, ret, strerror(errno)); msgb_free(msg); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); return ret; } @@ -308,10 +500,17 @@ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; int ret; + if (!e1d_connected()) { + msgb_free(msg); + return; + } + ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); - if (ret < 0) + if (ret < 0) { LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); + } } static int e1d_fd_cb(struct osmo_fd *bfd, unsigned int what) @@ -322,6 +521,9 @@ struct e1inp_ts *e1i_ts = &line->ts[idx]; int ret = 0; + if (!e1d_connected()) + return -EIO; + switch (e1i_ts->type) { case E1INP_TS_TYPE_SIGN: if (what & OSMO_FD_READ) @@ -359,6 +561,9 @@ static int e1d_want_write(struct e1inp_ts *e1i_ts) { + if (!e1d_connected()) + return -EIO; + /* We never include the DAHDI B-Channel FD into the writeset */ if (e1i_ts->type == E1INP_TS_TYPE_TRAU || e1i_ts->type == E1INP_TS_TYPE_I460) { @@ -386,22 +591,33 @@ if (line->driver != &e1d_driver) return -EINVAL; - if (!g_e1d) { - /* Connect to daemon */ - g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); - if (!g_e1d) { - LOGPIL(line, DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); - return -EPIPE; - } + /* Memorize that osmo-e1d is responsible for this line */ + lines[line->num] = true; + + /* Spawn FSM to handle connection towards osmo-e1d */ + if (!g_e1d_fsm_inst) { + g_e1d_fsm_inst = osmo_fsm_inst_alloc(&fsm_e1d_client, NULL, NULL, LOGL_DEBUG, "fsm_e1d_client"); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONNECT, NULL); + OSMO_ASSERT(g_e1d_fsm_inst); } - LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + /* In case no connection to osmo-e1d is available, we may postpone the line update until the connection is + * available (again) */ + if (!e1d_connected()) { + LOGPIL(line, DLINP, LOGL_NOTICE, "No connection to osmo-e1d daemon, postponing Line update: %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + e1d_intf, e1d_line, line->num_ts); + return 0; + } + LOGPIL(line, DLINP, LOGL_NOTICE, "Line update: %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); ret = osmo_e1dp_client_ts_query(g_e1d, &ts_info, &num_ts_info, e1d_intf, e1d_line, E1DP_INVALID); if (ret < 0) { - LOGPIL(line, DLINP, LOGL_ERROR, "Cannot query E1D for timeslot information: %d\n", ret); - return -EIO; + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot query E1D for timeslot information: %d, postpoining line update\n", ret); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, NULL); + /* Since we have mechanisms in place that allow us to postpone the line update until the connection + * to osmo-e1d is up again, we may pretend that the line update went ok. */ + return 0; } for (ts=1; ts<line->num_ts; ts++) @@ -445,6 +661,7 @@ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); bfd->fd = 0; + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, NULL); return -EIO; } bfd->when = OSMO_FD_READ; @@ -476,6 +693,7 @@ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); bfd->fd = 0; + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, NULL); return -EIO; } bfd->when = OSMO_FD_READ; @@ -501,6 +719,7 @@ LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); talloc_free(ts_info); bfd->fd = 0; + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, NULL); return -EIO; } bfd->when = OSMO_FD_READ; @@ -530,6 +749,9 @@ int e1inp_e1d_init(void) { + OSMO_ASSERT(osmo_fsm_register(&fsm_e1d_client) == 0); + memset(lines, 0, sizeof(lines)); + /* register the driver with the core */ return e1inp_driver_register(&e1d_driver); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 Gerrit-Change-Number: 32374 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_csd: test non-transp data rates

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368 to look at the new patch set (#2). Change subject: bsc: TC_assignment_csd: test non-transp data rates ...................................................................... bsc: TC_assignment_csd: test non-transp data rates Related: OS#4393 Change-Id: I2dce9486f3528a79bdea09bdbc1f02833e6bedc0 --- M bsc/BSC_Tests.ttcn 1 file changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/32368/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dce9486f3528a79bdea09bdbc1f02833e6bedc0 Gerrit-Change-Number: 32368 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: CSD: support non-transparent data rates

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32369 ) Change subject: CSD: support non-transparent data rates ...................................................................... CSD: support non-transparent data rates Implement gsm0808_data_rate_non_transp_to_gsm0408 and add GSM48_CMODE_DATA_43k5 to all related switch statements, as it can be returned from gsm0808_data_rate_non_transp_to_gsm0408. All other GSM48_CMODE_DATA_* are already in the switch statements. Related: OS#4393 Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68 --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/data_rate_pref.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c 6 files changed, 43 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/32369/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 37f0e81..c2b3bd9 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -456,6 +456,7 @@ case GSM48_CMODE_SPEECH_AMR: cm->chan_rate = RSL_CMOD_SP_GSM3; break; + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: @@ -2697,6 +2698,7 @@ int ipacc_payload_type(enum gsm48_chan_mode tch_mode, enum gsm_chan_t type) { switch (gsm48_chan_mode_to_non_vamos(tch_mode)) { + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index b631767..1cb96e5 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -363,6 +363,7 @@ case GSM48_CMODE_DATA_14k5: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_32k0: + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_SPEECH_EFR: /* these services all explicitly require a TCH/F */ return type == GSM_LCHAN_TCH_F; @@ -380,6 +381,7 @@ static int chan_mode_to_ch_indctr(enum gsm48_chan_mode chan_mode) { switch (gsm48_chan_mode_to_non_vamos(chan_mode)) { + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: diff --git a/src/osmo-bsc/data_rate_pref.c b/src/osmo-bsc/data_rate_pref.c index 2c98169..977c53c 100644 --- a/src/osmo-bsc/data_rate_pref.c +++ b/src/osmo-bsc/data_rate_pref.c @@ -76,10 +76,27 @@ } } -static int gsm0808_data_rate_non_transp_to_gsm0408(enum gsm0808_data_rate_non_transp rate) +static int gsm0808_data_rate_non_transp_to_gsm0408(enum gsm0808_data_rate_non_transp rate, bool full_rate) { - LOGP(DMSC, LOGL_ERROR, "%s is not implemented\n", __func__); /* FIXME */ - return -1; + switch (rate) { + case GSM0808_DATA_RATE_NON_TRANSP_12000_6000: + if (full_rate) + return GSM48_CMODE_DATA_12k0; + return GSM48_CMODE_DATA_6k0; + case GSM0808_DATA_RATE_NON_TRANSP_43k5: + return GSM48_CMODE_DATA_43k5; + case GSM0808_DATA_RATE_NON_TRANSP_29k0: + return GSM48_CMODE_DATA_29k0; + case GSM0808_DATA_RATE_NON_TRANSP_14k5: + return GSM48_CMODE_DATA_14k5; + case GSM0808_DATA_RATE_NON_TRANSP_12k0: + return GSM48_CMODE_DATA_12k0; + case GSM0808_DATA_RATE_NON_TRANSP_6k0: + return GSM48_CMODE_DATA_6k0; + default: + LOGP(DMSC, LOGL_ERROR, "Unsupported non-transparent data rate 0x%x\n", rate); + return -1; + } } static int gsm0808_data_rate_non_transp_to_gsm0858(enum gsm0808_data_rate_non_transp rate, bool full_rate) @@ -146,7 +163,7 @@ return -1; ch_mode_rate->data_rate.nt = rc; - rc = gsm0808_data_rate_non_transp_to_gsm0408(ct->data_rate); + rc = gsm0808_data_rate_non_transp_to_gsm0408(ct->data_rate, full_rate); if (rc == -1) return -1; ch_mode_rate->chan_mode = rc; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 1e132f4..fc3148c 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1034,6 +1034,7 @@ case GSM48_CMODE_SPEECH_EFR: case GSM48_CMODE_SPEECH_AMR: return RSL_CMOD_SPD_SPEECH; + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 8b6faad..fa398bf 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -871,6 +871,7 @@ static enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate) { switch (gsm48_chan_mode_to_non_vamos(chan_mode)) { + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 9e0da86..8b9b81a 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -184,6 +184,7 @@ /* fall through */ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_AMR: + case GSM48_CMODE_DATA_43k5: case GSM48_CMODE_DATA_32k0: case GSM48_CMODE_DATA_29k0: case GSM48_CMODE_DATA_14k5: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68 Gerrit-Change-Number: 32369 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_csd: split into two tests

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 ) Change subject: bsc: TC_assignment_csd: split into two tests ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I052685d36d9fc794502b6fe2c444b95ebac8dfc4 Gerrit-Change-Number: 32364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_csd: split into two tests

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 ) Change subject: bsc: TC_assignment_csd: split into two tests ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I am not sure I'm understanding this patch. […] Preserving existing functionality from my earlier patch: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557 But given that it makes more sense to just test all data rates in one function (as you noted in https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365/1), there is no need for this patch and I'll abandon it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I052685d36d9fc794502b6fe2c444b95ebac8dfc4 Gerrit-Change-Number: 32364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Apr 2023 14:40:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_csd: test all transp data rates

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 ) Change subject: bsc: TC_assignment_csd: test all transp data rates ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I wonder if it would make more sense to have all of them in 1 test to speed up a bit everything. […] yes it is significantly faster. on my machine, with non-transparent data rates also added, running them separately takes 161 seconds and running them all in one test takes 71 seconds. I've adjusted the patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d Gerrit-Change-Number: 32365 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Apr 2023 14:39:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023