- gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: xua_snm.c: Handle DAUD with aff_pc containing wildcards

by laforge

Attention is currently required from: daniel, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email ) Change subject: xua_snm.c: Handle DAUD with aff_pc containing wildcards ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d Gerrit-Change-Number: 40498 Gerrit-PatchSet: 3 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Jun 2025 12:10:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 23 hours

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP

by laforge

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email ) Change subject: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I28bfb13744f2feb4adb610b341330725e2691a77 Gerrit-Change-Number: 40487 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Jun 2025 12:09:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 23 hours

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP

by laforge

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email ) Change subject: xua_snm.c: Fix wrong PC value passed in MTP-{PAUSE,RESUME} towards SCCP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I28bfb13744f2feb4adb610b341330725e2691a77 Gerrit-Change-Number: 40487 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Jun 2025 12:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 23 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce support to configure and enable TCP keep-alive

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email ) Change subject: asp: Introduce support to configure and enable TCP keep-alive ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481/comment/ad76c74b_d0839… : PS3, Line 801: > "this way" = storing return code in a var and not using it, instead of not storing it. mh. I don't think it's an established practice in our code base so far; my preference would be to not use the return value and optionally adding some kind of unused-annotation supported by tools like coverity. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2a9338053e741fb6dab94492c6bdc2badaf7afb1 Gerrit-Change-Number: 40481 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Jun 2025 12:08:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 day, 23 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Tx DAUD when ASP becomes activated

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40501?usp=email ) Change subject: asp: Tx DAUD when ASP becomes activated ...................................................................... asp: Tx DAUD when ASP becomes activated Otherwise the local Signalling Point has no way to know whether the remote Signalling Points it wants to talk to are actually already connected to the STP when it becomes active after the process starts up. This pocedure is documented both for M3UA and SUA: * RFC4666 4.6, RFC3868 4.6 * RFC4666 4.5.3, RFC3868 4.5.3 "ASP Auditing" * RFC4666 5.5.1.1.3 "Support for ASP Querying of SS7 Destination States" The M3UA specs (RFC4666 5.5.1.1.3) explicitly state that the point codes to audit are not to be provided by uppers layers, so picking the ones from the locally configured address book for now: """ Note: there is no primitive for the MTP3-User to request this audit from the M3UA layer, as this is initiated by an internal M3UA management function. """ Related: OS#5917 Related: SYS#7501 Change-Id: I7c8c5099d4d00ea6f4a8db59ed6b833fb0ffa43d --- M src/m3ua.c M src/sua.c M src/xua_asp_fsm.c M src/xua_internal.h M src/xua_snm.c 5 files changed, 110 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/01/40501/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40501?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I7c8c5099d4d00ea6f4a8db59ed6b833fb0ffa43d Gerrit-Change-Number: 40501 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

