- gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: msc_vlr_test_call.c: fix misleading comments
by neels 08 Feb '24

08 Feb '24

Attention is currently required from: neels. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35878?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: msc_vlr_test_call.c: fix misleading comments ...................................................................... msc_vlr_test_call.c: fix misleading comments The comments indicating which two "members" are identical are inaccurate. (One of them is a macro pointing at the other.) Change-Id: Ifaa2f361db77cd0ed3ad39d6ca197195b9354ea1 --- M tests/msc_vlr/msc_vlr_test_call.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/35878/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifaa2f361db77cd0ed3ad39d6ca197195b9354ea1 Gerrit-Change-Number: 35878 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-msc[master]: report caller's file,line in trans_cc_filter_run()
by neels 08 Feb '24

08 Feb '24

Attention is currently required from: neels. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35879?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: report caller's file,line in trans_cc_filter_run() ...................................................................... report caller's file,line in trans_cc_filter_run() When we get the codec filter result logged, it is most interesting to know the caller. So wrap a file-line macro around trans_cc_filter_run(). Change-Id: I243404487c1871e921b08098086ef2fc78a5561d --- M include/osmocom/msc/transaction_cc.h M src/libmsc/transaction_cc.c 2 files changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/35879/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I243404487c1871e921b08098086ef2fc78a5561d Gerrit-Change-Number: 35879 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-msc[master]: cosmetic: rename to sdp_audio_codecs_foreach()
by neels 08 Feb '24

08 Feb '24

Attention is currently required from: neels. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35880?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: rename to sdp_audio_codecs_foreach() ...................................................................... cosmetic: rename to sdp_audio_codecs_foreach() Better match the pattern of sdp_audio_codecs_* instead of having foreach_ in the front. Prepare for prepending osmo_ some day, because I plan to move the SDP API to a separate library. Change-Id: Ia96190e0bdb513886663be1c8c12be3b403b71c9 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/codec_mapping.c M src/libmsc/rtp_stream.c M src/libmsc/sdp_msg.c M tests/msc_vlr/msc_vlr_test_call.c 5 files changed, 28 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/35880/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia96190e0bdb513886663be1c8c12be3b403b71c9 Gerrit-Change-Number: 35880 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-msc[master]: pick up all *.vty in EXTRA_DIST
by neels 08 Feb '24

08 Feb '24

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email ) Change subject: pick up all *.vty in EXTRA_DIST ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > That rings a bell for me too. I observe that: - all *.vty files are present in the distro tar on https://obs.osmocom.org/package/show/osmocom:master/osmo-bsc - but also neighbor_ident.vty is present in https://obs.osmocom.org/package/show/osmocom:master/osmo-msc even though it is missing from Makefile.am's EXTRA_DIST That confuses me. When I do 'make dist' in osmo-msc, neighbor_ident.vty is missing from the distro tar. Aren't the packages in OBS built from 'make dist'?????? For the record, 'make dist' in osmo-bsc includes all *.vty files as expected, so the wildcard Works For Me (TM)... I know about all those aspects of wildcards in build files, yet in practice I find that: anything without a wildcard will have us forget to add *.vty files to Makefile.am, and using the wildcard means we will never forget them again... Let's clarify first why non-make-dist files show up in OBS. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id28e020fc59b83d1b4cd0e5b72314a46bea62259 Gerrit-Change-Number: 35872 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 Feb 2024 22:51:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Add ms power
by laforge 08 Feb '24

08 Feb '24

Attention is currently required from: daniel, fixeria, fixeria, matanp, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email ) Change subject: ctrl: Add ms power ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35747?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6f556b66011be6126d6bac31a14101ba37f81cc4 Gerrit-Change-Number: 35747 Gerrit-PatchSet: 6 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <axilirator(a)gmail.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: fixeria <axilirator(a)gmail.com> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 08 Feb 2024 20:31:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl
by matanp 08 Feb '24

