- fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2556
-- Commit Summary --
* smsops: fix len calc for a concatenated sms
-- File Changes --
M src/modules/smsops/smsops_impl.c (12)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2556.patch https://github.com/kamailio/kamailio/pull/2556.diff
@miconda commented on this pull request.
@@ -618,6 +627,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
// Coding: 7 Bit if (rp_data->pdu.coding == 0x00) { // We don't care about the extra used bytes here. + rp_data->pdu.payload.sm.len = len; rp_data->pdu.payload.sm.len = gsm_to_ascii(&body.s[p], len, rp_data->pdu.payload.sm, fill_bits);
Above are now two assignments one after the other to `rp_data->pdu.payload.sm.len`, is it `rp_data->pdu.payload.sm.len` used inside `gsm_to_ascii()`? Asking because len is also provided as parameter to `gsm_to_ascii()`.
@alexyosifov commented on this pull request.
@@ -618,6 +627,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
// Coding: 7 Bit if (rp_data->pdu.coding == 0x00) { // We don't care about the extra used bytes here. + rp_data->pdu.payload.sm.len = len; rp_data->pdu.payload.sm.len = gsm_to_ascii(&body.s[p], len, rp_data->pdu.payload.sm, fill_bits);
Yes "rp_data->pdu.payload.sm" is used in the gsm_to_ascii(...). You can see that sms.len is used in a few "if" statements.
@miconda commented on this pull request.
@@ -618,6 +627,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
// Coding: 7 Bit if (rp_data->pdu.coding == 0x00) { // We don't care about the extra used bytes here. + rp_data->pdu.payload.sm.len = len; rp_data->pdu.payload.sm.len = gsm_to_ascii(&body.s[p], len, rp_data->pdu.payload.sm, fill_bits);
OK, I will merge it. Somehow confusing is that `len` is also explicitly passed as a parameter to that function.
Merged #2556 into master.
-
alexyosifov -
Daniel-Constantin Mierla