2 days, 16 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: WIP: Tx DAUD when ASP becomes activated

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40501?usp=email ) Change subject: WIP: Tx DAUD when ASP becomes activated ...................................................................... WIP: Tx DAUD when ASP becomes activated Otherwise the local Signalling Point has no way to know whether the remote Signalling Points it wants to talk to are actually already connected to the STP when it becomes active after the process starts up. This pocedure is documented both for M3UA and SUA: * RFC4666 4.6, RFC3868 4.6 * RFC4666 4.5.3, RFC3868 4.5.3 "ASP Auditing" * RFC4666 5.5.1.1.3 "Support for ASP Querying of SS7 Destination States" The M3UA specs (RFC4666 5.5.1.1.3) explicitly state that the point codes to audit are not to be provided by uppers layers, so picking the ones from the locally configured address book for now: """ Note: there is no primitive for the MTP3-User to request this audit from the M3UA layer, as this is initiated by an internal M3UA management function. """ Related: OS#5917 Related: SYS#7501 Change-Id: I7c8c5099d4d00ea6f4a8db59ed6b833fb0ffa43d --- M src/m3ua.c M src/sua.c M src/xua_asp_fsm.c M src/xua_internal.h M src/xua_snm.c 5 files changed, 110 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/01/40501/1 diff --git a/src/m3ua.c b/src/m3ua.c index f073c8e..b3b0797 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -883,7 +883,6 @@ return xua; } -#if 0 /* not used so far */ /* 3.4.3 Destination Available (DAUD) */ static struct xua_msg *m3ua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, @@ -895,7 +894,6 @@ xua->hdr.msg_type = M3UA_SNM_DAUD; return xua; } -#endif /* 3.4.5 Destination User Part Unavailable (DUPU) */ static struct xua_msg *m3ua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, @@ -976,6 +974,22 @@ m3ua_tx_xua_asp(asp, xua); } +/*! Transmit SSNM DAUD message requesting [un]availability status of certain point code[s] + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] info_string optional information string (can be NULL). + */ +void m3ua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = m3ua_encode_daud(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + m3ua_tx_xua_asp(asp, xua); +} + /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. diff --git a/src/sua.c b/src/sua.c index 7d14f3b..9d3e3f1 100644 --- a/src/sua.c +++ b/src/sua.c @@ -825,7 +825,6 @@ return xua; } -#if 0 /* not used so far */ /* 3.4.3 Destination Available (DAUD) */ static struct xua_msg *sua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, @@ -837,7 +836,6 @@ xua->hdr.msg_type = SUA_SNM_DAUD; return xua; } -#endif /* 3.4.5 Destination User Part Unavailable (DUPU) */ static struct xua_msg *sua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, @@ -914,6 +912,23 @@ xua_msg_add_data(xua, SUA_IEI_INFO_STRING, strlen(info_string)+1, (const uint8_t *) info_string); } +/*! Transmit SSNM DAUD message requesting [un]availability status of certain point code[s] + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] aff_ssn affected SSN (optional) + * \param[in] smi subsystem multiplicity indicator (optional) + * \param[in] info_string optional information strng (can be NULL). + */ +void sua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, + const uint32_t *smi, const char *info_string) +{ + struct xua_msg *xua = sua_encode_daud(rctx, num_rctx, aff_pc, num_aff_pc, aff_ssn, smi, info_string); + sua_tx_xua_asp(asp, xua); +} /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 26f3a78..96bceb8 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -31,6 +31,7 @@ #include "ss7_asp.h" #include "ss7_internal.h" #include "ss7_xua_srv.h" +#include "sccp_internal.h" #include "xua_asp_fsm.h" #include "xua_as_fsm.h" #include "xua_internal.h" @@ -146,6 +147,47 @@ xua_asp_send_xlm_prim_simple(asp, prim_type, op); } +static void xua_asp_tx_snm_daud_address_book(struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_instance *inst = asp->inst; + uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; + unsigned int num_rctx; + uint32_t *aff_pc = NULL; + unsigned int num_aff_pc = 0; + struct osmo_sccp_addr_entry *entry; + + num_rctx = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), NULL); + + llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { + if (entry->addr.presence & OSMO_SCCP_ADDR_T_PC) + num_aff_pc++; + } + if (num_aff_pc == 0) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "Tx DAUD: No SCCP in address book! skip\n"); + return; + } + aff_pc = talloc_size(asp, sizeof(*aff_pc) * num_aff_pc); + OSMO_ASSERT(aff_pc); + num_aff_pc = 0; + llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { + uint32_t curr_aff_pc; + unsigned int i; + if (!(entry->addr.presence & OSMO_SCCP_ADDR_T_PC)) + continue; + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Tx DAUD: Requesting status of DPC=%u=%s\n", + entry->addr.pc, osmo_ss7_pointcode_print2(inst, entry->addr.pc)); + curr_aff_pc = htonl(entry->addr.pc); /* mask = 0 */ + for (i = 0; i < num_aff_pc; i++) + if (aff_pc[i] == curr_aff_pc) + break; + if (i == num_aff_pc) /* not found in array */ + aff_pc[num_aff_pc++] = curr_aff_pc; + } + + xua_tx_snm_daud(asp, rctx, num_rctx, aff_pc, num_aff_pc, "ASP_ACTIVATE_DAUD"); + talloc_free(aff_pc); +} + /* determine the osmo_ss7_as_traffic_mode to be used by this ASP; will * iterate over all AS configured for this ASP. If they're compatible, * a single traffic mode is returned as enum osmo_ss7_as_traffic_mode. @@ -702,6 +744,18 @@ xua_t_beat_send(fi); } + if (asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP) { + /* RFC4666 4.6, RFC3868 4.6: "The ASP MAY choose to audit the availability + * of unavailable destinations by sending DAUD messages. + * This would be the case when, for example, an AS becomes active at an ASP + * and does not have current destination statuses." + * See also RFC4666 4.5.3, RFC3868 4.5.3 "ASP Auditing". + * See also RFC4666 5.5.1.1.3 "Support for ASP Querying of SS7 Destination States" + */ + LOGPFSML(fi, LOGL_NOTICE, "Tx DAUD\n"); + xua_asp_tx_snm_daud_address_book(asp); + } + dispatch_to_all_as(fi, XUA_ASPAS_ASP_ACTIVE_IND, asp); } diff --git a/src/xua_internal.h b/src/xua_internal.h index 576708f..58aed4a 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -28,6 +28,9 @@ void sua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *ssn, const uint8_t cong_level, const char *info_string); +void sua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, + const uint32_t *smi, const char *info_string); void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); @@ -42,6 +45,8 @@ const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *concerned_dpc, const uint8_t *cong_level, const char *info_string); +void m3ua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string); void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); @@ -91,6 +96,9 @@ void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available); +void xua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str); + enum ss7_asp_lm_timer { /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ SS7_ASP_LM_T_WAIT_ASP_UP = 1, diff --git a/src/xua_snm.c b/src/xua_snm.c index f3c8bb8..2d4b038 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -82,6 +82,21 @@ } } +void xua_tx_snm_daud(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_snm_daud(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_snm_daud(asp, rctx, num_rctx, aff_pc, num_aff_pc, NULL, NULL, info_str); + break; + default: + break; + } +} + static void xua_tx_upu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40501?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I7c8c5099d4d00ea6f4a8db59ed6b833fb0ffa43d Gerrit-Change-Number: 40501 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 days, 16 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_snm.c: Handle DAUD with aff_pc containing wildcards

