March 2024 - gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Rework templates to make them more extensible

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: SIP_Templates: Rework templates to make them more extensible ...................................................................... SIP_Templates: Rework templates to make them more extensible The existing template system in SIP_Templates made it difficult to craft specific templates, since it was usually skipping several layers of fields when passing parameters. This commit reworks some of those templates, adds news templates, and cleans formatting for others, as a preparation for further work which will be done when adding Asterisk_Tests testsuite. Change-Id: Ifd14213e9c2b8f5061f828a63ef47844828d94ea --- M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 2 files changed, 329 insertions(+), 192 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36489/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email 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: Ifd14213e9c2b8f5061f828a63ef47844828d94ea Gerrit-Change-Number: 36489 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Rework templates to make them more extensible

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email ) Change subject: SIP_Templates: Rework templates to make them more extensible ...................................................................... SIP_Templates: Rework templates to make them more extensible The existing template system in SIP_Templates made it difficult to craft specific templates, since it was usually skipping several layers of fields when passing parameters. This commit reworks some of those templates, adds news templates, and cleans formatting for others, as a preparation for further work which will be done when adding Asterisk_Tests testsuite. Change-Id: Ifd14213e9c2b8f5061f828a63ef47844828d94ea --- M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 2 files changed, 305 insertions(+), 180 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36489/1 diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index f57b524..dc4212a 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -11,59 +11,142 @@ const charstring c_SIP_VERSION := "SIP/2.0"; -template (value) SipUrl ts_SipUrl(charstring user_or_tel, charstring host, integer portnr) := { +template (value) SipUrl ts_SipUrl(template (value) HostPort host_port, + template (omit) UserInfo user_info := omit) := { scheme := "sip", - userInfo := { - userOrTelephoneSubscriber := user_or_tel, - password := omit - }, - hostPort := { - host := host, - portField := portnr - }, + userInfo := user_info, + hostPort := host_port, urlParameters := omit, headers := omit } -template SipUrl tr_SipUrl(template charstring user_or_tel, - template charstring host, - template integer portnr) := { +template (present) SipUrl tr_SipUrl(template (present) HostPort host_port := ?, + template UserInfo user_info := *) := { scheme := "sip", - userInfo := { - userOrTelephoneSubscriber := user_or_tel, - password := * - }, - hostPort := { - host := host, - portField := portnr - }, + userInfo := user_info, + hostPort := host_port, urlParameters := *, headers := * } -template (value) SipAddr ts_SipAddr(charstring user_or_tel, charstring host, integer portnr) := { - addr := { - nameAddr := { - displayName := omit, - addrSpec := ts_SipUrl(user_or_tel, host, portnr) - } - }, - params := omit +template (value) SipUrl ts_SipUrlHost(template (value) charstring host) + := ts_SipUrl(ts_HostPort(host)); + +// [20.10] +template (present) NameAddr tr_NameAddr(template (present) SipUrl addrSpec := ?, + template charstring displayName := *) := { + displayName := displayName, + addrSpec := addrSpec } -template SipAddr tr_SipAddr(template charstring user_or_tel, - template charstring host, - template integer portnr) := { +template (value) NameAddr ts_NameAddr(template (value) SipUrl addrSpec, + template (omit) charstring displayName := omit) := { + displayName := displayName, + addrSpec := addrSpec +} + +template (present) Addr_Union tr_Addr_Union_NameAddr(template (present) NameAddr nameAddr := ?) := { + nameAddr := nameAddr +} +template (value) Addr_Union ts_Addr_Union_NameAddr(template (value) NameAddr nameAddr) := { + nameAddr := nameAddr +} + +template (present) Addr_Union tr_Addr_Union_SipUrl(template (present) SipUrl sipUrl := ?) := { + addrSpecUnion := sipUrl +} +template (value) Addr_Union ts_Addr_Union_SipUrl(template (value) SipUrl sipUrl) := { + addrSpecUnion := sipUrl +} + + +template (present) ContactAddress tr_ContactAddress(template (present) Addr_Union addressField := ?, + template SemicolonParam_List contactParams := *) := { + addressField := addressField, + contactParams := contactParams +} +template (value) ContactAddress ts_ContactAddress(template (value) Addr_Union addressField, + template (omit) SemicolonParam_List contactParams := omit) := { + addressField := addressField, + contactParams := contactParams +} + +template (present) Contact tr_Contact(template (present) ContactAddress_List contactAddresses := ?) := { + fieldName := CONTACT_E, + contactBody := { + contactAddresses := contactAddresses + } +} +template (value) Contact ts_Contact(template (value) ContactAddress_List contactAddresses) := { + fieldName := CONTACT_E, + contactBody := { + contactAddresses := contactAddresses + } +} + +template (value) Contact ts_ContactWildcard := { + fieldName := CONTACT_E, + contactBody := { + wildcard := "*" + } +} + +template (present) Contact tr_Contact_SipAddr(template (present) SipAddr contact_addr := ?) + := tr_Contact({ tr_ContactAddress(contact_addr.addr, contact_addr.params) }); + +private function f_tr_Contact_SipAddr(template SipAddr contact_addr) return template Contact +{ + if (istemplatekind(contact_addr, "omit")) { + return omit; + } else if (istemplatekind(contact_addr, "*")) { + return *; + } + return tr_Contact_SipAddr(contact_addr); +} + +template (value) Contact ts_Contact_SipAddr(template (value) SipAddr contact_addr) + := ts_Contact({ ts_ContactAddress(contact_addr.addr, contact_addr.params) }); +private function ts_Contact_SipAddr_omit(template (omit) SipAddr contact_addr := omit) return template (omit) Contact +{ + if (istemplatekind(contact_addr, "omit")) { + return omit; + } + return ts_Contact_SipAddr(contact_addr); +} + + +// [20.19] +template (value) Expires ts_Expires(template (value) DeltaSec deltaSec := "7200") := { + fieldName := EXPIRES_E, + deltaSec := deltaSec +} + +template (value) SipAddr ts_SipAddr(template (value) HostPort host_port, + template (omit) UserInfo user_info := omit, + template (omit) charstring displayName := omit, + template (omit) SemicolonParam_List params := omit) := { addr := { nameAddr := { - displayName := *, - addrSpec := tr_SipUrl(user_or_tel, host, portnr) + displayName := displayName, + addrSpec := ts_SipUrl(host_port, user_info) } }, - params := * + params := params +} +template (present) SipAddr tr_SipAddr(template (present) HostPort host_port := ?, + template UserInfo user_info := *, + template charstring displayName := *, + template SemicolonParam_List params := *) := { + addr := { + nameAddr := { + displayName := displayName, + addrSpec := tr_SipUrl(host_port, user_info) + } + }, + params := params } /* build a receive template from a value: substitute '*' for omit */ -function tr_SipAddr_from_val(SipAddr tin) return template SipAddr { - var template SipAddr ret := tin; +function tr_SipAddr_from_val(SipAddr tin) return template (present) SipAddr { + var template (present) SipAddr ret := tin; if (tin.addr.nameAddr.displayName == omit) { ret.addr.nameAddr.displayName := *; } @@ -76,7 +159,11 @@ return ret; } - +template (value) HostPort ts_HostPort(template (omit) charstring host := omit, + template (omit) integer portField := omit) := { + host := host, + portField := portField +} function tr_HostPort(template HostPort hp) return template HostPort { var template HostPort hpout := hp; /* if the port number is 5060, it may be omitted */ @@ -86,15 +173,28 @@ return hpout; } -template (value) RequestLine ts_SIP_ReqLine(Method method, template (value) SipUrl uri, + +template (value) UserInfo ts_UserInfo(template (value) charstring userOrTelephoneSubscriber, + template (omit) charstring password := omit) := { + userOrTelephoneSubscriber := userOrTelephoneSubscriber, + password := password +} +template (present) UserInfo tr_UserInfo(template (present) charstring userOrTelephoneSubscriber := ?, + template charstring password := *) := { + userOrTelephoneSubscriber := userOrTelephoneSubscriber, + password := password +} + +template (value) RequestLine ts_SIP_ReqLine(Method method, + template (value) SipUrl uri, charstring ver := c_SIP_VERSION) := { method := method, requestUri := uri, sipVersion := ver } -template RequestLine tr_SIP_ReqLine(template Method method, - template SipUrl uri, - template charstring ver := c_SIP_VERSION) := { +template (present) RequestLine tr_SIP_ReqLine(template (present) Method method := ?, + template (present) SipUrl uri := ?, + template (present) charstring ver := c_SIP_VERSION) := { method := method, requestUri := uri, sipVersion := ver @@ -105,7 +205,8 @@ statusCode := status_code, reasonPhrase := reason } -template StatusLine tr_SIP_StatusLine(template integer status_code, template charstring reason) := { +template (present) StatusLine tr_SIP_StatusLine(template integer status_code, + template charstring reason) := { sipVersion := "SIP/2.0", statusCode := status_code, reasonPhrase := reason @@ -141,28 +242,30 @@ mediaType := "application/sdp" }; -template (value) Via ts_Via_from(SipAddr from_addr) := { +template (value) Via ts_Via_from(template (value) HostPort addr) := { fieldName := VIA_E, viaBody := { { sentProtocol := { "SIP", "2.0", "UDP" }, - sentBy := from_addr.addr.nameAddr.addrSpec.hostPort, + sentBy := addr, viaParams := omit } } } -template (value) MessageHeader ts_SIP_msgHeader_empty :=c_SIP_msgHeader_empty; -template (value) MessageHeader ts_SIP_msgh_std( CallidString call_id, - SipAddr from_addr, - SipAddr to_addr, - template (omit) SipAddr contact_addr, - charstring method, - integer seq_nr, - template (value) Via via, - template (omit) ContentType content_type := omit, - Method_List allow_methods := c_SIP_defaultMethods - ) modifies ts_SIP_msgHeader_empty := { +template (value) MessageHeader ts_SIP_msgHeader_empty := c_SIP_msgHeader_empty; +template (value) MessageHeader +ts_SIP_msgh_std(template (value) CallidString call_id, + template (value) SipAddr from_addr, + template (value) SipAddr to_addr, + template (omit) Contact contact, + template (value) charstring method, + template (value) integer seq_nr, + template (value) Via via, + template (omit) ContentType content_type := omit, + template (value) Method_List allow_methods := c_SIP_defaultMethods, + template (omit) Expires expires := omit + ) modifies ts_SIP_msgHeader_empty := { allow := { fieldName := ALLOW_E, methods := allow_methods @@ -171,13 +274,14 @@ fieldName := CALL_ID_E, callid := call_id }, - contact := ts_Contact(contact_addr), + contact := contact, contentType := content_type, cSeq := { fieldName := CSEQ_E, seqNumber := seq_nr, method := method }, + expires := expires, fromField := { fieldName := FROM_E, addressField := from_addr.addr, @@ -197,49 +301,6 @@ via := via } -private function tr_Contact(template SipAddr contact_addr) return template Contact -{ - if (istemplatekind(contact_addr, "omit")) { - return omit; - } else if (istemplatekind(contact_addr, "*")) { - return *; - } else if (istemplatekind(contact_addr, "?")) { - return ?; - } - var template Contact ret := { - fieldName := CONTACT_E, - contactBody := { - contactAddresses := { - { - addressField := contact_addr.addr, - contactParams := contact_addr.params - } - } - } - }; - return ret; -} - -private function ts_Contact(template (omit) SipAddr contact_addr) return template (omit) Contact -{ - if (istemplatekind(contact_addr, "omit")) { - return omit; - } - var template (omit) Contact ret := { - fieldName := CONTACT_E, - contactBody := { - contactAddresses := { - { - addressField := contact_addr.addr, - contactParams := contact_addr.params - } - } - } - }; - return ret; -} - - function tr_AllowMethods(template Method_List allow_methods) return template Allow { if (istemplatekind(allow_methods, "omit")) { return omit; @@ -248,34 +309,37 @@ } else if (istemplatekind(allow_methods, "?")) { return ?; } - var template Allow ret := { + var template (present) Allow ret := { fieldName := ALLOW_E, methods := allow_methods } return ret } -template MessageHeader tr_SIP_msgh_std( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, - template SipAddr contact_addr, - template charstring method, - template ContentType content_type := *, - template integer seq_nr := ?, - template Method_List allow_methods := * - ) modifies t_SIP_msgHeader_any := { +template (present) MessageHeader +tr_SIP_msgh_std(template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template Contact contact, + template charstring method, + template ContentType content_type := *, + template integer seq_nr := ?, + template Method_List allow_methods := *, + template Expires expires := * + ) modifies t_SIP_msgHeader_any := { allow := tr_AllowMethods(allow_methods), callId := { fieldName := CALL_ID_E, callid := call_id }, - contact := tr_Contact(contact_addr), + contact := contact, contentType := content_type, cSeq := { fieldName := CSEQ_E, seqNumber := seq_nr, method := method }, + expires := expires, fromField := { fieldName := FROM_E, addressField := from_addr.addr, @@ -300,49 +364,88 @@ } -template (value) PDU_SIP_Request ts_SIP_INVITE( CallidString call_id, - SipAddr from_addr, - SipAddr to_addr, - integer seq_nr, - template (omit) charstring body - ) := { - requestLine := ts_SIP_ReqLine(INVITE_E, to_addr.addr.nameAddr.addrSpec), - msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, from_addr, "INVITE", seq_nr, - ts_Via_from(from_addr), f_ContentTypeOrOmit(ts_CT_SDP, body)), +template (value) PDU_SIP_Request +ts_SIP_REGISTER(template (value) SipUrl sip_url_host_port, + template (value) CallidString call_id, + template (value) SipAddr from_addr, + template (value) SipAddr to_addr, + template (value) Via via, + integer seq_nr, + template (omit) Contact contact, + template (omit) Expires expires, + template (omit) charstring body := omit) := { + requestLine := ts_SIP_ReqLine(REGISTER_E, sip_url_host_port), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, contact, + "REGISTER", seq_nr, via, + f_ContentTypeOrOmit(ts_CT_SDP, body), + expires := expires), messageBody := body, payload := omit } -template PDU_SIP_Request tr_SIP_INVITE( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, - template integer seq_nr, - template charstring body - ) := { +template (present) PDU_SIP_Request +tr_SIP_REGISTER(template (present) SipUrl sip_url_host_port := ?, + template (present) CallidString call_id := ?, + template (present) SipAddr from_addr := ?, + template (present) SipAddr to_addr := ?, + template integer seq_nr := *, + template Contact contact := *, + template Expires expires := *, + template charstring body := *) := { + requestLine := tr_SIP_ReqLine(REGISTER_E, sip_url_host_port), + msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, + "INVITE", *, seq_nr, + expires := expires), + messageBody := body, + payload := omit +} + +template (value) PDU_SIP_Request +ts_SIP_INVITE(CallidString call_id, + SipAddr from_addr, + SipAddr to_addr, + integer seq_nr, + template (omit) charstring body := omit) := { + requestLine := ts_SIP_ReqLine(INVITE_E, to_addr.addr.nameAddr.addrSpec), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, + ts_Contact_SipAddr(from_addr), + "INVITE", seq_nr, + ts_Via_from(from_addr.addr.nameAddr.addrSpec.hostPort), + f_ContentTypeOrOmit(ts_CT_SDP, body)), + messageBody := body, + payload := omit +} +template (present) PDU_SIP_Request +tr_SIP_INVITE(template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template integer seq_nr, + template charstring body) := { requestLine := tr_SIP_ReqLine(INVITE_E, to_addr.addr.nameAddr.addrSpec), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, ?, "INVITE", *, seq_nr), messageBody := body, payload := omit } -template (value) PDU_SIP_Request ts_SIP_BYE( CallidString call_id, - SipAddr from_addr, - SipAddr to_addr, - integer seq_nr, - template (omit) charstring body - ) := { +template (value) PDU_SIP_Request +ts_SIP_BYE(CallidString call_id, + SipAddr from_addr, + SipAddr to_addr, + integer seq_nr, + template (omit) charstring body) := { requestLine := ts_SIP_ReqLine(BYE_E, to_addr.addr.nameAddr.addrSpec), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, "BYE", seq_nr, - ts_Via_from(from_addr), f_ContentTypeOrOmit(ts_CT_SDP, body)), + ts_Via_from(from_addr.addr.nameAddr.addrSpec.hostPort), + f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } -template PDU_SIP_Request tr_SIP_BYE( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, - template integer seq_nr, - template charstring body - ) := { +template (present) PDU_SIP_Request +tr_SIP_BYE(template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template integer seq_nr, + template charstring body) := { requestLine := tr_SIP_ReqLine(BYE_E, to_addr.addr.nameAddr.addrSpec), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, omit, "BYE", *, seq_nr), messageBody := body, @@ -350,42 +453,43 @@ } -template (value) PDU_SIP_Request ts_SIP_ACK( CallidString call_id, - SipAddr from_addr, - SipAddr to_addr, - integer seq_nr, - template (omit) charstring body - ) := { +template (value) PDU_SIP_Request +ts_SIP_ACK(CallidString call_id, + SipAddr from_addr, + SipAddr to_addr, + integer seq_nr, + template (omit) charstring body) := { requestLine := ts_SIP_ReqLine(ACK_E, to_addr.addr.nameAddr.addrSpec), - msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, from_addr, "ACK", seq_nr, - ts_Via_from(from_addr), f_ContentTypeOrOmit(ts_CT_SDP, body)), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, + ts_Contact_SipAddr(from_addr), + "ACK", seq_nr, + ts_Via_from(from_addr.addr.nameAddr.addrSpec.hostPort), + f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } -template PDU_SIP_Request tr_SIP_ACK( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, - template integer seq_nr, - template charstring body - ) := { +template (present) PDU_SIP_Request +tr_SIP_ACK(template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template integer seq_nr, + template charstring body) := { requestLine := tr_SIP_ReqLine(ACK_E, to_addr.addr.nameAddr.addrSpec), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, *, "ACK", *, seq_nr), messageBody := body, payload := omit } - - -template (value) PDU_SIP_Response ts_SIP_Response( CallidString call_id, - SipAddr from_addr, - SipAddr to_addr, - charstring method, - integer status_code, - integer seq_nr, - charstring reason, - Via via, - template (omit) charstring body := omit - ) := { +template (value) PDU_SIP_Response +ts_SIP_Response(CallidString call_id, + SipAddr from_addr, + SipAddr to_addr, + charstring method, + integer status_code, + integer seq_nr, + charstring reason, + Via via, + template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(status_code, reason), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, via, f_ContentTypeOrOmit(ts_CT_SDP, body)), @@ -393,18 +497,18 @@ payload := omit } -template PDU_SIP_Response tr_SIP_Response( template CallidString call_id, - template SipAddr from_addr, - template SipAddr to_addr, - template SipAddr contact_addr, - template charstring method, - template integer status_code, - template integer seq_nr := ?, - template charstring reason := ?, - template charstring body := ? - ) := { +template (present) PDU_SIP_Response +tr_SIP_Response(template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template Contact contact, + template charstring method, + template integer status_code, + template integer seq_nr := ?, + template charstring reason := ?, + template charstring body := ?) := { statusLine := tr_SIP_StatusLine(status_code, reason), - msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact_addr, method, *, seq_nr), + msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, method, *, seq_nr), messageBody := body, payload := omit } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index ab33af7..aee1a82 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -99,12 +99,16 @@ private function f_CallPars_compute(inout CallPars cp) { if (cp.is_mo) { - cp.comp.sip_url_ext := valueof(ts_SipAddr(cp.called, mp_local_host, 5060)); - cp.comp.sip_url_gsm := valueof(ts_SipAddr(cp.calling, mp_osmosip_host, 5060)); + cp.comp.sip_url_ext := valueof(ts_SipAddr(ts_HostPort(mp_local_host, 5060), + ts_UserInfo(cp.called))); + cp.comp.sip_url_gsm := valueof(ts_SipAddr(ts_HostPort(mp_osmosip_host, 5060), + ts_UserInfo(cp.calling))); cp.mncc_call_id := f_sip_rand_seq_nr(); } else { - cp.comp.sip_url_ext := valueof(ts_SipAddr(cp.calling, mp_local_host, 5060)); - cp.comp.sip_url_gsm := valueof(ts_SipAddr(cp.called, mp_osmosip_host, 5060)); + cp.comp.sip_url_ext := valueof(ts_SipAddr(ts_HostPort(mp_local_host, 5060), + ts_UserInfo(cp.calling))); + cp.comp.sip_url_gsm := valueof(ts_SipAddr(ts_HostPort(mp_osmosip_host, 5060), + ts_UserInfo(cp.called))); cp.comp.sip_call_id := hex2str(f_rnd_hexstring(15)); } cp.comp.sip_seq_nr := f_sip_rand_seq_nr(); @@ -338,7 +342,7 @@ } /* OSC -> SIP: OSC confirms call establishment to SIP side */ - as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, contact_addr := ?, + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, contact := ?, method := "INVITE", status_code := 200, seq_nr := ?, reason := "OK", body := expect_sdp_to_sip)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email 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: Ifd14213e9c2b8f5061f828a63ef47844828d94ea Gerrit-Change-Number: 36489 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP: generate seq_nr within allowed range

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email ) Change subject: SIP: generate seq_nr within allowed range ...................................................................... SIP: generate seq_nr within allowed range Change-Id: Iea5f4568af1bd795db57d2b77e82d976edc9e337 --- M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/36488/1 diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 75681a9..f57b524 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -1,6 +1,7 @@ module SIP_Templates { import from SIPmsg_Types all; +import from Osmocom_Types all; /* wrapper type to encapsulate the Addr_Union + parameter list used in From, To. ... */ type record SipAddr { @@ -409,5 +410,13 @@ } +/* RFC 3261 8.1.1.5: + * "The sequence number value MUST be expressible as a 32-bit unsigned integer + * and MUST be less than 2**31." + */ +function f_sip_rand_seq_nr() return integer { + /* 2**31 = 2147483648 */ + return f_rnd_int(2147483648) +} } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 9d92b87..ab33af7 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -101,13 +101,13 @@ if (cp.is_mo) { cp.comp.sip_url_ext := valueof(ts_SipAddr(cp.called, mp_local_host, 5060)); cp.comp.sip_url_gsm := valueof(ts_SipAddr(cp.calling, mp_osmosip_host, 5060)); - cp.mncc_call_id := f_rnd_int(429496725); + cp.mncc_call_id := f_sip_rand_seq_nr(); } else { cp.comp.sip_url_ext := valueof(ts_SipAddr(cp.calling, mp_local_host, 5060)); cp.comp.sip_url_gsm := valueof(ts_SipAddr(cp.called, mp_osmosip_host, 5060)); cp.comp.sip_call_id := hex2str(f_rnd_hexstring(15)); } - cp.comp.sip_seq_nr := f_rnd_int(4294967295); + cp.comp.sip_seq_nr := f_sip_rand_seq_nr(); cp.comp.sip_body := ""; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email 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: Iea5f4568af1bd795db57d2b77e82d976edc9e337 Gerrit-Change-Number: 36488 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 4: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15489): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/440cb2eb_4da76159 PS4, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15489): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/46adcedb_e8c91e24 PS4, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 15:21:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: use json to decode counters from nftables ...................................................................... use json to decode counters from nftables Switch nft output to json. Add libjansson dependency, and use it to parse the result. Navigate the json tree to retrieve the counter values. Parsing with json takes longer than the direct string parsing of nft language, but it is the more correct and more stable approach: in case nftables changes its API, json is likely to still be compatible. Related: SYS#6773 Change-Id: Id4e7fa017c31945388a010d8581715d71482116b --- M configure.ac M src/osmo-hnbgw/nft_kpi.c 2 files changed, 115 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/85/36485/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 3: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15486): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/9b8a4186_13126240 PS3, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15486): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/ce27fe6c_95a4e951 PS3, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 15:00:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... sockaddr_str: add conversion to,from osmo_sockaddr Add functions to pass struct osmo_sockaddr to the osmo_sockaddr_str_{to,from}* API directly. So far the interface to osmo_sockaddr_str_ is: osmo_sockaddr_str_from_sockaddr(&my_sa_str, &my_osa->u.sas); I'm working a lot with osmo_sockaddr at the moment, and the cumulated time of forgetting to add 'u.sas' and having another compilation cycle because of those is justifying this additional API. Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 --- M TODO-RELEASE M include/osmocom/core/sockaddr_str.h M src/core/libosmocore.map M src/core/sockaddr_str.c 4 files changed, 48 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 01f7c41..ce04162 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,6 +11,7 @@ core ADD osmo_sock_multiaddr_get_ip_and_port(), osmo_multiaddr_ip_and_port_snprintf(), osmo_sock_multiaddr_get_name_buf() core ADD osmo_sock_sctp_get_peer_addr_info() core ADD gsmtap_inst_fd2() core, DEPRECATE gsmtap_inst_fd() +core ADD osmo_sockaddr_str_from_osa() osmo_sockaddr_str_to_osa() core behavior change osmo_tdef_fsm_inst_state_chg(): allow millisecond precision core ABI change osmo_io_ops now contains a struct of structs, not union of structs core ABI change osmo_iofd_set_ioops() now returns a value (error code) diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index c646f49..8ec514c 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -34,6 +34,7 @@ struct sockaddr_storage; struct sockaddr_in; struct sockaddr_in6; +struct osmo_sockaddr; /*! \defgroup sockaddr_str IP address/port utilities. * @{ @@ -84,6 +85,7 @@ int osmo_sockaddr_str_from_sockaddr_in(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in *src); int osmo_sockaddr_str_from_sockaddr_in6(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_in6 *src); int osmo_sockaddr_str_from_sockaddr(struct osmo_sockaddr_str *sockaddr_str, const struct sockaddr_storage *src); +int osmo_sockaddr_str_from_osa(struct osmo_sockaddr_str *sockaddr_str, const struct osmo_sockaddr *src); int osmo_sockaddr_str_to_in_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in_addr *dst); int osmo_sockaddr_str_to_in6_addr(const struct osmo_sockaddr_str *sockaddr_str, struct in6_addr *dst); @@ -92,6 +94,7 @@ int osmo_sockaddr_str_to_sockaddr_in(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in *dst); int osmo_sockaddr_str_to_sockaddr_in6(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in6 *dst); int osmo_sockaddr_str_to_sockaddr(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_storage *dst); +int osmo_sockaddr_str_to_osa(const struct osmo_sockaddr_str *sockaddr_str, struct osmo_sockaddr *dst); int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port) OSMO_DEPRECATED("osmo_sockaddr_str_from_32n() actually uses *host* byte order. Use osmo_sockaddr_str_from_32h() instead"); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index fb294ba..c5ab6e3 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -400,6 +400,7 @@ osmo_sockaddr_str_from_sockaddr; osmo_sockaddr_str_from_sockaddr_in; osmo_sockaddr_str_from_sockaddr_in6; +osmo_sockaddr_str_from_osa; osmo_sockaddr_str_from_str; osmo_sockaddr_str_from_str2; osmo_sockaddr_str_is_nonzero; @@ -412,6 +413,7 @@ osmo_sockaddr_str_to_sockaddr; osmo_sockaddr_str_to_sockaddr_in; osmo_sockaddr_str_to_sockaddr_in6; +osmo_sockaddr_str_to_osa; osmo_sockaddr_to_octets; osmo_sockaddr_to_str; osmo_sockaddr_to_str_and_uint; diff --git a/src/core/sockaddr_str.c b/src/core/sockaddr_str.c index 9f1e897..bea6184 100644 --- a/src/core/sockaddr_str.c +++ b/src/core/sockaddr_str.c @@ -33,6 +33,7 @@ #include <osmocom/core/sockaddr_str.h> #include <osmocom/core/utils.h> #include <osmocom/core/byteswap.h> +#include <osmocom/core/socket.h> /*! \addtogroup sockaddr_str * @@ -359,6 +360,17 @@ return -EINVAL; } +/*! Convert IPv4 or IPv6 address and port to osmo_sockaddr_str. + * \param[out] sockaddr_str The instance to copy to. + * \param[in] src IPv4 or IPv6 address and port data. + * \return 0 on success, negative if src does not indicate AF_INET nor AF_INET6 (or if the conversion fails, which + * should not be possible in practice). + */ +int osmo_sockaddr_str_from_osa(struct osmo_sockaddr_str *sockaddr_str, const struct osmo_sockaddr *src) +{ + return osmo_sockaddr_str_from_sockaddr(sockaddr_str, &src->u.sas); +} + /*! Convert osmo_sockaddr_str address string to IPv4 address data. * \param[in] sockaddr_str The instance to convert the IP of. * \param[out] dst IPv4 address data to write to. @@ -509,5 +521,15 @@ } } +/*! Convert osmo_sockaddr_str address string and port to IPv4 or IPv6 address and port data. + * \param[in] sockaddr_str The instance to convert the IP and port of. + * \param[out] dst IPv4/IPv6 address and port data to write to. + * \return 0 on success, negative on error (e.g. invalid IP address string for the family indicated by sockaddr_str->af). + */ +int osmo_sockaddr_str_to_osa(const struct osmo_sockaddr_str *sockaddr_str, struct osmo_sockaddr *dst) +{ + return osmo_sockaddr_str_to_sockaddr(sockaddr_str, &dst->u.sas); +} + /*! @} */ #endif // HAVE_NETINET_IN_H -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 28 Mar 2024 14:47:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: checkpatch: recognize json_array_foreach etc.

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email ) Change subject: checkpatch: recognize json_array_foreach etc. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0b58c6d70a961c7d0ba93a2f0d6a5a4afa321fa9 Gerrit-Change-Number: 36487 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 14:23:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: …-pablo-gtp: don't wipe workspace

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email ) Change subject: jobs/ttcn3: …-pablo-gtp: don't wipe workspace ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36486/comment/78d5b878_16ea9dfa PS1, Line 35: wipe_workspace: false maybe document it with a comment here on why this is needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba Gerrit-Change-Number: 36486 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 14:23:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): fix by_tmsi arg

