Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11915 )
Change subject: libmsc/gsm_04_11.c: refactor RP-DATA header validation
......................................................................
libmsc/gsm_04_11.c: refactor RP-DATA header validation
It's much better to have both RP-DATA header parsing and validation
code in a single function. There is no need to pass all the header
fields (DA, OA, UI) to gsm411_rx_rp_ud() because they are not
used there.
Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15
---
M src/libmsc/gsm_04_11.c
1 file changed, 18 insertions(+), 20 deletions(-)
Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 4d43b57..14f9f57 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -587,27 +587,10 @@
/* Receive a 04.11 TPDU inside RP-DATA / user data */
static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans,
- struct gsm411_rp_hdr *rph,
- uint8_t src_len, uint8_t *src,
- uint8_t dst_len, uint8_t *dst,
- uint8_t tpdu_len, uint8_t *tpdu)
+ struct gsm411_rp_hdr *rph)
{
int rc = 0;
- if (src_len && src)
- LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n");
-
- if (!dst_len || !dst || !tpdu_len || !tpdu) {
- LOGP(DLSMS, LOGL_ERROR,
- "RP-DATA (MO) without DST or TPDU ?!?\n");
- gsm411_send_rp_error(trans, rph->msg_ref,
- GSM411_RP_CAUSE_INV_MAND_INF);
- return -EIO;
- }
- msg->l4h = tpdu;
-
- DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len));
-
rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref);
if (rc == 0)
return gsm411_send_rp_ack(trans, rph->msg_ref);
@@ -639,8 +622,23 @@
DEBUGP(DLSMS, "RX_RP-DATA: src_len=%u, dst_len=%u ud_len=%u\n",
src_len, dst_len, rpud_len);
- return gsm411_rx_rp_ud(msg, trans, rph, src_len, src, dst_len, dst,
- rpud_len, rp_ud);
+
+ if (src_len && src)
+ LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n");
+
+ if (!dst_len || !dst || !rpud_len || !rp_ud) {
+ LOGP(DLSMS, LOGL_ERROR,
+ "RP-DATA (MO) without DST or TPDU ?!?\n");
+ gsm411_send_rp_error(trans, rph->msg_ref,
+ GSM411_RP_CAUSE_INV_MAND_INF);
+ return -EIO;
+ }
+
+ msg->l4h = rp_ud;
+
+ DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len));
+
+ return gsm411_rx_rp_ud(msg, trans, rph);
}
static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms)
--
To view, visit https://gerrit.osmocom.org/11915
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15
Gerrit-Change-Number: 11915
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
