- gerrit-log - lists.osmocom.org

[M] Change in osmo-mgw[master]: mgw: Split mgcp_rtp_end to its own file
by pespin 14 Jan '25

14 Jan '25

Attention is currently required from: daniel, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39213?usp=email ) Change subject: mgw: Split mgcp_rtp_end to its own file ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I plan to merge this patchset soon it it doesn't receive more feedback. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39213?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id1b6cab57e44ad4859bde8212d0ac9f7146d7198 Gerrit-Change-Number: 39213 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Jan 2025 09:47:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by pespin 14 Jan '25

14 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... nokia_site: introduce hopping control for Nokia *Site nokia_site hopping-mode baseband nokia_site hopping-mode synthesizer Signed-off-by: csaba.sipos <metro4(a)freemail.hu> Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 --- A doc/examples/osmo-bsc/nokia/osmo-bsc.metrosite.RF-hopping.2TRX.cfg M include/osmocom/bsc/bts.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c 4 files changed, 219 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/doc/examples/osmo-bsc/nokia/osmo-bsc.metrosite.RF-hopping.2TRX.cfg b/doc/examples/osmo-bsc/nokia/osmo-bsc.metrosite.RF-hopping.2TRX.cfg new file mode 100644 index 0000000..ba17670 --- /dev/null +++ b/doc/examples/osmo-bsc/nokia/osmo-bsc.metrosite.RF-hopping.2TRX.cfg @@ -0,0 +1,160 @@ +! +! OpenBSC configuration saved from vty +! ! +password foo +! +line vty + no login +! +log stderr + logging timestamp 1 + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print file 1 + logging level llapd notice + logging level nm debug + logging level linp debug + logging level lmgcp notice +e1_input + e1_line 0 driver dahdi + e1_line 0 port 0 +network + network country code 1 + mobile network code 1 + timer t3101 10 + timer t3113 60 + mgw 0 + remote-ip 127.0.0.1 + remote-port 2427 + local-port 2727 + bts 0 + type nokia_site + band GSM1800 + cell_identity 1 + location_area_code 0x0001 + base_station_id_code 63 + training_sequence_code 7 + nokia_site skip-reset 0 + nokia_site no-local-rel-conf 1 + nokia_site bts-reset-timer 30 + nokia_site hopping-mode synthesizer + codec-support fr + neighbor-list mode automatic + + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 1 + + trx 0 + arfcn 885 + max_power_red 20 + rsl e1 line 0 timeslot 2 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 1 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 2 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 3 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + timeslot 4 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 7 sub-slot 0 + timeslot 5 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 7 sub-slot 1 + timeslot 6 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 7 sub-slot 2 + timeslot 7 + phys_chan_config SDCCH8 + hopping enabled 0 + e1 line 0 timeslot 7 sub-slot 3 + + trx 1 + arfcn 883 + max_power_red 20 + rsl e1 line 0 timeslot 3 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 882 + hopping arfcn add 883 + e1 line 0 timeslot 9 sub-slot 3 + +cs7 instance 0 + point-code 1.23.3 +msc 0 + diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 248c746..0264dcf 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -488,7 +488,8 @@ no_loc_rel_cnf:1, /* don't wait for RSL REL CONF */ bts_reset_timer_cnf, /* timer for BTS RESET */ did_reset:1, /* we received a RESET ACK */ - wait_reset:2; /* we are waiting for reset to complete */ + wait_reset:2, /* we are waiting for reset to complete */ + hopping_mode:1; /* hopping type selection for Nokia */ struct osmo_timer_list reset_timer; } nokia; }; diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 14d4388..256b49f 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1102,7 +1102,7 @@ */ static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config, - int need_hopping) + int need_hopping, int hopping_type) { /* is it an InSite BTS ? */ if (bts_type == 0x0E || bts_type == 0x0F || bts_type == 0x10) { /* TODO */ @@ -1132,9 +1132,24 @@ len += (sizeof(bts_config_1) + (n_trx - 1)); memcpy(fu_config + len, bts_config_2, sizeof(bts_config_2)); - /* set hopping mode (Baseband and RF hopping work for the MetroSite) */ - if (need_hopping) - fu_config[len + 2 + 1] = 1; /* 0: no hopping, 1: Baseband hopping, 2: RF hopping */ + /* set hopping mode */ + if (need_hopping) { + switch (hopping_type) { + /* 0: no hopping, 1: Baseband hopping, 2: RF hopping */ + case 0: + LOG_BTS(bts, DNM, LOGL_INFO, "Baseband hopping selected!\n"); + fu_config[len + 2 + 1] = 1; + break; + case 1: + LOG_BTS(bts, DNM, LOGL_INFO, "Synthesizer (RF) hopping selected!\n"); + fu_config[len + 2 + 1] = 2; + break; + default: + LOG_BTS(bts, DNM, LOGL_INFO, "No hopping is selected!\n"); + fu_config[len + 2 + 1] = 0; + break; + } + } len += sizeof(bts_config_2); /* set extended cell radius for each TRX */ @@ -1381,6 +1396,9 @@ int ret; int hopping = 0; int need_hopping = 0; + int hopping_type = 0; + + hopping_type = bts->nokia.hopping_mode; memset(config, 0, sizeof(config)); @@ -1407,7 +1425,7 @@ idx++; } - ret = make_bts_config(bts, bts_type, idx, config + len, need_hopping); + ret = make_bts_config(bts, bts_type, idx, config + len, need_hopping, hopping_type); len += ret; #if 0 /* debugging */ diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index f6ee514..1babd4d 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -91,6 +91,12 @@ { 0, NULL } }; +static const struct value_string nokia_hopping_mode_strs[] = { + { 0, "baseband" }, + { 1, "synthesizer" }, + { 0, NULL } +}; + static struct cmd_node bts_node = { BTS_NODE, "%s(config-net-bts)# ", @@ -464,6 +470,31 @@ return CMD_SUCCESS; } + +DEFUN_USRATTR(cfg_bts_nokia_site_hopping_mode, + cfg_bts_nokia_site_hopping_mode_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), + "nokia_site hopping-mode (baseband|synthesizer)", + NOKIA_STR + "Sets the hopping type for Nokia *Site\n" + "Baseband (BB) hopping\n" + "Synthesizer (RF) hopping\n") +{ + struct gsm_bts *bts = vty->index; + + if (!is_nokia_bts(bts)) { + vty_out(vty, "%% BTS is not of Nokia *Site type%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (!strcmp(argv[0], "baseband")) + bts->nokia.hopping_mode = 0; + else + bts->nokia.hopping_mode = 1; + + return CMD_SUCCESS; +} + #define OML_STR "Organization & Maintenance Link\n" #define IPA_STR "A-bis/IP Specific Options\n" @@ -4700,6 +4731,8 @@ vty_out(vty, " nokia_site no-local-rel-conf %d%s", bts->nokia.no_loc_rel_cnf, VTY_NEWLINE); vty_out(vty, " nokia_site bts-reset-timer %d%s", bts->nokia.bts_reset_timer_cnf, VTY_NEWLINE); + vty_out(vty, " nokia_site hopping-mode %s%s", get_value_string(nokia_hopping_mode_strs, bts->nokia.hopping_mode), VTY_NEWLINE); + /* fall through: Nokia requires "oml e1" parameters also */ default: config_write_e1_link(vty, &bts->oml_e1_link, " oml "); @@ -4926,6 +4959,7 @@ install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_no_loc_rel_cnf_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_bts_reset_timer_cnf_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_site_hopping_mode_cmd); install_element(BTS_NODE, &cfg_bts_stream_id_cmd); install_element(BTS_NODE, &cfg_bts_deprecated_stream_id_cmd); install_element(BTS_NODE, &cfg_bts_oml_e1_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 12 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> 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>

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by pespin 14 Jan '25

14 Jan '25

Attention is currently required from: csaba.sipos, laforge. pespin has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 11 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> 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: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 14 Jan 2025 08:58:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-msc[master]: vlr: Add support for CS and PS timers
by daniel 14 Jan '25

14 Jan '25

Attention is currently required from: lynxis lazus. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38486?usp=email ) Change subject: vlr: Add support for CS and PS timers ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I364973b8d9e277ec5963343c0a83061e81a5baba Gerrit-Change-Number: 38486 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 14 Jan 2025 08:56:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-netif[master]: add dependency on libosmovty
by falconia 14 Jan '25