by pespin

Attention is currently required from: fixeria, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email ) Change subject: msc: f_expect_paging(): fix by_tmsi arg ...................................................................... Patch Set 1: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455/comment/fe9042bd_9195… PS1, Line 1360: boolean by_tmsi := true > i appreciate the feedback and myself tend to give strict review, so i know what it's like. […] You already spent more time saying how much time you'd spend changing it, than actually applying the requested change, btw requested by already 2 people, not only me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email 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: I9434745b7faeb738caafed8080b9f7b1a6a8079a Gerrit-Change-Number: 36455 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 14:19:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by pespin

Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 28 Mar 2024 14:17:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: checkpatch: recognize json_array_foreach etc.

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email to look at the new patch set (#2). Change subject: checkpatch: recognize json_array_foreach etc. ...................................................................... checkpatch: recognize json_array_foreach etc. Treat json_array_foreach, json_object_foreach, json_object_foreach_safe etc. the same as if, while, for, switch, and require exactly one space after using it: json_array_foreach (nftables, i, item) { … } Related: osmo-hnbgw Id4e7fa017c31945388a010d8581715d71482116b Change-Id: I0b58c6d70a961c7d0ba93a2f0d6a5a4afa321fa9 --- M lint/checkpatch/checkpatch.pl 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/36487/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0b58c6d70a961c7d0ba93a2f0d6a5a4afa321fa9 Gerrit-Change-Number: 36487 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/nft_kpi.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/8cc89a5e_740b8d79 PS2, Line 266: json_array_foreach (nftables, i, item) { > space prohibited between function name and open parenthesis '(' fix for the linter: https://gerrit.osmocom.org/c/osmo-ci/+/36487 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 08:03:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: checkpatch: recognize json_array_for_each etc.

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email ) Change subject: checkpatch: recognize json_array_for_each etc. ...................................................................... checkpatch: recognize json_array_for_each etc. Treat json_array_foreach, json_object_foreach, json_object_foreach_safe etc. the same as if, while, for, switch, and require exactly one space after using it: json_array_foreach (nftables, i, item) { … } Related: osmo-hnbgw Id4e7fa017c31945388a010d8581715d71482116b Change-Id: I0b58c6d70a961c7d0ba93a2f0d6a5a4afa321fa9 --- M lint/checkpatch/checkpatch.pl 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/36487/1 diff --git a/lint/checkpatch/checkpatch.pl b/lint/checkpatch/checkpatch.pl index eada2a9..ff6eea1 100755 --- a/lint/checkpatch/checkpatch.pl +++ b/lint/checkpatch/checkpatch.pl @@ -4888,6 +4888,7 @@ # Ignore those directives where spaces _are_ permitted. if ($name =~ /^(?: if|for|while|switch|return|case| + [a-z_]*for[_]?each[a-z_]*| volatile|__volatile__| __attribute__|format|__extension__| asm|__asm__)$/x) @@ -5513,7 +5514,7 @@ } # Need a space before open parenthesis after if, while etc - if ($line =~ /\b(if|while|for|switch)\(/) { + if ($line =~ /\b(if|while|for|switch|[a-z_]*for[_]?each[a-z_]*)\(/) { if (ERROR("SPACING", "space required before the open parenthesis '('\n" . $herecurr) && $fix) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0b58c6d70a961c7d0ba93a2f0d6a5a4afa321fa9 Gerrit-Change-Number: 36487 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: …-pablo-gtp: don't wipe workspace

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email ) Change subject: jobs/ttcn3: …-pablo-gtp: don't wipe workspace ...................................................................... jobs/ttcn3: …-pablo-gtp: don't wipe workspace The ttcn3-ggsn-test-kernel-* jobs should not wipe their workspace, as cloning the kernel repositories takes a long time and lots of traffic. (The exception are the jobs using the debian kernel, as there we don't clone and build a kernel tree.) The way the scripts in docker-playground.git are written, this also caused a permission error. Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba --- M jobs/ttcn3-testsuites.yml 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/36486/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 8a17e04..168cb10 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -32,6 +32,7 @@ Test osmo-ggsn master with the Debian kernel. - ttcn3-ggsn-test-kernel-pablo-gtp: timer: H 04 * * * + wipe_workspace: false description: | Test osmo-ggsn master with the Linux kernel built from main of <a href="https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/">pablo/gtp.git</a>. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba Gerrit-Change-Number: 36486 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_lu_tmsi_noauth_notmsi

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?usp=email ) Change subject: msc: add TC_lu_tmsi_noauth_notmsi ...................................................................... Patch Set 1: (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459/comment/a7055a5f_736c… PS1, Line 7312: valueof > 1- a "template (value)" parameter can be passed either a "template (value)" var or a value val, both […] This code has a lot of complexity to discuss, but that is not in this "valueof()" here. It is, still, really a bikeshed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?usp=email 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: If10b9987395670b084ff8ad6d1f033ff46896d75 Gerrit-Change-Number: 36459 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:49:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?usp=email ) Change subject: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?usp=email 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: I4d719928f04e5a47d415c38f835451b1f10c713d Gerrit-Change-Number: 36457 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:22:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): better detect failure

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?usp=email ) Change subject: msc: f_expect_paging(): better detect failure ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: my opinion on the bikeshed property is unchanged -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?usp=email 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: I30273e3882e348a2ded88b7b96a5ec1473a56913 Gerrit-Change-Number: 36456 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:22:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): fix by_tmsi arg

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email ) Change subject: msc: f_expect_paging(): fix by_tmsi arg ...................................................................... Patch Set 1: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455/comment/2124249d_bc8a… PS1, Line 1360: boolean by_tmsi := true > I don't even know why I'm doing code review if 99% of what I say seems to be irrelevant, bikeshed, e […] i appreciate the feedback and myself tend to give strict review, so i know what it's like. i am still of the humble opinion that this is not relevant enough to discuss. When I weigh the possible consequences against the time spent, here is way more time than consequence, so please let's quit this. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email 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: I9434745b7faeb738caafed8080b9f7b1a6a8079a Gerrit-Change-Number: 36455 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:21:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ran-emu: allow receiving Paging without a TMSI

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?usp=email ) Change subject: ran-emu: allow receiving Paging without a TMSI ...................................................................... Patch Set 1: (1 comment) File library/RAN_Emulation.ttcnpp: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454/comment/92551cee_1c2a… PS1, Line 507: var template OCT4 tmsi := omit; > that would be a var "template (omit) OCT4" it works, why change it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?usp=email 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: I1bdf3488be0f8d4f0905665c4ba642f9468b9777 Gerrit-Change-Number: 36454 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:13:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: invalidate vsub->msc_conn_ref when msc_a is discarded

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36451?usp=email ) Change subject: invalidate vsub->msc_conn_ref when msc_a is discarded ...................................................................... invalidate vsub->msc_conn_ref when msc_a is discarded We have an msc_conn_ref pointer from vlr_subscr to an active msc_a instance. So far, we just keep it pointing at discarded memory. Instead, make sure it goes back to NULL when the msc_a instance deallocates. This way the VLR can reliably tell whether a given VLR entry still has an active connection or is just inactively caching the subscriber. Related: SYS#6860 OS#4721 Change-Id: Ic63d01d220b63453976fe06a7c6b606f97172c99 --- M src/libmsc/msc_a.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 4fb30c4..70d9bf7 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -999,6 +999,7 @@ void msc_a_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct msc_a *msc_a = msc_a_fi_priv(fi); + struct vlr_subscr *vsub = msc_a_vsub(msc_a); trans_conn_closed(msc_a); @@ -1006,6 +1007,10 @@ LOG_MSC_A(msc_a, LOGL_ERROR, "Deallocating active transactions failed\n"); LOG_MSC_A_CAT(msc_a, DREF, LOGL_DEBUG, "max total use count was %d\n", msc_a->max_total_use_count); + + /* Invalidate the active conn in VLR subscriber state, if any. */ + if (vsub && vsub->msc_conn_ref == msc_a) + vsub->msc_conn_ref = NULL; } const struct value_string msc_a_fsm_event_names[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic63d01d220b63453976fe06a7c6b606f97172c99 Gerrit-Change-Number: 36451 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email ) Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... fix VLR evil twin on LU with unknown TMSI When a subscriber first attaches by TMSI only, and later tells the IMSI via ID Response, it may turn out that this IMSI already exists in the VLR database. If this happens, the TMSI that the subscriber issued was not known in the existing VLR entry, indicating that the subscriber has in the meantime camped on a different core. Which means we can assume that there cannot be any active connections, and the old subscriber can be discarded, for the benefit of the new one. (We could also discard the new one, but it is more complex to reparent the ongoing FSMs for Compl L3 than to copy some dormant VLR state.) In vlr_subscr_set_imsi(), check for an existing IMSI entry in the VLR. If such exists, copy any pending Paging and auth tuple state to the new subscriber, and discard the old one from the VLR. In order to safely discard a vlr subscriber by force, add a new vlr_ops function: subscr_inval(), to tell the MSC that a vlr_subscr is no longer valid. Upcoming patch I583682d1a35a70b008d7bb2d89ba7c3109a60b21 better clears TMSI state from the VLR, making it more likely to hit the evil twin situation this patch fixes; hence this is, sort of, preparation. Related: SYS#6860 OS#4721 Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd --- M include/osmocom/msc/paging.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/paging.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 139 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/include/osmocom/msc/paging.h b/include/osmocom/msc/paging.h index 4de679d..f8ebf9e 100644 --- a/include/osmocom/msc/paging.h +++ b/include/osmocom/msc/paging.h @@ -40,6 +40,7 @@ struct paging_request *paging_request_start(struct vlr_subscr *vsub, enum paging_cause cause, paging_cb_t paging_cb, struct gsm_trans *trans, const char *label); +void paging_request_join_vsub(struct vlr_subscr *keep_vsub, struct vlr_subscr *discarding_vsub); void paging_request_remove(struct paging_request *pr); void paging_response(struct msc_a *msc_a); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 86a72f2..a7707fd 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -257,6 +257,8 @@ /* notify MSC/SGSN that the given subscriber has been associated * with this msc_conn_ref */ int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); + /* notify MSC that the given subscriber is no longer valid */ + void (*subscr_inval)(void *msc_conn_ref, struct vlr_subscr *vsub); }; /* An instance of the VLR codebase */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 70faf95..17350fa 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1572,6 +1572,24 @@ return 0; } +static void msc_vlr_subscr_inval(void *msc_conn_ref, struct vlr_subscr *vsub) +{ + /* Search vsub backwards to make sure msc_conn_ref is a valid msc_a instance. */ + struct msub *msub; + OSMO_ASSERT(vsub); + llist_for_each_entry(msub, &msub_list, entry) { + struct msc_a *msc_a; + if (msub->vsub != vsub) + continue; + + msc_a = msub_msc_a(msub); + if (msc_a) + msc_a_release_cn(msc_a); + + msub->vsub = NULL; + } +} + /* operations that we need to implement for libvlr */ const struct vlr_ops msc_vlr_ops = { .tx_auth_req = msc_vlr_tx_auth_req, @@ -1586,6 +1604,7 @@ .tx_mm_info = msc_vlr_tx_mm_info, .subscr_update = msc_vlr_subscr_update, .subscr_assoc = msc_vlr_subscr_assoc, + .subscr_inval = msc_vlr_subscr_inval, }; struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value) diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index 9845f99..9b3dad5 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -120,6 +120,34 @@ return pr; } +/* Two subscribers (e.g. an old TMSI and a new TMSI) turn out to have the same identity, so in order to discard one of + * them, transfer any pending Paging requests to the vsub that will survive. */ +void paging_request_join_vsub(struct vlr_subscr *keep_vsub, struct vlr_subscr *discarding_vsub) +{ + struct paging_request *pr; + + if (!discarding_vsub->cs.is_paging) + return; + + /* transfer all Paging Response callbacks */ + while ((pr = llist_first_entry_or_null(&discarding_vsub->cs.requests, struct paging_request, entry))) { + llist_del(&pr->entry); + talloc_steal(keep_vsub, pr); + llist_add_tail(&pr->entry, &keep_vsub->cs.requests); + } + + /* make sure a Paging use count is present on keep_vsub, if needed */ + if (!keep_vsub->cs.is_paging && !llist_empty(&keep_vsub->cs.requests)) { + vlr_subscr_get(keep_vsub, VSUB_USE_PAGING); + keep_vsub->cs.is_paging = true; + } + + /* Already made sure at the top of this function that discarding_vsub->cs.is_paging == true */ + discarding_vsub->cs.is_paging = false; + osmo_timer_del(&discarding_vsub->cs.paging_response_timer); + vlr_subscr_put(discarding_vsub, VSUB_USE_PAGING); +} + void paging_request_remove(struct paging_request *pr) { struct gsm_trans *trans = pr->trans; diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index e2e02bf..cb5794f 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -36,6 +36,7 @@ #include <osmocom/msc/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/msc/paging.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -272,7 +273,8 @@ llist_for_each_entry(vsub, &vlr->subscribers, list) { if (vlr_subscr_matches_imsi(vsub, imsi)) { - vlr_subscr_get_src(vsub, use, file, line); + if (use) + vlr_subscr_get_src(vsub, use, file, line); return vsub; } } @@ -577,11 +579,63 @@ return vsub; } +static void dedup_vsub(struct vlr_subscr *exists, struct vlr_subscr *vsub) +{ + struct vlr_instance *vlr = exists->vlr; + int i; + int j; + LOGP(DVLR, LOGL_NOTICE, + "There is an existing subscriber for IMSI %s used by %s, replacing with new VLR subscr: %s used by %s\n", + exists->imsi, osmo_use_count_to_str_c(OTC_SELECT, &exists->use_count), + vlr_subscr_name(vsub), + osmo_use_count_to_str_c(OTC_SELECT, &vsub->use_count)); + + /* Take over some state from the previous vsub */ + paging_request_join_vsub(vsub, exists); + if (!vsub->msisdn[0]) + OSMO_STRLCPY_ARRAY(vsub->msisdn, exists->msisdn); + if (!vsub->name[0]) + OSMO_STRLCPY_ARRAY(vsub->name, exists->name); + /* Copy valid auth tuples we may already have, to reduce the need to ask for new ones from the HLR */ + for (i = 0; i < ARRAY_SIZE(exists->auth_tuples); i++) { + if (exists->auth_tuples[i].key_seq == VLR_KEY_SEQ_INVAL) + continue; + for (j = 0; j < ARRAY_SIZE(vsub->auth_tuples); j++) { + if (vsub->auth_tuples[j].key_seq != VLR_KEY_SEQ_INVAL) + continue; + vsub->auth_tuples[j] = exists->auth_tuples[i]; + } + } + + if (exists->msc_conn_ref) + LOGVSUBP(LOGL_ERROR, vsub, + "There is an existing VLR entry for this same subscriber with an active connection." + " That should not be possible. Discarding old subscriber entry %s.\n", + exists->imsi); + + if (vlr->ops.subscr_inval) + vlr->ops.subscr_inval(exists->msc_conn_ref, exists); + vlr_subscr_free(exists); +} + void vlr_subscr_set_imsi(struct vlr_subscr *vsub, const char *imsi) { + struct vlr_subscr *exists; if (!vsub) return; + /* If the same IMSI is already set, nothing changes. */ + if (!strcmp(vsub->imsi, imsi)) + return; + + /* We've just learned about this new IMSI, our primary key in the VLR. make sure to invalidate any prior VLR + * entries for this IMSI. */ + exists = vlr_subscr_find_by_imsi(vsub->vlr, imsi, NULL); + + if (exists) + dedup_vsub(exists, vsub); + + /* Set the IMSI on the new subscriber, here. */ if (OSMO_STRLCPY_ARRAY(vsub->imsi, imsi) >= sizeof(vsub->imsi)) { LOGP(DVLR, LOGL_NOTICE, "IMSI was truncated: full IMSI=%s, truncated IMSI=%s\n", imsi, vsub->imsi); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index e649325..fae302f 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -467,7 +467,6 @@ DMM IDENTITY RESPONSE: IMSI-901700000004620 DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: Received Event VLR_ULA_E_ID_IMSI -DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_node1_pre() DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_node1() DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_post_auth() -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: never page for TMSI with 'no assign-tmsi'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: never page for TMSI with 'no assign-tmsi' ...................................................................... never page for TMSI with 'no assign-tmsi' With 'no assign-tmsi', regard any TMSI as invalidated at the end of a Location Updating procedure. Hence, avoid paging by TMSI. When 'no assign-tmsi' is set, osmo-msc does not actively assign a new TMSI at the end of the Location Updating. However, it stores any TMSI identity that the MS sends in a Location Updating Request. So far, this caused osmo-msc to use the TMSI that the MS had sent in subsequent Paging, which goes unanswered by the MS. (After the long standing evil twin problem regarding TMSI MI has been fixed in recent Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd, there is no longer an evil twin risked by clearing out a TMSI.) Related: SYS#6860 OS#4721 Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 38 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 7500c86..5d8f78b 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -469,6 +469,8 @@ lu_compl_vlr_new_tmsi(fi); return; } + /* else, any previously used TMSI is now invalid. */ + vsub->tmsi = GSM_RESERVED_TMSI; /* Location Updating Accept */ vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); @@ -514,6 +516,8 @@ /* Wait for TMSI ack */ return; } + /* else, any previously used TMSI is now invalid. */ + vsub->tmsi = GSM_RESERVED_TMSI; /* No TMSI needed, accept now. */ vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index fae302f..3a6442e 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -527,7 +527,7 @@ DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + attached: now used by 3 (active-conn,vlr_gsup_rx,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + attached: now used by 3 (active-conn,vlr_gsup_rx,attached) DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: upd_hlr_vlr_fsm(TMSI-0x23422342:GERAN-A:LU)) @@ -540,15 +540,15 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + msc_a_fsm_releasing_onenter: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + vlr_subscr_cancel_attach_fsm: now used by 5 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + msc_a_fsm_releasing_onenter: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_subscr_cancel_attach_fsm: now used by 5 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) DREF msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on GERAN-A DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - msc_a_fsm_releasing_onenter: now used by 3 (active-conn,vlr_gsup_rx,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - msc_a_fsm_releasing_onenter: now used by 3 (active-conn,vlr_gsup_rx,attached) DVLR upd_hlr_vlr_fsm(TMSI-0x23422342:GERAN-A:LU){UPD_HLR_VLR_S_DONE}: Deallocated, including all deferred deallocations -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - vlr_gsup_rx: now used by 2 (active-conn,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - vlr_gsup_rx: now used by 2 (active-conn,attached) <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed @@ -566,19 +566,19 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm DREF msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: max total use count was 3 DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) MSC-A terminated -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) 1 MSC-I still active +DMSC msub(IMSI-901700000004620:MSISDN-46071) MSC-A terminated +DMSC msub(IMSI-901700000004620:MSISDN-46071) 1 MSC-I still active DMSC msub_fsm{active}: state_chg to terminating DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU)) DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU)) DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Removing from parent msub_fsm DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU) -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) Free -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - active-conn: now used by 1 (attached) +DMSC msub(IMSI-901700000004620:MSISDN-46071) Free +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - active-conn: now used by 1 (attached) DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU) DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations - msub gone llist_count(&msub_list) == 0 -DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 (max total use count was 5) +DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_lu_unknown_tmsi: SUCCESS -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 Gerrit-Change-Number: 36453 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email ) Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:10:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email ) Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... Patch Set 2: (1 comment) File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/36452/comment/a1cbfb2c_e038db31 PS1, Line 597: struct vlr_instance *vlr = exists->vlr; > ack […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 03:07:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

