lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

August 2022

  • 3 participants
  • 2402 discussions
Change in osmo-ttcn3-hacks[master]: hnbap: Use protocolExtensions := * in tr and omit in ts templates
by daniel 24 Aug '22

24 Aug '22
Attention is currently required from: laforge, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 ) Change subject: hnbap: Use protocolExtensions := * in tr and omit in ts templates ...................................................................... Patch Set 3: (1 comment) File library/hnbap/HNBAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206/comment/7c7e9566_da79… PS2, Line 93: ts_HNBAP_HNBRegisterRequest > Something is wrong here: […] Right, thanks for noticing. I first tried to make it work without all the copy/paste with the "template modifies" syntax, but that didn't seem to be happy about template functions. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 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: Ic8f9afc9d74507f7d73f52cefc92ed1c2dc4b1bc Gerrit-Change-Number: 29206 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Aug 2022 12:01:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbap: Use protocolExtensions := * in tr and omit in ts templates
by fixeria 24 Aug '22

24 Aug '22
Attention is currently required from: laforge, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 ) Change subject: hnbap: Use protocolExtensions := * in tr and omit in ts templates ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File library/hnbap/HNBAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206/comment/9dd07386_e80f… PS2, Line 93: ts_HNBAP_HNBRegisterRequest Something is wrong here: * this is a send (ts_) template, so it should be '(value)', not '(present)'; * all arguments should also be '(value)' or '(omit)', not '(present)'; * there should be no '?' nor '*' in send templates. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 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: Ic8f9afc9d74507f7d73f52cefc92ed1c2dc4b1bc Gerrit-Change-Number: 29206 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Aug 2022 11:54:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in pysim[master]: Add new pySim.ota library, implement SIM OTA crypto
by Christian Amsüss 24 Aug '22

24 Aug '22
Attention is currently required from: laforge, pespin, dexter. Christian Amsüss has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29033 ) Change subject: Add new pySim.ota library, implement SIM OTA crypto ...................................................................... Patch Set 7: (4 comments) File pySim/ota.py: https://gerrit.osmocom.org/c/pysim/+/29033/comment/f6c2c89c_c57bb312 PS4, Line 44: S 102 225 Table 5 : ota_status_codes = bidict({ : 0x00: 'PoR OK', : 0x01: 'RC/CC/DS failed', : 0x02: 'CNTR low', : 0x03: 'CNTR high', : 0x04: 'CNTR blocked', : 0x05: 'Ciphering error', : 0x06: 'Unidentified security error', : 0x07: 'Insufficient memory', : 0x08: 'more time', : 0x09: 'TAR unknown', : 0x0a: 'Insufficient security level', : 0x0b: 'Actual Response in SMS-SUBMIT', # 31.115 : 0x0c: 'Actual Response in USSD', # 31.115 : }) > yes, that can be removed. […] Ack https://gerrit.osmocom.org/c/pysim/+/29033/comment/397c5293_41284fbb PS4, Line 120: algo_auth: str, kid_idx: int, kid: bytes, cntr: int = 0): I still think we'd have a more secure-in-use API if we removed the default cntr and added a note in the docstring along the lines of: > Setting the cntr to a constant value (e.g. cntr=0) is only recommended in experimentation, testing (especially to obtain reproducible ciphertexts) and research. Whenever commands need to be secured against adversaries that could intercept the messages, the caller needs to ensure that the same counter value is not used twice for any key. Thus, users in testing / research actively have to acknowledge that they do something that'd be dangerous in production, and users who ship this have an easier time finding the right place to adjust the demo code they find. File pySim/ota.py: https://gerrit.osmocom.org/c/pysim/+/29033/comment/66ee6149_01287e6b PS5, Line 416: res = self.SmsResponsePacket.parse(remainder) > I'm not sure I understand you here. […] The bad part about an exception is that aborting would be unwarranted. If `spi['por_shall_be_ciphered']`, then decoding the remainder would yield garbage (only what's in the if-clause below, decoding the deciphered remainder yields good data). Decoding is currently obviously rather lax, in that it even accepts the "garbage" data it currently decodes, but if that decode step got stricter, it'd be a toss-up whether the ciphertext happens to be a valid SmsResponsePacket (in which case the function can continue, and the garbage in `res` is never accessed) or it happens to be invalid (which would be no surprise), and an exception is raised about data that is neither expected to be usable nor actually used (as `res` would be overwritten with the correct result in the if-clause, if only execution got there). File pySim/sms.py: https://gerrit.osmocom.org/c/pysim/+/29033/comment/627e5a1d_91beacc0 PS5, Line 30: ie_c = Struct('offset'/Tell, 'iei'/Int8ub, 'length'/Int8ub, 'data'/Bytes(this.length)) > updated version pushed. I don't see that in change set 7 yet -- I was referring to the changes in I0d95e62c1e7183a7851d1fe38df0f5133830cb1f which look like: ``` class UserDataHeader: # a single IE in the user data header - ie_c = Struct('offset'/Tell, 'iei'/Int8ub, 'length'/Int8ub, 'data'/Bytes(this.length)) + ie_c = Struct('iei'/Int8ub, 'length'/Int8ub, 'value'/Bytes(this.length)) # parser for the full UDH: Length octet followed by sequence of IEs - _construct = Struct('udhl'/Int8ub, - # FIXME: somehow the below lambda is not working, we always only get the first IE? - 'ies'/RepeatUntil(lambda obj,lst,ctx: ctx._io.tell() > 1+this.udhl, ie_c)) + _construct = Struct('ies'/Prefixed(Int8ub, GreedyRange(ie_c)), + 'data'/GreedyBytes) ``` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I193ff4712c8503279c017b4b1324f0c3d38b9f84 Gerrit-Change-Number: 29033 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Aug 2022 11:53:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbgw: Add test to check for duplicate hnb registrations
by daniel 24 Aug '22