by pespin

Attention is currently required from: daniel, laforge. Hello Jenkins Builder, daniel, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: xua_snm.c: Handle DAUD with aff_pc containing wildcards ...................................................................... xua_snm.c: Handle DAUD with aff_pc containing wildcards Handle it with a really basic implementation for completeness. In theory we shouldn't in general be receiving such big masks, since RFC466 3.4.3 states: """ It is recommended that during normal operation (traffic handling) the mask field of the Affected Point Code parameter in the DAUD message be kept to a zero value in order to avoid SG overloading. """ Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d --- M src/xua_snm.c 1 file changed, 47 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/98/40498/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d Gerrit-Change-Number: 40498 Gerrit-PatchSet: 3 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

2 days, 17 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: Move sccp_address_book logic out of vty.c

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40500?usp=email ) Change subject: Move sccp_address_book logic out of vty.c ...................................................................... Move sccp_address_book logic out of vty.c Move it tto a file containing data domain code. Move the struct definition to a header so it can be used in other files like ss7_vty.c. It will be used in more places in follow-up patches. Change-Id: Ib37a2503b8cf0fadce9072020e0e14a2a05561bf --- M src/sccp_internal.h M src/ss7_instance.c M src/ss7_vty.c 3 files changed, 113 insertions(+), 104 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/00/40500/1 diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 37ada11..298ef3e 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -15,6 +15,19 @@ #include "ss7_user.h" +/* SCCP addressbook */ +extern struct llist_head sccp_address_book_global; +struct osmo_sccp_addr_entry { + struct llist_head list; + struct llist_head list_global; + struct osmo_ss7_instance *inst; + char name[32]; + struct osmo_sccp_addr addr; +}; +struct osmo_sccp_addr_entry *addr_entry_by_name_local(const char *name, + const struct osmo_ss7_instance *inst); +struct osmo_sccp_addr_entry *addr_entry_by_name_global(const char *name); + /* Appendix C.4 of Q.714 */ enum osmo_sccp_timer { /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ diff --git a/src/ss7_instance.c b/src/ss7_instance.c index 527cf2a..ef0fbd8 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -39,6 +39,7 @@ #include "ss7_instance.h" #include "ss7_linkset.h" #include "ss7_route_table.h" +#include "sccp_internal.h" static int32_t next_rctx = 1; static int32_t next_l_rk_id = 1; @@ -609,3 +610,102 @@ /* parse mask as point code */ return osmo_ss7_pointcode_parse(inst, in); } + +/*********************************************************************** + * SCCP addressbook handling + ***********************************************************************/ + +/* A global list that holds all addressbook entries at once + * (see also .cfg in struct osmo_ss7_instance) */ +LLIST_HEAD(sccp_address_book_global); + +/* Pick an SCCP address entry from the addressbook list by its name */ +struct osmo_sccp_addr_entry +*addr_entry_by_name_local(const char *name, + const struct osmo_ss7_instance *inst) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { + if (strcmp(entry->name, name) == 0) { + OSMO_ASSERT(entry->inst == inst); + return entry; + } + } + + return NULL; +} + +/* Pick an SCCP address entry from the global addressbook + * list by its name */ +struct osmo_sccp_addr_entry +*addr_entry_by_name_global(const char *name) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &sccp_address_book_global, + list_global) { + if (strcmp(entry->name, name) == 0) + return entry; + } + + return NULL; +} + +/*! \brief Lookup an SCCP address from the addressbook 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 + * \returns SS7 instance; NULL on error */ +struct osmo_ss7_instance * +osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, + const char *name) +{ + struct osmo_sccp_addr_entry *entry; + + entry = addr_entry_by_name_global(name); + if (!entry) + return NULL; + + if (dest_addr) + *dest_addr = entry->addr; + + 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 */ +const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr) +{ + struct osmo_sccp_addr_entry *entry; + + llist_for_each_entry(entry, &sccp_address_book_global, list_global) { + if (memcmp(&entry->addr, addr, sizeof(*addr)) == 0) + return entry->name; + } + + return NULL; +} diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 862e9ff..66efc03 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -727,15 +727,6 @@ * SCCP addressbook handling ***********************************************************************/ -/* SCCP addressbook */ -struct osmo_sccp_addr_entry { - struct llist_head list; - struct llist_head list_global; - struct osmo_ss7_instance *inst; - char name[32]; - struct osmo_sccp_addr addr; -}; - static struct cmd_node sccpaddr_node = { L_CS7_SCCPADDR_NODE, "%s(config-cs7-sccpaddr)# ", @@ -748,101 +739,6 @@ 1, }; -/* A global list that holds all addressbook entries at once - * (see also .cfg in struct osmo_ss7_instance) */ -LLIST_HEAD(sccp_address_book_global); - -/* Pick an SCCP address entry from the addressbook list by its name */ -static struct osmo_sccp_addr_entry -*addr_entry_by_name_local(const char *name, - const struct osmo_ss7_instance *inst) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &inst->cfg.sccp_address_book, list) { - if (strcmp(entry->name, name) == 0) { - OSMO_ASSERT(entry->inst == inst); - return entry; - } - } - - return NULL; -} - -/* Pick an SCCP address entry from the global addressbook - * list by its name */ -static struct osmo_sccp_addr_entry -*addr_entry_by_name_global(const char *name) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &sccp_address_book_global, - list_global) { - if (strcmp(entry->name, name) == 0) - return entry; - } - - return NULL; -} - -/*! \brief Lookup an SCCP address from the addressbook 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 - * \returns SS7 instance; NULL on error */ -struct osmo_ss7_instance * -osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, - const char *name) -{ - struct osmo_sccp_addr_entry *entry; - - entry = addr_entry_by_name_global(name); - if (!entry) - return NULL; - - if (dest_addr) - *dest_addr = entry->addr; - - 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 */ -const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr) -{ - struct osmo_sccp_addr_entry *entry; - - llist_for_each_entry(entry, &sccp_address_book_global, list_global) { - if (memcmp(&entry->addr, addr, sizeof(*addr)) == 0) - return entry->name; - } - - return NULL; -} - /* Generate VTY configuration file snippet */ static void write_sccp_addressbook(struct vty *vty, const struct osmo_ss7_instance *inst) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40500?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ib37a2503b8cf0fadce9072020e0e14a2a05561bf Gerrit-Change-Number: 40500 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 days, 17 hours