08 Feb '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email ) Change subject: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl ...................................................................... ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl Besides from making the ts ctrl interface follow the convention of being in its own file, it will be used in the next patch to add a ctrl interface for lchan. Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a --- M include/osmocom/bsc/ctrl.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/bts_trx_ctrl.c A src/osmo-bsc/bts_trx_ts_ctrl.c 4 files changed, 121 insertions(+), 98 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve matanp: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/ctrl.h b/include/osmocom/bsc/ctrl.h index 86d1bda..0d6c8a0 100644 --- a/include/osmocom/bsc/ctrl.h +++ b/include/osmocom/bsc/ctrl.h @@ -11,6 +11,7 @@ /* Used internally in different ctrl source code files: */ int bsc_bts_ctrl_cmds_install(void); int bsc_bts_trx_ctrl_cmds_install(void); +int bsc_bts_trx_ts_ctrl_cmds_install(void); void ctrl_generate_bts_location_state_trap(struct gsm_bts *bts, struct bsc_msc_data *msc); void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_data *msc_data); diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 661188e..e577c95 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -46,6 +46,7 @@ bts.c \ bts_trx.c \ bts_trx_ctrl.c \ + bts_trx_ts_ctrl.c \ bts_ericsson_rbs2000.c \ bts_init.c \ bts_ipaccess_nanobts.c \ diff --git a/src/osmo-bsc/bts_trx_ctrl.c b/src/osmo-bsc/bts_trx_ctrl.c index 258203c..d5e8f5a 100644 --- a/src/osmo-bsc/bts_trx_ctrl.c +++ b/src/osmo-bsc/bts_trx_ctrl.c @@ -19,109 +19,11 @@ * */ -#include <errno.h> -#include <time.h> - #include <osmocom/ctrl/control_cmd.h> #include <osmocom/bsc/ctrl.h> -#include <osmocom/bsc/osmo_bsc_rf.h> #include <osmocom/bsc/bts.h> -#include <osmocom/bsc/ipaccess.h> -#include <osmocom/bsc/chan_alloc.h> #include <osmocom/bsc/abis_nm.h> -#include <osmocom/bsc/neighbor_ident.h> -#include <osmocom/bsc/system_information.h> - -/********************* - * TS_NODE - *********************/ - -static int verify_ts_hopping_arfcn_add(struct ctrl_cmd *cmd, const char *value, void *_data) -{ - int64_t arfcn; - enum gsm_band unused; - if (osmo_str_to_int64(&arfcn, value, 10, 0, 1024) < 0) - return 1; - if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { - return 1; - } - return 0; -} -static int set_ts_hopping_arfcn_add(struct ctrl_cmd *cmd, void *data) -{ - struct gsm_bts_trx_ts *ts = cmd->node; - int arfcn = atoi(cmd->value); - - bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ONE); - - /* Update Cell Allocation (list of all the frequencies allocated to a cell) */ - if (generate_cell_chan_alloc(ts->trx->bts) != 0) { - bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ZERO); /* roll-back */ - cmd->reply = "Failed to re-generate Cell Allocation"; - return CTRL_CMD_ERROR; - } - - cmd->reply = "OK"; - return CTRL_CMD_REPLY; -} -/* Parameter format: "<arfcn>" */ -CTRL_CMD_DEFINE_WO(ts_hopping_arfcn_add, "hopping-arfcn-add"); - -static int verify_ts_hopping_arfcn_del(struct ctrl_cmd *cmd, const char *value, void *_data) -{ - int64_t arfcn; - enum gsm_band unused; - if (strcmp(value, "all") == 0) - return 0; - if (osmo_str_to_int64(&arfcn, value, 10, 0, 1024) < 0) - return 1; - if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { - return 1; - } - return 0; -} -static int set_ts_hopping_arfcn_del(struct ctrl_cmd *cmd, void *data) -{ - struct gsm_bts_trx_ts *ts = cmd->node; - bool all = (strcmp(cmd->value, "all") == 0); - int arfcn; - - if (all) { - bitvec_zero(&ts->hopping.arfcns); - } else { - arfcn = atoi(cmd->value); - bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ZERO); - } - - /* Update Cell Allocation (list of all the frequencies allocated to a cell) */ - if (generate_cell_chan_alloc(ts->trx->bts) != 0) { - if (!all) - bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ONE); /* roll-back */ - cmd->reply = "Failed to re-generate Cell Allocation"; - return CTRL_CMD_ERROR; - } - - cmd->reply = "OK"; - return CTRL_CMD_REPLY; -} -/* Parameter format: "(<arfcn>|all)" */ -CTRL_CMD_DEFINE_WO(ts_hopping_arfcn_del, "hopping-arfcn-del"); - - -static int bsc_bts_trx_ts_ctrl_cmds_install(void) -{ - int rc = 0; - - rc |= ctrl_cmd_install(CTRL_NODE_TS, &cmd_ts_hopping_arfcn_add); - rc |= ctrl_cmd_install(CTRL_NODE_TS, &cmd_ts_hopping_arfcn_del); - - return rc; -} - -/********************* - * TRX_NODE - *********************/ static int get_trx_rf_locked(struct ctrl_cmd *cmd, void *data) { diff --git a/src/osmo-bsc/bts_trx_ts_ctrl.c b/src/osmo-bsc/bts_trx_ts_ctrl.c new file mode 100644 index 0000000..dc8aaf4 --- /dev/null +++ b/src/osmo-bsc/bts_trx_ts_ctrl.c @@ -0,0 +1,106 @@ +/* + * (C) 2013-2015 by Holger Hans Peter Freyther + * (C) 2013-2022 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/ctrl/control_cmd.h> + +#include <osmocom/bsc/ctrl.h> +#include <osmocom/bsc/bts.h> +#include <osmocom/bsc/system_information.h> + +static int verify_ts_hopping_arfcn_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int64_t arfcn; + enum gsm_band unused; + if (osmo_str_to_int64(&arfcn, value, 10, 0, 1024) < 0) + return 1; + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) + return 1; + return 0; +} +static int set_ts_hopping_arfcn_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts_trx_ts *ts = cmd->node; + int arfcn = atoi(cmd->value); + + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ONE); + + /* Update Cell Allocation (list of all the frequencies allocated to a cell) */ + if (generate_cell_chan_alloc(ts->trx->bts) != 0) { + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ZERO); /* roll-back */ + cmd->reply = "Failed to re-generate Cell Allocation"; + return CTRL_CMD_ERROR; + } + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} +/* Parameter format: "<arfcn>" */ +CTRL_CMD_DEFINE_WO(ts_hopping_arfcn_add, "hopping-arfcn-add"); + +static int verify_ts_hopping_arfcn_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int64_t arfcn; + enum gsm_band unused; + if (strcmp(value, "all") == 0) + return 0; + if (osmo_str_to_int64(&arfcn, value, 10, 0, 1024) < 0) + return 1; + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) + return 1; + return 0; +} +static int set_ts_hopping_arfcn_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts_trx_ts *ts = cmd->node; + bool all = (strcmp(cmd->value, "all") == 0); + int arfcn; + + if (all) { + bitvec_zero(&ts->hopping.arfcns); + } else { + arfcn = atoi(cmd->value); + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ZERO); + } + + /* Update Cell Allocation (list of all the frequencies allocated to a cell) */ + if (generate_cell_chan_alloc(ts->trx->bts) != 0) { + if (!all) + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, ONE); /* roll-back */ + cmd->reply = "Failed to re-generate Cell Allocation"; + return CTRL_CMD_ERROR; + } + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} +/* Parameter format: "(<arfcn>|all)" */ +CTRL_CMD_DEFINE_WO(ts_hopping_arfcn_del, "hopping-arfcn-del"); + + +int bsc_bts_trx_ts_ctrl_cmds_install(void) +{ + int rc = 0; + + rc |= ctrl_cmd_install(CTRL_NODE_TS, &cmd_ts_hopping_arfcn_add); + rc |= ctrl_cmd_install(CTRL_NODE_TS, &cmd_ts_hopping_arfcn_del); + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a Gerrit-Change-Number: 35746 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl
by laforge 08 Feb '24

