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

Change in libosmocore[master]: libosmocore: Transition to use of 'telnet_init_default'

by msuraev

Attention is currently required from: arehbein. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31093 ) Change subject: libosmocore: Transition to use of 'telnet_init_default' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie762d0c642021db1a6ef95333cd771351de86845 Gerrit-Change-Number: 31093 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Jan 2023 11:46:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bts[master]: Add SI10 support

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31039 ) Change subject: Add SI10 support ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I268ba716ded330a024a8f3c0d1bd2f28622cecab Gerrit-Change-Number: 31039 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 28 Jan 2023 11:42:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add more L1 signals to common part

by jolly

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31031 to look at the new patch set (#2). Change subject: Add more L1 signals to common part ...................................................................... Add more L1 signals to common part Change-Id: I295dc340d3d3a7cbb5aba5afe807746acbcde33f --- M include/osmocom/abis/e1_input.h M src/e1_input.c 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/31/31031/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I295dc340d3d3a7cbb5aba5afe807746acbcde33f Gerrit-Change-Number: 31031 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add function to set Sa bits to common part

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31032 to look at the new patch set (#2). Change subject: Add function to set Sa bits to common part ...................................................................... Add function to set Sa bits to common part Change-Id: I4f5f975f0e5f708ae573a1e1ce41c6a08c207fad --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input.c 3 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/32/31032/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4f5f975f0e5f708ae573a1e1ce41c6a08c207fad Gerrit-Change-Number: 31032 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add L1 signals to misdn driver

by jolly

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31033 to look at the new patch set (#4). Change subject: Add L1 signals to misdn driver ...................................................................... Add L1 signals to misdn driver Change-Id: Id8b6fad9b073cf92eee92a6906bf5b57af37e2f0 --- M include/mISDNif.h M src/input/misdn.c 2 files changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/33/31033/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id8b6fad9b073cf92eee92a6906bf5b57af37e2f0 Gerrit-Change-Number: 31033 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Use correct bit order of RAW channels at misdn driver

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31035 to look at the new patch set (#4). Change subject: Use correct bit order of RAW channels at misdn driver ...................................................................... Use correct bit order of RAW channels at misdn driver mISDN Kernel driver uses reversed bit order for RAW (transparent) channels. With this patch, the order is reversed. Now it uses the same bit order as RTP payload does. Also it uses same bit order as other drivers do, like dahdi and e1d. Change-Id: I77b899bceacdf5484ea9a841cad55775864b4c82 --- M src/input/misdn.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/35/31035/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I77b899bceacdf5484ea9a841cad55775864b4c82 Gerrit-Change-Number: 31035 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add setting of Sa bits to misdn driver

by jolly

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31034 to look at the new patch set (#4). Change subject: Add setting of Sa bits to misdn driver ...................................................................... Add setting of Sa bits to misdn driver Change-Id: I54205a2534a7638cc071888d853f9d6d312dc9f0 --- M src/input/misdn.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/34/31034/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I54205a2534a7638cc071888d853f9d6d312dc9f0 Gerrit-Change-Number: 31034 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add more L1 signals to common part

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31031 ) Change subject: Add more L1 signals to common part ...................................................................... Patch Set 1: (2 comments) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/31031/comment/1579fa08_8ba36a55 PS1, Line 245: S_L_INP_LINE_LOS, : S_L_INP_LINE_NOLOS, : S_L_INP_LINE_AIS, : S_L_INP_LINE_NOAIS, : S_L_INP_LINE_RAI, : S_L_INP_LINE_NORAI, : S_L_INP_LINE_SLIP_RX, : S_L_INP_LINE_SLIP_TX, > I understand the above signals, but what does the SA_BITS signal do? when is it supposed to be gener […] I will add a description of the location of the bits. https://gerrit.osmocom.org/c/libosmo-abis/+/31031/comment/fb4ec6db_5805a40f PS1, Line 370: uint8_t sa_bits; > IIUC this doesn't break ABI in struct size sense, since it's filling a hole. Yes, it checked it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I295dc340d3d3a7cbb5aba5afe807746acbcde33f Gerrit-Change-Number: 31031 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Jan 2023 10:08:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add L1 signals to misdn driver

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31033 ) Change subject: Add L1 signals to misdn driver ...................................................................... Patch Set 3: (1 comment) File src/input/misdn.c: https://gerrit.osmocom.org/c/libosmo-abis/+/31033/comment/fa2f86e5_ac9b6893 PS3, Line 115: LOGP(DLMI, LOGL_DEBUG, "L1_SIGNAL_LOS_OFF\n"); > I agree, a value_string migt make sense. […] I will put the signals into a value_string array. AIS/LOS/RAI may be received very often when the interface is not connected. (Due to noise.) A NOTICE would flood the log. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id8b6fad9b073cf92eee92a6906bf5b57af37e2f0 Gerrit-Change-Number: 31033 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Jan 2023 09:41:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-abis[master]: Add setting of Sa bits to misdn driver

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31034 ) Change subject: Add setting of Sa bits to misdn driver ...................................................................... Patch Set 3: (1 comment) File src/input/misdn.c: https://gerrit.osmocom.org/c/libosmo-abis/+/31034/comment/563568a2_9b07eace PS3, Line 302: uint8_t buffer[sizeof(struct mISDNhead) + sizeof(int)]; > uint32_t? Yes, int32_t/uint32_t describes it better, but kernel still uses (int). I will update this. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I54205a2534a7638cc071888d853f9d6d312dc9f0 Gerrit-Change-Number: 31034 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 28 Jan 2023 08:51:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: EF_Predefined: Decode first record different from others

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31056 ) Change subject: gsm_r: EF_Predefined: Decode first record different from others ...................................................................... Patch Set 3: (3 comments) File pySim/gsm_r.py: https://gerrit.osmocom.org/c/pysim/+/31056/comment/f718b69d_a519bd4f PS2, Line 254: EF_Predefined > self Done https://gerrit.osmocom.org/c/pysim/+/31056/comment/f4d0066e_5170ac03 PS2, Line 257: r = None > In Python (unlike C/C++), if/for/with statements do not have their own scope. ... so that there is no need to declare r outside of the if. https://gerrit.osmocom.org/c/pysim/+/31056/comment/8b48f75f_131cfca4 PS2, Line 259: EF_Predefined > self Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Gerrit-Change-Number: 31056 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jan 2023 22:19: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> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: EF_Predefined: Decode first record different from others

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31056 ) Change subject: gsm_r: EF_Predefined: Decode first record different from others ...................................................................... Patch Set 3: (2 comments) File pySim/gsm_r.py: https://gerrit.osmocom.org/c/pysim/+/31056/comment/f24ca68b_32990a70 PS2, Line 252: EF_Predefined > Done All class variables are accessible by class objects via self, as if they were set from __init__() or any other method. Accessing them via class name is possible, but might lead to errors e.g. in inherited classes redefining those class variables. https://gerrit.osmocom.org/c/pysim/+/31056/comment/bfbe924b_b47dc53b PS2, Line 257: r = None > Done In Python (unlike C/C++), if/for/with statements do not have their own scope. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Gerrit-Change-Number: 31056 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jan 2023 22:16:16 +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> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: Fix byte/nibble ordering of predefined_value1

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31057 ) Change subject: gsm_r: Fix byte/nibble ordering of predefined_value1 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0dd8994556548a17a0a3101225c23e804511717 Gerrit-Change-Number: 31057 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jan 2023 19:50:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: EF_Predefined: Decode first record different from others

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31056 ) Change subject: gsm_r: EF_Predefined: Decode first record different from others ...................................................................... Patch Set 3: Code-Review+2 (3 comments) File pySim/gsm_r.py: https://gerrit.osmocom.org/c/pysim/+/31056/comment/52668ac2_0c00d1a9 PS2, Line 252: EF_Predefined > I thought that only works for instance variables, but not for class variables? I can test, but I thi […] Done https://gerrit.osmocom.org/c/pysim/+/31056/comment/383e7597_f714042f PS2, Line 257: r = None > In that case: What would ensure that the scope of 'r' is not just within the "if" statement but in t […] Done https://gerrit.osmocom.org/c/pysim/+/31056/comment/11630541_4792e29b PS2, Line 261: EF_Predefined > self Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Gerrit-Change-Number: 31056 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 19:50:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: Prepare for decoding/encoding records differently based on record number

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/31055 ) Change subject: Prepare for decoding/encoding records differently based on record number ...................................................................... Prepare for decoding/encoding records differently based on record number In their infinite wisdom, the authors of the EIRENE FFFIS for GSM-R SIM cards invented yet a new way of encoding data in SIM card files: The first record of a file may be encoded differently than further records of files. Let's add the required infrastructure to pySim so that the encode and decode methods for record-oriented files get passed in the current record number. Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b Related: OS#5784 --- M pySim/apdu/ts_102_221.py M pySim/filesystem.py M pySim/sysmocom_sja2.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py 7 files changed, 46 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index ea45602..cd246b1 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -201,7 +201,7 @@ return b2h(self.rsp_data) method = getattr(self.file, 'decode_record_bin', None) if self.successful and callable(method): - return method(self.rsp_data) + return method(self.rsp_data, self.cmd_dict['record_number']) # TS 102 221 Section 11.1.6 class UpdateRecord(ApduCommand, n='UPDATE RECORD', ins=0xDC, cla=['0X', '4X', '6X']): @@ -217,7 +217,7 @@ return b2h(self.cmd_data) method = getattr(self.file, 'decode_record_bin', None) if self.successful and callable(method): - return method(self.cmd_data) + return method(self.cmd_data, self.cmd_dict['record_number']) # TS 102 221 Section 11.1.7 class SearchRecord(ApduCommand, n='SEARCH RECORD', ins=0xA2, cla=['0X', '4X', '6X']): diff --git a/pySim/filesystem.py b/pySim/filesystem.py index a3d1122..6dd1db7 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -945,7 +945,7 @@ self._construct = None self._tlv = None - def decode_record_hex(self, raw_hex_data: str) -> dict: + def decode_record_hex(self, raw_hex_data: str, record_nr: int) -> dict: """Decode raw (hex string) data into abstract representation. A derived class would typically provide a _decode_record_bin() or _decode_record_hex() @@ -954,16 +954,17 @@ Args: raw_hex_data : hex-encoded data + record_nr : record number (1 for first record, ...) Returns: abstract_data; dict representing the decoded data """ method = getattr(self, '_decode_record_hex', None) if callable(method): - return method(raw_hex_data) + return method(raw_hex_data, record_nr=record_nr) raw_bin_data = h2b(raw_hex_data) method = getattr(self, '_decode_record_bin', None) if callable(method): - return method(raw_bin_data) + return method(raw_bin_data, record_nr=record_nr) if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: @@ -972,7 +973,7 @@ return t.to_dict() return {'raw': raw_bin_data.hex()} - def decode_record_bin(self, raw_bin_data: bytearray) -> dict: + def decode_record_bin(self, raw_bin_data: bytearray, record_nr: int) -> dict: """Decode raw (binary) data into abstract representation. A derived class would typically provide a _decode_record_bin() or _decode_record_hex() @@ -981,16 +982,17 @@ Args: raw_bin_data : binary encoded data + record_nr : record number (1 for first record, ...) Returns: abstract_data; dict representing the decoded data """ method = getattr(self, '_decode_record_bin', None) if callable(method): - return method(raw_bin_data) + return method(raw_bin_data, record_nr=record_nr) raw_hex_data = b2h(raw_bin_data) method = getattr(self, '_decode_record_hex', None) if callable(method): - return method(raw_hex_data) + return method(raw_hex_data, record_nr=record_nr) if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: @@ -999,7 +1001,7 @@ return t.to_dict() return {'raw': raw_hex_data} - def encode_record_hex(self, abstract_data: dict) -> str: + def encode_record_hex(self, abstract_data: dict, record_nr: int) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1008,15 +1010,16 @@ Args: abstract_data : dict representing the decoded data + record_nr : record number (1 for first record, ...) Returns: hex string encoded data """ method = getattr(self, '_encode_record_hex', None) if callable(method): - return method(abstract_data) + return method(abstract_data, record_nr=record_nr) method = getattr(self, '_encode_record_bin', None) if callable(method): - raw_bin_data = method(abstract_data) + raw_bin_data = method(abstract_data, record_nr=record_nr) return b2h(raw_bin_data) if self._construct: return b2h(self._construct.build(abstract_data)) @@ -1027,7 +1030,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_record_bin(self, abstract_data: dict) -> bytearray: + def encode_record_bin(self, abstract_data: dict, record_nr : int) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1036,15 +1039,16 @@ Args: abstract_data : dict representing the decoded data + record_nr : record number (1 for first record, ...) Returns: binary encoded data """ method = getattr(self, '_encode_record_bin', None) if callable(method): - return method(abstract_data) + return method(abstract_data, record_nr=record_nr) method = getattr(self, '_encode_record_hex', None) if callable(method): - return h2b(method(abstract_data)) + return h2b(method(abstract_data, record_nr=record_nr)) if self._construct: return self._construct.build(abstract_data) elif self._tlv: @@ -1681,7 +1685,7 @@ abstract data contained in record """ (data, sw) = self.read_record(rec_nr) - return (self.selected_file.decode_record_hex(data), sw) + return (self.selected_file.decode_record_hex(data, rec_nr), sw) def update_record(self, rec_nr: int, data_hex: str): """Update a record with given binary data @@ -1702,7 +1706,7 @@ rec_nr : Record number to read data_hex : Abstract data to be written """ - data_hex = self.selected_file.encode_record_hex(data) + data_hex = self.selected_file.encode_record_hex(data, rec_nr) return self.update_record(rec_nr, data_hex) def retrieve_data(self, tag: int = 0): diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index a78318e..4967701 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -87,7 +87,7 @@ def __init__(self, fid='6f22', name='EF.0348_KEY', desc='TS 03.48 OTA Keys'): super().__init__(fid, name=name, desc=desc, rec_len=(27, 35)) - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): u = unpack('!BBB', raw_bin_data[0:3]) key_algo = (u[2] >> 6) & 1 key_length = ((u[2] >> 3) & 3) * 8 @@ -105,7 +105,7 @@ def __init__(self, fid='6f23', name='EF.0348_COUNT', desc='TS 03.48 OTA Counters'): super().__init__(fid, name=name, desc=desc, rec_len=(7, 7)) - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): u = unpack('!BB5s', raw_bin_data) return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2]} @@ -120,7 +120,7 @@ def __init__(self, fid='6f26', name='EF.GP_COUNT', desc='GP SCP02 Counters'): super().__init__(fid, name=name, desc=desc, rec_len=(5, 5)) - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): u = unpack('!BBHB', raw_bin_data) return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2], 'rfu': u[3]} @@ -129,7 +129,7 @@ def __init__(self, fid='6f27', name='EF.GP_DIV_DATA', desc='GP SCP02 key diversification data'): super().__init__(fid, name=name, desc=desc, rec_len=(12, 12)) - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): u = unpack('!BB8s', raw_bin_data) return {'sec_domain': u[0], 'key_set_version': u[1], 'key_div_data': u[2].hex()} diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 83ddb85..e180b28 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -608,13 +608,13 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=2, size=(2, None)) - def _decode_record_bin(self, bin_data): + def _decode_record_bin(self, bin_data, **kwargs): if bin_data == b'\xff\xff': return None else: return bin_data.decode('ascii') - def _encode_record_bin(self, in_json): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff' else: @@ -665,7 +665,7 @@ raise ValueError return by_mode - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) dec = arr_seq.decode_multi(raw_bin_data) @@ -673,7 +673,7 @@ # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0] - def _encode_record_bin(self, in_json): + def _encode_record_bin(self, in_json, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) return arr_seq.encode_multi(in_json) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 65a2afe..e68866c 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -515,14 +515,14 @@ desc='Language Indication'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) - def _decode_record_bin(self, in_bin): + def _decode_record_bin(self, in_bin, **kwargs): if in_bin == b'\xff\xff': return None else: # officially this is 7-bit GSM alphabet with one padding bit in each byte return in_bin.decode('ascii') - def _encode_record_bin(self, in_json): + def _encode_record_bin(self, in_json, **kwargs): if in_json == None: return b'\xff\xff' else: @@ -604,7 +604,7 @@ desc='Emergency Call Codes'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(4, 20)) - def _decode_record_bin(self, in_bin): + def _decode_record_bin(self, in_bin, **kwargs): # mandatory parts code = in_bin[:3] if code == b'\xff\xff\xff': @@ -618,7 +618,7 @@ ret['alpha_id'] = parse_construct(EF_ECC.alpha_construct, alpha_id) return ret - def _encode_record_bin(self, in_json): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff\xff\xff' code = EF_ECC.cc_construct.build(in_json['call_code']) @@ -753,7 +753,7 @@ def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size=(2, 4), rec_len=2, desc='RPLMN Last used Access Technology', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex): + def _decode_record_hex(self, in_hex, **kwargs): return dec_act(in_hex) # TODO: Encode diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 30df0b7..ee50ddb 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -142,11 +142,11 @@ def __init__(self, fid='6f09', sfid=None, name='EF.P-CSCF', desc='P-CSCF Address', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - def _decode_record_hex(self, raw_hex): + def _decode_record_hex(self, raw_hex, **kwargs): addr, addr_type = dec_addr_tlv(raw_hex) return {"addr": addr, "addr_type": addr_type} - def _encode_record_hex(self, json_in): + def _encode_record_hex(self, json_in, **kwargs): addr = json_in['addr'] addr_type = json_in['addr_type'] return enc_addr_tlv(addr, addr_type) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index d16ea72..bb49f13 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -356,7 +356,7 @@ def __init__(self, fid='6f3c', sfid=None, name='EF.SMS', desc='Short messages', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(176, 176), **kwargs) - def _decode_record_bin(self, raw_bin_data): + def _decode_record_bin(self, raw_bin_data, **kwargs): def decode_status(status): if status & 0x01 == 0x00: return (None, 'free_space') @@ -387,10 +387,10 @@ def __init__(self, fid='6f40', sfid=None, name='EF.MSISDN', desc='MSISDN', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(15, 34), **kwargs) - def _decode_record_hex(self, raw_hex_data): + def _decode_record_hex(self, raw_hex_data, **kwargs): return {'msisdn': dec_msisdn(raw_hex_data)} - def _encode_record_hex(self, abstract): + def _encode_record_hex(self, abstract, **kwargs): msisdn = abstract['msisdn'] if type(msisdn) == str: encoded_msisdn = enc_msisdn(msisdn) @@ -516,10 +516,10 @@ desc='Language Preference'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) - def _decode_record_bin(self, in_bin): + def _decode_record_bin(self, in_bin, **kwargs): return b2h(in_bin) - def _encode_record_bin(self, in_json): + def _encode_record_bin(self, in_json, **kwargs): return h2b(in_json) # TS 51.011 Section 10.3.2 @@ -566,13 +566,13 @@ size=(24, None), rec_len=3, **kwargs): super().__init__(fid, name=name, sfid=sfid, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex): + def _decode_record_hex(self, in_hex, **kwargs): if in_hex[:6] == "ffffff": return None else: return dec_plmn(in_hex) - def _encode_record_hex(self, in_json): + def _encode_record_hex(self, in_json, **kwargs): if in_json == None: return "ffffff" else: @@ -772,7 +772,7 @@ desc='Co-operative Network List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex): + def _decode_record_hex(self, in_hex, **kwargs): (in_plmn, sub, svp, corp) = unpack('!3sBBB', h2b(in_hex)) res = dec_plmn(b2h(in_plmn)) res['network_subset'] = sub @@ -780,7 +780,7 @@ res['corporate_id'] = corp return res - def _encode_record_hex(self, in_json): + def _encode_record_hex(self, in_json, **kwargs): plmn = enc_plmn(in_json['mcc'], in_json['mnc']) return b2h(pack('!3sBBB', h2b(plmn), @@ -815,13 +815,13 @@ def __init__(self, fid, sfid=None, name=None, desc=None, size=(40, None), rec_len=5, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex): + def _decode_record_hex(self, in_hex, **kwargs): if in_hex[:6] == "ffffff": return None else: return dec_xplmn_w_act(in_hex) - def _encode_record_hex(self, in_json): + def _encode_record_hex(self, in_json, **kwargs): if in_json == None: return "ffffff0000" else: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b Gerrit-Change-Number: 31055 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in pysim[master]: Prepare for decoding/encoding records differently based on record number

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31055 ) Change subject: Prepare for decoding/encoding records differently based on record number ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b Gerrit-Change-Number: 31055 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jan 2023 19:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: EF_Predefined: Decode first record different from others

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31056 ) Change subject: gsm_r: EF_Predefined: Decode first record different from others ...................................................................... Patch Set 2: (2 comments) File pySim/gsm_r.py: https://gerrit.osmocom.org/c/pysim/+/31056/comment/5ededd3a_bd49c57f PS2, Line 252: EF_Predefined > self I thought that only works for instance variables, but not for class variables? I can test, but I think I've run into problems with this at some other time. https://gerrit.osmocom.org/c/pysim/+/31056/comment/e16b8d6f_32cd1e5e PS2, Line 257: r = None > this line can be safely removed In that case: What would ensure that the scope of 'r' is not just within the "if" statement but in the entire method? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Gerrit-Change-Number: 31056 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 19:49:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in pysim[master]: gsm_r: EF_Predefined: Decode first record different from others

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/31056 to look at the new patch set (#3). Change subject: gsm_r: EF_Predefined: Decode first record different from others ...................................................................... gsm_r: EF_Predefined: Decode first record different from others In their infinite wisdom, the authors of the EIRENE FFFIS for GSM-R SIM cards invented yet a new way of encoding data in SIM card files: The first record of a file may be encoded differently than further records of files. This patch implements the feature based on the newly-introduced way by which we pass the record number to the encoder and decoder methods. Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Related: OS#5784 --- M pySim/gsm_r.py 1 file changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/31056/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib526f6c3c2ac9a945b8242e2e54536628376efc0 Gerrit-Change-Number: 31056 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 19:24:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 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

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 6 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:35:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: llc: remove unused reference to msgb address

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31090 ) Change subject: llc: remove unused reference to msgb address ...................................................................... llc: remove unused reference to msgb address This is probably a leftover from an old refactoring where the tv was moved to MetaInfo (msg->cb[]. Change-Id: I7aceaf2d13a125c75925877c4344c0aeed326c79 --- M src/llc.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/llc.c b/src/llc.c index 7d39d61..7745bd0 100644 --- a/src/llc.c +++ b/src/llc.c @@ -236,7 +236,7 @@ static struct msgb *llc_queue_pick_msg(struct gprs_llc_queue *q, enum gprs_llc_queue_prio *prio) { struct msgb *msg; - struct timespec *tv, tv_now, tv_result; + struct timespec tv_now, tv_result; uint32_t lifetime; unsigned int i; const struct MetaInfo *meta_storage; @@ -257,7 +257,6 @@ /* take the second time */ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); - tv = (struct timespec *)&msg->data[sizeof(*tv)]; timespecsub(&tv_now, &meta_storage->recv_time, &tv_result); lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7aceaf2d13a125c75925877c4344c0aeed326c79 Gerrit-Change-Number: 31090 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

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: llc: Refactor code checking if PDU expired while dequeueing

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31087 ) Change subject: llc: Refactor code checking if PDU expired while dequeueing ...................................................................... llc: Refactor code checking if PDU expired while dequeueing The previous function name was misleading since it was checking already for more stuff than pdu containing user data. Rename the function and move all checks on PDU in there instead of having it half in one place and half in the other. Change-Id: Ia0738caa1ccab5f78c2d49db582bdce96f18600a --- M src/llc.c 1 file changed, 8 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/llc.c b/src/llc.c index c283146..7d39d61 100644 --- a/src/llc.c +++ b/src/llc.c @@ -80,9 +80,12 @@ llc->length += len; } -static bool llc_is_user_data_frame(const uint8_t *data, size_t len) +static bool llc_pdu_can_be_discarded(const uint8_t *data, size_t len) { - if (len < 2) + const unsigned keep_small_thresh = 60; + + /* Is the frame small, perhaps only a TCP ACK? */ + if (len <= keep_small_thresh) return false; if ((data[0] & 0x0f) == 1 /* GPRS_SAPI_GMM */) @@ -271,7 +274,6 @@ struct gprs_rlcmac_bts *bts = q->ms->bts; struct gprs_pcu *pcu = bts->pcu; struct timespec hyst_delta = {0, 0}; - const unsigned keep_small_thresh = 60; enum gprs_llc_queue_prio prio; if (pcu->vty.llc_discard_csec) @@ -306,14 +308,9 @@ /* Hysteresis mode, try to discard LLC messages until * the low water mark has been reached */ - /* Check whether to abort the hysteresis mode */ - - /* Is the frame small, perhaps only a TCP ACK? */ - if (msg->len <= keep_small_thresh) - break; - - /* Is it a GMM message? */ - if (!llc_is_user_data_frame(msg->data, msg->len)) + /* Check whether to abort the hysteresis mode: + * Can the PDU be discarded according to its type? */ + if (!llc_pdu_can_be_discarded(msg->data, msg->len)) break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0738caa1ccab5f78c2d49db582bdce96f18600a Gerrit-Change-Number: 31087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: llc: remove unused reference to msgb address

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31090 ) Change subject: llc: remove unused reference to msgb address ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7aceaf2d13a125c75925877c4344c0aeed326c79 Gerrit-Change-Number: 31090 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 10:34:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: pespin. osmith 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+2 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 10:33:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: llc: Refactor code checking if PDU expired while dequeueing