24 Aug '22
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29198 ) Change subject: hnbgw: Add test to check for duplicate hnb registrations ...................................................................... hnbgw: Add test to check for duplicate hnb registrations Change-Id: Ib20d07ffabb91dfa82c212aaa363cafc7496bba8 Related: OS#6084 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 33 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 7429c38..d3d3a36 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -208,7 +208,7 @@ } -const integer NUM_HNB := 1; +const integer NUM_HNB := 2; type record HnbConfig { LocationAreaIdentification lai, @@ -320,13 +320,6 @@ /* global initialization function */ function f_init(charstring id := "HNBGW", float guard_timeout := 30.0) runs on test_CT { - g_hnb_cfg[0] := { - lai := { - mcc_mnc := '00101'H, - lac := 2342 - }, - sac := 55 - } T_guard.start(guard_timeout); activate(as_Tguard()); @@ -336,6 +329,13 @@ unitdata_cb := refers(IuhRanapUnitdataCallback) }; for (var integer i := 0; i < NUM_HNB; i := i+1) { + g_hnb_cfg[i] := { + lai := { + mcc_mnc := '00101'H, + lac := 2342 + i + }, + sac := 55 + }; f_init_hnodeb(testcasename(), i, rua_ops); } @@ -374,7 +374,7 @@ /* helper function to start all of the simulated hNodeBs */ function f_start_hnbs() runs on test_CT { for (var integer i:= 0; i < NUM_HNB; i := i+1) { - f_hnbap_register(i); + f_hnbap_register(i, i); } } @@ -634,13 +634,13 @@ ***********************************************************************/ -function f_hnbap_register(integer hnb_idx := 0) runs on test_CT +function f_hnbap_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT { timer T := 2.0; HNBAP[hnb_idx].send(tr_HNBAP_HNBRegisterRequest(char2oct("TTCN3 HNodeB"), '00F110'O, - int2bit(1 + hnb_idx, 28), + int2bit(1 + cell_id, 28), int2oct(2, 2), int2oct(3, 1), int2oct(4, 2))); @@ -648,13 +648,24 @@ T.start; alt { [] HNBAP[hnb_idx].receive(tr_HNBAP_HNBRegisterAccept(?)) { - setverdict(pass); + if (expect_reject) { + setverdict(fail, "Rx HNB Register Accept while expecting reject"); + } else { + setverdict(pass); + } + } + [] HNBAP[hnb_idx].receive(tr_HNBAP_HNBRegisterReject(?)) { + if (expect_reject) { + setverdict(pass); + } else { + setverdict(fail, "Rx HNB Register Reject while expecting accept"); + } } [] HNBAP[hnb_idx].receive(IUHEM_Event:?) { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for HNB Register Accept"); + setverdict(fail, "Timeout waiting for HNB Register response"); } } } @@ -665,6 +676,14 @@ f_shutdown_helper(); } +testcase TC_hnb_register_duplicate() runs on test_CT { + f_init(); + f_hnbap_register(0); + f_hnbap_register(1, 0, expect_reject := true); + f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); + f_shutdown_helper(); +} + /*********************************************************************** * RUA / RANAP Testing ***********************************************************************/ @@ -1322,6 +1341,7 @@ control { execute(TC_hnb_register()); + execute(TC_hnb_register_duplicate()); execute(TC_ranap_cs_initial_ue()); execute(TC_ranap_ps_initial_ue()); execute(TC_ranap_cs_initial_ue_empty_cr()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29198 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: Ib20d07ffabb91dfa82c212aaa363cafc7496bba8 Gerrit-Change-Number: 29198 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbap: Add tr_HNBAP_HNBRegisterReject
by daniel 24 Aug '22