1
0
0 0

[XS] Change in libosmo-sigtran[master]: cosmetic: sua: Fix API documentation typo

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40499?usp=email ) Change subject: cosmetic: sua: Fix API documentation typo ...................................................................... cosmetic: sua: Fix API documentation typo Change-Id: I5aa42a3dfd5782425e23278f1b6a8ee8b9af2cac --- M src/sua.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/99/40499/1 diff --git a/src/sua.c b/src/sua.c index 41bea1b..7d14f3b 100644 --- a/src/sua.c +++ b/src/sua.c @@ -863,7 +863,7 @@ } /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] - * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. * \param[in] num_rctx number of rctx * \param[in] aff_pc array of 'Affected Point Code' in network byte order. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5aa42a3dfd5782425e23278f1b6a8ee8b9af2cac Gerrit-Change-Number: 40499 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 days, 17 hours

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_snm.c: Handle DAUD with aff_pc containing wildcards

by pespin

Attention is currently required from: daniel, laforge. Hello Jenkins Builder, daniel, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: xua_snm.c: Handle DAUD with aff_pc containing wildcards ...................................................................... xua_snm.c: Handle DAUD with aff_pc containing wildcards Handle it with a really basic implementation for completeness. In theory we shouldn't in general be receiving such big masks, since RFC466 3.4.3 states: """ It is recommended that during normal operation (traffic handling) the mask field of the Affected Point Code parameter in the DAUD message be kept to a zero value in order to avoid SG overloading. """ Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d --- M src/xua_snm.c 1 file changed, 47 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/98/40498/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40498?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Icdb726ae66d3bee19b2113b1e77d68b517e8fb4d Gerrit-Change-Number: 40498 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

2 days, 18 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log