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

Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Fix 3GPP Spec number

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 ) Change subject: DIAMETER_Templates: Fix 3GPP Spec number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 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: I33d437593a13a92151e33e86534e2189b541b5ea Gerrit-Change-Number: 31097 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jan 2023 18:41:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Fix 3GPP Spec number

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 ) Change subject: DIAMETER_Templates: Fix 3GPP Spec number ...................................................................... DIAMETER_Templates: Fix 3GPP Spec number It's 3GPP TS 29.272, not 29.262. Change-Id: I33d437593a13a92151e33e86534e2189b541b5ea --- M library/DIAMETER_Templates.ttcn 1 file changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/31097/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 964708f..67cd78d 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -563,7 +563,7 @@ -/* TS 29.262 7.3.53 RAND */ +/* TS 29.272 7.3.53 RAND */ template (value) GenericAVP ts_AVP_RAND(template (value) octetstring rand) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_RAND), @@ -573,7 +573,7 @@ } } -/* TS 29.262 7.3.54 XRES */ +/* TS 29.272 7.3.54 XRES */ template (value) GenericAVP ts_AVP_XRES(template (value) octetstring xres) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_XRES), @@ -583,7 +583,7 @@ } } -/* TS 29.262 7.3.55 XRES */ +/* TS 29.272 7.3.55 XRES */ template (value) GenericAVP ts_AVP_AUTN(template (value) octetstring autn) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AUTN), @@ -593,7 +593,7 @@ } } -/* TS 29.262 7.3.56 KASME */ +/* TS 29.272 7.3.56 KASME */ template (value) GenericAVP ts_AVP_KASME(template (value) octetstring kasme) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), @@ -603,7 +603,7 @@ } } -/* TS 29.262 7.3.23 Item-Number */ +/* TS 29.272 7.3.23 Item-Number */ template (value) GenericAVP ts_AVP_ItemNumber(uint32_t num) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), @@ -613,7 +613,7 @@ } } -/* TS 29.262 7.3.18 E-UTRAN Vector */ +/* TS 29.272 7.3.18 E-UTRAN Vector */ template (value) GenericAVP ts_AVP_EutranVec(uint32_t item_num, octetstring rand, octetstring xres, octetstring autn, octetstring kasme) := { avp := { @@ -630,7 +630,7 @@ } } -/* TS 29.262 7.3.2 Subscription-Data */ +/* TS 29.272 7.3.2 Subscription-Data */ template (value) GenericAVP ts_AVP_3GPP_SubscriptionData(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscription_Data), @@ -650,7 +650,7 @@ } -/* TS 29.262 7.3.17 Authentication-Info */ +/* TS 29.272 7.3.17 Authentication-Info */ template (value) GenericAVP ts_AVP_3GPP_AuthInfo(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Authentication_Info), @@ -669,7 +669,7 @@ } } -/* TS 29.262 7.3.9 Visited-PLMN-Id */ +/* TS 29.272 7.3.9 Visited-PLMN-Id */ template (value) GenericAVP ts_AVP_3GPP_VisitedPlmnId(template (value) octetstring id) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), @@ -687,7 +687,7 @@ } } -/* TS 29.262 7.3.13 RAT-Type */ +/* TS 29.272 7.3.13 RAT-Type */ template (value) GenericAVP ts_AVP_PCC_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), @@ -714,7 +714,7 @@ } } -/* TS 29.262 7.3.7 ULR-Flags */ +/* TS 29.272 7.3.7 ULR-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), @@ -732,7 +732,7 @@ } } -/* TS 29.262 7.3.8 ULA-Flags */ +/* TS 29.272 7.3.8 ULA-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlaFlags(template (value) UINT32 flags) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), @@ -785,7 +785,7 @@ } -/* TS 29.262 7.3.27 Context-Identifier */ +/* TS 29.272 7.3.27 Context-Identifier */ template (value) GenericAVP ts_AVP_3GPP_ContextId(uint32_t ctx) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Context_Identifier), @@ -795,7 +795,7 @@ } } -/* Ts 29.262 7.3.29 Subscriber-Status */ +/* Ts 29.272 7.3.29 Subscriber-Status */ template (value) GenericAVP ts_AVP_3GPP_SubscriberStatus(template (value) AAA_3GPP_Subscriber_Status sts) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscriber_Status), @@ -814,7 +814,7 @@ } } -/* TS 29.262 7.3.33 All-APN-Configurations-Included-Indicator */ +/* TS 29.272 7.3.33 All-APN-Configurations-Included-Indicator */ template (value) GenericAVP ts_AVP_3GPP_AllApnConfigsIncl(template (value) AAA_3GPP_All_APN_Configurations_Included_Indicator ind := All_APN_CONFIGURATIONS_INCLUDED) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_All_APN_Configurations_Included_Indicator), @@ -824,7 +824,7 @@ } } -/* TS 29.262 7.3.34 APN-Configuration-Profile */ +/* TS 29.272 7.3.34 APN-Configuration-Profile */ template (value) GenericAVP ts_AVP_3GPP_ApnConfigProfile(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), @@ -834,7 +834,7 @@ } } -/* TS 29.262 7.3.35 APN-Configuration */ +/* TS 29.272 7.3.35 APN-Configuration */ template (value) GenericAVP ts_AVP_3GPP_ApnConfig(uint32_t ctx, AAA_3GPP_PDN_Type pdn_type, charstring apn) := { avp := { @@ -850,7 +850,7 @@ } } -/* TS 29.262 7.3.36 Service-Selection (refers to RFC 5778) */ +/* TS 29.272 7.3.36 Service-Selection (refers to RFC 5778) */ template (value) GenericAVP ts_AVP_ServiceSelection(charstring apn) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection), @@ -949,7 +949,7 @@ } -/* TS 29.262 7.3.41 AMBR */ +/* TS 29.272 7.3.41 AMBR */ template (value) GenericAVP ts_AVP_3GPP_AMBR(uint32_t ul, uint32_t dl) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AMBR), @@ -1142,7 +1142,7 @@ } } -/* TS 29.262 7.3.62 PDN-Type */ +/* TS 29.272 7.3.62 PDN-Type */ template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_PDN_Type), @@ -1348,7 +1348,7 @@ tr_AVP_3GPP_VisitedPlmnId )); -/* TS 29.262 5.2.3.1 + 7.2.6 Authentication Information Answer */ +/* TS 29.272 5.2.3.1 + 7.2.6 Authentication Information Answer */ template (value) PDU_DIAMETER ts_DIA_AIA(template (value) AVP_list auth_info_contents, template (value) octetstring sess_id := c_def_sess_id, @@ -1391,7 +1391,7 @@ )); -/* TS 29.262 7.2.3 Update Location Request */ +/* TS 29.272 7.2.3 Update Location Request */ template (value) PDU_DIAMETER ts_DIA_ULR(/* template (value) */ hexstring imsi, template (value) octetstring sess_id := c_def_sess_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 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: I33d437593a13a92151e33e86534e2189b541b5ea Gerrit-Change-Number: 31097 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in pysim[master]: filesystem: add unit tests for encoder/decoder methods

