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

Change in osmo-cbc[master]: vty: Print created and expired times for each message

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28785 ) Change subject: vty: Print created and expired times for each message ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I9ee49b99546a44be706700c3db94d45210c47e54 Gerrit-Change-Number: 28785 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 10:55:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Add command to delete expired messages

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28786 ) Change subject: vty: Add command to delete expired messages ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3 Gerrit-Change-Number: 28786 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 10:52:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve logging on non-implemented PWS Restart/Failure Ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28803 ) Change subject: sbcap: Improve logging on non-implemented PWS Restart/Failure Ind ...................................................................... sbcap: Improve logging on non-implemented PWS Restart/Failure Ind Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 --- M src/sbcap_link_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/03/28803/1 diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index a5b738e..826e291 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -80,7 +80,7 @@ //pdu = data; /* TODO: delete any CBS state we have for this peer */ /* TODO: re-send messages we have matching the scope of the peer */ - LOGPSBCAPC(link, LOGL_NOTICE, "RESTART but re-sending not implemented yet\n"); + LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Restart Indication not implemented yet\n"); break; default: OSMO_ASSERT(0); @@ -274,10 +274,12 @@ return osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_RX_RESTART, pdu); case SBcAP_ProcedureId_Error_Indication: return cbc_sbcap_link_rx_error_ind(link, pdu); + case SBcAP_ProcedureId_PWS_Failure_Indication: + LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Failure Indication not implemented yet\n"); + return 0; case SBcAP_ProcedureId_Stop_Warning_Indication: case SBcAP_ProcedureId_Write_Replace_Warning_Indication: break; /* Handle msg id below */ - case SBcAP_ProcedureId_PWS_Failure_Indication: default: LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n", pdu->choice.initiatingMessage.procedureCode); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 Gerrit-Change-Number: 28803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Fix 'show message' not finding expired messages

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28788 ) Change subject: vty: Fix 'show message' not finding expired messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I23523876f1df167e8afd730b2164f133c2776085 Gerrit-Change-Number: 28788 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 10:49:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of rx Error Indication

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-cbc/+/28802 ) Change subject: sbcap: Improve handling of rx Error Indication ...................................................................... sbcap: Improve handling of rx Error Indication Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 --- M src/sbcap_link_fsm.c 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28802/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of rx Error Indication

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28802 ) Change subject: sbcap: Improve handling of rx Error Indication ...................................................................... sbcap: Improve handling of rx Error Indication Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 --- M src/sbcap_link_fsm.c 1 file changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28802/1 diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index d4d10f2..8095e40 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -213,6 +213,46 @@ } /* message was received from remote SBcAP peer (BSC) */ +static int cbc_sbcap_link_rx_error_ind(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) +{ + A_SEQUENCE_OF(void) *as_pdu = NULL; + SBcAP_ErrorIndicationIEs_t *ie; + SBcAP_Criticality_Diagnostics_t *ie_diag = NULL; + long cause = -1; + long proc_code = -1; + long trigger_msg = -1; + long criticality = -1; + int i; + + as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Error_Indication.protocolIEs.list; + OSMO_ASSERT(as_pdu); + + for (i = 0; i < as_pdu->count; i++) { + ie = (SBcAP_ErrorIndicationIEs_t *)(as_pdu->array[i]); + OSMO_ASSERT(ie); + switch (ie->id) { + case SBcAP_ErrorIndicationIEs__value_PR_Cause: + cause = ie->value.choice.Cause; + break; + case SBcAP_ErrorIndicationIEs__value_PR_Criticality_Diagnostics: + ie_diag = &ie->value.choice.Criticality_Diagnostics; + if (ie_diag->procedureCode) + proc_code = *ie_diag->procedureCode; + if (ie_diag->triggeringMessage) + trigger_msg = *ie_diag->triggeringMessage; + if (ie_diag->procedureCriticality) + criticality = *ie_diag->procedureCriticality; + default: + continue; + } + } + + LOGPSBCAPC(link, LOGL_ERROR, "Rx ERROR_IND (cause=%ld, diagnostics=%d [proc_code=%ld, trigger_msg=%ld criticality=%ld])\n", + cause, !!ie_diag, proc_code, trigger_msg, criticality); + return 0; +} + +/* message was received from remote SBcAP peer (BSC) */ int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { struct cbc_message *smscb; @@ -231,10 +271,11 @@ return -EINVAL; case SBcAP_ProcedureId_PWS_Restart_Indication: return osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_RX_RESTART, pdu); + case SBcAP_ProcedureId_Error_Indication: + return cbc_sbcap_link_rx_error_ind(link, pdu); case SBcAP_ProcedureId_Stop_Warning_Indication: case SBcAP_ProcedureId_Write_Replace_Warning_Indication: break; /* Handle msg id below */ - case SBcAP_ProcedureId_Error_Indication: case SBcAP_ProcedureId_PWS_Failure_Indication: default: LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Drop unused events

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28801 ) Change subject: sbcap: Drop unused events ...................................................................... sbcap: Drop unused events Those events doesn't exist in SBc-AP. Change-Id: Ie4843ed5debbd4282df487ada9596b4d75f4b46c --- M include/osmocom/cbc/sbcap_link_fsm.h M src/sbcap_link_fsm.c 2 files changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/01/28801/1 diff --git a/include/osmocom/cbc/sbcap_link_fsm.h b/include/osmocom/cbc/sbcap_link_fsm.h index e41f1d2..48b4f41 100644 --- a/include/osmocom/cbc/sbcap_link_fsm.h +++ b/include/osmocom/cbc/sbcap_link_fsm.h @@ -6,10 +6,7 @@ extern struct osmo_fsm sbcap_link_fsm; enum sbcap_link_event { - SBcAP_LINK_E_RX_RST_COMPL, /* reset complete received */ - SBcAP_LINK_E_RX_RST_FAIL, /* reset failure received */ - SBcAP_LINK_E_RX_KA_COMPL, /* keep-alive complete received */ - SBcAP_LINK_E_RX_RESTART, /* restart received */ + SBcAP_LINK_E_RX_RESTART, /* SBc-AP PWS Restart Ind received */ SBcAP_LINK_E_CMD_RESET, /* RESET command from CBC */ SBcAP_LINK_E_CMD_CLOSE, /* CLOSE command from CBC */ }; diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 0c66a62..d4d10f2 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -42,9 +42,6 @@ }; static const struct value_string sbcap_link_event_names[] = { - { SBcAP_LINK_E_RX_RST_COMPL, "Rx Reset Complete" }, - { SBcAP_LINK_E_RX_RST_FAIL, "Rx Reset Failure" }, - { SBcAP_LINK_E_RX_KA_COMPL, "Rx Keep-Alive Complete" }, { SBcAP_LINK_E_RX_RESTART, "Rx Restart" }, { SBcAP_LINK_E_CMD_RESET, "RESET.cmd" }, { SBcAP_LINK_E_CMD_CLOSE, "CLOSE.cmd" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie4843ed5debbd4282df487ada9596b4d75f4b46c Gerrit-Change-Number: 28801 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Fix typo in sbcap_cause_vals

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28799 ) Change subject: sbcap: Fix typo in sbcap_cause_vals ...................................................................... sbcap: Fix typo in sbcap_cause_vals Change-Id: I519a86e5292c39bf1ad502c587838e7b62a0e64f --- M src/sbcap/sbcap_common.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/99/28799/1 diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index a8967ad..3968c71 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -36,7 +36,7 @@ { SBcAP_Cause_parameter_value_invalid, "parameter value invalid" }, { SBcAP_Cause_valid_message_not_identified, "valid message not identified" }, { SBcAP_Cause_tracking_area_not_valid, "Tracking Area not valid" }, - { SBcAP_Cause_unrecognised_message, "unrecoznied message" }, + { SBcAP_Cause_unrecognised_message, "unrecognised message" }, { SBcAP_Cause_missing_mandatory_element, "missing mandatory element" }, { SBcAP_Cause_mME_capacity_exceeded, "MME capacity exceeded" }, { SBcAP_Cause_mME_memory_exceeded, "MME memory exceeded" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I519a86e5292c39bf1ad502c587838e7b62a0e64f Gerrit-Change-Number: 28799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Send Error Indication if decoding rx msg fails

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28800 ) Change subject: sbcap: Send Error Indication if decoding rx msg fails ...................................................................... sbcap: Send Error Indication if decoding rx msg fails Change-Id: I444290f3d697e7485e04eaa38acd8fc3623e0eab --- M include/osmocom/cbc/sbcap_msg.h M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link.c M src/sbcap_msg.c 5 files changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/00/28800/1 diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 1f2c350..882e0b9 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -1,6 +1,7 @@ #pragma once #include <osmocom/core/linuxlist.h> #include <osmocom/netif/stream.h> +#include <osmocom/sbcap/sbcap_common.h> #include "cbc_data.h" @@ -9,3 +10,4 @@ SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx,const struct cbc_message *cbcmsg); SBcAP_SBC_AP_PDU_t *sbcap_gen_stop_warning_req(void *ctx, const struct cbc_message *cbcmsg); +SBcAP_SBC_AP_PDU_t *sbcap_gen_error_ind(void *ctx, SBcAP_Cause_t cause); diff --git a/include/osmocom/sbcap/sbcap_common.h b/include/osmocom/sbcap/sbcap_common.h index 795bf25..167e5d1 100644 --- a/include/osmocom/sbcap/sbcap_common.h +++ b/include/osmocom/sbcap/sbcap_common.h @@ -146,3 +146,6 @@ SBcAP_Stop_Warning_Request_IEs_t *sbcap_alloc_Stop_Warning_Request_IE( long id, SBcAP_Criticality_t criticality, SBcAP_Stop_Warning_Request_IEs__value_PR present); + +SBcAP_ErrorIndicationIEs_t *sbcap_alloc_Error_Indication_IE( + long id, SBcAP_Criticality_t criticality, SBcAP_Stop_Warning_Request_IEs__value_PR present); diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index 3968c71..cd22fee 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -135,3 +135,13 @@ ie->value.present = present; return ie; } + +SBcAP_ErrorIndicationIEs_t *sbcap_alloc_Error_Indication_IE( + long id, SBcAP_Criticality_t criticality, SBcAP_Stop_Warning_Request_IEs__value_PR present) +{ + SBcAP_ErrorIndicationIEs_t *ie = CALLOC(1, sizeof(*ie)); + ie->id = id; + ie->criticality = criticality; + ie->value.present = present; + return ie; +} diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 6459c58..ce59397 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -39,6 +39,7 @@ #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/sbcap_link_fsm.h> +#include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/debug.h> @@ -166,6 +167,13 @@ g_cbc->sbcap.mgr->rx_cb(link, pdu); } else { LOGPSBCAPC(link, LOGL_ERROR, "Unable to decode %s\n", msgb_hexdump(msg)); + pdu = sbcap_gen_error_ind(link, SBcAP_Cause_unrecognised_message); + if (pdu) { + cbc_sbcap_link_tx(link, pdu); + } else { + LOGPSBCAPC(link, LOGL_ERROR, + "Tx SBc-AP Error-Indication: msg gen failed\n"); + } } out: msgb_free(msg); diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 735cf8b..55ca0e2 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -291,3 +291,39 @@ return pdu; } + +/* generate a SBc-AP ERROR INDICATION, 3GPP TS 29.168 4.3.4.2A.1 */ +SBcAP_SBC_AP_PDU_t *sbcap_gen_error_ind(void *ctx, SBcAP_Cause_t cause) +{ + SBcAP_SBC_AP_PDU_t *pdu; + SBcAP_ErrorIndicationIEs_t *ie; + + pdu = sbcap_pdu_alloc(); + if (!pdu) + return NULL; + pdu->present = SBcAP_SBC_AP_PDU_PR_initiatingMessage; + pdu->choice.initiatingMessage.procedureCode = SBcAP_ProcedureId_Error_Indication; + pdu->choice.initiatingMessage.criticality = SBcAP_Criticality_ignore; + pdu->choice.initiatingMessage.value.present = SBcAP_InitiatingMessage__value_PR_Error_Indication; + + A_SEQUENCE_OF(void) *as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Error_Indication.protocolIEs.list; + + /* Cause, Optional: + * 3GPP TS 36.413 4.3.4.3.2 + * static const long asn_VAL_19_SBcAP_id_Cause = 1; */ + ie = sbcap_alloc_Error_Indication_IE(1, SBcAP_Criticality_ignore, + SBcAP_ErrorIndicationIEs__value_PR_Cause); + ie->value.choice.Cause = cause; + ASN_SEQUENCE_ADD(as_pdu, ie); + +#if 0 + /* Criticality Diagnostics, Optional: + * 3GPP TS 36.413 4.3.4.3.3 + * static const long asn_VAL_20_SBcAP_id_Criticality_Diagnostics = 2; */ + ie = sbcap_alloc_Error_Indication_IE(1, SBcAP_Criticality_ignore, + SBcAP_ErrorIndicationIEs__value_Criticality_Diagnostics); + ie->value.choice.Criticality_Diagnostics = ...; + ASN_SEQUENCE_ADD(as_pdu, ie); +#endif + return pdu; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I444290f3d697e7485e04eaa38acd8fc3623e0eab Gerrit-Change-Number: 28800 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Rename functions generating CBSP/SBc-AP Write-Replace request

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28798 ) Change subject: Rename functions generating CBSP/SBc-AP Write-Replace request ...................................................................... Rename functions generating CBSP/SBc-AP Write-Replace request Previous naming is misleading, as it seems to indicate the function is used to generate any kind of message, which is wrong. Change-Id: Ib0228c64bbf104accdbbebb6076004a6a1f44c6f --- M include/osmocom/cbc/cbsp_msg.h M include/osmocom/cbc/sbcap_msg.h M src/cbc_message.c M src/cbsp_msg.c M src/sbcap_msg.c 5 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/98/28798/1 diff --git a/include/osmocom/cbc/cbsp_msg.h b/include/osmocom/cbc/cbsp_msg.h index d64d355..c462af4 100644 --- a/include/osmocom/cbc/cbsp_msg.h +++ b/include/osmocom/cbc/cbsp_msg.h @@ -2,4 +2,4 @@ #include <osmocom/gsm/cbsp.h> struct cbc_message; -struct osmo_cbsp_decoded *cbcmsg_to_cbsp(void *ctx, const struct cbc_message *cbcmsg); +struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg); diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 784938d..1f2c350 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -7,5 +7,5 @@ struct cbc_message; typedef struct SBcAP_SBC_AP_PDU SBcAP_SBC_AP_PDU_t; -SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg); +SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx,const struct cbc_message *cbcmsg); SBcAP_SBC_AP_PDU_t *sbcap_gen_stop_warning_req(void *ctx, const struct cbc_message *cbcmsg); diff --git a/src/cbc_message.c b/src/cbc_message.c index 8884b6c..029abcb 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -65,7 +65,7 @@ peer->name); return -ENOTCONN; } - if (!(cbsp = cbcmsg_to_cbsp(peer, cbcmsg))) { + if (!(cbsp = cbsp_gen_write_replace_req(peer, cbcmsg))) { LOGP(DCBSP, LOGL_ERROR, "[%s] Tx CBSP: msg gen failed\n", peer->name); return -EINVAL; @@ -79,7 +79,7 @@ peer->name); return -ENOTCONN; } - if (!(sbcap = cbcmsg_to_sbcap(peer, cbcmsg))) { + if (!(sbcap = sbcap_gen_write_replace_warning_req(peer, cbcmsg))) { LOGP(DSBcAP, LOGL_ERROR, "[%s] Tx SBc-AP: msg gen failed\n", peer->name); return -EINVAL; diff --git a/src/cbsp_msg.c b/src/cbsp_msg.c index 4d0f8d3..de8d852 100644 --- a/src/cbsp_msg.c +++ b/src/cbsp_msg.c @@ -50,7 +50,7 @@ } /* generate a CBSP WRITE-REPLACE from our internal representation */ -struct osmo_cbsp_decoded *cbcmsg_to_cbsp(void *ctx, const struct cbc_message *cbcmsg) +struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg) { struct osmo_cbsp_write_replace *wrepl; const struct smscb_message *smscb = &cbcmsg->msg; diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 511036f..735cf8b 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -84,7 +84,7 @@ /* generate a SBc-AP WRITE-REPLACE WARNING REQUEST from our internal representation. * 3GPP TS 36.413 9.1.13.1 */ -SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg) +SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx,const struct cbc_message *cbcmsg) { const struct smscb_message *smscb = &cbcmsg->msg; SBcAP_SBC_AP_PDU_t *pdu; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0228c64bbf104accdbbebb6076004a6a1f44c6f Gerrit-Change-Number: 28798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022