24 Aug '22
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29197 ) Change subject: hnbap: Add tr_HNBAP_HNBRegisterReject ...................................................................... hnbap: Add tr_HNBAP_HNBRegisterReject Change-Id: Ide006cac4fcdc062614f53fb95970feb51d63731 Related: OS#5656 --- M library/hnbap/HNBAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/hnbap/HNBAP_Templates.ttcn b/library/hnbap/HNBAP_Templates.ttcn index b199799..0e62291 100644 --- a/library/hnbap/HNBAP_Templates.ttcn +++ b/library/hnbap/HNBAP_Templates.ttcn @@ -132,6 +132,26 @@ } /* 9.1.5 HNB REGISTER REJECT */ +template (present) HNBAP_PDU +tr_HNBAP_HNBRegisterReject(template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_HNBRegister, + criticality := reject, + value_ := { + HNBRegisterReject := { + protocolIEs := { + { + id := HNBAP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } + }, + protocolExtensions := * /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + template (value) HNBAP_PDU ts_HNBAP_HNBRegisterReject(template (value) Cause cause) := { unsuccessfulOutcome := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29197 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: Ide006cac4fcdc062614f53fb95970feb51d63731 Gerrit-Change-Number: 29197 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbgw: Add test to check for duplicate hnb registrations
by fixeria 24 Aug '22

24 Aug '22
Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29198 ) Change subject: hnbgw: Add test to check for duplicate hnb registrations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29198 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: Ib20d07ffabb91dfa82c212aaa363cafc7496bba8 Gerrit-Change-Number: 29198 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Aug 2022 11:44:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbap: Add tr_HNBAP_HNBRegisterReject
by fixeria 24 Aug '22

24 Aug '22
Attention is currently required from: laforge, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29197 ) Change subject: hnbap: Add tr_HNBAP_HNBRegisterReject ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29197 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: Ide006cac4fcdc062614f53fb95970feb51d63731 Gerrit-Change-Number: 29197 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Aug 2022 11:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-ttcn3-hacks[master]: hnbap: Use protocolExtensions := * in tr and omit in ts templates
by daniel 24 Aug '22

