September 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-gprs[master]: llc: rename enum osmo_gprs_llc_{primitive->prim_type}

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29410 ) Change subject: llc: rename enum osmo_gprs_llc_{primitive->prim_type} ...................................................................... llc: rename enum osmo_gprs_llc_{primitive->prim_type} Change-Id: Ie0f9cd174934c54940217b89e46568a7c1b76b96 --- M include/osmocom/gprs/llc/llc_prim.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 834c27a..ddb1732 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -2,7 +2,7 @@ /* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum osmo_gprs_llc_primitive { +enum osmo_gprs_llc_prim_type { /* GMM <-> LLME */ OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie0f9cd174934c54940217b89e46568a7c1b76b96 Gerrit-Change-Number: 29410 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add definitions of service primitive parameters

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 ) Change subject: llc: add definitions of service primitive parameters ...................................................................... llc: add definitions of service primitive parameters Change-Id: Iaa520a818b05c962e0d3be9607d3a8c5991f539e --- M include/osmocom/gprs/llc/llc_prim.h 1 file changed, 172 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index ddb1732..f58c5fa 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -1,5 +1,12 @@ #pragma once +/* 3GPP TS 44.064, section 7.1 "Definition of service primitives and parameters" */ + +#include <stdint.h> +#include <stddef.h> + +#include <osmocom/core/prim.h> + /* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ enum osmo_gprs_llc_prim_type { @@ -28,3 +35,168 @@ /* LLE <-> BSSGP (SGSN side) */ OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ }; + +/* Parameters for OSMO_GPRS_LLC_LLGMM_* prims */ +struct osmo_gprs_llc_llgmm_prim { + /* Common fields */ + uint32_t tlli; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_LLGMM_ASSIGN | Req */ + struct { + uint32_t tlli_new; + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + uint8_t kc[16]; /* max 16 * 8 = 128 bits */ + /* TODO: Integrity Key & Algo */ + } assign_req; + /* OSMO_GPRS_LLC_LLGMM_TRIGGER | Req */ + struct { + uint8_t cause; + } trigger_req; + /* OSMO_GPRS_LLC_LLGMM_SUSPEND | Req */ + struct { + uint8_t page; + } suspend_req; + /* OSMO_GPRS_LLC_LLGMM_STATUS | Ind */ + struct { + uint8_t cause; + } status_ind; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Ind */ + struct { + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + } psho_ind; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Req */ + struct { + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + uint8_t kc[16]; /* max 16 * 8 = 128 bits */ + } psho_req; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Cnf */ + struct { + uint32_t iov_ui; + /* TODO: old XID indicator */ + } psho_cnf; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_LL_* prims */ +struct osmo_gprs_llc_ll_prim { + /* Common fields */ + uint32_t tlli; + /* OSMO_GPRS_LLC_LL_[UNIT]DATA */ + uint8_t *l3_pdu; + size_t l3_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_LL_RESET | Ind */ + struct { + /* TODO: old XID indicator */ + } reset_ind; + /* OSMO_GPRS_LLC_LL_ESTABLISH | { Req, Ind, Rsp, Cnf } */ + struct { + /* TODO: XID Req/Neg */ + uint16_t n201_i; /* only for Ind & Cnf */ + uint16_t n201_u; /* only for Ind & Cnf */ + } establish; + /* OSMO_GPRS_LLC_LL_RELEASE | Req */ + struct { + uint8_t local; + } release_req; + /* OSMO_GPRS_LLC_LL_RELEASE | Ind */ + struct { + uint8_t cause; + } release_ind; + /* OSMO_GPRS_LLC_LL_XID | { Req, Ind, Rsp, Cnf } */ + struct { + /* TODO: XID Req/Neg */ + uint16_t n201_i; /* only for Ind & Cnf */ + uint16_t n201_u; /* only for Ind & Cnf */ + } xid; + /* OSMO_GPRS_LLC_LL_DATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t reference; /* TODO: confirm type */ + uint8_t radio_prio; /* only for the MS side */ + } data_req; + /* OSMO_GPRS_LLC_LL_DATA | Cnf */ + struct { + uint8_t reference; /* TODO: confirm type */ + } data_cnf; + /* OSMO_GPRS_LLC_LL_UNITDATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t radio_prio; /* only for the MS side */ + bool apply_gea; /* Cipher */ + bool apply_gia; /* Integrity Protection */ + } unitdata_req; + /* OSMO_GPRS_LLC_LL_UNITDATA | Ind */ + struct { + bool apply_gea; /* Cipher */ + bool apply_gia; /* Integrity Protection */ + /* TODO: MAC Verified */ + /* TODO: LLC MAC */ + } unitdata_ind; + /* OSMO_GPRS_LLC_LL_STATUS | Ind */ + struct { + uint8_t cause; + } status_ind; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_GRR_* prims */ +struct osmo_gprs_llc_grr_prim { + /* Common fields */ + uint32_t tlli; + uint8_t *ll_pdu; + size_t ll_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_GRR_[UNIT]DATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t radio_prio; + uint8_t cause; /* only for OSMO_GPRS_LLC_GRR_UNITDATA | Req */ + uint8_t sapi; + } data_req; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_BSSGP_* prims */ +struct osmo_gprs_llc_bssgp_prim { + /* Common fields */ + uint32_t tlli; + uint8_t *ll_pdu; + size_t ll_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Req */ + struct { + uint8_t qos_params[3]; + bool rlc_confirm; + uint8_t sapi; + /* TODO: MOCN specific parameters: + * - Redirect indication + * - IMSI + * - GMM cause + * - V(U) for redirect + * - Redirect complete */ + } unitdata_req; + /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Ind */ + struct { + uint16_t cell_id; + /* TODO: MOCN specific parameters: + * - Redirect attempt + * - IMSI + * - V(U) for redirect */ + } unitdata_ind; + }; +}; + +struct osmo_gprs_llc_prim { + struct osmo_prim_hdr oph; + union { + struct osmo_gprs_llc_llgmm_prim llgmm; + struct osmo_gprs_llc_ll_prim ll; + struct osmo_gprs_llc_grr_prim grr; + struct osmo_gprs_llc_bssgp_prim bssgp; + }; +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iaa520a818b05c962e0d3be9607d3a8c5991f539e Gerrit-Change-Number: 29411 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> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 ) Change subject: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h ...................................................................... llc: separate enum osmo_gprs_llc_primitive to llc_prim.h Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d --- M include/osmocom/gprs/llc/Makefile.am M include/osmocom/gprs/llc/llc.h A include/osmocom/gprs/llc/llc_prim.h 3 files changed, 31 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index 5f44218..f4b10a9 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,5 +1,6 @@ llc_HEADERS = \ llc.h \ + llc_prim.h \ $(NULL) llcdir = $(includedir)/osmocom/gprs/llc diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index c2ec379..4723a4b 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -83,35 +83,6 @@ OSMO_GPRS_LLC_XID_T_RESET = 12, }; -/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ -/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum osmo_gprs_llc_primitive { - /* GMM <-> LLME */ - OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ - OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ - OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ - OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ - OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ - OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ - /* LLE <-> (GMM/SNDCP/SMS/TOM) */ - OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ - OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ - OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ - OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ - OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ - /* LLE <-> RLC/MAC (MS side) */ - OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ - OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ - /* LLE <-> BSSGP (SGSN side) */ - OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ -}; - /* Section 4.5.2 Logical Link States + Annex C.2 */ enum osmo_gprs_llc_lle_state { OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h new file mode 100644 index 0000000..834c27a --- /dev/null +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -0,0 +1,30 @@ +#pragma once + +/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ +/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ +enum osmo_gprs_llc_primitive { + /* GMM <-> LLME */ + OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ + OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ + OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ + OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ + OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ + OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ + /* LLE <-> (GMM/SNDCP/SMS/TOM) */ + OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ + OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ + OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ + OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ + OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + /* LLE <-> RLC/MAC (MS side) */ + OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ + OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ + /* LLE <-> BSSGP (SGSN side) */ + OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ +}; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d Gerrit-Change-Number: 29409 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add definitions of service primitive parameters

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 ) Change subject: llc: add definitions of service primitive parameters ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS1: > would be good to also see usage of the new definitions, or have a commit log hint at which patch wil […] Currently only my WIP code is using these, which will be published after some clean up. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iaa520a818b05c962e0d3be9607d3a8c5991f539e Gerrit-Change-Number: 29411 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> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Sep 2022 16:21:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 ) Change subject: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I'm also wondering what the rationale of this is. […] The idea is to avoid having one huge header file with everything this library provides. Currently it's just one enum, but next patch adds several structs. I am also planning to add some more API there, so I believe it makes sense. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d Gerrit-Change-Number: 29409 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Sep 2022 16:20:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOW...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 ) Change subject: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOWN_EVENT ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I11b6af51a58dc250975a696b98d0c0c9ff3df9e0 Gerrit-Change-Number: 29451 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Sep 2022 15:44:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: cosmetic: mgcp_conn.h: fix indentation whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29453 ) Change subject: cosmetic: mgcp_conn.h: fix indentation whitespace ...................................................................... cosmetic: mgcp_conn.h: fix indentation whitespace Change-Id: I6b12b589d1b0a8f95a8283aac8ba0ad22026b43f --- M include/osmocom/mgcp/mgcp_conn.h 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/29453/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index a08c089..3eca2f8 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -145,12 +145,12 @@ enum { IN_STREAM_ERR_TSTMP_CTR, OUT_STREAM_ERR_TSTMP_CTR, - RTP_PACKETS_RX_CTR, - RTP_OCTETS_RX_CTR, - RTP_PACKETS_TX_CTR, - RTP_OCTETS_TX_CTR, - RTP_DROPPED_PACKETS_CTR, - RTP_NUM_CONNECTIONS, + RTP_PACKETS_RX_CTR, + RTP_OCTETS_RX_CTR, + RTP_PACKETS_TX_CTR, + RTP_OCTETS_TX_CTR, + RTP_DROPPED_PACKETS_CTR, + RTP_NUM_CONNECTIONS, }; /* RTP per-connection statistics. Instances of the corresponding rate counter group -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6b12b589d1b0a8f95a8283aac8ba0ad22026b43f Gerrit-Change-Number: 29453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Log sendto() error

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29452 ) Change subject: osmux: Log sendto() error ...................................................................... osmux: Log sendto() error Change-Id: Icd91b725ac6b5ef2b9307cc99d67d60efdfa32cb --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/29452/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 98f2639..f15f37c 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -48,6 +48,7 @@ { struct osmux_handle *handle = data; socklen_t dest_len; + int rc; switch (handle->rem_addr.u.sa.sa_family) { case AF_INET6: @@ -58,8 +59,14 @@ dest_len = sizeof(handle->rem_addr.u.sin); break; } - sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, - (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); + rc = sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, + (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); + if (rc < 0) { + char errbuf[129]; + strerror_r(errno, errbuf, sizeof(errbuf)); + LOGP(DOSMUX, LOGL_NOTICE, "osmux sendto(%s) failed: %s\n", + osmo_sockaddr_to_str(&handle->rem_addr), errbuf); + } msgb_free(batch_msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icd91b725ac6b5ef2b9307cc99d67d60efdfa32cb Gerrit-Change-Number: 29452 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOW...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 ) Change subject: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOWN_EVENT ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I11b6af51a58dc250975a696b98d0c0c9ff3df9e0 Gerrit-Change-Number: 29451 Gerrit-PatchSet: 4 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: Thu, 22 Sep 2022 14:42:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOW...

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 to look at the new patch set (#4). Change subject: hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOWN_EVENT ...................................................................... hnbgw: Fix recent regression not closing conn upon rx of SCTP_SHUTDOWN_EVENT Before handling of OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION in recent commit (see Fixes: below), osmo_stream_srv_recv() and internal _sctp_recvmsg_wrapper() in libosmo-netif would return either -EAGAIN or 0 when an sctp notification was received from the kernel. After adding handling of OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION, the code paths for "rc == -EAGAIN" and "rc == 0" would not be executed anymore since the first branch takes preference in the if-else tree. For "rc == -EAGAIN" it's fine because the new branch superseeds what's done on the "rc == -EAGAIN" branch. However, for the "rc == 0", we forgot to actually destroy the connection. The "rc == 0" branch was basically reached when SCTP_SHUTDOWN_EVENT was received because osmo_stream_srv_recv() tried to resemble the interface of regular recv(); let's hence check for that explicitly and destroy the conn object (and the related hnb context in the process) when we receive that event. Fixes: 1de2091515530e531196ebca27b1445cecd1b88d Related: SYS#6113 Change-Id: I11b6af51a58dc250975a696b98d0c0c9ff3df9e0 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/51/29451/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I11b6af51a58dc250975a696b98d0c0c9ff3df9e0 Gerrit-Change-Number: 29451 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022