14 Jan '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39308?usp=email ) Change subject: add dependency on libosmovty ...................................................................... add dependency on libosmovty libosmovty is part of libosmocore.git, hence no new repository-level dependency is introduced. However, the upcoming addition of twjit (Themyscira Wireless RTP jitter buffer implementation) includes vty configuration, hence libosmovty dependency is needed. Change-Id: I57cb919891e5c7ee0f828b98af11199cd9c123f8 --- M configure.ac M src/Makefile.am 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/08/39308/1 diff --git a/configure.ac b/configure.ac index 9513270..9b52901 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) diff --git a/src/Makefile.am b/src/Makefile.am index e3634be..37952ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,12 +3,14 @@ LIBVERSION=13:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) +AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) lib_LTLIBRARIES = libosmonetif.la -libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) +libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) $(LIBSCTP_LIBS) libosmonetif_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I57cb919891e5c7ee0f828b98af11199cd9c123f8 Gerrit-Change-Number: 39308 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by fixeria 14 Jan '25

14 Jan '25

Attention is currently required from: csaba.sipos, laforge, pespin. fixeria has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 11 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> 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: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Jan 2025 03:17:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by csaba.sipos 14 Jan '25

14 Jan '25

Attention is currently required from: fixeria, laforge, pespin. csaba.sipos has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... Patch Set 11: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/39290/comment/e2e962cb_473a1432?usp… : PS10, Line 4728: vty_out(vty, " nokia_site hopping-mode %d%s", bts->nokia.hopping_mode, VTY_NEWLINE); > wrong, you need to convert the integer back to a string. […] Resolved it another way. Hope it is good enough. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 11 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(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: Tue, 14 Jan 2025 00:44:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by csaba.sipos 14 Jan '25

14 Jan '25

Attention is currently required from: csaba.sipos, fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... nokia_site: introduce hopping control for Nokia *Site nokia_site hopping-mode baseband nokia_site hopping-mode synthesizer Signed-off-by: csaba.sipos <metro4(a)freemail.hu> Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 --- A doc/examples/osmo-bsc/nokia/osmo-bsc.metrosite.RF-hopping.2TRX.cfg M include/osmocom/bsc/bts.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c 4 files changed, 219 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/39290/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 11 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: nokia_site: introduce hopping control for Nokia *Site
by pespin 13 Jan '25

13 Jan '25

Attention is currently required from: csaba.sipos, fixeria, laforge. pespin has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email ) Change subject: nokia_site: introduce hopping control for Nokia *Site ...................................................................... Patch Set 10: Code-Review-1 (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/39290/comment/949c24ed_884652eb?usp… : PS10, Line 4728: vty_out(vty, " nokia_site hopping-mode %d%s", bts->nokia.hopping_mode, VTY_NEWLINE); wrong, you need to convert the integer back to a string. We usually use osmo_value_string for this type of thing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb1d269d2ee80d72ede2394125e8acedf0ee8b06 Gerrit-Change-Number: 39290 Gerrit-PatchSet: 10 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jan 2025 21:14:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-pcap[master]: server: Use osmo_sockaddr in remote_addr field
by pespin 13 Jan '25

13 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39307?usp=email ) Change subject: server: Use osmo_sockaddr in remote_addr field ...................................................................... server: Use osmo_sockaddr in remote_addr field Change-Id: Id63c7047bbc49ed5991b14fecfb3835972442165 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 35 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/07/39307/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 8bd1dee..f394c7c 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -32,6 +32,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/write_queue.h> +#include <osmocom/core/socket.h> #include <osmo-pcap/wireformat.h> #include <osmo-pcap/osmo_tls.h> @@ -80,7 +81,7 @@ char *name; char *remote_host; bool store; - struct in_addr remote_addr; + struct osmo_sockaddr rem_addr; /* Remote connection */ struct osmo_wqueue rem_wq; diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index c1cc47e..21ff255 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -462,13 +462,15 @@ static int accept_cb(struct osmo_fd *fd, unsigned int when) { - struct osmo_pcap_conn *conn; + struct osmo_pcap_conn *conn = NULL; struct osmo_pcap_server *server; - struct sockaddr_in addr; - socklen_t size = sizeof(addr); + char str[INET6_ADDRSTRLEN]; + struct osmo_sockaddr osa; + socklen_t len = sizeof(osa.u.sas); int new_fd; - new_fd = accept(fd->fd, (struct sockaddr *) &addr, &size); + memset(&osa, 0, sizeof(osa)); + new_fd = accept(fd->fd, &osa.u.sa, &len); if (new_fd < 0) { LOGP(DSERVER, LOGL_ERROR, "Failed to accept socket: %d\n", errno); return -1; @@ -480,13 +482,20 @@ rate_ctr_inc2(server->ctrg, SERVER_CTR_CONNECT); llist_for_each_entry(conn, &server->conn, entry) { - if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) { - LOGP(DSERVER, LOGL_NOTICE, - "New connection from %s\n", conn->name); - osmo_pcap_conn_event(conn, "connect", NULL); - new_connection(server, conn, new_fd); - return 0; - } + if (conn->rem_addr.u.sa.sa_family != osa.u.sa.sa_family) + continue; + switch (conn->rem_addr.u.sa.sa_family) { + case AF_INET: + if (conn->rem_addr.u.sin.sin_addr.s_addr != osa.u.sin.sin_addr.s_addr) + continue; + goto found; + case AF_INET6: + if (memcmp(&conn->rem_addr.u.sin6.sin6_addr, &osa.u.sin6.sin6_addr, sizeof(struct in6_addr))) + continue; + goto found; + default: + continue; + }; } rate_ctr_inc2(server->ctrg, SERVER_CTR_NOCLIENT); @@ -496,10 +505,16 @@ * this client. */ - LOGP(DSERVER, LOGL_ERROR, - "Failed to find client for %s\n", inet_ntoa(addr.sin_addr)); + LOGP(DSERVER, LOGL_ERROR, "Failed to find client for %s\n", + osmo_sockaddr_ntop(&osa.u.sa, str)); close(new_fd); return -1; + +found: + LOGP(DSERVER, LOGL_NOTICE, "New connection from %s\n", conn->name); + osmo_pcap_conn_event(conn, "connect", NULL); + new_connection(server, conn, new_fd); + return 0; } int osmo_pcap_server_listen(struct osmo_pcap_server *server) diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index eab5cb4..51448ff 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -360,9 +360,11 @@ return CMD_WARNING; } - talloc_free(conn->remote_host); - conn->remote_host = talloc_strdup(pcap_server, remote_host); - inet_aton(remote_host, &conn->remote_addr); + if (osmo_sockaddr_from_str_and_uint(&conn->rem_addr, remote_host, 0) < 0) { + vty_out(vty, "Failed parsing address\n"); + return CMD_WARNING; + } + osmo_talloc_replace_string(pcap_server, &conn->remote_host, remote_host); /* Checking store and maybe closing a pcap file */ if (!store) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Id63c7047bbc49ed5991b14fecfb3835972442165 Gerrit-Change-Number: 39307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log