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

Change in osmo-cbc[master]: Add sbcap library

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28600 ) Change subject: Add sbcap library ...................................................................... Add sbcap library This commit adds initial support to encode/decode SBc-AP messages in the form of a library, under src/sbcap/ (includes in include/osmocom/sbcap/). asn1c is used to generate all suport code and structures for ASN.1 APER encoding/decoding, based on asn files obtained from 3GPP TS 29.168 and stored under src/sbcap/asn1/. Currently, mainstream asn1c doesn't yet support ASN.1 APER encoding/decoding, hence mouse07410 's fork is used [1]. Furthermore, several encdoing/decoding bugs where found during the process and fixed, which means asn1.c git >= 30219de2d3da888b4f1eea0dd79f2a505000401a must be used to generate proper code. A new "make -C src/ gen" target is added which can be used to regenerate all C code from the available ASN.1 files in src/sbcap/asn1/*.asn (after properly setting configure.ac ASN_* variables if needed). [1] https://github.com/mouse07410/asn1c Related: OS#4945 Change-Id: If76f8619a9b2d46af6d94b8ae49348b8514e53aa --- M configure.ac M include/osmocom/Makefile.am A include/osmocom/sbcap/Makefile.am A include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List-5GS.h A include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List.h A include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List-5GS.h A include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List.h A include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List-5GS.h A include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List.h A include/osmocom/sbcap/SBcAP_CancelledCellinEAI-Item.h A include/osmocom/sbcap/SBcAP_CancelledCellinEAI.h A include/osmocom/sbcap/SBcAP_CancelledCellinTAI-5GS.h A include/osmocom/sbcap/SBcAP_CancelledCellinTAI-Item.h A include/osmocom/sbcap/SBcAP_CancelledCellinTAI.h A include/osmocom/sbcap/SBcAP_Cause.h A include/osmocom/sbcap/SBcAP_CellID-Cancelled-Item.h A include/osmocom/sbcap/SBcAP_CellID-Cancelled-List-5GS.h A include/osmocom/sbcap/SBcAP_CellID-Cancelled-List.h A include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-5GS.h A include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-Item.h A include/osmocom/sbcap/SBcAP_CellId-Broadcast-List.h A include/osmocom/sbcap/SBcAP_CellIdentity.h A include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h A include/osmocom/sbcap/SBcAP_Criticality-Diagnostics.h A include/osmocom/sbcap/SBcAP_Criticality.h A include/osmocom/sbcap/SBcAP_CriticalityDiagnostics-IE-List.h A include/osmocom/sbcap/SBcAP_Data-Coding-Scheme.h A include/osmocom/sbcap/SBcAP_ECGIList.h A include/osmocom/sbcap/SBcAP_ENB-ID.h A include/osmocom/sbcap/SBcAP_EUTRAN-CGI.h A include/osmocom/sbcap/SBcAP_EXTERNAL.h A include/osmocom/sbcap/SBcAP_Emergency-Area-ID-List.h A include/osmocom/sbcap/SBcAP_Emergency-Area-ID.h A include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List-Item.h A include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List.h A include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-Item.h A include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-List.h A include/osmocom/sbcap/SBcAP_Error-Indication.h A include/osmocom/sbcap/SBcAP_Extended-Repetition-Period.h A include/osmocom/sbcap/SBcAP_Failed-Cell-List-NR.h A include/osmocom/sbcap/SBcAP_Failed-Cell-List.h A include/osmocom/sbcap/SBcAP_GNB-ID.h A include/osmocom/sbcap/SBcAP_Global-ENB-ID.h A include/osmocom/sbcap/SBcAP_Global-GNB-ID.h A include/osmocom/sbcap/SBcAP_Global-NgENB-ID.h A include/osmocom/sbcap/SBcAP_Global-RAN-Node-ID.h A include/osmocom/sbcap/SBcAP_InitiatingMessage.h A include/osmocom/sbcap/SBcAP_List-of-5GS-Cells-for-Failure.h A include/osmocom/sbcap/SBcAP_List-of-5GS-TAI-for-Restart.h A include/osmocom/sbcap/SBcAP_List-of-5GS-TAIs.h A include/osmocom/sbcap/SBcAP_List-of-EAIs-Restart.h A include/osmocom/sbcap/SBcAP_List-of-TAIs-Restart.h A include/osmocom/sbcap/SBcAP_List-of-TAIs.h A include/osmocom/sbcap/SBcAP_Message-Identifier.h A include/osmocom/sbcap/SBcAP_NR-CGI.h A include/osmocom/sbcap/SBcAP_NR-CGIList.h A include/osmocom/sbcap/SBcAP_NRCellIdentity.h A include/osmocom/sbcap/SBcAP_NgENB-ID.h A include/osmocom/sbcap/SBcAP_Number-of-Broadcasts-Requested.h A include/osmocom/sbcap/SBcAP_NumberOfBroadcasts.h A include/osmocom/sbcap/SBcAP_Omc-Id.h A include/osmocom/sbcap/SBcAP_PLMNidentity.h A include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h A include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h A include/osmocom/sbcap/SBcAP_Presence.h A include/osmocom/sbcap/SBcAP_ProcedureCode.h A include/osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h A include/osmocom/sbcap/SBcAP_ProtocolExtensionField.h A include/osmocom/sbcap/SBcAP_ProtocolExtensionID.h A include/osmocom/sbcap/SBcAP_ProtocolIE-Container.h A include/osmocom/sbcap/SBcAP_ProtocolIE-ContainerList.h A include/osmocom/sbcap/SBcAP_ProtocolIE-Field.h A include/osmocom/sbcap/SBcAP_ProtocolIE-ID.h A include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h A include/osmocom/sbcap/SBcAP_Repetition-Period.h A include/osmocom/sbcap/SBcAP_Restarted-Cell-List-NR.h A include/osmocom/sbcap/SBcAP_Restarted-Cell-List.h A include/osmocom/sbcap/SBcAP_SBC-AP-PDU.h A include/osmocom/sbcap/SBcAP_ScheduledCellinEAI-Item.h A include/osmocom/sbcap/SBcAP_ScheduledCellinEAI.h A include/osmocom/sbcap/SBcAP_ScheduledCellinTAI-5GS.h A include/osmocom/sbcap/SBcAP_ScheduledCellinTAI-Item.h A include/osmocom/sbcap/SBcAP_ScheduledCellinTAI.h A include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h A include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h A include/osmocom/sbcap/SBcAP_Serial-Number.h A include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h A include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h A include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h A include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h A include/osmocom/sbcap/SBcAP_SuccessfulOutcome.h A include/osmocom/sbcap/SBcAP_TAC-5GS.h A include/osmocom/sbcap/SBcAP_TAC.h A include/osmocom/sbcap/SBcAP_TAI-5GS.h A include/osmocom/sbcap/SBcAP_TAI-Broadcast-List-5GS.h A include/osmocom/sbcap/SBcAP_TAI-Broadcast-List-Item.h A include/osmocom/sbcap/SBcAP_TAI-Broadcast-List.h A include/osmocom/sbcap/SBcAP_TAI-Cancelled-List-5GS.h A include/osmocom/sbcap/SBcAP_TAI-Cancelled-List-Item.h A include/osmocom/sbcap/SBcAP_TAI-Cancelled-List.h A include/osmocom/sbcap/SBcAP_TAI-List-for-Warning.h A include/osmocom/sbcap/SBcAP_TAI.h A include/osmocom/sbcap/SBcAP_TBCD-STRING.h A include/osmocom/sbcap/SBcAP_TriggeringMessage.h A include/osmocom/sbcap/SBcAP_TypeOfError.h A include/osmocom/sbcap/SBcAP_Unknown-5GS-Tracking-Area-List.h A include/osmocom/sbcap/SBcAP_Unknown-Tracking-Area-List.h A include/osmocom/sbcap/SBcAP_UnsuccessfulOutcome.h A include/osmocom/sbcap/SBcAP_Warning-Area-Coordinates.h A include/osmocom/sbcap/SBcAP_Warning-Area-List-5GS.h A include/osmocom/sbcap/SBcAP_Warning-Area-List.h A include/osmocom/sbcap/SBcAP_Warning-Message-Content.h A include/osmocom/sbcap/SBcAP_Warning-Security-Information.h A include/osmocom/sbcap/SBcAP_Warning-Type.h A include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h A include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h A include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h A include/osmocom/sbcap/sbcap_common.h A include/osmocom/sbcap/sbcap_internal.h A move-asn1-header-files.sh M src/Makefile.am A src/sbcap/Makefile.am A src/sbcap/asn1/SBC_AP_CommonDataTypes.asn A src/sbcap/asn1/SBC_AP_Constants.asn A src/sbcap/asn1/SBC_AP_Containers.asn A src/sbcap/asn1/SBC_AP_IEs.asn A src/sbcap/asn1/SBC_AP_PDU_Contents.asn A src/sbcap/asn1/SBC_AP_PDU_Descriptions.asn A src/sbcap/gen/ANY.c A src/sbcap/gen/ANY_aper.c A src/sbcap/gen/BIT_STRING.c A src/sbcap/gen/BIT_STRING_print.c A src/sbcap/gen/BIT_STRING_rfill.c A src/sbcap/gen/GraphicString.c A src/sbcap/gen/INTEGER.c A src/sbcap/gen/INTEGER_aper.c A src/sbcap/gen/INTEGER_print.c A src/sbcap/gen/INTEGER_rfill.c A src/sbcap/gen/NativeEnumerated.c A src/sbcap/gen/NativeEnumerated_aper.c A src/sbcap/gen/NativeInteger.c A src/sbcap/gen/NativeInteger_aper.c A src/sbcap/gen/NativeInteger_print.c A src/sbcap/gen/NativeInteger_rfill.c A src/sbcap/gen/OBJECT_IDENTIFIER.c A src/sbcap/gen/OBJECT_IDENTIFIER_print.c A src/sbcap/gen/OBJECT_IDENTIFIER_rfill.c A src/sbcap/gen/OCTET_STRING.c A src/sbcap/gen/OCTET_STRING_aper.c A src/sbcap/gen/OCTET_STRING_print.c A src/sbcap/gen/OCTET_STRING_rfill.c A src/sbcap/gen/OPEN_TYPE.c A src/sbcap/gen/OPEN_TYPE_aper.c A src/sbcap/gen/ObjectDescriptor.c A src/sbcap/gen/SBcAP_Broadcast-Cancelled-Area-List-5GS.c A src/sbcap/gen/SBcAP_Broadcast-Cancelled-Area-List.c A src/sbcap/gen/SBcAP_Broadcast-Empty-Area-List-5GS.c A src/sbcap/gen/SBcAP_Broadcast-Empty-Area-List.c A src/sbcap/gen/SBcAP_Broadcast-Scheduled-Area-List-5GS.c A src/sbcap/gen/SBcAP_Broadcast-Scheduled-Area-List.c A src/sbcap/gen/SBcAP_CancelledCellinEAI-Item.c A src/sbcap/gen/SBcAP_CancelledCellinEAI.c A src/sbcap/gen/SBcAP_CancelledCellinTAI-5GS.c A src/sbcap/gen/SBcAP_CancelledCellinTAI-Item.c A src/sbcap/gen/SBcAP_CancelledCellinTAI.c A src/sbcap/gen/SBcAP_Cause.c A src/sbcap/gen/SBcAP_CellID-Cancelled-Item.c A src/sbcap/gen/SBcAP_CellID-Cancelled-List-5GS.c A src/sbcap/gen/SBcAP_CellID-Cancelled-List.c A src/sbcap/gen/SBcAP_CellId-Broadcast-List-5GS.c A src/sbcap/gen/SBcAP_CellId-Broadcast-List-Item.c A src/sbcap/gen/SBcAP_CellId-Broadcast-List.c A src/sbcap/gen/SBcAP_CellIdentity.c A src/sbcap/gen/SBcAP_Concurrent-Warning-Message-Indicator.c A src/sbcap/gen/SBcAP_Criticality-Diagnostics.c A src/sbcap/gen/SBcAP_Criticality.c A src/sbcap/gen/SBcAP_CriticalityDiagnostics-IE-List.c A src/sbcap/gen/SBcAP_Data-Coding-Scheme.c A src/sbcap/gen/SBcAP_ECGIList.c A src/sbcap/gen/SBcAP_ENB-ID.c A src/sbcap/gen/SBcAP_EUTRAN-CGI.c A src/sbcap/gen/SBcAP_EXTERNAL.c A src/sbcap/gen/SBcAP_Emergency-Area-ID-List.c A src/sbcap/gen/SBcAP_Emergency-Area-ID.c A src/sbcap/gen/SBcAP_EmergencyAreaID-Broadcast-List-Item.c A src/sbcap/gen/SBcAP_EmergencyAreaID-Broadcast-List.c A src/sbcap/gen/SBcAP_EmergencyAreaID-Cancelled-Item.c A src/sbcap/gen/SBcAP_EmergencyAreaID-Cancelled-List.c A src/sbcap/gen/SBcAP_Error-Indication.c A src/sbcap/gen/SBcAP_Extended-Repetition-Period.c A src/sbcap/gen/SBcAP_Failed-Cell-List-NR.c A src/sbcap/gen/SBcAP_Failed-Cell-List.c A src/sbcap/gen/SBcAP_GNB-ID.c A src/sbcap/gen/SBcAP_Global-ENB-ID.c A src/sbcap/gen/SBcAP_Global-GNB-ID.c A src/sbcap/gen/SBcAP_Global-NgENB-ID.c A src/sbcap/gen/SBcAP_Global-RAN-Node-ID.c A src/sbcap/gen/SBcAP_InitiatingMessage.c A src/sbcap/gen/SBcAP_List-of-5GS-Cells-for-Failure.c A src/sbcap/gen/SBcAP_List-of-5GS-TAI-for-Restart.c A src/sbcap/gen/SBcAP_List-of-5GS-TAIs.c A src/sbcap/gen/SBcAP_List-of-EAIs-Restart.c A src/sbcap/gen/SBcAP_List-of-TAIs-Restart.c A src/sbcap/gen/SBcAP_List-of-TAIs.c A src/sbcap/gen/SBcAP_Message-Identifier.c A src/sbcap/gen/SBcAP_NR-CGI.c A src/sbcap/gen/SBcAP_NR-CGIList.c A src/sbcap/gen/SBcAP_NRCellIdentity.c A src/sbcap/gen/SBcAP_NgENB-ID.c A src/sbcap/gen/SBcAP_Number-of-Broadcasts-Requested.c A src/sbcap/gen/SBcAP_NumberOfBroadcasts.c A src/sbcap/gen/SBcAP_Omc-Id.c A src/sbcap/gen/SBcAP_PLMNidentity.c A src/sbcap/gen/SBcAP_PWS-Failure-Indication.c A src/sbcap/gen/SBcAP_PWS-Restart-Indication.c A src/sbcap/gen/SBcAP_Presence.c A src/sbcap/gen/SBcAP_ProcedureCode.c A src/sbcap/gen/SBcAP_ProtocolExtensionContainer.c A src/sbcap/gen/SBcAP_ProtocolExtensionField.c A src/sbcap/gen/SBcAP_ProtocolExtensionID.c A src/sbcap/gen/SBcAP_ProtocolIE-Container.c A src/sbcap/gen/SBcAP_ProtocolIE-ContainerList.c A src/sbcap/gen/SBcAP_ProtocolIE-Field.c A src/sbcap/gen/SBcAP_ProtocolIE-ID.c A src/sbcap/gen/SBcAP_RAT-Selector-5GS.c A src/sbcap/gen/SBcAP_Repetition-Period.c A src/sbcap/gen/SBcAP_Restarted-Cell-List-NR.c A src/sbcap/gen/SBcAP_Restarted-Cell-List.c A src/sbcap/gen/SBcAP_SBC-AP-PDU.c A src/sbcap/gen/SBcAP_ScheduledCellinEAI-Item.c A src/sbcap/gen/SBcAP_ScheduledCellinEAI.c A src/sbcap/gen/SBcAP_ScheduledCellinTAI-5GS.c A src/sbcap/gen/SBcAP_ScheduledCellinTAI-Item.c A src/sbcap/gen/SBcAP_ScheduledCellinTAI.c A src/sbcap/gen/SBcAP_Send-Stop-Warning-Indication.c A src/sbcap/gen/SBcAP_Send-Write-Replace-Warning-Indication.c A src/sbcap/gen/SBcAP_Serial-Number.c A src/sbcap/gen/SBcAP_Stop-All-Indicator.c A src/sbcap/gen/SBcAP_Stop-Warning-Indication.c A src/sbcap/gen/SBcAP_Stop-Warning-Request.c A src/sbcap/gen/SBcAP_Stop-Warning-Response.c A src/sbcap/gen/SBcAP_SuccessfulOutcome.c A src/sbcap/gen/SBcAP_TAC-5GS.c A src/sbcap/gen/SBcAP_TAC.c A src/sbcap/gen/SBcAP_TAI-5GS.c A src/sbcap/gen/SBcAP_TAI-Broadcast-List-5GS.c A src/sbcap/gen/SBcAP_TAI-Broadcast-List-Item.c A src/sbcap/gen/SBcAP_TAI-Broadcast-List.c A src/sbcap/gen/SBcAP_TAI-Cancelled-List-5GS.c A src/sbcap/gen/SBcAP_TAI-Cancelled-List-Item.c A src/sbcap/gen/SBcAP_TAI-Cancelled-List.c A src/sbcap/gen/SBcAP_TAI-List-for-Warning.c A src/sbcap/gen/SBcAP_TAI.c A src/sbcap/gen/SBcAP_TBCD-STRING.c A src/sbcap/gen/SBcAP_TriggeringMessage.c A src/sbcap/gen/SBcAP_TypeOfError.c A src/sbcap/gen/SBcAP_Unknown-5GS-Tracking-Area-List.c A src/sbcap/gen/SBcAP_Unknown-Tracking-Area-List.c A src/sbcap/gen/SBcAP_UnsuccessfulOutcome.c A src/sbcap/gen/SBcAP_Warning-Area-Coordinates.c A src/sbcap/gen/SBcAP_Warning-Area-List-5GS.c A src/sbcap/gen/SBcAP_Warning-Area-List.c A src/sbcap/gen/SBcAP_Warning-Message-Content.c A src/sbcap/gen/SBcAP_Warning-Security-Information.c A src/sbcap/gen/SBcAP_Warning-Type.c A src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c A src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c A src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c A src/sbcap/gen/aper_decoder.c A src/sbcap/gen/aper_encoder.c A src/sbcap/gen/aper_opentype.c A src/sbcap/gen/aper_support.c A src/sbcap/gen/asn_SEQUENCE_OF.c A src/sbcap/gen/asn_SET_OF.c A src/sbcap/gen/asn_application.c A src/sbcap/gen/asn_bit_data.c A src/sbcap/gen/asn_codecs_prim.c A src/sbcap/gen/asn_internal.c A src/sbcap/gen/asn_random_fill.c A src/sbcap/gen/ber_tlv_length.c A src/sbcap/gen/ber_tlv_tag.c A src/sbcap/gen/constr_CHOICE.c A src/sbcap/gen/constr_CHOICE_aper.c A src/sbcap/gen/constr_CHOICE_print.c A src/sbcap/gen/constr_CHOICE_rfill.c A src/sbcap/gen/constr_SEQUENCE.c A src/sbcap/gen/constr_SEQUENCE_OF.c A src/sbcap/gen/constr_SEQUENCE_OF_aper.c A src/sbcap/gen/constr_SEQUENCE_aper.c A src/sbcap/gen/constr_SEQUENCE_print.c A src/sbcap/gen/constr_SEQUENCE_rfill.c A src/sbcap/gen/constr_SET_OF.c A src/sbcap/gen/constr_SET_OF_aper.c A src/sbcap/gen/constr_SET_OF_print.c A src/sbcap/gen/constr_SET_OF_rfill.c A src/sbcap/gen/constr_TYPE.c A src/sbcap/gen/constraints.c A src/sbcap/gen/per_decoder.c A src/sbcap/gen/per_encoder.c A src/sbcap/gen/per_opentype.c A src/sbcap/gen/per_support.c A src/sbcap/sbcap_common.c A src/sbcap/skel/ANY.h A src/sbcap/skel/BIT_STRING.h A src/sbcap/skel/BMPString.h A src/sbcap/skel/BOOLEAN.h A src/sbcap/skel/ENUMERATED.h A src/sbcap/skel/GeneralString.h A src/sbcap/skel/GeneralizedTime.h A src/sbcap/skel/GraphicString.h A src/sbcap/skel/IA5String.h A src/sbcap/skel/INTEGER.h A src/sbcap/skel/ISO646String.h A src/sbcap/skel/NULL.h A src/sbcap/skel/NativeEnumerated.h A src/sbcap/skel/NativeInteger.h A src/sbcap/skel/NativeReal.h A src/sbcap/skel/NumericString.h A src/sbcap/skel/OBJECT_IDENTIFIER.h A src/sbcap/skel/OCTET_STRING.h A src/sbcap/skel/OPEN_TYPE.h A src/sbcap/skel/ObjectDescriptor.h A src/sbcap/skel/PrintableString.h A src/sbcap/skel/REAL.h A src/sbcap/skel/RELATIVE-OID.h A src/sbcap/skel/T61String.h A src/sbcap/skel/TeletexString.h A src/sbcap/skel/UTCTime.h A src/sbcap/skel/UTF8String.h A src/sbcap/skel/UniversalString.h A src/sbcap/skel/VideotexString.h A src/sbcap/skel/VisibleString.h A src/sbcap/skel/aper_decoder.h A src/sbcap/skel/aper_encoder.h A src/sbcap/skel/aper_opentype.h A src/sbcap/skel/aper_support.h A src/sbcap/skel/asn_SEQUENCE_OF.h A src/sbcap/skel/asn_SET_OF.h A src/sbcap/skel/asn_application.h A src/sbcap/skel/asn_bit_data.h A src/sbcap/skel/asn_codecs.h A src/sbcap/skel/asn_codecs_prim.h A src/sbcap/skel/asn_config.h A src/sbcap/skel/asn_internal.h A src/sbcap/skel/asn_ioc.h A src/sbcap/skel/asn_random_fill.h A src/sbcap/skel/asn_system.h A src/sbcap/skel/ber_decoder.h A src/sbcap/skel/ber_tlv_length.h A src/sbcap/skel/ber_tlv_tag.h A src/sbcap/skel/constr_CHOICE.h A src/sbcap/skel/constr_SEQUENCE.h A src/sbcap/skel/constr_SEQUENCE_OF.h A src/sbcap/skel/constr_SET.h A src/sbcap/skel/constr_SET_OF.h A src/sbcap/skel/constr_TYPE.h A src/sbcap/skel/constraints.h A src/sbcap/skel/der_encoder.h A src/sbcap/skel/jer_encoder.h A src/sbcap/skel/oer_decoder.h A src/sbcap/skel/oer_encoder.h A src/sbcap/skel/oer_support.h A src/sbcap/skel/per_decoder.h A src/sbcap/skel/per_encoder.h A src/sbcap/skel/per_opentype.h A src/sbcap/skel/per_support.h A src/sbcap/skel/uper_decoder.h A src/sbcap/skel/uper_encoder.h A src/sbcap/skel/uper_opentype.h A src/sbcap/skel/uper_support.h A src/sbcap/skel/xer_decoder.h A src/sbcap/skel/xer_encoder.h A src/sbcap/skel/xer_support.h 373 files changed, 50,364 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If76f8619a9b2d46af6d94b8ae49348b8514e53aa Gerrit-Change-Number: 28600 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Add unit tests for sbcap

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28601 ) Change subject: Add unit tests for sbcap ...................................................................... Add unit tests for sbcap This commit adds some minimum unit tests to validate encoding and decoding of SBc-AP ASN.1 APER format is working properly. Related: OS#4945 Change-Id: I5a26d008b7282da637c3781ae77435c6a69cf65d --- M configure.ac M tests/Makefile.am A tests/sbcap/Makefile.am A tests/sbcap/sbcap_test.c A tests/sbcap/sbcap_test.ok A tests/testsuite.at 6 files changed, 346 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 0cd3d32..c104f2c 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,7 @@ contrib/Makefile contrib/osmo-cbc.spec tests/Makefile + tests/sbcap/Makefile doc/Makefile doc/examples/Makefile doc/manuals/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index a77bd66..cad72df 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,50 @@ +SUBDIRS = \ + sbcap \ + $(NULL) +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = \ + testsuite.at \ + $(srcdir)/package.m4 \ + $(TESTSUITE) \ + $(NULL) + +TESTSUITE = $(srcdir)/testsuite DISTCLEANFILES = \ atconfig \ $(NULL) + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/tests/sbcap/Makefile.am b/tests/sbcap/Makefile.am new file mode 100644 index 0000000..844b4b0 --- /dev/null +++ b/tests/sbcap/Makefile.am @@ -0,0 +1,46 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/sbcap/skel \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(ULFIUS_CFLAGS) \ + $(JANSSON_CFLAGS) \ + $(ORCANIA_CFLAGS) \ + $(ASN_MODULE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +EXTRA_DIST = \ + sbcap_test.ok \ + $(NULL) + +check_PROGRAMS = \ + sbcap_test \ + $(NULL) + +sbcap_test_SOURCES = \ + sbcap_test.c \ + $(NULL) + +sbcap_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(ULFIUS_LIBS) \ + $(JANSSON_LIBS) \ + $(ORCANIA_LIBS) \ + $(LIBSCTP_LIBS) \ + $(top_builddir)/src/sbcap/libosmo-sbcap.la \ + $(NULL) diff --git a/tests/sbcap/sbcap_test.c b/tests/sbcap/sbcap_test.c new file mode 100644 index 0000000..5c5a4b0 --- /dev/null +++ b/tests/sbcap/sbcap_test.c @@ -0,0 +1,240 @@ +#include <osmocom/core/application.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/sbcap/sbcap_common.h> + +/* 3GPP TS 36.413 9.2.1.53 */ +#define SBCAP_WARN_MSG_CONTENTS_IE_MAX_LEN 9600 + +void test_asn1c_enc(void) +{ + struct msgb *msg; + SBcAP_SBC_AP_PDU_t *pdu; + SBcAP_Write_Replace_Warning_Request_IEs_t *ie; + uint16_t ie_warning_type = 0x01; + uint8_t ie_dcs = 2; + uint8_t ie_warning_sec_info[50] = {0x30, 0x40, 0x12, 0x23, 0x45}; + uint8_t ie_warning_msg_content[SBCAP_WARN_MSG_CONTENTS_IE_MAX_LEN] = {0x30, 0x40, 0x12, 0x23, 0x45}; + + static uint8_t ie_message_identifier[] = {0xab, 0x01}; + static uint8_t ie_serial_number[] = {0xab, 0xcd}; + + printf("==== %s ====\n", __func__); + + pdu = sbcap_pdu_alloc(); + pdu->present = SBcAP_SBC_AP_PDU_PR_initiatingMessage; + pdu->choice.initiatingMessage.procedureCode = SBcAP_ProcedureId_Write_Replace_Warning; + pdu->choice.initiatingMessage.criticality = SBcAP_Criticality_reject; + pdu->choice.initiatingMessage.value.present = SBcAP_InitiatingMessage__value_PR_Write_Replace_Warning_Request; + + A_SEQUENCE_OF(void) *as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Write_Replace_Warning_Request.protocolIEs.list; + + /* static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(5, SBcAP_Criticality_reject, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Message_Identifier); + ie->value.choice.Message_Identifier.buf = MALLOC(sizeof(ie_message_identifier)); + ie->value.choice.Message_Identifier.size = sizeof(ie_message_identifier); + ie->value.choice.Message_Identifier.bits_unused = 0; + memcpy(ie->value.choice.Message_Identifier.buf, ie_message_identifier, sizeof(ie_message_identifier)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* static const long asn_VAL_2_SBcAP_id_Serial_Number = 11; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(11, SBcAP_Criticality_reject, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Serial_Number); + ie->value.choice.Serial_Number.buf = MALLOC(sizeof(ie_serial_number)); + ie->value.choice.Serial_Number.size = sizeof(ie_serial_number); + ie->value.choice.Serial_Number.bits_unused = 0; + memcpy(ie->value.choice.Serial_Number.buf, ie_serial_number, sizeof(ie_serial_number)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* static const long asn_VAL_5_SBcAP_id_Repetition_Period = 10; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(10, SBcAP_Criticality_reject, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Repetition_Period); + ie->value.choice.Repetition_Period = 30; /*seconds */ + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* static const long asn_VAL_7_SBcAP_id_Number_of_Broadcasts_Requested = 7; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(7, SBcAP_Criticality_reject, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Number_of_Broadcasts_Requested); + ie->value.choice.Number_of_Broadcasts_Requested = 89; + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* Warning Type, 3GPP TS 36.413 sec 9.2.1.50: */ + /* static const long asn_VAL_8_SBcAP_id_Warning_Type = 18; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(18, SBcAP_Criticality_ignore, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Type); + ie->value.choice.Warning_Type.buf = MALLOC(sizeof(ie_warning_type)); + ie->value.choice.Warning_Type.size = sizeof(ie_warning_type); + ie_warning_type |= 0x0100; + ie_warning_type |= 0x0080; + memcpy(ie->value.choice.Warning_Type.buf, &ie_warning_type, sizeof(ie_warning_type)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* Warning Security Information, 3GPP TS 36.413 sec 9.2.1.51: */ + /*static const long asn_VAL_9_SBcAP_id_Warning_Security_Information = 17 */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(17, SBcAP_Criticality_ignore, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Security_Information); + ie->value.choice.Warning_Security_Information.buf = MALLOC(sizeof(ie_warning_sec_info)); + ie->value.choice.Warning_Security_Information.size = sizeof(ie_warning_sec_info); + memcpy(ie->value.choice.Warning_Security_Information.buf, ie_warning_sec_info, sizeof(ie_warning_sec_info)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + + /* static const long asn_VAL_10_SBcAP_id_Data_Coding_Scheme = 3; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(3, SBcAP_Criticality_ignore, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Data_Coding_Scheme); + ie->value.choice.Data_Coding_Scheme.buf = MALLOC(sizeof(ie_dcs)); + ie->value.choice.Data_Coding_Scheme.size = sizeof(ie_dcs); + ie->value.choice.Data_Coding_Scheme.bits_unused = 0; + memcpy(ie->value.choice.Data_Coding_Scheme.buf, &ie_dcs, sizeof(ie_dcs)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + /* 3GPP TS 36.413 9.2.1.53 Warning Message Contents */ + /* static const long asn_VAL_11_SBcAP_id_Warning_Message_Content = 16; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(16, SBcAP_Criticality_ignore, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Message_Content); + ie->value.choice.Warning_Message_Content.buf = MALLOC(sizeof(ie_warning_msg_content)); + ie->value.choice.Warning_Message_Content.size = 20; + memcpy(ie->value.choice.Warning_Message_Content.buf, ie_warning_msg_content, sizeof(ie_warning_msg_content)); + ASN_SEQUENCE_ADD(as_pdu, ie); + + msg = sbcap_encode(pdu); + ASN_STRUCT_FREE(asn_DEF_SBcAP_SBC_AP_PDU, pdu); + OSMO_ASSERT(msg); + + printf("Encoded message: %s\n", msgb_hexdump(msg)); + + msgb_free(msg); +} + +static void test_asn1c_dec(void) +{ + asn_dec_rval_t rval; + SBcAP_SBC_AP_PDU_t *pdu = sbcap_pdu_alloc(); + SBcAP_Write_Replace_Warning_Response_IEs_t *ie; + SBcAP_Message_Identifier_t *msg_id_ie; + SBcAP_Serial_Number_t *serial_nr_ie; + + printf("==== %s ====\n", __func__); +/* +SBc Application Part + SBC-AP-PDU: successfulOutcome (1) + successfulOutcome + procedureCode: id-Write-Replace-Warning (0) + criticality: reject (0) + value + Write-Replace-Warning-Response + protocolIEs: 3 items + Item 0: id-Message-Identifier + ProtocolIE-Field + id: id-Message-Identifier (5) + criticality: reject (0) + value + Message-Identifier: Unknown (43) + Item 1: id-Serial-Number + ProtocolIE-Field + id: id-Serial-Number (11) + criticality: reject (0) + value + Serial-Number: 4170 [bit length 16, 0100 0001 0111 0000 decimal value 16752] + 01.. .... .... .... = Geographical Scope: Display mode normal, PLMN wide (1) + ..00 0001 0111 .... = Message Code: 23 + .... .... .... 0000 = Update Number: 0 + Item 2: id-Cause + ProtocolIE-Field + id: id-Cause (1) + criticality: reject (0) + value + Cause: message-accepted (0) +*/ + uint8_t write_replace_warning_resp[] = { + 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x02, 0x00, + 0x2b, 0x00, 0x0b, 0x00, 0x02, 0x41, 0x70, 0x00, 0x01, 0x00, 0x01, 0x00 + }; + printf("Decoding message: %s\n", + osmo_hexdump(write_replace_warning_resp, sizeof(write_replace_warning_resp))); + rval = aper_decode_complete(NULL, &asn_DEF_SBcAP_SBC_AP_PDU, + (void **)&pdu, write_replace_warning_resp, sizeof(write_replace_warning_resp)); + OSMO_ASSERT(rval.code == RC_OK); + OSMO_ASSERT(pdu); + + OSMO_ASSERT(pdu->present = SBcAP_SBC_AP_PDU_PR_successfulOutcome); + OSMO_ASSERT(pdu->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); + OSMO_ASSERT(pdu->choice.successfulOutcome.criticality == SBcAP_Criticality_reject); + + A_SEQUENCE_OF(void) *as_pdu = NULL; + as_pdu = (void *)&pdu->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + OSMO_ASSERT(as_pdu); + OSMO_ASSERT(as_pdu->count == 3); + + /* Message-Identifier: */ + ie = ((SBcAP_Write_Replace_Warning_Response_IEs_t *)(as_pdu->array[0])); + OSMO_ASSERT(ie); + OSMO_ASSERT(ie->id == 5); + OSMO_ASSERT(ie->criticality == 0); + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_Message_Identifier); + msg_id_ie = &ie->value.choice.Message_Identifier; + OSMO_ASSERT(msg_id_ie->size == 2); + OSMO_ASSERT(osmo_load16be(msg_id_ie->buf) == 43); + + /* Serial-Number: */ + ie = ((SBcAP_Write_Replace_Warning_Response_IEs_t *)(as_pdu->array[1])); + OSMO_ASSERT(ie); + OSMO_ASSERT(ie->id == 11); + OSMO_ASSERT(ie->criticality == 0); + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_Serial_Number); + serial_nr_ie = &ie->value.choice.Serial_Number; + OSMO_ASSERT(serial_nr_ie->size == 2); + OSMO_ASSERT(serial_nr_ie->buf[0] == 0x41 && serial_nr_ie->buf[1] == 0x70); + + /* Cause: */ + ie = ((SBcAP_Write_Replace_Warning_Response_IEs_t *)(as_pdu->array[2])); + OSMO_ASSERT(ie); + OSMO_ASSERT(ie->id == 1); + OSMO_ASSERT(ie->criticality == 0); + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_Cause); + OSMO_ASSERT(ie->value.choice.Cause == 0); + + sbcap_pdu_free(pdu); + printf("Decoded message successfully\n"); +} + +static const struct log_info_cat log_categories[] = { + [0] = { + .name = "DSBcAP", + .description = "SBc Application Part (CBC-MME)", + .color = "\033[1;32m", + .enabled = 1, + .loglevel = LOGL_DEBUG, + }, +}; + +const struct log_info log_info = { + .cat = log_categories, + .num_cat = ARRAY_SIZE(log_categories), +}; + +int main(int argc, char **argv) +{ + void *ctx = talloc_named_const(NULL, 0, "mgcp_test"); + void *msgb_ctx = msgb_talloc_ctx_init(ctx, 0); + osmo_init_logging2(ctx, &log_info); + sbcap_set_log_area(0); + log_set_log_level(osmo_stderr_target, LOGL_DEBUG); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_use_color(osmo_stderr_target, 0); + + test_asn1c_enc(); + test_asn1c_dec(); + + OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0); + OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); + talloc_free(msgb_ctx); + printf("Done\n"); + return EXIT_SUCCESS; +} diff --git a/tests/sbcap/sbcap_test.ok b/tests/sbcap/sbcap_test.ok new file mode 100644 index 0000000..b67583a --- /dev/null +++ b/tests/sbcap/sbcap_test.ok @@ -0,0 +1,6 @@ +==== test_asn1c_enc ==== +Encoded message: 00 00 00 76 00 00 08 00 05 00 02 ab 01 00 0b 00 02 ab cd 00 0a 00 02 00 1e 00 07 00 02 00 59 00 12 40 02 81 01 00 11 40 32 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 40 01 02 00 10 40 16 00 13 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +==== test_asn1c_dec ==== +Decoding message: 20 00 00 14 00 00 03 00 05 00 02 00 2b 00 0b 00 02 41 70 00 01 00 01 00 +Decoded message successfully +Done diff --git a/tests/testsuite.at b/tests/testsuite.at new file mode 100644 index 0000000..8484980 --- /dev/null +++ b/tests/testsuite.at @@ -0,0 +1,8 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +AT_SETUP([sbcap]) +AT_KEYWORDS([sbcap]) +cat $abs_srcdir/sbcap/sbcap_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/sbcap/sbcap_test], [], [expout], [ignore]) +AT_CLEANUP 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I5a26d008b7282da637c3781ae77435c6a69cf65d Gerrit-Change-Number: 28601 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Patch Set 8: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Jul 2022 14:09:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Add sbcap library

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28600 ) Change subject: Add sbcap library ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If76f8619a9b2d46af6d94b8ae49348b8514e53aa Gerrit-Change-Number: 28600 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Jul 2022 14:08:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-bsc[2022q2]: smscb: Tx Failure and Restart Ind using CGI as cellID

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28618 ) Change subject: smscb: Tx Failure and Restart Ind using CGI as cellID ...................................................................... smscb: Tx Failure and Restart Ind using CGI as cellID Let's use CGI instead of LAC+CI, which contains only a subset of the information. Furthermore, It was noted that some third party (non-osmocom, non open source) CBCs don't support/like receiving LAC+CI, and expect to receive CGI instead. Related: SYS#5910 Change-Id: I33a6216f89496484cbb3921609fcd3ab90761c69 --- M src/osmo-bsc/smscb.c 1 file changed, 9 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/28618/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 0e9049f..32f8f98 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -481,20 +481,15 @@ { struct osmo_cbsp_decoded *cbsp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_RESTART); struct osmo_cbsp_cell_ent cell_ent; + struct osmo_cell_global_id *cgi; if (is_emerg) cbsp->u.restart.bcast_msg_type = 0x01; cbsp->u.restart.recovery_ind = 0x00; /* message data available */ - cbsp->u.restart.cell_list.id_discr = CELL_IDENT_LAC_AND_CI; + cbsp->u.restart.cell_list.id_discr = CELL_IDENT_WHOLE_GLOBAL; - cell_ent = (struct osmo_cbsp_cell_ent){ - .cell_id = { - .lac_and_ci = { - .lac = bts->location_area_code, - .ci = bts->cell_identity, - } - } - }; + cgi = bts_get_cgi(bts); + cell_ent.cell_id.global = *cgi; llist_add(&cell_ent.list, &cbsp->u.restart.cell_list.list); return cbsp_tx_decoded(cbc, cbsp); @@ -505,20 +500,15 @@ { struct osmo_cbsp_decoded *cbsp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_FAILURE); struct osmo_cbsp_fail_ent fail_ent; + struct osmo_cell_global_id *cgi; if (is_emerg) cbsp->u.failure.bcast_msg_type = 0x01; - fail_ent = (struct osmo_cbsp_fail_ent){ - .id_discr = CELL_IDENT_LAC_AND_CI, - .cell_id = { - .lac_and_ci = { - .lac = bts->location_area_code, - .ci = bts->cell_identity, - } - }, - .cause = OSMO_CBSP_CAUSE_CELL_BROADCAST_NOT_OPERATIONAL - }; + cgi = bts_get_cgi(bts); + fail_ent.id_discr = CELL_IDENT_WHOLE_GLOBAL; + fail_ent.cell_id.global = *cgi; + fail_ent.cause = OSMO_CBSP_CAUSE_CELL_BROADCAST_NOT_OPERATIONAL; llist_add(&fail_ent.list, &cbsp->u.failure.fail_list); return cbsp_tx_decoded(cbc, cbsp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2022q2 Gerrit-Change-Id: I33a6216f89496484cbb3921609fcd3ab90761c69 Gerrit-Change-Number: 28618 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-bsc[2022q2]: smscb: Tx Failure and Restart Ind for each Bcast Msg Type

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28619 ) Change subject: smscb: Tx Failure and Restart Ind for each Bcast Msg Type ...................................................................... smscb: Tx Failure and Restart Ind for each Bcast Msg Type As described in 3GPP TS 48.049: 7.8.2: "The RESTART message is sent once per broadcast message type as indicated by the Broadcast Message Type IE." 7.9.2: "The FAILURE message is sent once per broadcast message type as indicated by the Broadcast Message Type IE." Related: SYS#5910 Change-Id: I6668b55868cf534a3b59da5e11542abb8131d604 --- M src/osmo-bsc/smscb.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/28619/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 32f8f98..8e1c634 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -1131,6 +1131,7 @@ bts_cbch_timer_schedule(trx->bts); /* Start ETWS/PWS Primary Notification, if active */ bts_etws_bootstrap(trx->bts); + cbsp_tx_restart_bts(bts->network->cbc, true, bts); cbsp_tx_restart_bts(bts->network->cbc, false, bts); } } else { @@ -1138,6 +1139,7 @@ /* If timer is ongoing it means CBCH was available */ LOG_BTS(bts, DCBS, LOGL_INFO, "BTS becomes unavailable for CBCH\n"); osmo_timer_del(&bts->cbch_timer); + cbsp_tx_failure_bts(bts->network->cbc, true, bts); cbsp_tx_failure_bts(bts->network->cbc, false, bts); } /* else: CBCH was already unavailable before */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2022q2 Gerrit-Change-Id: I6668b55868cf534a3b59da5e11542abb8131d604 Gerrit-Change-Number: 28619 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]: Add sbcap library

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28600 ) Change subject: Add sbcap library ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If76f8619a9b2d46af6d94b8ae49348b8514e53aa Gerrit-Change-Number: 28600 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Jul 2022 14:02:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: debian: add packaging

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28605 ) Change subject: debian: add packaging ...................................................................... debian: add packaging Add initial debian packaging and a systemd service that starts osmo_dia2gsup. Given that dependencies listed in rebar.lock are not packaged in debian 11, this just uses rebar3 to download and compile the dependencies during the build. Resulting erlang files are installed to the following path, where they become available in the erlang shell (erl): /lib/erlang/lib/{name_of_component}/ebin/ Related: SYS#6006 Change-Id: Ic55bca1260f992d0ed8583e7c7fe948ba0160d4d --- M .gitignore A contrib/systemd/osmo_dia2gsup.service A debian/changelog A debian/compat A debian/control A debian/osmo-diameter2gsup.install A debian/rules A debian/source/format 8 files changed, 64 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: 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 diff --git a/.gitignore b/.gitignore index 587d7e9..0f543cd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,9 @@ src/diameter_3gpp* src/diameter_rfc* src/diameter_etsi* + +/debian/*.debhelper +/debian/files +/debian/osmo-diameter2gsup.substvars +/debian/osmo-diameter2gsup/ +/debian/debhelper-build-stamp diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service new file mode 100644 index 0000000..3ae9b68 --- /dev/null +++ b/contrib/systemd/osmo_dia2gsup.service @@ -0,0 +1,14 @@ +[Unit] +Description=Osmocom DIAMETER to GSUP translator +After=osmo-hlr.service + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo_dia2gsup" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup +ExecStart=/usr/bin/erl -noshell -sname osmo_dia2gsup -eval "osmo_dia2gsup:start()." +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..6e45d35 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +osmo-diameter2gsup (0.1.0) unstable; urgency=medium + + * Initial release. + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 14 Jul 2022 14:51:01 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..7d5b6a7 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: osmo-diameter2gsup +Maintainer: Osmocom Community <openbsc(a)lists.osmocom.org> +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, +Standards-Version: 4.5.0 + +Package: osmo-diameter2gsup +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom DIAMETER to GSUP translator + This can be used to translate DIAMETER requests (such as those by an EPC) + to the Osmocom specific GSUP protocol, which means you can use OsmoHLR + as a simplistic HSS. diff --git a/debian/osmo-diameter2gsup.install b/debian/osmo-diameter2gsup.install new file mode 100644 index 0000000..6d442ad --- /dev/null +++ b/debian/osmo-diameter2gsup.install @@ -0,0 +1,2 @@ +/contrib/systemd/osmo_dia2gsup.service /lib/systemd/system/ +/_lib/* /usr/lib/erlang/lib/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..607a359 --- /dev/null +++ b/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +build: + rebar3 compile + rebar3 escriptize + rebar3 eunit + for i in _build/default/lib/*; do \ + libdir=_lib/"$$(basename "$$i")"; \ + mkdir -pv "$$libdir"; \ + cp -rv "$$i/ebin" "$$libdir"; \ + done + find _lib -name .empty -delete + +clean: + rm -rf _build _lib + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ic55bca1260f992d0ed8583e7c7fe948ba0160d4d Gerrit-Change-Number: 28605 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: debian: add packaging

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28605 ) Change subject: debian: add packaging ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ic55bca1260f992d0ed8583e7c7fe948ba0160d4d Gerrit-Change-Number: 28605 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Jul 2022 14:00:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022