24 Aug '22
Attention is currently required from: daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 to look at the new patch set (#2). Change subject: hnbap: Use protocolExtensions := * in tr and omit in ts templates ...................................................................... hnbap: Use protocolExtensions := * in tr and omit in ts templates Change-Id: Ic8f9afc9d74507f7d73f52cefc92ed1c2dc4b1bc --- M hnbgw/HNBGW_Tests.ttcn M library/hnbap/HNBAP_Templates.ttcn 2 files changed, 62 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/29206/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 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: Ic8f9afc9d74507f7d73f52cefc92ed1c2dc4b1bc Gerrit-Change-Number: 29206 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset
1 0
0 0
Change in osmo-hnbgw[master]: hnbgw_hnbap: Fix memory leaks in HNBAP handling
by daniel 24 Aug '22

24 Aug '22
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29199 ) Change subject: hnbgw_hnbap: Fix memory leaks in HNBAP handling ...................................................................... hnbgw_hnbap: Fix memory leaks in HNBAP handling * Use osmo_stream closed_cb to call hnb_context_release() in all cases * Also call hnbap_free_hnbregisterrequesties() when sending hnb register reject Related: OS#5656 Change-Id: I3ba02b0939413c67bc8088ea1a8f2252fc2bda31 --- M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c 2 files changed, 15 insertions(+), 6 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index fe503f8..3655855 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -256,11 +256,10 @@ return 0; } else if (rc < 0) { LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); - /* FIXME: clean up after disappeared HNB */ - hnb_context_release(hnb); + osmo_stream_srv_destroy(conn); goto out; } else if (rc == 0) { - hnb_context_release(hnb); + osmo_stream_srv_destroy(conn); rc = -1; goto out; @@ -294,6 +293,16 @@ return rc; } +static int hnb_closed_cb(struct osmo_stream_srv *conn) +{ + struct hnb_context *hnb = osmo_stream_srv_get_data(conn); + + if (hnb) + hnb_context_release(hnb); + + return 0; +} + struct hnb_context *hnb_context_alloc(struct hnb_gw *gw, struct osmo_stream_srv_link *link, int new_fd) { struct hnb_context *ctx; @@ -304,7 +313,7 @@ INIT_LLIST_HEAD(&ctx->map_list); ctx->gw = gw; - ctx->conn = osmo_stream_srv_create(tall_hnb_ctx, link, new_fd, hnb_read_cb, NULL, ctx); + ctx->conn = osmo_stream_srv_create(tall_hnb_ctx, link, new_fd, hnb_read_cb, hnb_closed_cb, ctx); if (!ctx->conn) { LOGP(DMAIN, LOGL_INFO, "error while creating connection\n"); talloc_free(ctx); @@ -351,8 +360,7 @@ context_map_deactivate(map); } ue_context_free_by_hnb(ctx->gw, ctx); - - osmo_stream_srv_destroy(ctx->conn); + osmo_stream_srv_set_data(ctx->conn, NULL); talloc_free(ctx); } diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 4c3a5c0..2a35491 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -426,6 +426,7 @@ "MCC=%u,MNC=%u,LAC=%u,RAC=%u,SAC=%u,CID=%u from %s\n", ctx->id.mcc, ctx->id.mnc, ctx->id.lac, ctx->id.rac, ctx->id.sac, ctx->id.cid, name); talloc_free(name); + hnbap_free_hnbregisterrequesties(&ies); return hnbgw_tx_hnb_register_rej(ctx); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3ba02b0939413c67bc8088ea1a8f2252fc2bda31 Gerrit-Change-Number: 29199 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
Change in osmo-hnbgw[master]: Install show talloc-context VTY commands
by daniel 24 Aug '22

24 Aug '22
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29196 ) Change subject: Install show talloc-context VTY commands ...................................................................... Install show talloc-context VTY commands Related: OS#5656 Change-Id: Ia4b0023028405ce065f618f536c92ea2bcd0ce15 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 526622b..fe503f8 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -49,6 +49,7 @@ #include <osmocom/ctrl/ports.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> +#include <osmocom/vty/misc.h> #include <osmocom/vty/command.h> #include <osmocom/vty/ports.h> @@ -623,6 +624,7 @@ exit(1); } + vty_info.tall_ctx = tall_hnb_ctx; vty_info.copyright = osmo_hnbgw_copyright; vty_init(&vty_info); @@ -631,6 +633,7 @@ hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); ctrl_vty_init(tall_hnb_ctx); logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); /* Handle options after vty_init(), for --version */ handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia4b0023028405ce065f618f536c92ea2bcd0ce15 Gerrit-Change-Number: 29196 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • ...
  • 241
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.