Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/38613?usp=email )
Change subject: pfcp: add API osmo_pfcp_cp_peer_set_associated_cb()
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/38613?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Ibc8047856ddcc9c71f2b4cf30f577862b6b414ca
Gerrit-Change-Number: 38613
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 04 Nov 2024 11:25:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/38612?usp=email )
Change subject: Make struct osmo_pfcp_cp_peer private
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Nevermind, we are already too late, osmo-hnbgw is actually using it...
osmo-hnbgw/src/osmo-hnbgw/context_map_sccp.c:244:103: error: invalid use of undefined type 'struct osmo_pfcp_cp_peer'
244 | osmo_sockaddr_to_str_c(OTC_SELECT, &g_hnbgw->pfcp.cp_peer->remote_addr));
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/38612?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: I7f79ce239cb3c57bae2cf5846edf71e1aa03fa95
Gerrit-Change-Number: 38612
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Mon, 04 Nov 2024 11:23:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-pfcp/+/38613?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: pfcp: add API osmo_pfcp_cp_peer_set_associated_cb()
......................................................................
pfcp: add API osmo_pfcp_cp_peer_set_associated_cb()
Change-Id: Ibc8047856ddcc9c71f2b4cf30f577862b6b414ca
---
M TODO-RELEASE
M include/osmocom/pfcp/pfcp_cp_peer.h
M src/libosmo-pfcp/pfcp_cp_peer.c
3 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/13/38613/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/38613?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Ibc8047856ddcc9c71f2b4cf30f577862b6b414ca
Gerrit-Change-Number: 38613
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/38612?usp=email )
Change subject: Make struct osmo_pfcp_cp_peer private
......................................................................
Make struct osmo_pfcp_cp_peer private
Only user of this lib so far, osmo-hnbgw, doesn't access the struct.
Make it private before anybody starts using it.
Change-Id: I7f79ce239cb3c57bae2cf5846edf71e1aa03fa95
---
M include/osmocom/pfcp/Makefile.am
M include/osmocom/pfcp/pfcp_cp_peer.h
A include/osmocom/pfcp/pfcp_cp_peer_private.h
M src/libosmo-pfcp/pfcp_cp_peer.c
4 files changed, 56 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/12/38612/1
diff --git a/include/osmocom/pfcp/Makefile.am b/include/osmocom/pfcp/Makefile.am
index 898113f..2693be5 100644
--- a/include/osmocom/pfcp/Makefile.am
+++ b/include/osmocom/pfcp/Makefile.am
@@ -1,3 +1,7 @@
+noinst_HEADERS = \
+ pfcp_cp_peer_private.h \
+ $(NULL)
+
pfcp_HEADERS = \
pfcp_endpoint.h \
pfcp_ies_custom.h \
diff --git a/include/osmocom/pfcp/pfcp_cp_peer.h b/include/osmocom/pfcp/pfcp_cp_peer.h
index e555a5f..85647d6 100644
--- a/include/osmocom/pfcp/pfcp_cp_peer.h
+++ b/include/osmocom/pfcp/pfcp_cp_peer.h
@@ -36,23 +36,6 @@
typedef void (*osmo_pfcp_cp_peer_assoc_cb)(struct osmo_pfcp_cp_peer *cp_peer, bool associated);
-struct osmo_pfcp_cp_peer {
- struct osmo_fsm_inst *fi;
- struct osmo_pfcp_endpoint *ep;
- struct osmo_sockaddr remote_addr;
- uint64_t next_seid_state;
-
- /* If non-NULL, called whenever the peer completes a PFCP Association, and when it loses association.
- * Argument associated == true means the peer has just associated;
- * associated == false means the association has been lost. */
- osmo_pfcp_cp_peer_assoc_cb assoc_cb;
- /* Application private data for assoc_cb, in case ep->priv does not suffice. */
- void *priv;
-
- struct osmo_use_count use_count;
- struct osmo_use_count_entry use_count_buf[128];
-};
-
struct osmo_pfcp_cp_peer *osmo_pfcp_cp_peer_alloc(void *ctx,
struct osmo_pfcp_endpoint *ep,
const struct osmo_sockaddr *remote_addr);
diff --git a/include/osmocom/pfcp/pfcp_cp_peer_private.h b/include/osmocom/pfcp/pfcp_cp_peer_private.h
new file mode 100644
index 0000000..b8b0af7
--- /dev/null
+++ b/include/osmocom/pfcp/pfcp_cp_peer_private.h
@@ -0,0 +1,51 @@
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <osmocom/core/socket.h>
+#include <osmocom/core/use_count.h>
+#include <osmocom/pfcp/pfcp_cp_peer.h>
+
+struct osmo_fsm_inst;
+struct osmo_pfcp_endpoint;
+
+struct osmo_pfcp_cp_peer {
+ struct osmo_fsm_inst *fi;
+ struct osmo_pfcp_endpoint *ep;
+ struct osmo_sockaddr remote_addr;
+ uint64_t next_seid_state;
+
+ /* If non-NULL, called whenever the peer completes a PFCP Association, and when it loses association.
+ * Argument associated == true means the peer has just associated;
+ * associated == false means the association has been lost. */
+ osmo_pfcp_cp_peer_assoc_cb assoc_cb;
+ /* Application private data for assoc_cb, in case ep->priv does not suffice. */
+ void *priv;
+
+ struct osmo_use_count use_count;
+ struct osmo_use_count_entry use_count_buf[128];
+};
diff --git a/src/libosmo-pfcp/pfcp_cp_peer.c b/src/libosmo-pfcp/pfcp_cp_peer.c
index d900370..77a59d5 100644
--- a/src/libosmo-pfcp/pfcp_cp_peer.c
+++ b/src/libosmo-pfcp/pfcp_cp_peer.c
@@ -28,7 +28,7 @@
#include <osmocom/core/tdef.h>
#include <osmocom/pfcp/pfcp_endpoint.h>
-#include <osmocom/pfcp/pfcp_cp_peer.h>
+#include <osmocom/pfcp/pfcp_cp_peer_private.h>
#define LOG_CP_PEER(CP_PEER, LOGLEVEL, FMT, ARGS...) \
LOGPFSML((CP_PEER)->fi, LOGLEVEL, FMT, ##ARGS)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/38612?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: I7f79ce239cb3c57bae2cf5846edf71e1aa03fa95
Gerrit-Change-Number: 38612
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: dexter.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38605?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: global_platform/scp: mapdu may be undeclared
......................................................................
global_platform/scp: mapdu may be undeclared
when we sign and encrypt the APDU in _wrap_cmd_apdu (SCP03) we return an "mapdu"
at the end. However, in the (unlikely?) case where self.do_cencand
self.do_cmac are false, mapdu will be undeclared. In _wrap_cmd_apdu for SCP02
we just re-use the apdu variable and return it at the end, so when no
encryption and no signing is applied, the APDU falls just through without any
modifications. We should have the same mechanism for the SCP03 wrapping as
well.
Related: OS#6367
Change-Id: Ic7089a69dffd7313572c5b3e5953200be5925766
---
M pySim/global_platform/scp.py
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/05/38605/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38605?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic7089a69dffd7313572c5b3e5953200be5925766
Gerrit-Change-Number: 38605
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: dexter.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38604?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: pySim-shell-test: improve global platform tests
......................................................................
pySim-shell-test: improve global platform tests
The tests that check the establishment of a secure channel currently only test
security level 3. Also the get_data command after it only tests data reception
from the card.
Let's extend the test coverage and test the SCP establishment for security
level 1 as well. Let's also add a get_status command to make sure sending data
to the card also works (without exceptions).
Related: OS#6367
Change-Id: Idff40b414a249e532df1bdce2a8deb9b0cb9718f
---
M tests/pySim-shell_test/gp/test_est_scp02_csv.script
M tests/pySim-shell_test/gp/test_est_scp02_direct.template
M tests/pySim-shell_test/gp/test_est_scp03_csv.script
M tests/pySim-shell_test/gp/test_est_scp03_direct.template
4 files changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/38604/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38604?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Idff40b414a249e532df1bdce2a8deb9b0cb9718f
Gerrit-Change-Number: 38604
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38606?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Verified+1 by Jenkins Builder
Change subject: pySim-shell: allow checking of APDU responses
......................................................................
pySim-shell: allow checking of APDU responses
The "apdu" command allows us to send custom APDUs to a card. This command is
often used in low level initialization scripts or tests. To stop the script
execution in case of an error, the command allows us to specify a status word
that must match the status word of the response. But we have no such mechanism
for the response itself. Let's add another parameter where we can pass a regex
that the response must match.
Related: OS#6367
Change-Id: I97bbcdf37bdcf00ad50a875b96940c211de7073d
---
M pySim-shell.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/06/38606/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38606?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I97bbcdf37bdcf00ad50a875b96940c211de7073d
Gerrit-Change-Number: 38606
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38608?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: pySim-shell: add new commandline option "--skip-card-init"
......................................................................
pySim-shell: add new commandline option "--skip-card-init"
by default pySim-shell does all kinds of probing and file selection
on startup. This is to determine the card type and to find a suitable
card profile. However, in case the card is non yet provisioned this
probing may cause a error messages and even might upset the cards
internal state. So let's have a commandline option thrugh which we
can instruct pySim-shell to skip any initialization and to give us
a prompt immediately, so that we can enter custom APDUs
Related: OS#6367
Change-Id: I1d8a57de201fe7ad7cbcbc6f72969ea8521e821d
---
M pySim-shell.py
M pySim/app.py
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/38608/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38608?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I1d8a57de201fe7ad7cbcbc6f72969ea8521e821d
Gerrit-Change-Number: 38608
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>