This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
daniel gerrit-no-reply at lists.osmocom.orgdaniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26062 )
Change subject: gbproxy: Move BSSGP decoding into its own function and use it
......................................................................
gbproxy: Move BSSGP decoding into its own function and use it
This code was copied in BSS and SGSN PTP receive functions and also in
the functions that extract the inner PDU-in-error from the STATUS PDU.
Use a central function for less code duplication and better
maintainability.
This also fixes TTCN3 test TC_status_ptp_ul_tlli the c&p omitted the
special handling of UL/DL unitdata.
Related: OS#4892
Change-Id: I882aa97b0f4158affe45e81e4e4701bd36ef89f7
---
M src/gb_proxy.c
1 file changed, 27 insertions(+), 36 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gb_proxy.c b/src/gb_proxy.c
index 7333e80..b96b374 100644
--- a/src/gb_proxy.c
+++ b/src/gb_proxy.c
@@ -380,6 +380,29 @@
return gbprox_relay2peer(msg, sgsn_bvc, sig_bvci ? 0 : sgsn_bvc->bvci);
}
+static int gbproxy_decode_bssgp(const struct bssgp_normal_hdr *bgph, int msg_len, struct tlv_parsed *tp, const char *log_pfx)
+{
+ int rc;
+
+ /* UNITDATA PDUs have a different header than the other PDUs */
+ if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA || bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {
+ const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) bgph;
+ if (msg_len < sizeof(*budh))
+ return -OSMO_TLVP_ERR_MAND_IE_MISSING;
+ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, 1, budh->pdu_type, budh->data,
+ msg_len - sizeof(*budh), 0, 0, DGPRS, log_pfx);
+ /* populate TLLI from the fixed headser into the TLV-parsed array so later code
+ * doesn't have to worry where the TLLI came from */
+ tp->lv[BSSGP_IE_TLLI].len = 4;
+ tp->lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli;
+ } else {
+ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, 1, bgph->pdu_type, bgph->data,
+ msg_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx);
+ }
+
+ return rc;
+}
+
static int gbproxy_tlli_from_status_pdu(struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx);
/* Receive an incoming PTP message from a BSS-side NS-VC */
@@ -419,21 +442,7 @@
return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg);
}
- /* UL_UNITDATA has a different header than all other uplink PDUs */
- if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA) {
- const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg);
- if (msgb_bssgp_len(msg) < sizeof(*budh))
- return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg);
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data,
- msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx);
- /* populate TLLI from the fixed headser into the TLV-parsed array so later code
- * doesn't have to worry where the TLLI came from */
- tp.lv[BSSGP_IE_TLLI].len = 4;
- tp.lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli;
- } else {
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, bgph->data,
- msgb_bssgp_len(msg) - sizeof(*bgph), 0, 0, DGPRS, log_pfx);
- }
+ rc = gbproxy_decode_bssgp(bgph, msgb_bssgp_len(msg), &tp, log_pfx);
if (rc < 0) {
rate_ctr_inc(rate_ctr_group_get_ctr(nse->cfg->ctrg, GBPROX_GLOB_CTR_PROTO_ERR_BSS));
return tx_status_from_tlvp(nse, rc, msg);
@@ -567,21 +576,7 @@
return tx_status(nse, ns_bvci, BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg);
}
- /* DL_UNITDATA has a different header than all other uplink PDUs */
- if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {
- const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg);
- if (msgb_bssgp_len(msg) < sizeof(*budh))
- return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg);
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data,
- msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx);
- /* populate TLLI from the fixed headser into the TLV-parsed array so later code
- * doesn't have to worry where the TLLI came from */
- tp.lv[BSSGP_IE_TLLI].len = 4;
- tp.lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli;
- } else {
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, bgph->data,
- msgb_bssgp_len(msg) - sizeof(*bgph), 0, 0, DGPRS, log_pfx);
- }
+ rc = gbproxy_decode_bssgp(bgph, msgb_bssgp_len(msg), &tp, log_pfx);
if (rc < 0) {
rate_ctr_inc(rate_ctr_group_get_ctr(nse->cfg->ctrg, GBPROX_GLOB_CTR_PROTO_ERR_BSS));
return tx_status_from_tlvp(nse, rc, msg);
@@ -1017,9 +1012,7 @@
struct tlv_parsed tp_inner[2];
/* TODO: Parse partial messages as well */
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data,
- pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx);
-
+ rc = gbproxy_decode_bssgp(bgph, pdu_len, &tp_inner[0], log_pfx);
if (rc < 0)
return rc;
@@ -1047,9 +1040,7 @@
struct tlv_parsed tp_inner[2];
/* TODO: Parse partial messages as well */
- rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data,
- pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx);
-
+ rc = gbproxy_decode_bssgp(bgph, pdu_len, &tp_inner[0], log_pfx);
if (rc < 0)
return rc;
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26062
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I882aa97b0f4158affe45e81e4e4701bd36ef89f7
Gerrit-Change-Number: 26062
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211103/3e2e0226/attachment.htm>