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

Change in dahdi-linux[master]: How did this ever work... stdbool.h is not in the kernel.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26951 ) Change subject: How did this ever work... stdbool.h is not in the kernel. ...................................................................... How did this ever work... stdbool.h is not in the kernel. Change-Id: I36438e35bb99325e1ac86b68c1746670a9851e4a --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/voicebus/vpmoct.h M drivers/dahdi/wcaxx-base.c M drivers/dahdi/wct4xxp/base.c M drivers/dahdi/wct4xxp/vpm450m.c M drivers/dahdi/wctc4xxp/base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/wcte12xp/base.c M drivers/dahdi/wcte13xp-base.c M drivers/dahdi/wcte43x-base.c M drivers/dahdi/wcxb.c M drivers/dahdi/wcxb_spi.h 12 files changed, 0 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index cde56c1..96e4afd 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -86,7 +86,6 @@ #include "hpec/hpec_user.h" -#include <stdbool.h> #if defined(EMPULSE) && defined(EMFLASH) #error "You cannot define both EMPULSE and EMFLASH" diff --git a/drivers/dahdi/voicebus/vpmoct.h b/drivers/dahdi/voicebus/vpmoct.h index cb55826..5c90946 100644 --- a/drivers/dahdi/voicebus/vpmoct.h +++ b/drivers/dahdi/voicebus/vpmoct.h @@ -30,7 +30,6 @@ #include <linux/timer.h> #include "dahdi/kernel.h" -#include <stdbool.h> #define VPMOCT_FIRM_HEADER_LEN 32 #define VPMOCT_BOOT_RAM_LEN 128 diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c index b934960..8467767 100644 --- a/drivers/dahdi/wcaxx-base.c +++ b/drivers/dahdi/wcaxx-base.c @@ -34,7 +34,6 @@ #include <linux/firmware.h> #include <linux/crc32.h> -#include <stdbool.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 3412402..9d5b9a9 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -42,7 +42,6 @@ #include <linux/crc32.h> #include <linux/slab.h> -#include <stdbool.h> #include <dahdi/kernel.h> #include "wct4xxp.h" diff --git a/drivers/dahdi/wct4xxp/vpm450m.c b/drivers/dahdi/wct4xxp/vpm450m.c index 82a0463..38c68ab 100644 --- a/drivers/dahdi/wct4xxp/vpm450m.c +++ b/drivers/dahdi/wct4xxp/vpm450m.c @@ -28,7 +28,6 @@ #include <linux/version.h> #include <dahdi/kernel.h> -#include <stdbool.h> #include "vpm450m.h" #include <oct612x.h> diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 3bd56d1..7ff3456 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -39,7 +39,6 @@ #include <linux/etherdevice.h> #include <linux/timer.h> -#include <stdbool.h> #include <dahdi/kernel.h> diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 16bf384..6571f17 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -54,7 +54,6 @@ #include <linux/crc32.h> #include <linux/slab.h> -#include <stdbool.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) /* Define this if you would like to load the modules in parallel. While this diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index e8a5861..c73acdd 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -43,7 +43,6 @@ #include <linux/slab.h> -#include <stdbool.h> #include <dahdi/kernel.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c index b5f8043..69f7099 100644 --- a/drivers/dahdi/wcte13xp-base.c +++ b/drivers/dahdi/wcte13xp-base.c @@ -35,7 +35,6 @@ #include <linux/sched.h> #include <linux/crc32.h> -#include <stdbool.h> #include <dahdi/kernel.h> #include "wct4xxp/wct4xxp.h" /* For certain definitions */ diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c index 45b0f6c..d164a69 100644 --- a/drivers/dahdi/wcte43x-base.c +++ b/drivers/dahdi/wcte43x-base.c @@ -43,7 +43,6 @@ #include <linux/firmware.h> #include <oct612x.h> -#include <stdbool.h> #include <dahdi/kernel.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) diff --git a/drivers/dahdi/wcxb.c b/drivers/dahdi/wcxb.c index 122f9d3..3db22ee 100644 --- a/drivers/dahdi/wcxb.c +++ b/drivers/dahdi/wcxb.c @@ -36,7 +36,6 @@ #include <dahdi/kernel.h> -#include <stdbool.h> #include "wcxb.h" #include "wcxb_spi.h" diff --git a/drivers/dahdi/wcxb_spi.h b/drivers/dahdi/wcxb_spi.h index 418cd77..4575f14 100644 --- a/drivers/dahdi/wcxb_spi.h +++ b/drivers/dahdi/wcxb_spi.h @@ -24,7 +24,6 @@ #define __WCXB_SPI_H #include <linux/spi/spi.h> -#include <stdbool.h> struct wcxb_spi_transfer { const void *tx_buf; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I36438e35bb99325e1ac86b68c1746670a9851e4a Gerrit-Change-Number: 26951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: How did this ever work... stdbool.h is not in the kernel.

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26951 ) Change subject: How did this ever work... stdbool.h is not in the kernel. ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I36438e35bb99325e1ac86b68c1746670a9851e4a Gerrit-Change-Number: 26951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 20 Jan 2022 17:20:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 ) Change subject: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip ...................................................................... PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip The old values are not valid anymore when running against open5gs version 2.4.2. Most likely, the default addresses got changed during the PGW split-up (now it's open5gs-smfd and open5gs-upfd). Change-Id: I3dd7d1f0d4aebb94b8859e8d12e952917de35071 Related: SYS#5602 --- M pgw/PGW_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index f026e58..c526fa2 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -19,14 +19,14 @@ modulepar { - charstring mp_pgw_hostname := "127.0.0.3"; + charstring mp_pgw_hostname := "127.0.0.4"; charstring mp_local_hostname_c := "127.0.0.1"; charstring mp_local_hostname_u := "127.0.0.1"; charstring mp_run_prog_as_user := "laforge"; charstring mp_ping_hostname := "10.45.0.1"; - charstring mp_pcrf_local_ip := "127.0.0.5"; + charstring mp_pcrf_local_ip := "127.0.0.9"; integer mp_pcrf_local_port := 3868; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3dd7d1f0d4aebb94b8859e8d12e952917de35071 Gerrit-Change-Number: 26954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: fix timer not being started in f_uecups_xcei...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26952 ) Change subject: library/GTPv2_Emulation: fix timer not being started in f_uecups_xceive() ...................................................................... library/GTPv2_Emulation: fix timer not being started in f_uecups_xceive() This change fixes the following error: Dynamic test case error: None of the branches can be chosen in the alt statement in file GTPv2_Emulation.ttcn between lines 362 and 370. which may happen when osmo-uecups-daemon fails to create a tunnel due to insufficient permissions. Change-Id: Icb229aed7fa9dedcf999837ec6ad249ab4fdebb7 Related: SYS#5602 --- M library/GTPv2_Emulation.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 8074269..f07afcb 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -359,6 +359,7 @@ var UECUPS_RecvFrom mrf; UECUPS.send(t_UECUPS_Send(g_uecups_conn_id, tx)); + T.start; alt { [] UECUPS.receive(tr_UECUPS_RecvFrom_R(rx_t)) -> value mrf { } [] UECUPS.receive(tr_SctpAssocChange) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb229aed7fa9dedcf999837ec6ad249ab4fdebb7 Gerrit-Change-Number: 26952 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: fix f_create_session(): add missing Serving Network IE

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26953 ) Change subject: PGW_Tests: fix f_create_session(): add missing Serving Network IE ...................................................................... PGW_Tests: fix f_create_session(): add missing Serving Network IE open5gs-smfd version 2.4.2 requires this IE to be present: [smf] INFO: [Added] Number of SMF-UEs is now 1 (../src/smf/context.c:820) [smf] INFO: [Added] Number of SMF-Sessions is now 1 (../src/smf/context.c:2610) [smf] ERROR: No Serving Network (../src/smf/s5c-handler.c:101) [smf] ERROR: No Data in Serving Network (../src/smf/s5c-handler.c:105) [smf] ERROR: Invalid Len[0] in Serving Network (../src/smf/s5c-handler.c:110) Change-Id: Idf6d147cc4a37996ee4ae6de18158b0e140d9db6 Related: SYS#5602 --- M library/GTPv2_Templates.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 3d69017..644728e 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -1035,6 +1035,25 @@ privateExtension := * }}); +/* 8.18 */ +template (value) ServingNetwork +ts_GTP2C_ServingNetwork(template (value) hexstring mcc, + template (value) hexstring mnc, + template (value) BIT4 instance := '0000'B) := +{ + elementIdentifier := '53'O, + lengthIndicator := 0, /* overwritten */ + instance := instance, + spare := '0000'B, + mccDigit1 := mcc[0], + mccDigit2 := mcc[1], + mccDigit3 := mcc[2], + mncDigit3 := mnc[2], /* 'F'H for 2 digit MNC */ + mncDigit1 := mnc[0], + mncDigit2 := mnc[1], + additionalOctets := omit +} + } diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 81e3552..f026e58 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -305,6 +305,7 @@ var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; g2c.gtpcv2_pdu.createSessionRequest.userLocationInfo := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); if (DIAMETER_PROC.checkstate("Connected")) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf6d147cc4a37996ee4ae6de18158b0e140d9db6 Gerrit-Change-Number: 26953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 ) Change subject: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3dd7d1f0d4aebb94b8859e8d12e952917de35071 Gerrit-Change-Number: 26954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jan 2022 17:19:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: fix f_create_session(): add missing Serving Network IE

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26953 ) Change subject: PGW_Tests: fix f_create_session(): add missing Serving Network IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf6d147cc4a37996ee4ae6de18158b0e140d9db6 Gerrit-Change-Number: 26953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jan 2022 17:19:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: fix timer not being started in f_uecups_xcei...

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26952 ) Change subject: library/GTPv2_Emulation: fix timer not being started in f_uecups_xceive() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb229aed7fa9dedcf999837ec6ad249ab4fdebb7 Gerrit-Change-Number: 26952 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jan 2022 17:18:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 280 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/1 diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index 1606928..2662484 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -10,6 +10,7 @@ ranap_ies_defs.h \ ranap_common.h \ ranap_common_cn.h \ + ranap_common_ran.h \ ranap_msg_factory.h \ iu_helpers.h \ iu_client.h \ diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h index e9e7a2e..efffd25 100644 --- a/include/osmocom/ranap/ranap_common.h +++ b/include/osmocom/ranap/ranap_common.h @@ -651,3 +651,5 @@ int ranap_decode_procedure_code(const uint8_t *ranap_pdu_encoded, unsigned int len); + +typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index dfce358..7964b7c 100644 --- a/include/osmocom/ranap/ranap_common_cn.h +++ b/include/osmocom/ranap/ranap_common_cn.h @@ -5,8 +5,6 @@ #include <osmocom/ranap/ranap_common.h> #include <osmocom/ranap/ranap_ies_defs.h> -typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); - /* receive a connection-less RANAP message */ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/include/osmocom/ranap/ranap_common_ran.h b/include/osmocom/ranap/ranap_common_ran.h new file mode 100644 index 0000000..431a276 --- /dev/null +++ b/include/osmocom/ranap/ranap_common_ran.h @@ -0,0 +1,9 @@ +#pragma once + +#include <stdint.h> + +#include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/ranap_ies_defs.h> + +/* receive a connection-oriented RANAP message */ +int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/src/Makefile.am b/src/Makefile.am index 6c10564..0407fa3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,7 +75,7 @@ libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) ranap/libosmo-asn1-ranap.la libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c \ - ranap_common_cn.c iu_client.c iu_client_vty.c + ranap_common_cn.c ranap_common_ran.c iu_client.c iu_client_vty.c libosmo_rua_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) libosmo_rua_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c new file mode 100644 index 0000000..1a0b222 --- /dev/null +++ b/src/ranap_common_ran.c @@ -0,0 +1,267 @@ +/* RANAP interface for a ran-network node */ + +/* (C) 2015 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <unistd.h> +#include <errno.h> +#include <string.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> + +#include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/ranap_common_ran.h> +#include <osmocom/ranap/ranap_ies_defs.h> + +#define DRANAP _ranap_DRANAP + +static int ran_ranap_rx_initiating_msg_co(void *ctx, RANAP_InitiatingMessage_t * imsg, ranap_message * message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO IM (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + rc = ranap_decode_rab_assignmentrequesties(&message->msg.raB_AssignmentRequestIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_Iu_Release: + rc = ranap_decode_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP Procedure %s (CO, IM) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + } + + return rc; +} + +static void ran_ranap_free_initiating_msg_co(ranap_message * message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + ranap_free_rab_assignmentrequesties(&message->msg.raB_AssignmentRequestIEs); + break; + case RANAP_ProcedureCode_id_Iu_Release: + ranap_free_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " + "Procedure %s (CO, IM) from RNC\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + +static int cn_ranap_rx_successful_msg_co(void *ctx, RANAP_SuccessfulOutcome_t * imsg, ranap_message * message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO SO (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* RAB assignment response */ + rc = ranap_decode_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + /* Security Mode Complete */ + rc = ranap_decode_securitymodecompleteies(&message->msg.securityModeCompleteIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + rc = ranap_decode_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "Procedure %s (SO) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + } + + return rc; +} + +static void cn_ranap_free_successful_msg_co(ranap_message * message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* RAB assignment response */ + ranap_free_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + /* Security Mode Complete */ + ranap_free_securitymodecompleteies(&message->msg.securityModeCompleteIEs); + break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + ranap_free_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " + "Procedure %s (SO) from RNC\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + +static int cn_ranap_rx_outcome_msg_co(void *ctx, RANAP_Outcome_t * imsg, ranap_message * message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO O (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* RAB assignment response */ + rc = ranap_decode_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "Procedure %s (O) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + } + + return rc; +} + +static void cn_ranap_free_outcome_msg_co(ranap_message * message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* RAB assignment response */ + ranap_free_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " + "Procedure %s (O) from RNC\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + +static int _ran_ranap_rx_co(void *ctx, RANAP_RANAP_PDU_t * pdu, ranap_message * message) +{ + int rc = 0; + + switch (pdu->present) { + case RANAP_RANAP_PDU_PR_initiatingMessage: + rc = ran_ranap_rx_initiating_msg_co(ctx, &pdu->choice.initiatingMessage, message); + break; + case RANAP_RANAP_PDU_PR_successfulOutcome: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "successful outcome procedure %s (CO) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, pdu->choice.unsuccessfulOutcome.procedureCode)); + rc = -1; + break; + case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "unsuccessful outcome procedure %s (CO) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, pdu->choice.unsuccessfulOutcome.procedureCode)); + rc = -1; + break; + case RANAP_RANAP_PDU_PR_outcome: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "outcome procedure %s (CO) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, pdu->choice.unsuccessfulOutcome.procedureCode)); + rc = -1; + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "presence %s (CO) from RNC, ignoring\n", get_value_string(ranap_presence_vals, pdu->present)); + rc = -1; + break; + } + + return rc; +} + +static void _ran_ranap_free_co(ranap_message * message) +{ + switch (message->direction) { + case RANAP_RANAP_PDU_PR_initiatingMessage: + ran_ranap_free_initiating_msg_co(message); + break; + case RANAP_RANAP_PDU_PR_successfulOutcome: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " + "unsuccessful outcome procedure (CO) from RNC\n"); + break; + case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " + "unsuccessful outcome procedure (CO) from RNC\n"); + break; + case RANAP_RANAP_PDU_PR_outcome: + LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " + "unsuccessful outcome procedure (CO) from RNC\n"); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "presence %s (CO) from RNC, ignoring\n", + get_value_string(ranap_presence_vals, message->direction)); + break; + } +} + +/* receive a connection-oriented RANAP message and call + * cn_ranap_handle_co() with the resulting ranap_message struct */ +int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +{ + RANAP_RANAP_PDU_t *pdu = NULL; + ranap_message message; + asn_dec_rval_t dec_ret; + int rc; + + memset(&message, 0, sizeof(message)); + + dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); + return -1; + } + + message.direction = pdu->present; + + rc = _ran_ranap_rx_co(ctx, pdu, &message); + + if (rc == 0) + (*cb) (ctx, &message); + else + LOGP(DRANAP, LOGL_ERROR, "Not calling ran_ranap_handle_co() due to rc=%d\n", rc); + + /* Free the asn1 structs in message */ + _ran_ranap_free_co(&message); + + ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 ) Change subject: PGW_Tests: update default values for mp_pgw_hostname/mp_pcrf_local_ip ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3dd7d1f0d4aebb94b8859e8d12e952917de35071 Gerrit-Change-Number: 26954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jan 2022 15:18:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022