Attention is currently required from: fixeria, laforge, neels, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email to look at the new patch set (#3). Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... fix VLR evil twin on LU with unknown TMSI When a subscriber first attaches by TMSI only, and later tells the IMSI via ID Response, it may turn out that this IMSI already exists in the VLR database. If this happens, the TMSI that the subscriber issued was not known in the existing VLR entry, indicating that the subscriber has in the meantime camped on a different core. Which means we can assume that there cannot be any active connections, and the old subscriber can be discarded, for the benefit of the new one. (We could also discard the new one, but it is more complex to reparent the ongoing FSMs for Compl L3 than to copy some dormant VLR state.) In vlr_subscr_set_imsi(), check for an existing IMSI entry in the VLR. If such exists, copy any pending Paging and auth tuple state to the new subscriber, and discard the old one from the VLR. In order to safely discard a vlr subscriber by force, add a new vlr_ops function: subscr_inval(), to tell the MSC that a vlr_subscr is no longer valid. Upcoming patch I583682d1a35a70b008d7bb2d89ba7c3109a60b21 better clears TMSI state from the VLR, making it more likely to hit the evil twin situation this patch fixes; hence this is, sort of, preparation. Related: SYS#6860 OS#4721 Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd --- M include/osmocom/msc/paging.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/paging.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 139 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/36452/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: never page for TMSI with 'no assign-tmsi'

by neels

Attention is currently required from: neels. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: never page for TMSI with 'no assign-tmsi' ...................................................................... never page for TMSI with 'no assign-tmsi' With 'no assign-tmsi', regard any TMSI as invalidated at the end of a Location Updating procedure. Hence, avoid paging by TMSI. When 'no assign-tmsi' is set, osmo-msc does not actively assign a new TMSI at the end of the Location Updating. However, it stores any TMSI identity that the MS sends in a Location Updating Request. So far, this caused osmo-msc to use the TMSI that the MS had sent in subsequent Paging, which goes unanswered by the MS. (After the long standing evil twin problem regarding TMSI MI has been fixed in recent Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd, there is no longer an evil twin risked by clearing out a TMSI.) Related: SYS#6860 OS#4721 Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 38 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/36453/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 Gerrit-Change-Number: 36453 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

Attention is currently required from: fixeria, laforge, neels, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... fix VLR evil twin on LU with unknown TMSI When a subscriber first attaches by TMSI only, and later tells the IMSI via ID Response, it may turn out that this IMSI already exists in the VLR database. If this happens, the TMSI that the subscriber issued was not known in the existing VLR entry, indicating that the subscriber has in the meantime camped on a different core. Which means we can assume that there cannot be any active connections, and the old subscriber can be discarded, for the benefit of the new one. (We could also discard the new one, but it is more complex to reparent the ongoing FSMs for Compl L3 than to copy some dormant VLR state.) In vlr_subscr_set_imsi(), check for an existing IMSI entry in the VLR. If such exists, copy any pending Paging and auth tuple state to the new subscriber, and discard the old one from the VLR. In order to safely discard a vlr subscriber by force, add a new vlr_ops function: subscr_inval(), to tell the MSC that a vlr_subscr is no longer valid. Upcoming patch I583682d1a35a70b008d7bb2d89ba7c3109a60b21 better clears TMSI state from the VLR, making it more likely to hit the evil twin situation this patch fixes; hence this is, sort of, preparation. Related: SYS#6860 OS#4721 Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd --- M include/osmocom/msc/paging.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/paging.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 138 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/36452/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 2: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15477): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/c6d17c27_557d122d PS2, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15477): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/ef649c34_b6c04499 PS2, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:47:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 2: (2 comments) Patchset: PS1: > I'm not feeling it -- we have the libfoo. […] Done Patchset: PS2: other patches use this, i'd like to merge. I am tempted to count the earlier +1 since there is an entry in TODO-RELEASE now. soon. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:45:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... sockaddr_str: add conversion to,from osmo_sockaddr Add functions to pass struct osmo_sockaddr to the osmo_sockaddr_str_{to,from}* API directly. So far the interface to osmo_sockaddr_str_ is: osmo_sockaddr_str_from_sockaddr(&my_sa_str, &my_osa->u.sas); I'm working a lot with osmo_sockaddr at the moment, and the cumulated time of forgetting to add 'u.sas' and having another compilation cycle because of those is justifying this additional API. Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 --- M TODO-RELEASE M include/osmocom/core/sockaddr_str.h M src/core/libosmocore.map M src/core/sockaddr_str.c 4 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/36265/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: > Are you the one looking at tons of commit log lines every few months for +10 projects? I am, and I r […] I'm not feeling it -- we have the libfoo.map files showing similar information that is guaranteed to be correct. Commit log summary should show it. The git log is quick to search for the first appearance of a function. I don't want to sabotage the release process or whine and make your life harder, but I doubt maintaining such lists manually is a good idea. File src/core/libosmocore.map: https://gerrit.osmocom.org/c/libosmocore/+/36265/comment/cc092b05_5969feb2 PS1, Line 401: osmo_sockaddr_str_from_osa; here is a diff of added API -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Mar 2024 02:36:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 1: (2 comments) File src/osmo-hnbgw/nft_kpi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15475): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/a499530c_d95520ab PS1, Line 266: json_array_foreach (nftables, i, item) { space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15475): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/9f3d3d71_2c6def1a PS1, Line 294: json_array_foreach (expr, j, expr_item) { space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Mar 2024 21:57:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... use json to decode counters from nftables Switch nft output to json. Add libjansson dependency, and use it to parse the result. Navigate the json tree to retrieve the counter values. Parsing with json takes longer than the direct string parsing of nft language, but it is the more correct and more stable approach: in case nftables changes its API, json is likely to still be compatible. Related: SYS#6773 Change-Id: Id4e7fa017c31945388a010d8581715d71482116b --- M configure.ac M src/osmo-hnbgw/nft_kpi.c 2 files changed, 115 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/85/36485/1 diff --git a/configure.ac b/configure.ac index bea9a76..657ad0d 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,7 @@ PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.12.0) PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2) +PKG_CHECK_MODULES(LIBJANSSON, jansson >= 2.14) # Enable PFCP support for GTP tunnel mapping via UPF AC_ARG_ENABLE([pfcp], [AS_HELP_STRING([--enable-pfcp], [Build with PFCP support, for GTP tunnel mapping via UPF])], diff --git a/src/osmo-hnbgw/nft_kpi.c b/src/osmo-hnbgw/nft_kpi.c index 0dd702f..0b5ac91 100644 --- a/src/osmo-hnbgw/nft_kpi.c +++ b/src/osmo-hnbgw/nft_kpi.c @@ -19,6 +19,7 @@ #include <ctype.h> #include <inttypes.h> +#include <jansson.h> #include <nftables/libnftables.h> #include <osmocom/core/logging.h> @@ -51,7 +52,7 @@ OSMO_ASSERT(false); } - nft_ctx_output_set_flags(s->nft.nft_ctx, NFT_CTX_OUTPUT_HANDLE); + nft_ctx_output_set_flags(s->nft.nft_ctx, NFT_CTX_OUTPUT_JSON); return s->nft.nft_ctx; } @@ -219,99 +220,123 @@ &val->bytes, bytes); } -/* In the string section *pos .. end, find the first occurence of after_str and return the following token, which ends - * by a space or at end. If end is NULL, search until the '\0' termination of *pos. - * Return true if after_str was found, copy the following token into buf, and in *pos, return the position just after - * that token. */ -static bool get_token_after(char *buf, size_t buflen, const char **pos, const char *end, const char *after_str) +static int hnb_update_counters_by_id(const char *id_str, bool ul, int64_t packets, int64_t bytes, int64_t handle, + struct hnb_persistent **last_hnbp) { - const char *found = strstr(*pos, after_str); - const char *token_end; - size_t token_len; - if (!found) - return false; - if (end && found >= end) { - *pos = end; - return false; + struct hnb_persistent *hnbp; + LOGP(DNFT, LOGL_DEBUG, "%s(%s, %s, %"PRId64", %"PRId64", %"PRId64")\n", __func__, + id_str, ul ? "ul" : "dl", packets, bytes, handle); + + /* Half the time, we already have a pointer to the correct hnb */ + if (last_hnbp && *last_hnbp && !strcmp((*last_hnbp)->id_str, id_str)) + hnbp = *last_hnbp; + else + hnbp = hnb_persistent_find_by_id_str(id_str); + if (!hnbp) { + LOGP(DNFT, LOGL_DEBUG, "%s(): cannot update counters, hNodeB not found: %s\n", __func__, id_str); + return -ENOENT; } - found += strlen(after_str); - while (*found && *found == ' ' && (!end || found < end)) - found++; - token_end = found; - while (*token_end != ' ' && (!end || token_end < end)) - token_end++; - if (token_end <= found) { - *pos = found; - return false; - } - if (*found == '"' && token_end > found + 1 && *(token_end - 1) == '"') { - found++; - token_end--; - } - token_len = token_end - found; - token_len = OSMO_MIN(token_len, buflen - 1); - memcpy(buf, found, token_len); - buf[token_len] = '\0'; - *pos = token_end; - return true; + if (last_hnbp) + *last_hnbp = hnbp; + hnb_update_counters(hnbp, ul, packets, bytes, handle); + return 0; } static void decode_nft_response(const char *response) { struct nft_kpi_state *s = &g_nft_kpi_state; - const char *pos; - char buf[128]; + struct hnb_persistent *hnbp = NULL; + json_t *json; + json_error_t json_err; + + json_t *nftables; + json_t *item; + int i; int count = 0; - /* find and parse all occurences of strings like: - * [...] counter packets 3 bytes 129 comment "ul:001-01-L2-R3-S4-C1" # handle 10 - */ - pos = response; - while (*pos) { - const char *line_end; - int64_t packets; - int64_t bytes; - int64_t handle = 0; + json = json_loads(response, 0, &json_err); + if (!json) + goto json_err; + + nftables = json_object_get(json, "nftables"); + + if (!json_is_array(nftables)) + goto json_inval; + + json_array_foreach (nftables, i, item) { + json_t *rule = json_object_get(item, "rule"); + json_t *handle; + json_t *comment; + json_t *expr; + json_t *expr_item; + json_t *packets; + json_t *bytes; bool ul; - struct hnb_persistent *hnbp; + json_t *counter = NULL; + int j; + const char *comment_str; + const char *hnb_id; - if (!get_token_after(buf, sizeof(buf), &pos, NULL, "counter packets ")) - break; - if (osmo_str_to_int64(&packets, buf, 10, 0, INT64_MAX)) - break; - line_end = strchr(pos, '\n'); - if (!line_end) - line_end = pos + strlen(pos); + if (!rule) + continue; - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "bytes ")) - break; - if (osmo_str_to_int64(&bytes, buf, 10, 0, INT64_MAX)) - break; + comment = json_object_get(rule, "comment"); + if (!comment || !json_is_string(comment)) + continue; - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "comment ")) - break; + handle = json_object_get(rule, "handle"); + if (!handle || !json_is_integer(handle)) + continue; - if (osmo_str_startswith(buf, "ul:")) + expr = json_object_get(rule, "expr"); + if (!json_is_array(expr)) + continue; + json_array_foreach (expr, j, expr_item) { + counter = json_object_get(expr_item, "counter"); + if (counter && !json_is_object(counter)) + counter = NULL; + if (counter) + break; + } + + if (!counter) + continue; + + packets = json_object_get(counter, "packets"); + if (!packets || !json_is_integer(packets)) + continue; + bytes = json_object_get(counter, "bytes"); + if (!bytes || !json_is_integer(bytes)) + continue; + + comment_str = json_string_value(comment); + if (osmo_str_startswith(comment_str, "ul:")) ul = true; - else if (osmo_str_startswith(buf, "dl:")) + else if (osmo_str_startswith(comment_str, "dl:")) ul = false; else - break; + continue; + hnb_id = comment_str + 3; - hnbp = hnb_persistent_find_by_id_str(buf + 3); - if (!hnbp) - break; - - if (!get_token_after(buf, sizeof(buf), &pos, line_end, "# handle ")) - break; - if (osmo_str_to_int64(&handle, buf, 10, 0, INT64_MAX)) - break; - - hnb_update_counters(hnbp, ul, packets, bytes, handle); + if (hnb_update_counters_by_id(hnb_id, + ul, + json_integer_value(packets), + json_integer_value(bytes), + json_integer_value(handle), + &hnbp)) + continue; count++; } LOGP(DNFT, LOGL_DEBUG, "read %d counters from nft table %s\n", count, s->nft.table_name); + return; + +json_err: + LOGP(DNFT, LOGL_ERROR, "failed to decode nft response: %d: %s\n", + json_err.line, json_err.text); + return; +json_inval: + LOGP(DNFT, LOGL_ERROR, "unexpected structure in nft response\n"); } void nft_kpi_read_counters(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 3: (1 comment) File src/osmo-hnbgw/hnbgw_hnbap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/8308cc6f_5184dab1 PS3, Line 213: char imsi[16]; we probably have defined for this 16? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:22:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests about UE registration

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email ) Change subject: hnbgw: Introduce tests about UE registration ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484/comment/22edbf71_a965… PS1, Line 1011: testcase TC_ue_register_before_hnb_register() runs on test_CT { You are missing adding these tests to control()? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email 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: Ice2743d376ab8041646259fa25117d6fd0e8c2fd Gerrit-Change-Number: 36484 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:21:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email ) Change subject: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email 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: I2fb7ca8dfc2011c727633e795a9d16856825379d Gerrit-Change-Number: 36483 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: Wed, 27 Mar 2024 21:18:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email ) Change subject: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email 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: I171f0385389c5f50dc7ad28525deef396fff5fbf Gerrit-Change-Number: 36482 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: Wed, 27 Mar 2024 21:18:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Make sure to respond with correct "reject"

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email ) Change subject: HNBAP: Make sure to respond with correct "reject" ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 Gerrit-Change-Number: 36478 Gerrit-PatchSet: 3 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: Wed, 27 Mar 2024 21:17:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-iuh[master]: hnbap_common: Make error message more verbose (which type failed)

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email ) Change subject: hnbap_common: Make error message more verbose (which type failed) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf Gerrit-Change-Number: 36480 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: Wed, 27 Mar 2024 21:17:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: fix MGCP_Test.TC_one_crcx_loopback_rtp_implicit expectations

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36466?usp=email ) Change subject: fix MGCP_Test.TC_one_crcx_loopback_rtp_implicit expectations ...................................................................... fix MGCP_Test.TC_one_crcx_loopback_rtp_implicit expectations osmo-mgw should not respond to unknown peers. The test expected the wrong thing, because of an old hack for 3G voice. Fix that. Related: OS#6424 Change-Id: Ibe2ee59d1ed2c25ffef7e8534c172ac190b4983d --- M mgw/MGCP_Test.ttcn 1 file changed, 29 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 3161079..7090b34 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1931,11 +1931,22 @@ stats := f_rtpem_stats_get(RTPEM[0]); - if (stats.num_pkts_tx != stats.num_pkts_rx) { - setverdict(fail); - } - if (stats.bytes_payload_tx != stats.bytes_payload_rx) { - setverdict(fail); + if (one_phase) { + /* osmo-mgw knows both local and remote RTP address. Expect all packets to be reflected. */ + if (stats.num_pkts_tx != stats.num_pkts_rx) { + setverdict(fail); + } + if (stats.bytes_payload_tx != stats.bytes_payload_rx) { + setverdict(fail); + } + } else { + /* osmo-mgw knows only the local RTP address. Expect no packets to be reflected. */ + if (stats.num_pkts_rx > 0) { + setverdict(fail, "stats.num_pkts_rx=", stats.num_pkts_rx, ": osmo-mgw should not send RTP packets to an arbitrary peer"); + } + if (stats.bytes_payload_rx > 0) { + setverdict(fail); + } } f_rtpem_stats_err_check(stats); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36466?usp=email 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: Ibe2ee59d1ed2c25ffef7e8534c172ac190b4983d Gerrit-Change-Number: 36466 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: fix MGCP_Test.TC_one_crcx_loopback_rtp_implicit expectations

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36466?usp=email ) Change subject: fix MGCP_Test.TC_one_crcx_loopback_rtp_implicit expectations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36466?usp=email 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: Ibe2ee59d1ed2c25ffef7e8534c172ac190b4983d Gerrit-Change-Number: 36466 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Mar 2024 21:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

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/osmo-hnbgw/+/36481?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/36481/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email ) Change subject: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register ...................................................................... hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register There's HNB and UE registration; let's make clear which it is. Change-Id: I171f0385389c5f50dc7ad28525deef396fff5fbf --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 20 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/36482/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 89b243b..cd8ac7a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -560,7 +560,7 @@ /* helper function to start all of the simulated hNodeBs */ function f_start_hnbs() runs on test_CT { for (var integer i:= 0; i < g_num_hnbs; i := i+1) { - f_hnbap_register(i, i); + f_hnbap_hnb_register(i, i); } } @@ -887,7 +887,7 @@ ***********************************************************************/ -function f_hnbap_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT +function f_hnbap_hnb_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT { timer T := 2.0; @@ -926,7 +926,7 @@ testcase TC_hnb_register() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); + f_hnbap_hnb_register(0); f_shutdown_helper(); } @@ -935,8 +935,8 @@ testcase TC_hnb_register_duplicate() runs on test_CT { g_num_hnbs := 2; f_init(start_hnb := false); - f_hnbap_register(0); - f_hnbap_register(1, 0, expect_reject := true); + f_hnbap_hnb_register(0); + f_hnbap_hnb_register(1, 0, expect_reject := true); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } @@ -947,8 +947,8 @@ testcase TC_hnb_register_duplicate_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); - f_hnbap_register(0); + f_hnbap_hnb_register(0); + f_hnbap_hnb_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } @@ -958,9 +958,9 @@ testcase TC_hnb_reregister_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); + f_hnbap_hnb_register(0); HNBAP[0].send(ts_HNBAP_HNBDe_Register(ts_HnbapCause(unspecified))); - f_hnbap_register(0); + f_hnbap_hnb_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email 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: I171f0385389c5f50dc7ad28525deef396fff5fbf Gerrit-Change-Number: 36482 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests about UE registration

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email ) Change subject: hnbgw: Introduce tests about UE registration ...................................................................... hnbgw: Introduce tests about UE registration We didn't have any test coverage for HNBAP UE registration so far. Let's start with two basic tests: * normal / successful case * abnormal case: UE Register without prior HNB Register Change-Id: Ice2743d376ab8041646259fa25117d6fd0e8c2fd --- M hnbgw/HNBGW_Tests.ttcn M library/hnbap/HNBAP_Templates.ttcn 2 files changed, 232 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/36484/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 91677b1..09079db 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -33,6 +33,7 @@ import from TELNETasp_PortType all; import from HNBAP_Templates all; +import from HNBAP_IEs all; import from HNBAP_PDU_Descriptions all; import from RUA_IEs all; @@ -923,6 +924,38 @@ } } +function f_hnbap_ue_register(integer hnb_idx := 0, template (present) UE_Identity ue_id, boolean expect_reject := false) runs on test_CT +{ + timer T := 2.0; + + HNBAP[hnb_idx].send(ts_HNBAP_UERegisterRequest(ue_id)); + + T.start; + alt { + [] HNBAP[hnb_idx].receive(tr_HNBAP_UERegisterAccept(ue_id)) { + if (expect_reject) { + setverdict(fail, "Rx UE Register Accept while expecting reject"); + } else { + setverdict(pass); + } + } + [] HNBAP[hnb_idx].receive(tr_HNBAP_UERegisterReject(ue_id, ?)) { + if (expect_reject) { + setverdict(pass); + } else { + setverdict(fail, "Rx UE Register Reject while expecting accept"); + } + } + [] HNBAP[hnb_idx].receive(IUHEM_Event:?) { + repeat; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for UE Register response"); + } + } +} + + testcase TC_hnb_register() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); @@ -965,6 +998,24 @@ f_shutdown_helper(); } +/* regular UE registration */ +testcase TC_ue_register() runs on test_CT { + var UE_Identity ue_id := { iMSI := imsi_hex2oct(f_gen_imsi(1)) }; + g_num_hnbs := 1; + f_init(start_hnb := true); + f_hnbap_ue_register(0, ue_id); + f_shutdown_helper(); +} + +/* UE registration from unregistered HNB */ +testcase TC_ue_register_before_hnb_register() runs on test_CT { + var UE_Identity ue_id := { iMSI := imsi_hex2oct(f_gen_imsi(1)) }; + g_num_hnbs := 1; + f_init(start_hnb := false); + f_hnbap_ue_register(0, ue_id, expect_reject := true); + f_shutdown_helper(); +} + /*********************************************************************** * RUA / RANAP Testing ***********************************************************************/ diff --git a/library/hnbap/HNBAP_Templates.ttcn b/library/hnbap/HNBAP_Templates.ttcn index 2576d17..7a86e0c 100644 --- a/library/hnbap/HNBAP_Templates.ttcn +++ b/library/hnbap/HNBAP_Templates.ttcn @@ -232,6 +232,172 @@ } } +/* 9.1.6 UE REGISTER REQUEST */ +template (present) HNBAP_PDU +tr_HNBAP_UERegisterRequest(template (present) UE_Identity ue_id) := { + initiatingMessage := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterRequest := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Registration_Cause, + criticality := ignore, + value_ := { Registration_Cause := normal } + }, { + id := HNBAP_Constants.id_UE_Capabilities, + criticality := ignore, + value_ := { + UE_Capabilities := { + access_stratum_release_indicator := ?, + csg_capability := ? + } + } + } + }, + protocolExtensions := * /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + +template (value) HNBAP_PDU +ts_HNBAP_UERegisterRequest(template (value) UE_Identity ue_id) := { + initiatingMessage := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterRequest := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Registration_Cause, + criticality := ignore, + value_ := { Registration_Cause := normal } + }, { + id := HNBAP_Constants.id_UE_Capabilities, + criticality := ignore, + value_ := { + UE_Capabilities := { + access_stratum_release_indicator := rel_8_and_beyond, + csg_capability := not_csg_capable, + iE_Extensions := omit + } + } + } + }, + protocolExtensions := omit /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + +/* 9.1.7 UE REGISTER ACCEPT */ +template (present) HNBAP_PDU +tr_HNBAP_UERegisterAccept(template (present) UE_Identity ue_id) := { + successfulOutcome := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterAccept := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Context_ID, + criticality := reject, + value_ := { Context_ID := ? } + }, * + }, + protocolExtensions := * /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + +template (value) HNBAP_PDU +ts_HNBAP_UERegisterAccept(template (value) UE_Identity ue_id, + template (value) BIT24 context_id) := { + successfulOutcome := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterAccept := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Context_ID, + criticality := reject, + value_ := { Context_ID := context_id } + } + }, + protocolExtensions := omit /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + +/* 9.1.8 UE REGISTER REJECT */ +template (present) HNBAP_PDU +tr_HNBAP_UERegisterReject(template (present) UE_Identity ue_id, template (present) Cause cause := ?) := { + unsuccessfulOutcome := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterReject := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + }, * + }, + protocolExtensions := * /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} +template (value) HNBAP_PDU +ts_HNBAP_UERegisterReject(template (value) UE_Identity ue_id, template (value) Cause cause) := { + unsuccessfulOutcome := { + procedureCode := id_UERegister, + criticality := reject, + value_ := { + uERegisterReject := { + protocolIEs := { + { + id := HNBAP_Constants.id_UE_Identity, + criticality := reject, + value_ := { UE_Identity := ue_id } + }, { + id := HNBAP_Constants.id_Cause, + criticality := ignore, + value_ := { Cause := cause } + } + }, + protocolExtensions := omit /* TODO: CriticalityDiagnostics, BackoffTimer */ + } + } + } +} + /* 9.1.9 HNB DE-REGISTER */ template (value) HNBAP_PDU ts_HNBAP_HNBDe_Register(template (value) Cause cause) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email 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: Ice2743d376ab8041646259fa25117d6fd0e8c2fd Gerrit-Change-Number: 36484 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email ) Change subject: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module ...................................................................... hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module This is in preparation of importing HNBAP_IEs which introduces types of the same name. Change-Id: I2fb7ca8dfc2011c727633e795a9d16856825379d --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/36483/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index cd8ac7a..91677b1 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -800,12 +800,12 @@ private function f_build_initial_ue_with_nas(TestHdlrParams pars, octetstring nas) return RANAP_PDU { - var LAI lai := { + var RANAP_IEs.LAI lai := { pLMNidentity := hex2oct(pars.hnb.lai.mcc_mnc), lAC := int2oct(pars.hnb.lai.lac, 2), iE_Extensions := omit }; - var SAI sai := { + var RANAP_IEs.SAI sai := { pLMNidentity := lai.pLMNidentity, lAC := lai.lAC, sAC := int2oct(pars.hnb.sac, 2), @@ -818,7 +818,7 @@ } var template RANAP_PDU ret; if (pars.ps_domain) { - var RAC rac := '00'O; + var RANAP_IEs.RAC rac := '00'O; ret := ts_RANAP_initialUE_PS(lai, rac, sai, nas, sigc_id, grnc_id); } else { ret := ts_RANAP_initialUE_CS(lai, sai, nas, sigc_id, grnc_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email 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: I2fb7ca8dfc2011c727633e795a9d16856825379d Gerrit-Change-Number: 36483 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 2: (2 comments) File src/osmo-hnbgw/hnbgw_hnbap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15469): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/8c93ee17_7cd64d0d PS2, Line 279: (const char *)ue_id->choice.iMSI.buf, code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15469): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/02102c28_9757617a PS2, Line 279: (const char *)ue_id->choice.iMSI.buf, please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Mar 2024 20:49:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/36481/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 1: (2 comments) File src/osmo-hnbgw/hnbgw_hnbap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15467): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/bb3602e0_8403a509 PS1, Line 277: (const char *)ue_id->choice.iMSI.buf, code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15467): https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/61055a53_2ce82423 PS1, Line 277: (const char *)ue_id->choice.iMSI.buf, please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Mar 2024 20:47:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log March 2024