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

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding
by pespin 01 Feb '22

01 Feb '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 12:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat
by osmith 01 Feb '22

01 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... jobs/{master-builds,gerrit-*}: add osmo-bsc-nat Related: SYS#5560 Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 --- M jobs/gerrit-lint.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 3 files changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 45db681..0d98d9d 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -26,6 +26,7 @@ - openbsc - openggsn - osmo-bsc + - osmo-bsc-nat - osmo-bts - osmo-hnodeb - osmo-hnbgw diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a1fce4d..84fe805 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -89,6 +89,7 @@ cmd: '{timeout_cmd} ./contrib/jenkins.sh' - osmo-bsc + - osmo-bsc-nat - osmo-bts: slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10] diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0c2be30..0b226d1 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -107,6 +107,7 @@ trigger: > master-openbsc, master-osmo-bsc, + master-osmo-bsc-nat, master-osmo-iuh, master-osmo-msc, master-osmo-sgsn @@ -130,6 +131,7 @@ # -> master-libosmo-sccp # -> master-openbsc # -> master-osmo-bsc + # -> master-osmo-bsc-nat # -> master-osmo-iuh # -> master-osmo-msc # -> master-osmo-sgsn @@ -181,6 +183,7 @@ {docker_img} /build/contrib/jenkins.sh - osmo-bsc + - osmo-bsc-nat - osmo-bts: slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat
by osmith 01 Feb '22

01 Feb '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:14:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat
by fixeria 01 Feb '22

01 Feb '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:12:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding
by osmith 01 Feb '22

01 Feb '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... Patch Set 7: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030/comment/fa55316c_3f774054 PS5, Line 142: oph->msg = NULL; > > Why are you doing this? […] patchset 7 uses osmo_sccp_tx_unitdata instead of osmo_sccp_tx_unitdata_msg, so I can just do one msgb_free() before the return. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:10:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local
by osmith 01 Feb '22

01 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... osmo_ss7_vty: add osmo_sccp_addr_by_name_local Add a new function similar to osmo_sccp_addr_by_name, but search in a specific ss7 instance's addressbook instead of searching in the global address book. This is needed for osmo-bsc-nat, which uses two separate instances at the same time. Related: SYS#5560 Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 --- M include/osmocom/sigtran/sccp_sap.h M src/osmo_ss7_vty.c 2 files changed, 24 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index adac606..2b41fed 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -301,6 +301,8 @@ int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); struct osmo_ss7_instance *osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, const char *name); +int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, + const struct osmo_ss7_instance *inst); const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr); diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 8ee3087..7dffe02 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1350,6 +1350,28 @@ return entry->inst; } +/*! \brief Lookup an SCCP address from the addressbook of a specific instance + * by its name. + * \param[out] dest_addr pointer to output the resulting sccp-address; + * (set to NULL if not interested) + * \param[in] name of the address to lookup + * \param[in] inst ss7 instance of which the address book will be searched + * \returns 0 on success; <0 on error */ +int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, + const struct osmo_ss7_instance *inst) +{ + struct osmo_sccp_addr_entry *entry; + + entry = addr_entry_by_name_local(name, inst); + if (!entry) + return -ENOENT; + + if (dest_addr) + *dest_addr = entry->addr; + + return 0; +} + /*! \brief Reverse lookup the lookup-name of a specified SCCP address. * \param[in] name of the address to lookup * \returns char pointer to the lookup-name; NULL on error */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmo-sccp[master]: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes
by osmith 01 Feb '22

01 Feb '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 ) Change subject: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes ...................................................................... include/osmocom/sigtran/sccp_sap.h: cosmetic fixes Move return type to the same line as the name of the function to follow coding guidelines. Change-Id: I10475aa395a1cfd49ff62c758f99f9689a0038d0 --- M include/osmocom/sigtran/sccp_sap.h 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index d741644..adac606 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -281,8 +281,7 @@ void osmo_sccp_vty_init(void); -struct osmo_sccp_instance * -osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv); +struct osmo_sccp_instance *osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv); void osmo_sccp_instance_destroy(struct osmo_sccp_instance *inst); struct osmo_ss7_instance *osmo_sccp_get_ss7(const struct osmo_sccp_instance *sccp); struct osmo_sccp_instance *osmo_sccp_get_sccp(const struct osmo_sccp_user *scu); @@ -291,22 +290,17 @@ void osmo_sccp_user_set_priv(struct osmo_sccp_user *scu, void *priv); void *osmo_sccp_user_get_priv(struct osmo_sccp_user *scu); -struct osmo_sccp_user * -osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, - osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc); +struct osmo_sccp_user *osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, + osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc); -struct osmo_sccp_user * -osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name, - osmo_prim_cb prim_cb, uint16_t ssn); -struct osmo_sccp_user * -osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc); +struct osmo_sccp_user *osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name, + osmo_prim_cb prim_cb, uint16_t ssn); +struct osmo_sccp_user *osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc); int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); -struct osmo_ss7_instance * -osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, - const char *name); +struct osmo_ss7_instance *osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, const char *name); const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I10475aa395a1cfd49ff62c758f99f9689a0038d0 Gerrit-Change-Number: 27026 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local
by osmith 01 Feb '22

01 Feb '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:08:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local
by osmith 01 Feb '22

01 Feb '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 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-Comment-Date: Tue, 01 Feb 2022 11:08:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding
by osmith 01 Feb '22

01 Feb '22

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 to look at the new patch set (#7). Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... bsc_nat_fsm: initial msc <> bsc msg forwarding Add an initial implementation of sccp_sap_up, that assumes one BSC and one MSC, and successfully forwards RESET and RESET ACK between both. Related: SYS#5560 Depends: libosmo-sccp I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M src/osmo-bsc-nat/bsc_nat_fsm.c 2 files changed, 110 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/30/27030/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

2025

2024

2023

2022

gerrit-log February 2022