sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:bd02d616: core: created a structure for async task attributes
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: bd02d616dacfd7152fefc9b050cb6203ea19cf39 URL: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-25T09:08:59+01:00 core: created a structure for async task attributes --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620… Patch: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620…

1 0

[kamailio/kamailio] smsops: fix len calc for a concatenated sms (#2556)
by alexyosifov 25 Nov '20

25 Nov '20

- fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16   #### Pre-Submission Checklist    - [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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  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 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2556

2 4

git:master:0b8d8840: Merge pull request #2556 from alexyosifov/smsops_fix_concatenated
by GitHub 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 0b8d884083c7240b1e58b720c57fd8e9bc6f8262 URL: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-25T08:12:31+01:00 Merge pull request #2556 from alexyosifov/smsops_fix_concatenated smsops: fix len calc for a concatenated sms --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… Patch: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b284d83c62..e956656d1a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -195,7 +195,7 @@ static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { } } - if (i <= sms.len) + if (i < sms.len) output_buffer[output_buffer_length++] = (sms.s[i] & BITMASK_7BITS) >> (carry_on_bits - 1); return output_buffer_length; @@ -606,6 +606,15 @@ int decode_3gpp_sms(struct sip_msg *msg) { udh_read += (1 /* IE ID */ + 1 /* IE Len */ + ie->data.len /* IE data */); } + // TS 23.040, Sec. 9.2.3.16 + // Coding: 7 Bit + if (rp_data->pdu.coding == 0x00) { + int udh_bit_len = (1 + udh_len) * 8; // add 1 octet for the udh length + udh_bit_len += (7 - (udh_bit_len % 7)); + len -= (udh_bit_len / 7); + }else{ + len -= (1 + udh_len); // add 1 octet for the udh length + } } blen = 2 + len*4; @@ -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); } else { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes)

1 0

git:master:d90f29b3: smsops: fix len calc for a concatenated sms
by Aleksandar Yosifov 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: d90f29b3b03386add989aebe3865bdc78dff8fbe URL: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-11-19T15:39:13+02:00 smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… Patch: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b284d83c62..e956656d1a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -195,7 +195,7 @@ static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { } } - if (i <= sms.len) + if (i < sms.len) output_buffer[output_buffer_length++] = (sms.s[i] & BITMASK_7BITS) >> (carry_on_bits - 1); return output_buffer_length; @@ -606,6 +606,15 @@ int decode_3gpp_sms(struct sip_msg *msg) { udh_read += (1 /* IE ID */ + 1 /* IE Len */ + ie->data.len /* IE data */); } + // TS 23.040, Sec. 9.2.3.16 + // Coding: 7 Bit + if (rp_data->pdu.coding == 0x00) { + int udh_bit_len = (1 + udh_len) * 8; // add 1 octet for the udh length + udh_bit_len += (7 - (udh_bit_len % 7)); + len -= (udh_bit_len / 7); + }else{ + len -= (1 + udh_len); // add 1 octet for the udh length + } } blen = 2 + len*4; @@ -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); } else { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes)

1 0