by osmith

Attention is currently required from: pespin, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31087 ) Change subject: llc: Refactor code checking if PDU expired while dequeueing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0738caa1ccab5f78c2d49db582bdce96f18600a Gerrit-Change-Number: 31087 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 10:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/31095/1 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-MessageType: newchange

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 10:25:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/31094/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index c7cf1d8..96ac6af 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -446,10 +446,11 @@ }; /* GSM 08.08 3.2.2.11 Channel Type */ +#define GSM0808_DATA_FULL_RPREF GSM0808_DATA_FULL_PREF enum gsm0808_chan_rate_type_data { GSM0808_DATA_FULL_BM = 0x8, GSM0808_DATA_HALF_LM = 0x9, - GSM0808_DATA_FULL_RPREF = 0xa, + GSM0808_DATA_FULL_PREF = 0xa, GSM0808_DATA_HALF_PREF = 0xb, GSM0808_DATA_FULL_PREF_NO_CHANGE = 0x1a, GSM0808_DATA_HALF_PREF_NO_CHANGE = 0x1b, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 3 months

1
0
0 0

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

by pespin

Attention is currently required from: fixeria. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31077 to look at the new patch set (#5). Change subject: modem: Initial integration of libosmo-gprs-rlcmac ...................................................................... modem: Initial integration of libosmo-gprs-rlcmac This commit places code to forward unitdata LLC<->RLCMAC. Depends: libosmo-gprs.git Change-Id I1870fa6a264612c5a669bfb832e6e8c0a892cb74 Related: OS#5500 Change-Id: I0e628d9ddaa5ad6a205f07746d4176d1b8df7eb0 --- M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/rlcmac.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/llc.c A src/host/layer23/src/modem/rlcmac.c 8 files changed, 177 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/31077/5 -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: are reviwers wiating for something specific here I'm not aware of? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 6 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:49:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: SI: add missing header

by pespin

Attention is currently required from: fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31080 ) Change subject: SI: add missing header ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia7530e9c8a21f6f99f3aac7baea5cbb38763c4f3 Gerrit-Change-Number: 31080 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30982 ) Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:45:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30982 ) Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... Patch Set 6: (1 comment) File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/aed82998_11716e06 PS5, Line 119: if (resolve_local_neighbor(&neighbor_bts, bts, n)) { > Ah okay, is it a general Osmocom principle to return error codes as negative numbers always? I'd say it's a general principle in system programming :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:42:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: osmo-pcu: Transition to use of 'telnet_init_default'

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31092 ) Change subject: osmo-pcu: Transition to use of 'telnet_init_default' ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Please update TODO-RELEASE file stating a new version of libosmocore is required (for instance libosmocore > 1.7.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9559486ce64a9ccf348b4ee0e1d09141dbc1ae8f Gerrit-Change-Number: 31092 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:40:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: libosmocore: Transition to use of 'telnet_init_default'

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31093 ) Change subject: libosmocore: Transition to use of 'telnet_init_default' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie762d0c642021db1a6ef95333cd771351de86845 Gerrit-Change-Number: 31093 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:38:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: osmo-pcu: Transition to use of 'telnet_init_default'

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31092 ) Change subject: osmo-pcu: Transition to use of 'telnet_init_default' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9559486ce64a9ccf348b4ee0e1d09141dbc1ae8f Gerrit-Change-Number: 31092 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 09:37:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-pcu[master]: llc: remove unused reference to msgb address

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31090 ) Change subject: llc: remove unused reference to msgb address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7aceaf2d13a125c75925877c4344c0aeed326c79 Gerrit-Change-Number: 31090 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 07:59:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by arehbein

Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30982 ) Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... Patch Set 6: (6 comments) Patchset: PS3: > You went the wrong direction by moving that into "neighbor-bts", you need to revert that and go back […] I'm assuming that was correct after all, since someone (not me) marked this as resolved. To me it looks like it's in the right place (where "neighbor-bts add/del" also are) File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/a874b02d_0d1fc46b PS3, Line 118: llist_for_each_entry(n, &bts->neighbors, entry) { > I see what you mean now, "neighbor-bts" prefix means only those added by its bts_nr. […] I asked and it's how you understood it File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/11bd17da_3d51c7ca PS5, Line 113: cmd->reply = "bts not found."; > I don't see the error lines in other functions using a dot at the end. […] I actually copied this from somewhere else in the code, but I'll keep it in mind https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/2d3def39_f1b42ef6 PS5, Line 119: if (resolve_local_neighbor(&neighbor_bts, bts, n)) { > Better check against "< 0" here, as usual for system programming and error codes, it's clearer. […] Ah okay, is it a general Osmocom principle to return error codes as negative numbers always? https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/72e9ed49_f812615a PS5, Line 120: LOGP(DCTRL, LOGL_ERROR, "Error resolving neighbor entry for BTS %" PRIu8 ".\n", bts->nr); > I wouldn't log an error here, it is expected that some neighbors are remote (BTS under another BSSC) […] Done File tests/ctrl_test_runner.py: https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/66ed685e_2d18b1df PS5, Line 630: self.assertEqual(r['value'], None) > Shouldn't this be an empty string? Or is None simply somehow converted to an empty string? Yes it's converted, not sure if in the Python scripts or if the CTRL reply automatically omits message parts that would be empty strings. I initially put `two single quotes there, but then the assert would fail due to the conversion, because `None` was parsed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jan 2023 00:56:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by arehbein

Attention is currently required from: arehbein. Hello Jenkins Builder, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 to look at the new patch set (#6). Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) Related: SYS#6287 Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 --- M src/osmo-bsc/neighbor_ident_ctrl.c M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py 3 files changed, 115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/30982/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: libosmocore: Transition to use of 'telnet_init_default'

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31093 ) Change subject: libosmocore: Transition to use of 'telnet_init_default' ...................................................................... libosmocore: Transition to use of 'telnet_init_default' Replace remaining calls of telnet_init_dynif() by telnet_init_default() Related: OS#5809 Change-Id: Ie762d0c642021db1a6ef95333cd771351de86845 --- M tests/logging/logging_vty_test.c M tests/stats/stats_vty_test.c M tests/tdef/tdef_vty_config_root_test.c M tests/tdef/tdef_vty_config_subnode_test.c M tests/tdef/tdef_vty_dynamic_test.c M tests/vty/vty_transcript_test.c M utils/osmo-ns-dummy.c 7 files changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/31093/1 diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index 96b316d..15f7fc2 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -261,7 +261,7 @@ } } - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/tests/stats/stats_vty_test.c b/tests/stats/stats_vty_test.c index 09b125a..29cbf5e 100644 --- a/tests/stats/stats_vty_test.c +++ b/tests/stats/stats_vty_test.c @@ -70,7 +70,7 @@ osmo_stats_vty_add_cmds(); - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/tests/tdef/tdef_vty_config_root_test.c b/tests/tdef/tdef_vty_config_root_test.c index e2dbcb4..8c46d95 100644 --- a/tests/tdef/tdef_vty_config_root_test.c +++ b/tests/tdef/tdef_vty_config_root_test.c @@ -260,7 +260,7 @@ } } - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/tests/tdef/tdef_vty_config_subnode_test.c b/tests/tdef/tdef_vty_config_subnode_test.c index d4abe09..e3e165d 100644 --- a/tests/tdef/tdef_vty_config_subnode_test.c +++ b/tests/tdef/tdef_vty_config_subnode_test.c @@ -253,7 +253,7 @@ } } - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/tests/tdef/tdef_vty_dynamic_test.c b/tests/tdef/tdef_vty_dynamic_test.c index 715fa60..b646c54 100644 --- a/tests/tdef/tdef_vty_dynamic_test.c +++ b/tests/tdef/tdef_vty_dynamic_test.c @@ -327,7 +327,7 @@ } } - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 0f18f7e..1754b67 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -361,7 +361,7 @@ } } - rc = telnet_init_dynif(root_ctx, NULL, vty_get_bind_addr(), 42042); + rc = telnet_init_default(root_ctx, NULL, 42042); if (rc < 0) return 2; diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c index e2662a2..890444c 100644 --- a/utils/osmo-ns-dummy.c +++ b/utils/osmo-ns-dummy.c @@ -272,8 +272,7 @@ fprintf(stderr, "No config file: '%s' Using default config.\n", config_file); - rc = telnet_init_dynif(ctx, NULL, vty_get_bind_addr(), - vty_port); + rc = telnet_init_default(ctx, NULL, vty_port); if (rc < 0) { fprintf(stderr, "Error initializing telnet\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie762d0c642021db1a6ef95333cd771351de86845 Gerrit-Change-Number: 31093 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 3 months

1
0
0 0

2024

2023

2022

gerrit-log January 2023