08 Feb '24

Attention is currently required from: matanp. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email ) Change subject: ctrl: Split bts_trx_ts_ctrl from bts_trx_ctrl ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9840bddd4eae409bc8373912d54b6bbfc9fc1c1a Gerrit-Change-Number: 35746 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 08 Feb 2024 20:30:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Add PDP-Info IE to GSUP Auth Info Req
by lynxis lazus 08 Feb '24

08 Feb '24

Attention is currently required from: fixeria, laforge, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35900?usp=email ) Change subject: epdg: Add PDP-Info IE to GSUP Auth Info Req ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35900?usp=email 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: I42e4dc4bbcef969aae5867dbb103f8a5db157c89 Gerrit-Change-Number: 35900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 Feb 2024 20:12:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Add defines for PDP Address Type Nr
by pespin 08 Feb '24

08 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35903?usp=email ) Change subject: Add defines for PDP Address Type Nr ...................................................................... Add defines for PDP Address Type Nr The values are the same for GTP and GMM (which in turn are used by GSUP). Change-Id: I48e7064f598d6dfb0d4398500fb078b2d5da0226 --- M include/gtp_utils.hrl M src/aaa_diameter_swx.erl M src/gsup_server.erl 3 files changed, 25 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/gtp_utils.hrl b/include/gtp_utils.hrl index 453efb0..4d1efe2 100644 --- a/include/gtp_utils.hrl +++ b/include/gtp_utils.hrl @@ -110,4 +110,8 @@ -define(GTP2_CAUSE_MULTIPLE_ACCESSES_TO_A_PDN_CONNECTION_NOT_ALLOWED, 126). -define(GTP2_CAUSE_REQUEST_REJECTED_DUE_TO_UE_CAPABILITY, 127). -define(GTP2_CAUSE_S1_U_PATH_FAILURE, 128). --define(GTP2_CAUSE_5GC_NOT_ALLOWED, 129). \ No newline at end of file +-define(GTP2_CAUSE_5GC_NOT_ALLOWED, 129). + +-define(GTP_PDP_ADDR_TYPE_NR_IPv4, 16#21). +-define(GTP_PDP_ADDR_TYPE_NR_IPv6, 16#57). +-define(GTP_PDP_ADDR_TYPE_NR_IPv4v6, 16#8d). \ No newline at end of file diff --git a/src/aaa_diameter_swx.erl b/src/aaa_diameter_swx.erl index e3ca289..c623b3e 100644 --- a/src/aaa_diameter_swx.erl +++ b/src/aaa_diameter_swx.erl @@ -42,6 +42,7 @@ -include_lib("diameter_3gpp_ts29_273_swx.hrl"). -include_lib("diameter/include/diameter_gen_base_rfc6733.hrl"). +-include("gtp_utils.hrl"). %% API Function Exports -export([start_link/0]). @@ -191,13 +192,13 @@ % Set only the Reserved=0 byte and Prefix-Length=0 IPv6Dyn = <<16#00:8,16#00:8>>, case PdpTypeNr of - 16#21 -> + ?GTP_PDP_ADDR_TYPE_NR_IPv4 -> IPv4Opt = Ipv4Dyn, IPv6Opt = []; - 16#57 -> + ?GTP_PDP_ADDR_TYPE_NR_IPv6 -> IPv4Opt = [], IPv6Opt = IPv6Dyn; - 16#8d -> + ?GTP_PDP_ADDR_TYPE_NR_IPv4v6 -> IPv4Opt = Ipv4Dyn, IPv6Opt = IPv6Dyn; _ -> diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 799d6df..229f5db 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -40,6 +40,7 @@ -include_lib("osmo_ss7/include/ipa.hrl"). -include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("gtplib/include/gtp_packet.hrl"). +-include("gtp_utils.hrl"). -define(SERVER, ?MODULE). @@ -160,7 +161,9 @@ IEs = CreateSessResp#gtp.ie, %%#{{v2_bearer_context,0} := BearerMap} = IEs, #{{v2_pdn_address_allocation,0} := Paa} = IEs, - PdpAddress = #{pdp_type_org => 1, pdp_type_nr => 16#21, address => #{ ipv4 => Paa#v2_pdn_address_allocation.address}}, + PdpAddress = #{pdp_type_org => 1, + pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4, + address => #{ ipv4 => Paa#v2_pdn_address_allocation.address}}, PdpInfo = #{pdp_context_id => 0, pdp_address => PdpAddress, access_point_name => "foobar.apn", -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35903?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I48e7064f598d6dfb0d4398500fb078b2d5da0226 Gerrit-Change-Number: 35903 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
by pespin 08 Feb '24

08 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email ) Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers ...................................................................... Make PDP-Type and APN from GSUP AuthInfoReq available through all layers Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 6 files changed, 75 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index ee3a8cb..7fdc247 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -20,7 +20,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/1, auth_compl_request/2, session_termination_request/1]). +-export([auth_request/3, auth_compl_request/2, session_termination_request/1]). -export([auth_response/2, auth_compl_response/2, session_termination_answer/2]). -define(SERVER, ?MODULE). @@ -47,8 +47,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Rx from emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -auth_request(Imsi) -> - gen_server:cast(?SERVER, {epdg_auth_req, Imsi}). +auth_request(Imsi, PdpTypeNr, Apn) -> + gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn}). auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). @@ -56,9 +56,9 @@ session_termination_request(Imsi) -> gen_server:cast(?SERVER, {str, Imsi}). -handle_cast({epdg_auth_req, Imsi}, State0) -> +handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn}, State0) -> {Sess, State1} = find_or_new_swm_session(Imsi, State0), - aaa_ue_fsm:ev_swm_auth_req(Sess#swm_session.pid), + aaa_ue_fsm:ev_swm_auth_req(Sess#swm_session.pid, {PdpTypeNr, Apn}), {noreply, State1}; handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) -> diff --git a/src/aaa_diameter_swx.erl b/src/aaa_diameter_swx.erl index 1db5809..e3ca289 100644 --- a/src/aaa_diameter_swx.erl +++ b/src/aaa_diameter_swx.erl @@ -49,7 +49,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3]). --export([multimedia_auth_request/6]). +-export([multimedia_auth_request/7]). -export([server_assignment_request/3]). -export([test/0, test/1]). @@ -136,11 +136,11 @@ test("001011234567890"). test(IMSI) -> - multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, [], []). + multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, [], [], 33). -multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey) -> +multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr) -> gen_server:call(?SERVER, - {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}). + {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr}}). % APN is optional and should be [] server_assignment_request(IMSI, Type, APN) -> gen_server:call(?SERVER, @@ -181,8 +181,30 @@ parse_saa(Saa) -> {unknown_err, []}. -handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, {Pid, _Tag} = _From, State) -> +handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey, PdpTypeNr}}, {Pid, _Tag} = _From, State) -> SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)), + % RFC 4005 6.11.1 Framed-IP-Address AVP: + % "0xFFFFFFFE indicates that the NAS should select an address for the user + % (e.g., assigned from a pool of addresses kept by the NAS)." + Ipv4Dyn = <<16#FFFFFFFE:32>>, + % 3GPP TS 29.229 6.3.54, RFC4005 6.11.6 2.3, RFC3162 2.3 allow empty prefix. + % Set only the Reserved=0 byte and Prefix-Length=0 + IPv6Dyn = <<16#00:8,16#00:8>>, + case PdpTypeNr of + 16#21 -> + IPv4Opt = Ipv4Dyn, + IPv6Opt = []; + 16#57 -> + IPv4Opt = [], + IPv6Opt = IPv6Dyn; + 16#8d -> + IPv4Opt = Ipv4Dyn, + IPv6Opt = IPv6Dyn; + _ -> + IPv4Opt = [], + IPv6Opt = [] + end, + lager:debug("Swx MAR: IPv4Opt=~p IPv6Opt=~p~n", [IPv4Opt, IPv6Opt]), MAR = #'MAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{ 'Vendor-Id' = ?VENDOR_ID_3GPP, 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}, @@ -192,10 +214,14 @@ 'SIP-Auth-Data-Item' = #'SIP-Auth-Data-Item'{ 'SIP-Authentication-Scheme' = [AuthScheme], 'Confidentiality-Key' = CKey, - 'Integrity-Key' = IntegrityKey}, + 'Integrity-Key' = IntegrityKey, + 'Framed-IP-Address' = IPv4Opt, + 'Framed-IPv6-Prefix' = IPv6Opt + }, 'SIP-Number-Auth-Items' = NumAuthItems, 'RAT-Type' = RAT }, + lager:debug("Swx Tx MAR: ~p~n", [MAR]), Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, [{extra, [Pid]}, detach]), case Ret of ok -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 5cdb553..e982d57 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -41,7 +41,7 @@ -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). --export([ev_swm_auth_req/1, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, +-export([ev_swm_auth_req/2, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_s6b_aar/2, ev_rx_s6b_str/1]). -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3]). @@ -66,10 +66,10 @@ lager:info("ue_fsm start_link(~p)~n", [ServerName]), gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). -ev_swm_auth_req(Pid) -> +ev_swm_auth_req(Pid, {PdpTypeNr, Apn}) -> lager:info("ue_fsm ev_swm_auth_req~n", []), try - gen_statem:call(Pid, swm_auth_req) + gen_statem:call(Pid, {swm_auth_req, PdpTypeNr, Apn}) catch exit:Err -> {error, Err} @@ -152,12 +152,12 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, From}, swm_auth_req, Data) -> - lager:info("ue_fsm state_new event=swm_auth_req, ~p~n", [Data]), +state_new({call, From}, {swm_auth_req, PdpTypeNr, Apn}, Data) -> + lager:info("ue_fsm state_new event=swm_auth_req {~p, ~p}, ~p~n", [PdpTypeNr, Apn, Data]), % request the diameter code for a tuple CKey = [], IntegrityKey = [], - case aaa_diameter_swx:multimedia_auth_request(Data#ue_fsm_data.imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey) of + case aaa_diameter_swx:multimedia_auth_request(Data#ue_fsm_data.imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey, PdpTypeNr) of ok -> {next_state, state_wait_swx_maa, Data, [{reply,From,ok}]}; {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} end; diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 800df44..9b010d9 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -19,7 +19,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/1, auth_compl_request/2, session_termination_request/1]). +-export([auth_request/3, auth_compl_request/2, session_termination_request/1]). -export([auth_response/2, auth_compl_response/2, session_termination_answer/2]). -define(SERVER, ?MODULE). @@ -33,10 +33,13 @@ {ok, #swm_state{}}. -auth_request(Imsi) -> +auth_request(Imsi, PdpTypeNr, Apn) -> % In Diameter we use Imsi as strings, as done by diameter module. ImsiStr = binary_to_list(Imsi), - Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr}), + % epdg_auth_req: Swm Diameter message Diameter-EAP-Request 3GPP TS 29.273 7.2.2.1.1 + % PdpTypeNr: SWm Diameter AVP "UE-Local-IP-Address" + % Apn: SWm Diameter AVP "Service-Selection" + Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr, PdpTypeNr, Apn}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_auth_response(self(), Result), @@ -68,10 +71,10 @@ _ -> Result end. -handle_call({epdg_auth_req, Imsi}, {Pid, _Tag} = _From, State0) -> +handle_call({epdg_auth_req, Imsi, PdpTypeNr, Apn}, {Pid, _Tag} = _From, State0) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: {_Sess, State1} = find_or_new_swm_session(Imsi, Pid, State0), - ok = aaa_diameter_swm:auth_request(Imsi), + ok = aaa_diameter_swm:auth_request(Imsi, PdpTypeNr, Apn), {reply, ok, State1}; handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 711f695..9221c79 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -40,7 +40,7 @@ -export([start_link/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). --export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). +-export([auth_request/2, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). -export([state_new/3, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3, @@ -69,10 +69,10 @@ stop(SrvRef) -> gen_statem:stop(SrvRef). -auth_request(Pid) -> +auth_request(Pid, {PdpTypeNr, Apn}) -> lager:info("ue_fsm auth_request~n", []), try - gen_statem:call(Pid, auth_request) + gen_statem:call(Pid, {auth_request, PdpTypeNr, Apn}) catch exit:Err -> {error, Err} @@ -183,9 +183,9 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, From}, auth_request, Data) -> - lager:info("ue_fsm state_new event=auth_request, ~p~n", [Data]), - case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi) of +state_new({call, From}, {auth_request, PdpTypeNr, Apn}, Data) -> + lager:info("ue_fsm state_new event=auth_request {~p, ~p}, ~p~n", [PdpTypeNr, Apn, Data]), + case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn) of ok -> {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}; {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} end; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 8a070bf..799d6df 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -231,9 +231,16 @@ {noreply, S#gsups_state{socket=Socket}}; % send auth info / requesting authentication tuples -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> +handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> + #{pdp_info_list := [PdpInfo]} = GsupMsgRx, + #{pdp_context_id := _PDPCtxId, + pdp_address := #{address := #{}, + pdp_type_nr := PdpTypeNr, + pdp_type_org := 241}, + access_point_name := Apn + } = PdpInfo, {UE, State1} = find_or_new_gsups_ue(Imsi, State0), - case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of + case epdg_ue_fsm:auth_request(UE#gsups_ue.pid, {PdpTypeNr, Apn}) of ok -> State2 = State1; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced Gerrit-Change-Number: 35901 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log