[kamailio/kamailio] CSeq is not being updated for ACK messges after upgrade to 5.3.7. Dialog + UAC module (#2559)
by arkadiam 24 Nov '20

24 Nov '20

### Description After updating from 5.3.6 to 5.3.7 Kamailio is no longer increments CSeq for ACK when used together with UAC module. Usage scenario: <pre> |EP1 | Kamailio | PBX | ->INVITE -> | | | <- 407 - | | | - ACK -> | | | -> INVITE SDP AUTH-> | | | <- 100 Trying - | | | | - INVITE SDP -> | | | <- 407 - | | | -> ACK -> | | | - INVITE SDP AUTH -> | | | <- 100 Trying - | | | <- 200 OK - | | <- 200 OK - | | | - ACK -> | | | | - ACK -> | ... </pre> Kamailio is configured to use dialog module and calling "dlg_manage();" UAC module is used to authenticate request on the PBX. Because of the authentication against the PBX the CSeq is being incremented independently between Kamailio & PBX. ACK that is send to the PBX after 200 OK usually is CSeq + 1 from EP1 ACK message. After update, Cseq is no longer incremented in ACK which cause re-transmission of 200 OK by the PBX and eventually in 30 sec PBX drops the call because 200 is not being acknowledged. Dialog configured as: modparam("dialog", "dlg_flag", FLD_TRACKDLG) modparam("dialog", "track_cseq_updates", 1) modparam("dialog", "dlg_match_mode", 1) modparam("dialog", "timeout_avp", "$avp(dlgtimeout)") modparam("dialog", "default_timeout", 43200) UAC configured as: modparam("uac", "reg_db_url", DBURL) modparam("uac", "reg_contact_addr", REG_CONTACT) modparam("uac", "reg_timer_interval", 10) modparam("uac", "restore_from_avp","$avp(original_uri_from)") modparam("uac", "restore_to_avp","$avp(original_uri_to)") modparam("uac", "restore_dlg", 1) modparam("uac", "auth_username_avp","$avp(auser)") modparam("uac", "auth_password_avp","$avp(apass)") modparam("uac", "auth_realm_avp","$avp(arealm)") modparam("uac", "restore_mode","manual") ### Possible Solutions After reverting this commit a973882b064c758972ce40e9ac3a83440c613be1 CSeq started to update properly. "dialog: skip non-INVITE initial request for cseq update processing" -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2559

2 2

git:master:fb878ee5: kemix: added functions to get contact header uri
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: fb878ee5b90fa79363c75338c294e78a9bc9f73a URL: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:25:43+01:00 kemix: added functions to get contact header uri --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… Patch: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index ba56a6c16f..37854bfa86 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -32,6 +32,8 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/digest/digest.h" +#include "../../core/parser/contact/parse_contact.h" + #include "../../core/tcp_conn.h" MODULE_VERSION @@ -997,6 +999,61 @@ static int ki_kx_get_msgtype(sip_msg_t *msg) } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_cturi_mode(sip_msg_t *msg, int xmode) +{ + contact_t *c; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if((parse_contact_headers(msg) < 0) || (msg->contact == NULL) + || (msg->contact->parsed == NULL)) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + if (((contact_body_t*)msg->contact->parsed)->star == 1) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + c = (((contact_body_t*)msg->contact->parsed)->contacts); + if(c==NULL || c->uri.s==NULL || c->uri.len<=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = c->uri; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */ @@ -1127,6 +1184,21 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_cturi"), + SR_KEMIP_XVAL, ki_kx_get_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_cturi"), + SR_KEMIP_XVAL, ki_kx_gete_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_cturi"), + SR_KEMIP_XVAL, ki_kx_getw_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_nhuri"), SR_KEMIP_XVAL, ki_kx_get_nhuri, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:802b8085: registrar: use core function for parsing all contact headers
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 802b80853baf3f9e33f84de79a4473bdf2b4e6df URL: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:11:57+01:00 registrar: use core function for parsing all contact headers --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… Patch: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 802435865f..2b43dd7611 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -86,8 +86,6 @@ static inline int get_expires_hf(struct sip_msg* _m) */ int parse_message(struct sip_msg* _m) { - struct hdr_field* ptr; - if (parse_headers(_m, HDR_EOH_F, 0) == -1) { rerrno = R_PARSE; LM_ERR("failed to parse headers\n"); @@ -118,18 +116,10 @@ int parse_message(struct sip_msg* _m) return -5; } - if (_m->contact) { - ptr = _m->contact; - while(ptr) { - if (ptr->type == HDR_CONTACT_T) { - if (!ptr->parsed && (parse_contact(ptr) < 0)) { - rerrno = R_PARSE_CONT; - LM_ERR("failed to parse Contact body\n"); - return -6; - } - } - ptr = ptr->next; - } + if(parse_contact_headers(_m) < 0) { + rerrno = R_PARSE_CONT; + LM_ERR("failed to parse Contact body\n"); + return -6; } return 0;

1 0

git:master:5dab8768: core/parser/contact: helper function to parse all contact headers
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 5dab8768efb3bc8214c46005520c92c6d735ba39 URL: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:09:23+01:00 core/parser/contact: helper function to parse all contact headers --- Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/contact/parse_contact.h --- Diff: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… Patch: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… --- diff --git a/src/core/parser/contact/parse_contact.c b/src/core/parser/contact/parse_contact.c index af0cd39c2c..37a075a17d 100644 --- a/src/core/parser/contact/parse_contact.c +++ b/src/core/parser/contact/parse_contact.c @@ -226,3 +226,31 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev) return 0; } } + +/** + * + */ +int parse_contact_headers(sip_msg_t *msg) +{ + hdr_field_t* hdr; + + if (parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse headers\n"); + return -1; + } + + if (msg->contact) { + hdr = msg->contact; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (!hdr->parsed && (parse_contact(hdr) < 0)) { + LM_ERR("failed to parse Contact body\n"); + return -1; + } + } + hdr = hdr->next; + } + } + + return 0; +} diff --git a/src/core/parser/contact/parse_contact.h b/src/core/parser/contact/parse_contact.h index 36389b5e06..4d8e1cd642 100644 --- a/src/core/parser/contact/parse_contact.h +++ b/src/core/parser/contact/parse_contact.h @@ -70,5 +70,9 @@ void print_contact(FILE* _o, contact_body_t* _c); */ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev); +/* + * parse all Contact headers + */ +int parse_contact_headers(sip_msg_t *msg); #endif /* PARSE_CONTACT_H */

1 0

ACK Relay Issue Transaction Not Found
by me.projects＠yahoo.com 24 Nov '20

24 Nov '20

Hi When ACK is received on Kamailio from PBX t_check_trans() fails. 200 OK sent PBX from Teams and ACK from PBX is provided here. What could be the issue. SIP/2.0 200 OK FROM: "Ext1"<sip:1102@PBX_IP>;tag=e08f0a03-1120-4e13-b0e2-90d1a027c05f TO: <sip:1101@KAM_IP>;tag=e667397cb47c457a860222931e320b41 CSEQ: 25772 INVITE CALL-ID: a6685754-b402-4a15-82b2-5fb2551e5b58 VIA: SIP/2.0/UDP PBX_IP:7790;received=PBX_IP;branch=z9hG4bKPj170912fc-0908-40bb-8248-9f6cb560332d;rport=7790 RECORD-ROUTE: <sip:sip-du-a-us.pstnhub.microsoft.com:5061;transport=tls;lr>,<sip:sbc.callsprout.com;transport=tls;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f;lr>,<sip:KAM_IP:7790;transport=udp;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f;lr> CONTACT: <sip:api-du-b-usea.pstnhub.microsoft.com:443;x-i=c825abba-7203-442c-8461-994522d14365;x-c=25f3c2ce3a635971b809dc3be872e51b/s/1/63c9eea743284db99366cabf5f7dcbf5;ias=52.114.132.46~5061~3> CONTENT-LENGTH: 353 SUPPORTED: timer CONTENT-TYPE: application/sdp ALLOW: INVITE,ACK,OPTIONS,CANCEL,BYE,NOTIFY REQUIRE: timer SESSION-EXPIRES: 1800;refresher=uac SERVER: Microsoft.PSTNHub.SIPProxy v.2020.11.16.5 i.USEA.5 X-Siptrace-Fromip: tls:KAM_IP:7790 X-Siptrace-Toip: udp:PBX_IP:7790 X-Siptrace-Time: 1606205334 607029 X-Siptrace-Method: INVITE X-Siptrace-Dir: out ACK sip:api-du-b-usea.pstnhub.microsoft.com:443;x-i=c825abba-7203-442c-8461-994522d14365;x-c=25f3c2ce3a635971b809dc3be872e51b/s/1/63c9eea743284db99366cabf5f7dcbf5;alias=.114.132.46~5061~3 SIP/2.0 Via: SIP/2.0/UDP PBX_IP:7790;rport;branch=z9hG4bKPjaa30c14c-c965-473d-bc49-9f223f9f634c From: "Ext1" <sip:1102@PBX_IP>;tag=e08f0a03-1120-4e13-b0e2-90d1a027c05f To: <sip:1101@KAM_IP>;tag=e667397cb47c457a860222931e320b41 Call-ID: a6685754-b402-4a15-82b2-5fb2551e5b58 CSeq: 25772 ACK Route: <sip:KAM_IP:7790;lr;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f> Route: <sip:sbc.callsprout.com;transport=tls;lr;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f> Route: <sip:sip-du-a-us.pstnhub.microsoft.com:5061;transport=tls;lr> Max-Forwards: 70 User-Agent: Asterisk Content-Length: 0 X-Siptrace-Fromip: udp:PBX_IP:7790 X-Siptrace-Toip: udp:KAM_IP:7790 X-Siptrace-Time: 1606205334 615495 X-Siptrace-Method: ACK X-Siptrace-Dir: in

1 0

git:master:32c750ed: misc/tools/kemi: lua - replaced markdown term
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 32c750ed833ec1d1c2d1a2a2cf189ea3b0c5e2ee URL: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T09:49:37+01:00 misc/tools/kemi: lua - replaced markdown term - no longer suitable for the new tools --- Modified: misc/tools/kemi/lua/kemiksrlib.py Modified: misc/tools/kemi/lua/kemiluacheck.py --- Diff: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… Patch: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… --- diff --git a/misc/tools/kemi/lua/kemiksrlib.py b/misc/tools/kemi/lua/kemiksrlib.py index dfa528cb79..f801a9d6a2 100644 --- a/misc/tools/kemi/lua/kemiksrlib.py +++ b/misc/tools/kemi/lua/kemiksrlib.py @@ -8,7 +8,7 @@ class ModuleObjGenerator(object): # Contains the output until it should be written to disk - markdown_string = "" + output_string = "" def execute(self, data): # Validate that we got some methods back. 155 is an arbitrary large number. @@ -57,7 +57,7 @@ def object_module_content(self, module, methods): module_prefix = module + "." for value in methods: - self.markdown_string += "local function KSR." + module_prefix + value["name"] + self.object_string += "local function KSR." + module_prefix + value["name"] # Sanitize the return values if value["return"] == "none": @@ -79,10 +79,10 @@ def object_module_content(self, module, methods): else: params_value = value["params"] - # Generate the output string for the markdown page - self.markdown_string += "(" + params_value + ")\n" - self.markdown_string += "\treturn" + return_value + ";\n" - self.markdown_string += "end\n\n" + # Generate the output string for the file + self.object_string += "(" + params_value + ")\n" + self.object_string += "\treturn" + return_value + ";\n" + self.object_string += "end\n\n" return True @@ -90,7 +90,7 @@ def object_module_content(self, module, methods): def obj_write(self): f = open(PATH_GENERATED_OBJ, "w") f.write("local KSR = {};\n\n") - f.write(self.markdown_string) + f.write(self.object_string) f.write("return KSR;\n") f.close() return True diff --git a/misc/tools/kemi/lua/kemiluacheck.py b/misc/tools/kemi/lua/kemiluacheck.py index 3da285305d..75c6e59f59 100644 --- a/misc/tools/kemi/lua/kemiluacheck.py +++ b/misc/tools/kemi/lua/kemiluacheck.py @@ -8,7 +8,7 @@ class ModuleObjGenerator(object): # Contains the output until it should be written to disk - markdown_string = "" + object_string = "" def execute(self, data): # Validate that we got some methods back. 155 is an arbitrary large number. @@ -19,7 +19,7 @@ def execute(self, data): functions_parsed = self.parse_function_list(data) self.output_obj(functions_parsed) - print ("Markdown doc created successfully at " + PATH_GENERATED_OBJ) + print ("File created successfully at " + PATH_GENERATED_OBJ) def parse_function_list(self, functions): data = {} @@ -52,22 +52,22 @@ def output_obj(self, data): def object_module_content(self, module, methods): if module != "_core": - self.markdown_string += "\t\t\t\t" + module + " = {\n\t\t\t\t\tfields= {\n" + self.object_string += "\t\t\t\t" + module + " = {\n\t\t\t\t\tfields= {\n" for value in methods: if module != "_core": - self.markdown_string += "\t\t\t\t\t\t" + value["name"] + " = {},\n" + self.object_string += "\t\t\t\t\t\t" + value["name"] + " = {},\n" else: - self.markdown_string += "\t\t\t\t" + value["name"] + " = {},\n" + self.object_string += "\t\t\t\t" + value["name"] + " = {},\n" if module != "_core": - self.markdown_string += "\t\t\t\t\t},\n\t\t\t\t},\n" + self.object_string += "\t\t\t\t\t},\n\t\t\t\t},\n" return True def obj_write(self): f = open(PATH_GENERATED_OBJ, "w") f.write("stds.KSR = {\n\tread_globals = {\n\t\tKSR = {\n\t\t\tfields = {\n") - f.write(self.markdown_string) + f.write(self.object_string) f.write("\t\t\t\tx = {\n\t\t\t\t\tfields= {\n") f.write("\t\t\t\t\t\tdrop= {},\n") f.write("\t\t\t\t\t\texit= {},\n")

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020