- gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: s1ap_utils_test: fix: expected value goes first
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41761?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: s1ap_utils_test: fix: expected value goes first ...................................................................... s1ap_utils_test: fix: expected value goes first Change-Id: Ib7c6478b95a78c9797e86180a89c098e75b615e0 --- M test/s1ap_utils_test.erl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/test/s1ap_utils_test.erl b/test/s1ap_utils_test.erl index 1f3279b..ca63606 100644 --- a/test/s1ap_utils_test.erl +++ b/test/s1ap_utils_test.erl @@ -18,7 +18,7 @@ s1ap_setup_req_test_() -> {MsgType, IEs} = s1ap_utils:parse_pdu(s1ap_samples:s1_setup_req_pdu()), - [?_assertEqual(MsgType, {?'id-S1Setup', initiatingMessage}), + [?_assertEqual({?'id-S1Setup', initiatingMessage}, MsgType), ?_assertEqualIE(?'id-Global-ENB-ID', #{enb_id => 0, plmn_id => {"001", "01"}}), ?_assertEqualIE(?'id-eNBname', undefined), %% optional, not present @@ -27,7 +27,7 @@ s1ap_setup_rsp_test_() -> {MsgType, IEs} = s1ap_utils:parse_pdu(s1ap_samples:s1_setup_rsp_pdu()), - [?_assertEqual(MsgType, {?'id-S1Setup', successfulOutcome}), + [?_assertEqual({?'id-S1Setup', successfulOutcome}, MsgType), ?_assertEqualIE(?'id-MMEname', "open5gs-mme0"), ?_assertMatchIE(?'id-ServedGUMMEIs', [#'ServedGUMMEIsItem'{}]), ?_assertEqualIE(?'id-RelativeMMECapacity', 16#ff)]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib7c6478b95a78c9797e86180a89c098e75b615e0 Gerrit-Change-Number: 41761 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[M] Change in ...osmo-s1gw[master]: s1ap_utils: add API for building S1 SETUP FAILURE PDU
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41762?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1ap_utils: add API for building S1 SETUP FAILURE PDU ...................................................................... s1ap_utils: add API for building S1 SETUP FAILURE PDU This API will be used in a follow-up patch adding the MME pooling. Take a chance to add a parsing test for the new PDU blob. Change-Id: I5a4e060e0a2ebdfbcfafac42f9de2e49ac3583b8 Related: SYS#7052 --- M src/s1ap_utils.erl M test/s1ap_samples.erl M test/s1ap_utils_test.erl 3 files changed, 88 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/s1ap_utils.erl b/src/s1ap_utils.erl index 6f7e6b6..5cded8b 100644 --- a/src/s1ap_utils.erl +++ b/src/s1ap_utils.erl @@ -40,6 +40,8 @@ parse_plmn_id/1, parse_enb_id/1, genb_id_str/1]). +-export([build_pdu/1, + build_s1setup_fail_pdu/1]). -include_lib("kernel/include/logger.hrl"). @@ -120,6 +122,34 @@ MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId). +%% Build an S1AP PDU +-spec build_pdu(s1ap_pdu_info()) -> {ok, binary()} | {error, term()}. +build_pdu({MsgType, Content}) -> + case build_pdu(MsgType, Content) of + {error, Error} -> + ?LOG_ERROR("S1AP PDU (~p) building failed: ~p", [MsgType, Error]), + {error, {build_pdu, Error}}; + PDU -> + try encode_pdu(PDU) of + {ok, Data} -> + {ok, Data}; + {error, Error} -> + ?LOG_ERROR("S1AP PDU (~p) encoding failed: ~p", [MsgType, Error]), + {error, {encode_pdu, Error}} + catch + Exception:Reason:StackTrace -> + ?LOG_ERROR("An exception occurred: ~p, ~p, ~p", [Exception, Reason, StackTrace]), + {error, encode_pdu} + end + end. + + +%% Build an S1AP S1 SETUP FAILURE PDU +-spec build_s1setup_fail_pdu(proplists:proplist()) -> {ok, binary()} | {error, term()}. +build_s1setup_fail_pdu(Content) -> + build_pdu({{?'id-S1Setup', unsuccessfulOutcome}, Content}). + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ @@ -207,4 +237,27 @@ lists:map(fun parse_ie/1, IEs). +-spec build_pdu(MsgType, Content) -> s1ap_pdu() | {error, term()} + when MsgType :: s1ap_msg_type(), + Content :: proplists:proplist(). +build_pdu({?'id-S1Setup' = PC, + unsuccessfulOutcome = Outcome}, Content) -> + Cause = proplists:get_value(?'id-Cause', Content, {misc, unspecified}), + TimeToWait = proplists:get_value(?'id-TimeToWait', Content, v10s), + IEs = [#'ProtocolIE-Field'{id = ?'id-Cause', + criticality = ignore, + value = Cause}, + #'ProtocolIE-Field'{id = ?'id-TimeToWait', + criticality = ignore, + value = TimeToWait}], + {Outcome, + #'UnsuccessfulOutcome'{procedureCode = PC, + criticality = reject, + value = #'S1SetupFailure'{protocolIEs = IEs}}}; + + +build_pdu(_MsgType, _Content) -> + {error, not_implemented}. + + %% vim:set ts=4 sw=4 et: diff --git a/test/s1ap_samples.erl b/test/s1ap_samples.erl index e3c3ac1..183aad6 100644 --- a/test/s1ap_samples.erl +++ b/test/s1ap_samples.erl @@ -2,6 +2,7 @@ -export([s1_setup_req_pdu/0, s1_setup_rsp_pdu/0, + s1_setup_fail_pdu/0, e_rab_setup_req_pdu/2, e_rab_setup_rsp_pdu/2, e_rab_setup_rsp_fail_pdu/0, @@ -48,6 +49,14 @@ >>. +%% S1 SETUP FAILURE +s1_setup_fail_pdu() -> + << 16#40, 16#11, 16#00, 16#0d, 16#00, 16#00, 16#02, 16#00, + 16#02, 16#40, 16#01, 16#44, 16#00, 16#41, 16#40, 16#01, + 16#30 + >>. + + %% [eNB <- MME] E-RAB SETUP REQUEST e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA), is_integer(TEID) -> diff --git a/test/s1ap_utils_test.erl b/test/s1ap_utils_test.erl index ca63606..9285da8 100644 --- a/test/s1ap_utils_test.erl +++ b/test/s1ap_utils_test.erl @@ -16,7 +16,7 @@ %% actual testcases %% ------------------------------------------------------------------ -s1ap_setup_req_test_() -> +s1ap_setup_req_parse_test_() -> {MsgType, IEs} = s1ap_utils:parse_pdu(s1ap_samples:s1_setup_req_pdu()), [?_assertEqual({?'id-S1Setup', initiatingMessage}, MsgType), ?_assertEqualIE(?'id-Global-ENB-ID', #{enb_id => 0, @@ -25,7 +25,7 @@ ?_assertMatchIE(?'id-SupportedTAs', [12345])]. %% we only parse the TACs -s1ap_setup_rsp_test_() -> +s1ap_setup_rsp_parse_test_() -> {MsgType, IEs} = s1ap_utils:parse_pdu(s1ap_samples:s1_setup_rsp_pdu()), [?_assertEqual({?'id-S1Setup', successfulOutcome}, MsgType), ?_assertEqualIE(?'id-MMEname', "open5gs-mme0"), @@ -33,4 +33,28 @@ ?_assertEqualIE(?'id-RelativeMMECapacity', 16#ff)]. +s1ap_setup_fail_parse_test_() -> + {MsgType, IEs} = s1ap_utils:parse_pdu(s1ap_samples:s1_setup_fail_pdu()), + [?_assertEqual({?'id-S1Setup', unsuccessfulOutcome}, MsgType), + ?_assertEqualIE(?'id-Cause', {misc, unspecified}), + ?_assertEqualIE(?'id-TimeToWait', v10s)]. + + +s1ap_setup_fail_build_test_() -> + [?_assertEqual({ok, s1ap_samples:s1_setup_fail_pdu()}, + s1ap_utils:build_s1setup_fail_pdu([]))]. + + +build_pdu_error_test_() -> + TraceStartReq = {{?'id-TraceStart', initiatingMessage}, []}, + S1SetupFailure = {{?'id-S1Setup', unsuccessfulOutcome}, + [{?'id-TimeToWait', 42}]}, %% wrong value + [%% test building a non-implemented PDU + ?_assertEqual({error, {build_pdu, not_implemented}}, + s1ap_utils:build_pdu(TraceStartReq)), + %% test building a PDU with a wrong user-supplied IE + ?_assertMatch({error, {encode_pdu, {asn1, _}}}, + s1ap_utils:build_pdu(S1SetupFailure))]. + + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41762?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I5a4e060e0a2ebdfbcfafac42f9de2e49ac3583b8 Gerrit-Change-Number: 41762 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[L] Change in ...osmo-s1gw[master]: [REST] Add MmeList, MmeAdd, MmeInfo, MmeDelete
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41282?usp=email ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: [REST] Add MmeList, MmeAdd, MmeInfo, MmeDelete ...................................................................... [REST] Add MmeList, MmeAdd, MmeInfo, MmeDelete Change-Id: Iad249aed99face9e35fd19e0596cf2364ade4c77 Related: SYS#7052 --- M contrib/openapi.yaml M contrib/osmo-s1gw-cli.py M doc/osmo-s1gw-cli.md M priv/openapi.json M src/rest_server.erl 5 files changed, 578 insertions(+), 15 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index 7f81608..6ab1346 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -66,6 +66,58 @@ '200': $ref: '#/components/responses/OperationResult' + /mme-list: + get: + summary: Get a list of registered MMEs + operationId: MmeList + responses: + '200': + description: A list of registered MMEs + content: + application/json: + schema: + $ref: '#/components/schemas/MmeList' + post: + summary: Add an MME to the pool + operationId: MmeAdd + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/MmeItem' + responses: + '201': + description: Successful outcome (MME added) + '409': + description: Unsuccessful outcome (MME already registered?) + + /mme/{MmeId}: + get: + summary: Get information about a specific MME + operationId: MmeInfo + parameters: + - $ref: '#/components/parameters/MmeId' + responses: + '200': + description: Successful outcome (MME info) + content: + application/json: + schema: + $ref: '#/components/schemas/MmeItem' + '404': + description: Unsuccessful outcome (MME not found) + delete: + summary: Delete an MME from the pool + operationId: MmeDelete + parameters: + - $ref: '#/components/parameters/MmeId' + responses: + '200': + description: Successful outcome (MME deleted) + '404': + description: Unsuccessful outcome (MME not found) + /enb-list: get: summary: Get a list of eNB connections @@ -168,6 +220,22 @@ $ref: '#/components/schemas/OperationResult' parameters: + MmeId: + name: MmeId + in: path + description: MME identifier (selector) + required: true + schema: + oneOf: + - type: string + pattern: '^name:' + description: MME name + example: mme0 + - type: string + pattern: '^addr:[0-9a-f:.]+-[0-9]+$' + description: MME remote address/port + example: addr:192.168.1.1-36412 + EnbId: name: EnbId in: path @@ -271,6 +339,38 @@ type: integer description: Remote Recovery TimeStamp + MmeList: + type: array + items: + $ref: '#/components/schemas/MmeItem' + + MmeItem: + type: object + required: + - name + - raddr + properties: + name: + type: string + description: Unique, human-readable identifier + laddr: + type: string + description: Local (bind) IP address + default: any + raddr: + type: string + description: Remote (connect) IP address + rport: + type: integer + description: Remote port + default: 36412 + tac_list: + type: array + items: + type: integer + description: List of allowed TACs (empty means allow-all) + default: [] + EnbList: type: array items: diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index b51a667..265c5fc 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -102,6 +102,26 @@ with self.send_post_req('pfcp/heartbeat') as f: return json.load(f) + def mme_list(self) -> RESTResponse: + ''' MmeList :: Get a list of registered MMEs ''' + with self.send_get_req('mme-list') as f: + return json.load(f) + + def mme_add(self, mme_info: dict) -> int: + ''' MmeAdd :: Add an MME to the pool ''' + with self.send_post_req('mme-list', mme_info) as f: + return f.status + + def mme_info(self, name: str) -> RESTResponse: + ''' MmeInfo :: Get information about a specific MME ''' + with self.send_get_req(f'mme/name:{name}') as f: + return json.load(f) + + def mme_delete(self, name: str) -> int: + ''' MmeInfo :: Get information about a specific MME ''' + with self.send_delete_req(f'mme/name:{name}') as f: + return f.status + def enb_list(self) -> RESTResponse: ''' EnbList :: Get a list of eNB connections ''' with self.send_get_req('enb-list') as f: @@ -143,6 +163,7 @@ CAT_METRICS = 'Metrics commands' CAT_PFCP = 'PFCP related commands' + CAT_MME = 'MME related commands' CAT_ENB = 'eNB related commands' CAT_ERAB = 'E-RAB related commands' @@ -229,6 +250,115 @@ self.perror('Heartbeat failed: {message}'.format(**data)) @staticmethod + def add_sort_group(parser, + default: str, + choices: set[str]) -> None: + ''' Add argparse group with sorting params ''' + sort_group = parser.add_argument_group('Sorting options') + sort_group.add_argument('-S', '--sort-by', + type=str, + default=default, + choices=choices, + help='Sort by (default: %(default)s)') + sort_group.add_argument('--reverse', + action='store_true', + help='Reverse order (default: %(default)s)') + + @staticmethod + def mme_list_item(item: dict) -> dict: + ''' Generate a table row for the given MME ''' + tac_list = item.get('tac_list') + tac_list = ', '.join(map(str, tac_list)) + return { + 'Name': item.get('name'), + 'Local address': item.get('laddr'), + 'Remote address/port': '{raddr}:{rport}'.format(**item), + 'Allowed TACs': tac_list or 'all', + } + + def mme_list_print(self, items: list[dict], + sort_by: str = 'none', + reverse: bool = False) -> None: + ''' Print a [sorted] list of MMEs in tabular form ''' + if sort_by != 'none': + items.sort(key=lambda item: item.get(sort_by), reverse=reverse) + self.poutput(tabulate.tabulate(map(self.mme_list_item, items), + headers='keys', tablefmt=self.tablefmt)) + + def mme_info_print(self, item: dict) -> None: + ''' Print MME info in tabular form ''' + self.poutput(tabulate.tabulate(self.mme_list_item(item).items(), + headers=['Parameter', 'Value'], + tablefmt=self.tablefmt)) + + mme_list_parser = cmd2.Cmd2ArgumentParser() + add_sort_group(mme_list_parser, default='none', + choices=('none', 'name', 'laddr', 'raddr')) + + @cmd2.with_argparser(mme_list_parser) + @cmd2.with_category(CAT_MME) + def do_mme_list(self, opts) -> None: + ''' Get a list of registered MMEs ''' + data = self.iface.mme_list() + self.mme_list_print(data, opts.sort_by, opts.reverse) + + mme_add_parser = cmd2.Cmd2ArgumentParser() + mme_add_parser.add_argument('-N', '--name', + type=str, required=True, + help='MME name (example: mme0)') + mme_add_parser.add_argument('-la', '--laddr', + type=str, default='any', + help='Local address (default: %(default)s)') + mme_add_parser.add_argument('-ra', '--raddr', + type=str, required=True, + help='Remote address (example: 192.168.1.101)') + mme_add_parser.add_argument('-rp', '--rport', + type=int, default=36412, + help='Remote port (default: %(default)s)') + mme_add_parser.add_argument('--tac', + type=int, default=[], + action='append', dest='tac_list', + help='Allowed TAC (Tracking Area Code)') + + @cmd2.with_argparser(mme_add_parser) + @cmd2.with_category(CAT_MME) + def do_mme_add(self, opts) -> None: + ''' Add an MME to the pool ''' + mme_info = dict(name=opts.name, + laddr=opts.laddr, + raddr=opts.raddr, + rport=opts.rport, + tac_list=opts.tac_list) + self.iface.mme_add(mme_info) + + @staticmethod + def add_mme_id_group(parser): + ''' Add argparse group for the MmeId parameter ''' + mme_id_group = parser.add_argument_group('MME ID') + mme_id_group = mme_id_group.add_mutually_exclusive_group(required=True) + mme_id_group.add_argument('-N', '--name', + type=str, + help='MME name (example: mme0)') + # TODO: address/port + return mme_id_group + + mme_info_parser = cmd2.Cmd2ArgumentParser() + add_mme_id_group(mme_info_parser) + + @cmd2.with_argparser(mme_info_parser) + @cmd2.with_category(CAT_MME) + def do_mme_info(self, opts) -> None: + ''' Get information about a specific MME ''' + data = self.iface.mme_info(opts.name) + self.mme_info_print(data) + + @cmd2.with_argparser(mme_info_parser) + @cmd2.with_category(CAT_MME) + def do_mme_delete(self, opts) -> None: + ''' Delete an MME from the pool ''' + self.iface.mme_delete(opts.name) + + @staticmethod def enb_list_item(item: dict) -> dict: ''' Generate a table row for the given eNB ''' enb_addr = lambda item: '{enb_saddr}:{enb_sport} ({enb_sctp_aid})'.format(**item) @@ -258,21 +388,6 @@ headers=['Parameter', 'Value'], tablefmt=self.tablefmt)) - @staticmethod - def add_sort_group(parser, - default: str, - choices: set[str]) -> None: - ''' Add argparse group with sorting params ''' - sort_group = parser.add_argument_group('Sorting options') - sort_group.add_argument('-S', '--sort-by', - type=str, - default=default, - choices=choices, - help='Sort by (default: %(default)s)') - sort_group.add_argument('--reverse', - action='store_true', - help='Reverse order (default: %(default)s)') - enb_list_parser = cmd2.Cmd2ArgumentParser() add_sort_group(enb_list_parser, default='handle', choices=('handle', 'pid', 'state', 'genb_id', 'uptime')) diff --git a/doc/osmo-s1gw-cli.md b/doc/osmo-s1gw-cli.md index be5ffc3..d50659e 100644 --- a/doc/osmo-s1gw-cli.md +++ b/doc/osmo-s1gw-cli.md @@ -151,6 +151,109 @@ Heartbeat failed: timeout ``` +### `mme_list` + +Get a list of registered MMEs. + +``` +Usage: mme_list [-h] [-S {none, name, laddr, raddr}] [--reverse] + +Get a list of registered MMEs + +optional arguments: + -h, --help show this help message and exit + +Sorting options: + -S, --sort-by {none, name, laddr, raddr} + Sort by (default: none) + --reverse Reverse order (default: False) +``` + +Example: getting a list of MMEs (not sorted by default). + +``` +OsmoS1GW# mme_list +| Name | Local address | Remote address/port | +|--------|-----------------|-----------------------| +| mme0 | :: | 127.0.2.10:36412 | +| mme1 | :: | 127.0.2.20:36412 | +| mme2 | :: | 127.0.2.30:36412 | +``` + +### `mme_add` + +Add an MME to the pool. + +``` +Usage: mme_add -N NAME -ra RADDR [-h] [-la LADDR] [-rp RPORT] + +Add an MME to the pool + +required arguments: + -N, --name NAME MME name (example: mme0) + -ra, --raddr RADDR Remote address (example: 192.168.1.101) + +optional arguments: + -h, --help show this help message and exit + -la, --laddr LADDR Local address (default: ::) + -rp, --rport RPORT Remote port (default: 36412) +``` + +Example: adding an MME with remote address "192.168.1.101". + +``` +OsmoS1GW# mme_add --name mme42 --raddr 192.168.1.101 +``` + +### `mme_info` + +Get information about a specific MME. + +``` +Usage: mme_info [-h] -N NAME + +Get information about a specific MME + +optional arguments: + -h, --help show this help message and exit + +MME ID: + -N, --name NAME MME name (example: mme0) +``` + +Example: getting information about an MME with name "mme0". + +``` +OsmoS1GW# mme_info --name mme0 +| Parameter | Value | +|---------------------|------------------| +| Name | mme0 | +| Local address | :: | +| Remote address/port | 127.0.2.10:36412 | +``` + +### `mme_delete` + +Delete an MME from the pool. + +``` +Usage: mme_delete [-h] -N NAME + +Delete an MME from the pool + +optional arguments: + -h, --help show this help message and exit + +MME ID: + -N, --name NAME MME name (example: mme0) +``` + +Example: deleting an MME with name "mme0". + +``` +OsmoS1GW# mme_delete --name mme0 +``` + ### `enb_list` Get a list of eNB connections. diff --git a/priv/openapi.json b/priv/openapi.json index 6bcefdb..87aafac 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -100,6 +100,89 @@ } } }, + "/mme-list": { + "get": { + "summary": "Get a list of registered MMEs", + "operationId": "MmeList", + "responses": { + "200": { + "description": "A list of registered MMEs", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MmeList" + } + } + } + } + } + }, + "post": { + "summary": "Add an MME to the pool", + "operationId": "MmeAdd", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MmeItem" + } + } + } + }, + "responses": { + "201": { + "description": "Successful outcome (MME added)" + }, + "409": { + "description": "Unsuccessful outcome (MME already registered?)" + } + } + } + }, + "/mme/{MmeId}": { + "get": { + "summary": "Get information about a specific MME", + "operationId": "MmeInfo", + "parameters": [ + { + "$ref": "#/components/parameters/MmeId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (MME info)", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MmeItem" + } + } + } + }, + "404": { + "description": "Unsuccessful outcome (MME not found)" + } + } + }, + "delete": { + "summary": "Delete an MME from the pool", + "operationId": "MmeDelete", + "parameters": [ + { + "$ref": "#/components/parameters/MmeId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (MME deleted)" + }, + "404": { + "description": "Unsuccessful outcome (MME not found)" + } + } + } + }, "/enb-list": { "get": { "summary": "Get a list of eNB connections", @@ -263,6 +346,28 @@ } }, "parameters": { + "MmeId": { + "name": "MmeId", + "in": "path", + "description": "MME identifier (selector)", + "required": true, + "schema": { + "oneOf": [ + { + "type": "string", + "pattern": "^name:", + "description": "MME name", + "example": "mme0" + }, + { + "type": "string", + "pattern": "^addr:[0-9a-f:.]+-[0-9]+$", + "description": "MME remote address/port", + "example": "addr:192.168.1.1-36412" + } + ] + } + }, "EnbId": { "name": "EnbId", "in": "path", @@ -406,6 +511,47 @@ } } }, + "MmeList": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MmeItem" + } + }, + "MmeItem": { + "type": "object", + "required": [ + "name", + "raddr" + ], + "properties": { + "name": { + "type": "string", + "description": "Unique, human-readable identifier" + }, + "laddr": { + "type": "string", + "description": "Local (bind) IP address", + "default": "any" + }, + "raddr": { + "type": "string", + "description": "Remote (connect) IP address" + }, + "rport": { + "type": "integer", + "description": "Remote port", + "default": 36412 + }, + "tac_list": { + "type": "array", + "items": { + "type": "integer" + }, + "description": "List of allowed TACs (empty means allow-all)", + "default": [] + } + } + }, "EnbList": { "type": "array", "items": { diff --git a/src/rest_server.erl b/src/rest_server.erl index 9535939..79090e8 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -37,6 +37,10 @@ -export([metrics_list/1, pfcp_assoc_state/1, pfcp_heartbeat/1, + mme_list/1, + mme_add/1, + mme_info/1, + mme_delete/1, enb_list/1, enb_info/1, enb_delete/1, @@ -95,6 +99,46 @@ end. +%% MmeList :: Get a list of registered MMEs +mme_list(#{}) -> + MmeList = mme_registry:fetch_mme_list(), + {200, [], lists:map(fun mme_item_build/1, MmeList)}. + + +%% MmeAdd :: Add an MME to the pool +mme_add(#{body := Body}) -> + MmeInfo = mme_item_parse(Body), + case mme_registry:mme_register(MmeInfo) of + ok -> {201, [], undefined}; + {error, _} -> {409, [], undefined} + end. + + +%% MmeInfo :: Get information about a specific MME +mme_info(#{path_parameters := PP}) -> + [{<< "MmeId" >>, << ID/bytes >>}] = PP, + case fetch_mme_info(ID) of + {ok, MmeInfo} -> + {200, [], mme_item_build(MmeInfo)}; + error -> + {404, [], undefined} + end. + + +%% MmeDelete :: Delete an MME from the pool +mme_delete(#{path_parameters := PP}) -> + [{<< "MmeId" >>, << ID/bytes >>}] = PP, + case fetch_mme_info(ID) of + {ok, #{name := MmeName}} -> + case mme_registry:mme_unregister(MmeName) of + ok -> {200, [], undefined}; + {error, _} -> {404, [], undefined} + end; + error -> + {404, [], undefined} + end. + + %% EnbList :: Get a list of eNB connections enb_list(#{}) -> EnbList = enb_registry:fetch_enb_list(), @@ -220,6 +264,60 @@ thing_to_list(X) when is_list(X) -> X. +%% Parse an MmeItem object (received from user) +-spec mme_item_parse(map()) -> mme_registry:mme_info(). +mme_item_parse(MmeItem) -> + maps:fold(fun mme_item_parse_field/3, #{ }, MmeItem). + + +%% Parse MmeItem object fields (received from user) +mme_item_parse_field(<< "name" >>, Name, MmeInfo) -> + MmeInfo#{name => binary_to_list(Name)}; +mme_item_parse_field(<< "laddr" >>, << "any" >>, MmeInfo) -> + MmeInfo#{laddr => any}; +mme_item_parse_field(<< "laddr" >>, LAddr, MmeInfo) -> + MmeInfo#{laddr => binary_to_list(LAddr)}; +mme_item_parse_field(<< "raddr" >>, RAddr, MmeInfo) -> + MmeInfo#{raddr => binary_to_list(RAddr)}; +mme_item_parse_field(<< "rport" >>, RPort, MmeInfo) -> + MmeInfo#{rport => RPort}; +mme_item_parse_field(<< "tac_list" >>, TACs, MmeInfo) -> + MmeInfo#{tac_list => TACs}; +mme_item_parse_field(_K, _V, MmeInfo) -> MmeInfo. + + +%% Build an MmeItem object (sent to user) +-spec mme_item_build(mme_registry:mme_info()) -> map(). +mme_item_build(MmeInfo) -> + maps:fold(fun mme_item_build_field/3, #{ }, MmeInfo). + +%% Build MmeItem object fields (sent to user) +mme_item_build_field(name, Name, MmeItem) -> + MmeItem#{<< "name" >> => bval(Name)}; +mme_item_build_field(laddr, any, MmeItem) -> + MmeItem#{<< "laddr" >> => << "any" >>}; +mme_item_build_field(laddr, LAddr, MmeItem) -> + MmeItem#{<< "laddr" >> => bval(inet:ntoa(LAddr))}; +mme_item_build_field(raddr, RAddr, MmeItem) -> + MmeItem#{<< "raddr" >> => bval(inet:ntoa(RAddr))}; +mme_item_build_field(rport, RPort, MmeItem) -> + MmeItem#{<< "rport" >> => RPort}; +mme_item_build_field(tac_list, TACs, MmeItem) -> + MmeItem#{<< "tac_list" >> => TACs}; +mme_item_build_field(_K, _V, MmeItem) -> MmeItem. + + +-spec fetch_mme_info(binary()) -> {ok, mme_registry:mme_info()} | error. +fetch_mme_info(<< "name:", Val/bytes >>) -> + MmeName = binary_to_list(Val), + mme_registry:fetch_mme_info(MmeName); + +%% TODO: '^addr:[0-9a-f:.]+-[0-9]+$' +fetch_mme_info(ID) -> + ?LOG_ERROR("Unhandled MME ID ~p", [ID]), + error. + + -spec enb_item(enb_registry:enb_info()) -> map(). enb_item(EnbInfo) -> M0 = #{handle => maps:get(handle, EnbInfo), @@ -395,6 +493,7 @@ bval(V) when is_atom(V) -> atom_to_binary(V); bval(V) when is_list(V) -> list_to_binary(V); bval(V) when is_map(V) -> rsp_map(V); +bval({?FUNCTION_NAME, V}) -> V; bval(V) -> V. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iad249aed99face9e35fd19e0596cf2364ade4c77 Gerrit-Change-Number: 41282 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: replace watchdog process with a timer
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42293?usp=email ) Change subject: pfcp_peer: replace watchdog process with a timer ...................................................................... pfcp_peer: replace watchdog process with a timer The watchdog process is spawned bare (no link/monitor), so if it crashes its failure goes unnoticed, and if pfcp_peer restarts the orphaned watchdog may fire a stale cast at the new process. The watchdog process exists solely to send a delayed message to pfcp_peer on timeout, and to be cancelled (by receiving heartbeat_response) when the response arrives. That's exactly what erlang:start_timer/3 does natively - no separate process needed. Change-Id: I8d71ad8300feefb0aecbf690a825a2b4e9f1102c --- M src/pfcp_peer.erl 1 file changed, 10 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index e1b3aa1..9910f5f 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -88,7 +88,7 @@ -record(heartbeat_state, {from :: undefined | gen_statem:from(), seq_nr :: pfcp_seq_nr(), - pid :: pid() + tref :: reference() }). -record(peer_state, {seid :: pfcp_seid(), @@ -323,11 +323,12 @@ %% Heartbeat Req (timeout) handle_event(_State, - cast, heartbeat_request_watchdog, + info, {timeout, TRef, heartbeat_request_watchdog}, #peer_state{heartbeat = HB} = S) -> case HB of #heartbeat_state{from = From, - seq_nr = SeqNr} -> + seq_nr = SeqNr, + tref = TRef} -> ?LOG_NOTICE("Heartbeat Request (SeqNr=~p) timeout", [SeqNr]), s1gw_metrics:ctr_inc(?S1GW_CTR_PFCP_HEARTBEAT_REQ_TIMEOUT), if @@ -337,7 +338,7 @@ ok end, {keep_state, S#peer_state{heartbeat = undefined}}; - undefined -> + _ -> {keep_state, S} end; @@ -550,25 +551,17 @@ case send_pdu({heartbeat_request, ReqIEs}, S0) of {ok, S1} -> s1gw_metrics:ctr_inc(?S1GW_CTR_PFCP_HEARTBEAT_REQ_TX), - Pid = spawn(fun heartbeat_request_watchdog/0), + TRef = erlang:start_timer(?PFCP_HEARTBEAT_REQ_TIMEOUT, self(), + heartbeat_request_watchdog), HB = #heartbeat_state{from = From, seq_nr = SeqNr, - pid = Pid}, + tref = TRef}, {ok, S1#peer_state{heartbeat = HB}}; Result -> Result end. -heartbeat_request_watchdog() -> - receive - heartbeat_response -> - ok - after - ?PFCP_HEARTBEAT_REQ_TIMEOUT -> - gen_statem:cast(?MODULE, ?FUNCTION_NAME) - end. - recv_heartbeat_response(#pfcp{type = heartbeat_response, seq_no = SeqNr, @@ -580,14 +573,14 @@ case HB of #heartbeat_state{from = From, seq_nr = SeqNr, - pid = Pid} -> + tref = TRef} -> + erlang:cancel_timer(TRef), if From =/= undefined -> gen_statem:reply(From, ok); true -> ok end, - Pid ! heartbeat_response, {ok, S#peer_state{heartbeat = undefined}}; _ -> ?LOG_NOTICE("Heartbeat Response (SeqNr=~p) was not expected", [SeqNr]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42293?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8d71ad8300feefb0aecbf690a825a2b4e9f1102c Gerrit-Change-Number: 42293 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: fix discarded result of handle_ies/3 in HO REQ ACK handler
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42294?usp=email ) Change subject: s1ap_proxy: fix discarded result of handle_ies/3 in HO REQ ACK handler ...................................................................... s1ap_proxy: fix discarded result of handle_ies/3 in HO REQ ACK handler The call processing the optional E-RABFailedToSetupListHOReqAck IE did not pattern-match its return value, causing any errors returned by handle_ies/3 to be silently swallowed. Bind the result to {_, S2} to make the intent explicit. Change-Id: I1c8feeb63fe23876ae443784980e9dc22a450c54 --- M src/s1ap_proxy.erl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a29a817..ef7665e 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -604,8 +604,8 @@ end, %% handle the (optional) list of failed E-RABs %% no #proxy_state modification is expected here - handle_ies(?'id-E-RABFailedToSetupListHOReqAck', - C0#'HandoverRequestAcknowledge'.protocolIEs, S2), + {_, S2} = handle_ies(?'id-E-RABFailedToSetupListHOReqAck', + C0#'HandoverRequestAcknowledge'.protocolIEs, S2), {Result, S2}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I1c8feeb63fe23876ae443784980e9dc22a450c54 Gerrit-Change-Number: 42294 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[S] Change in ...osmo-s1gw[master]: enb_registry: call enb_metrics_register/1 from a proper place
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42295?usp=email ) Change subject: enb_registry: call enb_metrics_register/1 from a proper place ...................................................................... enb_registry: call enb_metrics_register/1 from a proper place enb_metrics_register/1 requires the Global-eNB-ID to register per-eNB metrics. Calling it for every event, which may or may not contain the Global-eNB-ID, is suboptimal. Instead, invoke it from the enb_handle_event/2 clause that handles the {s1setup, GENBId} event, where the Global-Enb-ID is guaranteed to be available. Change-Id: I38237463aa9c968f89bf4f195407a18cba7e73c9 --- M src/enb_registry.erl 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/enb_registry.erl b/src/enb_registry.erl index e40d9f5..54eca5d 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -235,7 +235,6 @@ {ok, EnbInfo0} -> ?LOG_INFO("eNB (handle=~p) event: ~p", [Handle, Event]), EnbInfo1 = enb_handle_event(EnbInfo0, Event), - enb_metrics_register(EnbInfo1), {noreply, S#state{enbs = maps:update(Handle, EnbInfo1, ENBs)}}; error -> ?LOG_ERROR("eNB (handle=~p) is *not* registered", [Handle]), @@ -283,11 +282,9 @@ %% private API %% ------------------------------------------------------------------ --spec enb_metrics_register(enb_info()) -> term(). -enb_metrics_register(#{genb_id_str := GlobalENBId}) -> - catch exometer:new(?S1GW_CTR_ENB_UPTIME(GlobalENBId), counter); - -enb_metrics_register(_) -> ok. +-spec enb_metrics_register(string()) -> term(). +enb_metrics_register(GlobalENBId) -> + catch exometer:new(?S1GW_CTR_ENB_UPTIME(GlobalENBId), counter). -spec enb_metrics_reset(enb_info()) -> term(). @@ -307,9 +304,11 @@ mme_conn_info => ConnInfo}; enb_handle_event(EnbInfo, {s1setup, GENBId}) -> + GlobalENBId = s1ap_utils:genb_id_str(GENBId), + enb_metrics_register(GlobalENBId), EnbInfo#{state => s1setup, genb_id => GENBId, - genb_id_str => s1ap_utils:genb_id_str(GENBId)}; + genb_id_str => GlobalENBId}; enb_handle_event(EnbInfo, Event) -> ?LOG_ERROR("Unhandled event: ~p", [Event]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I38237463aa9c968f89bf4f195407a18cba7e73c9 Gerrit-Change-Number: 42295 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: enb_registry: fix pattern match in handle_info 'DOWN' handler
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42296?usp=email ) Change subject: enb_registry: fix pattern match in handle_info 'DOWN' handler ...................................................................... enb_registry: fix pattern match in handle_info 'DOWN' handler PIDs maps pid() => enb_handle() (an integer), so maps:find/2 returns {ok, SomeHandle}. The old pattern {ok, Pid} tried to match an integer against the already-bound pid() variable, which never succeeds. This handler is only called on abnormal termination (process crash), so the broken match caused the registry entry to never be cleaned up in that case. Fix by using a fresh {ok, Handle} binding and removing the now-redundant follow-up maps:get/2 call. Change-Id: I4cb044e8071c4ae2fc48c507f8733af6c617ec46 --- M src/enb_registry.erl 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/enb_registry.erl b/src/enb_registry.erl index 54eca5d..d2487a0 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -257,8 +257,7 @@ pids = PIDs} = S) -> ?LOG_INFO("eNB process (pid=~p) terminated with reason ~p", [Pid, Reason]), case maps:find(Pid, PIDs) of - {ok, Pid} -> - Handle = maps:get(Pid, PIDs), + {ok, Handle} -> enb_metrics_reset(maps:get(Handle, ENBs)), ?LOG_INFO("eNB (handle=~p, pid=~p) has been unregistered", [Handle, Pid]), {noreply, S#state{enbs = maps:remove(Handle, ENBs), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4cb044e8071c4ae2fc48c507f8733af6c617ec46 Gerrit-Change-Number: 42296 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[XS] Change in ...osmo-s1gw[master]: enb_registry: fix duplicate registration check in enb_register/0
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42297?usp=email ) Change subject: enb_registry: fix duplicate registration check in enb_register/0 ...................................................................... enb_registry: fix duplicate registration check in enb_register/0 next_handle was bound in the function head and reused in the case pattern {ok, Handle}, turning what looks like a binding into an equality test against next_handle. The duplicate check therefore only fired if the previously assigned handle happened to equal the current next_handle counter, which is essentially never true. Fix by removing next_handle from the function head pattern and reading it with S#state.next_handle inside the error branch, so that Handle in {ok, Handle} is always a fresh binding that matches any existing handle. Change-Id: Ia64f3e2e79bea055e5c37df9bce91a4bcbf7184c --- M src/enb_registry.erl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/enb_registry.erl b/src/enb_registry.erl index d2487a0..29a2575 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -155,13 +155,13 @@ handle_call(enb_register, {Pid, _Tag}, #state{enbs = ENBs, - pids = PIDs, - next_handle = Handle} = S) -> + pids = PIDs} = S) -> case maps:find(Pid, PIDs) of {ok, Handle} -> ?LOG_ERROR("eNB (handle=~p, pid=~p) is *already* registered", [Handle, Pid]), {reply, {error, already_registered}, S}; error -> + Handle = S#state.next_handle, %% keep an eye on the process being registered MonRef = erlang:monitor(process, Pid), %% create and store an initial eNB state -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42297?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia64f3e2e79bea055e5c37df9bce91a4bcbf7184c Gerrit-Change-Number: 42297 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: enb_registry: fix addr/port filter logic (use andalso)
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42298?usp=email ) Change subject: enb_registry: fix addr/port filter logic (use andalso) ...................................................................... enb_registry: fix addr/port filter logic (use andalso) In Erlang a function body returns only its last expression. The comma between the two enb_filter_by_sub_field/2 calls caused the result of the addr check to be silently discarded, so the filter only tested the port. Replace the comma with andalso to require both to match. Change-Id: I8061636cd1077a4f3a9e9d37a31224f5e373becb --- M src/enb_registry.erl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/enb_registry.erl b/src/enb_registry.erl index 29a2575..3c9e8ef 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -330,11 +330,11 @@ fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_aid, Aid}, Item) end; enb_filter({enb_addr_port, {Addr, Port}}) -> - fun(_, Item) -> enb_filter_by_sub_field({enb_conn_info, addr, Addr}, Item), + fun(_, Item) -> enb_filter_by_sub_field({enb_conn_info, addr, Addr}, Item) andalso enb_filter_by_sub_field({enb_conn_info, port, Port}, Item) end; enb_filter({mme_addr_port, {Addr, Port}}) -> - fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_addr, Addr}, Item), + fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_addr, Addr}, Item) andalso enb_filter_by_sub_field({mme_conn_info, mme_port, Port}, Item) end; enb_filter(Filter) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42298?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8061636cd1077a4f3a9e9d37a31224f5e373becb Gerrit-Change-Number: 42298 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: fix comment inaccuracies and a typo
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42290?usp=email ) Change subject: erab_fsm: fix comment inaccuracies and a typo ...................................................................... erab_fsm: fix comment inaccuracies and a typo Two comments copy-pasted from session_establish were left saying "ESTABLISH Req" in session_modify and session_delete handlers where "MODIFY Req" and "DELETE Req" are correct respectively. Also fix typo "unieue" -> "unique" in init/1. Change-Id: If84638142988767363aa080012b44082dee39f90 --- M src/erab_fsm.erl 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index f281e4b..1e39cb7 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -233,7 +233,7 @@ init([UID]) -> set_logging_prefix(UID), ?LOG_DEBUG("Creating E-RAB FSM (UID ~p)", [UID]), - %% request a unieue SEID for this E-RAB FSM + %% request a unique SEID for this E-RAB FSM {ok, SEID} = pfcp_peer:seid_alloc(), {ok, erab_wait_setup_req, #erab_state{uid = UID, @@ -360,7 +360,7 @@ {reply, From, {error, {timeout, ?FUNCTION_NAME}}}}; session_modify(info, #pfcp{type = session_modification_response, - seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req + seid = SEID_Rsp, %% matches F-SEID we sent in the MODIFY Req ie = #{pfcp_cause := 'Request accepted'}}, #erab_state{mod_kind = ModKind, from = From, @@ -504,7 +504,7 @@ rel_kind = RelKind} = S) -> case PDU of #pfcp{type = session_deletion_response, - seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req + seid = SEID_Rsp, %% matches F-SEID we sent in the DELETE Req ie = #{pfcp_cause := 'Request accepted'}} -> ?LOG_DEBUG("PFCP session deleted"), case RelKind of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42290?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If84638142988767363aa080012b44082dee39f90 Gerrit-Change-Number: 42290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log