by laforge

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/24012 ) Change subject: filesystem: add unit tests for encoder/decoder methods ...................................................................... Patch Set 8: (4 comments) Patchset: PS8: I'm going to try to resurrect this after not receiving any updates for a very long time File tests/test_files.py: https://gerrit.osmocom.org/c/pysim/+/24012/comment/041b7790_4c538a5f PS4, Line 57: for testvec_json in ef.__class__._encode_decode_testvector: > I do not understand what you mean. […] The problem without subTest is that it simply stops a the first assert and doesn't continue to check any of the other tests. https://gerrit.osmocom.org/c/pysim/+/24012/comment/e9365221_b53a4b45 PS4, Line 94: for obj in gc.get_objects(): > Using garbage collector for finding all instances of CardEF is an option, but how can you be sure th […] we already have utils.py:all_subclasses() for getting that recursive list. https://gerrit.osmocom.org/c/pysim/+/24012/comment/2c85d811_e83fd3d0 PS4, Line 96: if not file_in_list(test_candidates, obj.name): > Would be nice to implement the concept of sub-tests here for each file: […] Ack -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I02d884547f4982e0b8ed7ef21b8cda75237942e2 Gerrit-Change-Number: 24012 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Falkenber9 <robert.falkenberg(a)tu-dortmund.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 13:52:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in pysim[master]: ts_51_011: Implement Extended BCD Coding

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31066 ) Change subject: ts_51_011: Implement Extended BCD Coding ...................................................................... Patch Set 2: (1 comment) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/31066/comment/dd3adffb_b258fb4c PS2, Line 366: 'dialing_nr'/ExtendedBcdAdapter(BcdAdapter(Rpad(Bytes(10)))), > But then it's not really a BcdAdapter, if it simply translates the */# characters? I don't want to b […] I thought about the naming when writing the code, and the problem is that it *is* and adapter in the construct world. It also *does* convert BCD. Just not from bytes to BCD but it translates a BCD string to an Extended BCD string. So if you really wanted to be clear, you would have to rename the old BcdAdpater to BytesToBcdAdapter, and then the new one to BcdToExtdBcdAdapter or soemthing like that. In the end I didn't come up with a clean solution that doesn't need to rename everything. I'm also not convinced why we would always only directly convert between bytes and extended BCD like you presented. There may be BCD data which is already in form of a string of digits whcih we want to interpret as extended BCD. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifcec13e9b296dba7bec34b7872192b7ce185c23c Gerrit-Change-Number: 31066 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 13:42:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: Mark *_fsm_timeouts as static

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31096 to look at the new patch set (#2). Change subject: Mark *_fsm_timeouts as static ...................................................................... Mark *_fsm_timeouts as static After some earlier refactoring, those fields are only used internally in the module, and hence can be marked as static. Change-Id: Ibf2a6ee5636ae7102ffd13b7497769652bcc3202 --- M src/tbf_dl_ass_fsm.c M src/tbf_dl_ass_fsm.h M src/tbf_dl_fsm.c M src/tbf_fsm.c M src/tbf_ul_ack_fsm.c M src/tbf_ul_ack_fsm.h M src/tbf_ul_ass_fsm.c M src/tbf_ul_ass_fsm.h M src/tbf_ul_fsm.c 9 files changed, 32 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/31096/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibf2a6ee5636ae7102ffd13b7497769652bcc3202 Gerrit-Change-Number: 31096 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: cosmetic: Remove unneeded curly braces

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31095 ) Change subject: cosmetic: Remove unneeded curly braces ...................................................................... cosmetic: Remove unneeded curly braces Change-Id: I6d87f11ff749d027685bf539a81f43d35ff98e9a --- M src/gprs_rlcmac_sched.cpp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 0a72e3b..314fd58 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -162,9 +162,8 @@ msg = tbf_dl_ass_create_rlcmac_msg(tbfs->dl_ass, pdch, fn); else if (tbf == tbfs->ul_ack) msg = tbf_ul_ack_create_rlcmac_msg(tbfs->ul_ack, pdch, fn); - else if (tbf == tbfs->nacc) { + else if (tbf == tbfs->nacc) msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf, pdch, fn); - } if (!msg) { tbf = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6d87f11ff749d027685bf539a81f43d35ff98e9a Gerrit-Change-Number: 31095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: Mark *_fsm_timeouts as static

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31096 ) Change subject: Mark *_fsm_timeouts as static ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibf2a6ee5636ae7102ffd13b7497769652bcc3202 Gerrit-Change-Number: 31096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 12:45:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: cosmetic: Remove unneeded curly braces

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31095 ) Change subject: cosmetic: Remove unneeded curly braces ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6d87f11ff749d027685bf539a81f43d35ff98e9a Gerrit-Change-Number: 31095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 12:44:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: Mark *_fsm_timeouts as static

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31096 ) Change subject: Mark *_fsm_timeouts as static ...................................................................... Mark *_fsm_timeouts as static After some earlier refactoring, those fields are only used internally in the module, and hence can be marked as static. Change-Id: Ibf2a6ee5636ae7102ffd13b7497769652bcc3202 --- M src/tbf_dl_ass_fsm.c M src/tbf_dl_ass_fsm.h M src/tbf_dl_fsm.c M src/tbf_ul_ack_fsm.c M src/tbf_ul_ack_fsm.h M src/tbf_ul_ass_fsm.c M src/tbf_ul_ass_fsm.h M src/tbf_ul_fsm.c 8 files changed, 32 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/31096/1 diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c index dec7042..d5e3646 100644 --- a/src/tbf_dl_ass_fsm.c +++ b/src/tbf_dl_ass_fsm.c @@ -31,7 +31,7 @@ #define X(s) (1 << (s)) -const struct osmo_tdef_state_timeout tbf_dl_ass_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout tbf_dl_ass_fsm_timeouts[32] = { [TBF_DL_ASS_NONE] = {}, [TBF_DL_ASS_SEND_ASS] = {}, [TBF_DL_ASS_WAIT_ACK] = {}, @@ -45,6 +45,15 @@ { 0, NULL } }; +/* Transition to a state, using the T timer defined in tbf_dl_ass_fsm_timeouts. + * The actual timeout value is in turn obtained from conn->T_defs. + * Assumes local variable fi exists. */ +#define tbf_dl_ass_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ + tbf_dl_ass_fsm_timeouts, \ + the_pcu->T_defs, \ + -1) + struct msgb *create_packet_dl_assign(const struct tbf_dl_ass_fsm_ctx *ctx, const struct tbf_dl_ass_ev_create_rlcmac_msg_ctx *d) { diff --git a/src/tbf_dl_ass_fsm.h b/src/tbf_dl_ass_fsm.h index b0000ca..cb7be8d 100644 --- a/src/tbf_dl_ass_fsm.h +++ b/src/tbf_dl_ass_fsm.h @@ -41,16 +41,6 @@ struct gprs_rlcmac_tbf* tbf; /* back pointer */ }; -extern const struct osmo_tdef_state_timeout tbf_dl_ass_fsm_timeouts[32]; -/* Transition to a state, using the T timer defined in tbf_dl_ass_fsm_timeouts. - * The actual timeout value is in turn obtained from conn->T_defs. - * Assumes local variable fi exists. */ -#define tbf_dl_ass_fsm_state_chg(fi, NEXT_STATE) \ - osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ - tbf_dl_ass_fsm_timeouts, \ - the_pcu->T_defs, \ - -1) - extern struct osmo_fsm tbf_dl_ass_fsm; diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index 6b455da..a0b1c03 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -29,7 +29,7 @@ #define X(s) (1 << (s)) -const struct osmo_tdef_state_timeout tbf_dl_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout tbf_dl_fsm_timeouts[32] = { [TBF_ST_NEW] = {}, [TBF_ST_ASSIGN] = { }, [TBF_ST_FLOW] = { }, diff --git a/src/tbf_ul_ack_fsm.c b/src/tbf_ul_ack_fsm.c index e2299d4..264ea9e 100644 --- a/src/tbf_ul_ack_fsm.c +++ b/src/tbf_ul_ack_fsm.c @@ -33,7 +33,7 @@ #define X(s) (1 << (s)) -const struct osmo_tdef_state_timeout tbf_ul_ack_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout tbf_ul_ack_fsm_timeouts[32] = { [TBF_UL_ACK_ST_NONE] = {}, [TBF_UL_ACK_ST_SCHED_UL_ACK] = {}, [TBF_UL_ACK_ST_WAIT_ACK] = {}, @@ -47,6 +47,15 @@ { 0, NULL } }; +/* Transition to a state, using the T timer defined in tbf_ul_ack_fsm_timeouts. + * The actual timeout value is in turn obtained from conn->T_defs. + * Assumes local variable fi exists. */ +#define tbf_ul_ack_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ + tbf_ul_ack_fsm_timeouts, \ + the_pcu->T_defs, \ + -1) + static struct msgb *create_ul_ack_nack(const struct tbf_ul_ack_fsm_ctx *ctx, const struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *d, bool final) diff --git a/src/tbf_ul_ack_fsm.h b/src/tbf_ul_ack_fsm.h index d0005eb..3f34f31 100644 --- a/src/tbf_ul_ack_fsm.h +++ b/src/tbf_ul_ack_fsm.h @@ -42,16 +42,6 @@ struct gprs_rlcmac_ul_tbf *tbf; /* back pointer */ }; -extern const struct osmo_tdef_state_timeout tbf_ul_ack_fsm_timeouts[32]; -/* Transition to a state, using the T timer defined in tbf_ul_ack_fsm_timeouts. - * The actual timeout value is in turn obtained from conn->T_defs. - * Assumes local variable fi exists. */ -#define tbf_ul_ack_fsm_state_chg(fi, NEXT_STATE) \ - osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ - tbf_ul_ack_fsm_timeouts, \ - the_pcu->T_defs, \ - -1) - extern struct osmo_fsm tbf_ul_ack_fsm; diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index e15f21c..6c31e1e 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -31,7 +31,7 @@ #define X(s) (1 << (s)) -const struct osmo_tdef_state_timeout tbf_ul_ass_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout tbf_ul_ass_fsm_timeouts[32] = { [TBF_UL_ASS_NONE] = {}, [TBF_UL_ASS_SEND_ASS] = {}, [TBF_UL_ASS_SEND_ASS_REJ] = {}, @@ -48,6 +48,15 @@ { 0, NULL } }; +/* Transition to a state, using the T timer defined in tbf_ul_ass_fsm_timeouts. + * The actual timeout value is in turn obtained from conn->T_defs. + * Assumes local variable fi exists. */ +#define tbf_ul_ass_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ + tbf_ul_ass_fsm_timeouts, \ + the_pcu->T_defs, \ + -1) + static struct msgb *create_packet_access_reject(const struct tbf_ul_ass_fsm_ctx *ctx) { struct msgb *msg; diff --git a/src/tbf_ul_ass_fsm.h b/src/tbf_ul_ass_fsm.h index a978e91..28a09dc 100644 --- a/src/tbf_ul_ass_fsm.h +++ b/src/tbf_ul_ass_fsm.h @@ -44,16 +44,6 @@ struct gprs_rlcmac_tbf* tbf; /* back pointer */ }; -extern const struct osmo_tdef_state_timeout tbf_ul_ass_fsm_timeouts[32]; -/* Transition to a state, using the T timer defined in tbf_ul_ass_fsm_timeouts. - * The actual timeout value is in turn obtained from conn->T_defs. - * Assumes local variable fi exists. */ -#define tbf_ul_ass_fsm_state_chg(fi, NEXT_STATE) \ - osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ - tbf_ul_ass_fsm_timeouts, \ - the_pcu->T_defs, \ - -1) - extern struct osmo_fsm tbf_ul_ass_fsm; diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c index fb4a256..571c689 100644 --- a/src/tbf_ul_fsm.c +++ b/src/tbf_ul_fsm.c @@ -29,7 +29,7 @@ #define X(s) (1 << (s)) -const struct osmo_tdef_state_timeout tbf_ul_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout tbf_ul_fsm_timeouts[32] = { [TBF_ST_NEW] = {}, [TBF_ST_ASSIGN] = { }, [TBF_ST_FLOW] = { }, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibf2a6ee5636ae7102ffd13b7497769652bcc3202 Gerrit-Change-Number: 31096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-rlcmac

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31077 ) Change subject: modem: Initial integration of libosmo-gprs-rlcmac ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0e628d9ddaa5ad6a205f07746d4176d1b8df7eb0 Gerrit-Change-Number: 31077 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 10:37:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023