- sr-dev - kamailio.org

git:master:11831568: crypto: convert to memory error logging helper
by Henning Westerholt 29 Apr '23

29 Apr '23

Module: kamailio Branch: master Commit: 11831568d9eaef233fe6e482ad2c63788b04bbd9 URL: https://github.com/kamailio/kamailio/commit/11831568d9eaef233fe6e482ad2c637… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z crypto: convert to memory error logging helper --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/11831568d9eaef233fe6e482ad2c637… Patch: https://github.com/kamailio/kamailio/commit/11831568d9eaef233fe6e482ad2c637… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 37cdd6844a..f5728a6e42 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -25,6 +25,7 @@ #include <string.h> #include "../../core/dprint.h" +#include "../../core/mem/pkg.h" #include "crypto_aes.h" @@ -139,7 +140,7 @@ unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, unsigned char *ciphertext = (unsigned char *)malloc(c_len); if(ciphertext == NULL) { - LM_ERR("no more system memory\n"); + SYS_MEM_ERROR; return NULL; } /* allows reusing of 'e' for multiple encryption cycles */ @@ -179,7 +180,7 @@ unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, unsigned char *plaintext = (unsigned char *)malloc(p_len); if(plaintext==NULL) { - LM_ERR("no more system memory\n"); + SYS_MEM_ERROR; return NULL; } if(!EVP_DecryptInit_ex(e, NULL, NULL, NULL, NULL)){

1 0

git:master:d77448b3: websocket: convert to memory logging helper, add missing mem error logging
by Henning Westerholt 29 Apr '23

29 Apr '23

Module: kamailio Branch: master Commit: d77448b3a6a5dc3cf9e9a8ed85aeb7ae743900b6 URL: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z websocket: convert to memory logging helper, add missing mem error logging --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… Patch: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 1a4f8ffbb3c..0825d366083 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -100,7 +100,7 @@ int wsconn_init(void) wsconn_id_hash = (ws_connection_t **)shm_malloc( TCP_ID_HASH_SIZE * sizeof(ws_connection_t *)); if(wsconn_id_hash == NULL) { - LM_ERR("allocating WebSocket hash-table\n"); + SHM_MEM_ERROR_FMT("for WebSocket hash-table\n"); goto error; } memset((void *)wsconn_id_hash, 0, @@ -109,7 +109,7 @@ int wsconn_init(void) wsconn_used_list = (ws_connection_list_t *)shm_malloc( sizeof(ws_connection_list_t)); if(wsconn_used_list == NULL) { - LM_ERR("allocating WebSocket used list\n"); + SHM_MEM_ERROR_FMT("for WebSocket used list\n"); goto error; } memset((void *)wsconn_used_list, 0, sizeof(ws_connection_list_t)); @@ -197,7 +197,7 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); if(wsc == NULL) { - LM_ERR("allocating shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -530,9 +530,10 @@ ws_connection_t **wsconn_get_list(void) /* allocate a NULL terminated list of wsconn pointers */ list_size = (list_len + 1) * sizeof(ws_connection_t *); list = pkg_malloc(list_size); - if(!list) + if(!list) { + PKG_MEM_ERROR; goto end; - + } memset(list, 0, list_size); /* copy */ @@ -618,9 +619,10 @@ ws_connection_id_t *wsconn_get_list_ids(int idx) /* allocate a NULL terminated list of wsconn pointers */ list_size = (list_len + 1) * sizeof(ws_connection_id_t); list = pkg_malloc(list_size); - if(!list) + if(!list) { + PKG_MEM_ERROR; goto end; - + } memset(list, 0, list_size); /* copy */ diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index c7927b16f43..e4f1a8effd5 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -203,7 +203,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) /* Allocate send buffer and build frame */ frame_length = frame->payload_len + extended_length + 2; if((send_buf = pkg_malloc(sizeof(char) * frame_length)) == NULL) { - LM_ERR("allocating send buffer from pkg memory\n"); + PKG_MEM_ERROR_FMT("for send buffer\n"); return -1; } memset(send_buf, 0, sizeof(char) * frame_length); @@ -316,7 +316,7 @@ static int close_connection(ws_connection_t **p_wsc, ws_close_type_t type, if(wsc->state == WS_S_OPEN) { data = pkg_malloc(sizeof(char) * (reason.len + 2)); if(data == NULL) { - LM_ERR("allocating pkg memory\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 878c483f2ab..4566065bd64 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -296,7 +296,7 @@ int ws_handle_handshake(struct sip_msg *msg) reply_key.s = (char *)pkg_malloc((key.len + str_ws_guid.len) * sizeof(char)); if(reply_key.s == NULL) { - LM_ERR("allocating pkg memory\n"); + PKG_MEM_ERROR; ws_send_reply(msg, 500, &str_status_internal_server_error, NULL); goto end; }

1 0

git:master:89927295: utils: convert to memory logging helper
by Henning Westerholt 29 Apr '23

29 Apr '23

Module: kamailio Branch: master Commit: 89927295f23648d9e66fa5285ca3b65a615e89a5 URL: https://github.com/kamailio/kamailio/commit/89927295f23648d9e66fa5285ca3b65… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z utils: convert to memory logging helper --- Modified: src/modules/utils/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/89927295f23648d9e66fa5285ca3b65… Patch: https://github.com/kamailio/kamailio/commit/89927295f23648d9e66fa5285ca3b65… --- diff --git a/src/modules/utils/xcap_auth.c b/src/modules/utils/xcap_auth.c index 425fa105cd0..20cac431132 100644 --- a/src/modules/utils/xcap_auth.c +++ b/src/modules/utils/xcap_auth.c @@ -416,12 +416,12 @@ int get_rules_doc(str* user, str* domain, int type, str** rules_doc) doc= (str*)pkg_malloc(sizeof(str)); if (doc== NULL) { - ERR_MEM(PKG_MEM_STR); + PKG_MEM_ERROR; } doc->s= (char*)pkg_malloc(body.len* sizeof(char)); if (doc->s== NULL) { pkg_free(doc); - ERR_MEM(PKG_MEM_STR); + PKG_MEM_ERROR; } memcpy(doc->s, body.s, body.len); doc->len= body.len;

1 0

git:master:b1a47746: pua: convert to memory logging helper, add missing log message and mem error handling
by Henning Westerholt 29 Apr '23

29 Apr '23

Module: kamailio Branch: master Commit: b1a47746d6097c2d1fe47ee4799108368037283d URL: https://github.com/kamailio/kamailio/commit/b1a47746d6097c2d1fe47ee47991083… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z pua: convert to memory logging helper, add missing log message and mem error handling --- Modified: src/modules/pua/hash.c Modified: src/modules/pua/pua.c Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/b1a47746d6097c2d1fe47ee47991083… Patch: https://github.com/kamailio/kamailio/commit/b1a47746d6097c2d1fe47ee47991083… --- diff --git a/src/modules/pua/hash.c b/src/modules/pua/hash.c index 9b1fec3d0d..8bd4a442e6 100644 --- a/src/modules/pua/hash.c +++ b/src/modules/pua/hash.c @@ -229,6 +229,9 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires, if(p->remote_contact.s== NULL) { SHM_MEM_ERROR; + if(etag) { + shm_free(p->etag.s); + } return; } memcpy(p->remote_contact.s, contact->s, contact->len); diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index 33ddeddba4..255d0fa1bf 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -601,6 +601,9 @@ static int db_restore(void) if(p->etag.s== NULL) { SHM_MEM_ERROR; + if(watcher_uri.s && watcher_uri.len) { + shm_free(p->remote_contact.s); + } goto error; } memcpy(p->etag.s, etag.s, etag.len); diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 58e67de82d..c19ff1b965 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -409,6 +409,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) if(presentity->etag.s== NULL) { SHM_MEM_ERROR; + shm_free(presentity); goto error; } memcpy(presentity->etag.s, etag.s, etag.len); diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index dc239c61b6..1791e6cca2 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -654,7 +654,9 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) presentity->remote_contact.s= (char*)shm_malloc(contact.len* sizeof(char)); if(presentity->remote_contact.s==NULL) { - ERR_MEM(SHARE_MEM); + SHM_MEM_ERROR; + shm_free(presentity); + return; } memcpy(presentity->remote_contact.s, contact.s, contact.len); presentity->remote_contact.len= contact.len;

1 0

[kamailio/kamailio] Early Media on Kamailio 5.X w/rtpengine (Issue #3429)
by ibrahmgarip 28 Apr '23

28 Apr '23

Hi, I'm trying to build a script for early media. I've kamailio 5.6 and rtpengine 11.3.1 on my server. I just want to play local media when I get call to my server but its not working as I want. <!-- I've configured kamailio to work with rtpengine and added this snippet to " onreply_route[MANAGE_REPLY] " section. if(status=="100") { rtpengine_manage(); t_reply("183", "Session Progress"); block_dtmf(); play_media("from-tag=$fti file=/usr/share/rtpengine/decode_G711.wav"); I can see the RTP is playing successfuly but the kamailio is not creating SIP messaging with SDP to play on other side. ![image](https://user-images.githubusercontent.com/110819566/235202939-c8e599d3-e5e4-4932-bc84-a46c0fc28e57.png) ![image](https://user-images.githubusercontent.com/110819566/235203260-3841016d-c362-4f90-87bc-c6a096d258b7.png) I couldn't figure out how should I configure, can you please advise me about that? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3429 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3429(a)github.com>

2 2

git:master:7ae82075: github: PR use Github Packages registry [skip ci]
by Victor Seva 28 Apr '23

28 Apr '23

Module: kamailio Branch: master Commit: 7ae82075ba0b509cdc9c2f5d03e9b055fc3bf117 URL: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-28T11:48:49+02:00 github: PR use Github Packages registry [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… Patch: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e2f6416ce42..197361aaf21 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} + image: ghcr.io/kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} volumes: - ${{ github.workspace }}:/code env: @@ -27,7 +27,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v2 - - uses: ammaraskar/gcc-problem-matcher(a)0.1 + - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | cd /code

1 0

git:master:f27d15ba: auth_db: exported www_authenticate_method() to kemi
by Daniel-Constantin Mierla 28 Apr '23

28 Apr '23

Module: kamailio Branch: master Commit: f27d15ba6e1116a9f47e654d2bd0f4d3b73168a3 URL: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-28T09:19:31+02:00 auth_db: exported www_authenticate_method() to kemi --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c Modified: src/modules/auth_db/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… Patch: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index 5d54bdf4bd4..49556cd71de 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -452,6 +452,11 @@ static sr_kemi_t sr_kemi_auth_db_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth_db"), str_init("www_authenticate_method"), + SR_KEMIP_INT, ki_www_authenticate_method, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index e433534284c..5fd7cce61ad 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -444,6 +444,11 @@ int www_authenticate2(struct sip_msg* _m, char* _realm, char* _table, char *_met &smethod); } +int ki_www_authenticate_method(sip_msg_t *msg, str *realm, str *table, str *method) +{ + return digest_authenticate(msg, realm, table, HDR_AUTHORIZATION_T, method); +} + /** * */ diff --git a/src/modules/auth_db/authorize.h b/src/modules/auth_db/authorize.h index fd26f39e75e..b67ba7121f9 100644 --- a/src/modules/auth_db/authorize.h +++ b/src/modules/auth_db/authorize.h @@ -46,6 +46,8 @@ int proxy_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate2(struct sip_msg* _msg, char* _realm, char* _table, char *_method); +int ki_www_authenticate_method(sip_msg_t *msg, str *realm, str *table, str *method); + /* * Authenticate using WWW/Proxy-Authorize header field */

1 0

Re: hooking mechanism for routing blocks
by Henning Westerholt 27 Apr '23

27 Apr '23

(also added sr-dev) Hello, It probably not exactly what you are looking for, but a common way for modules to provide "hooks" towards the configuration for later extensions is about the event_route facility. You can find many of this event routes used from modules (on simple example is dispatcher module). Inter-module communication or usage is usually facilitated by an API export from the providing module, and an API import/binding on the consuming module. Examples here are the usrloc and registrar modules. The sl module API is also used from many other modules to send messages. Cheers, Henning -----Original Message----- From: Valentin Christoph <Christoph.Valentin(a)kontron.com> Sent: Montag, 24. April 2023 15:44 To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] hooking mechanism for routing blocks Dear all, I am looking for some hooking mechanism for user defined routing blocks. Is something like this already available? 1) a common part of the routing configuration shall not (or only slightly) be changed, after some hooks have been implemented Something like a function "engage_hooks()" of some "hook_module"? : Routing config that should not be changed by application developers engage_hooks(HOOK_TYPE); Routing config that should not be changed by application developers : 2) one application developer may "hook" new parts of the routing configuration into this, by modparam("hook_module", "hook", "name=MY_RB;type=HOOK_TYPE;prio=50); : : Route [MY_RB] { Do something at hook HOOK_TYPE; } : : 3) another application developer might want to "hook" into the same HOOK_TYPE with a higher priority modparam("hook_module", "hook", "name=ANOTHER_RB;type=HOOK_TYPE;prio=20); : : Route [ANOTHER_RB] { Do another thing with higher priority at hook HOOK_TYPE } : : Kr, Christoph __________________________________________________________ Kamailio - Users Mailing List - Non Commercial Discussions To unsubscribe send an email to sr-users-leave(a)lists.kamailio.org Important: keep the mailing list in the recipients, do not reply only to the sender! Edit mailing list options or unsubscribe:

2 1

git:master:f16ba6d4: auth: exported auth_get_www_authenticate() to kemi
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: f16ba6d4a5305be84d5a2b9d1e6c6a15368c8c76 URL: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:36:36+02:00 auth: exported auth_get_www_authenticate() to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Patch: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 5538ffb4f03..8e74d33dd4e 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1260,6 +1260,43 @@ static int fixup_auth_get_www_authenticate(void **param, int param_no) return 0; } +/** + * + */ +static int ki_auth_get_www_authenticate(sip_msg_t* msg, str* realm, + int flags, str *pvdst) +{ + str hf = {0}; + pv_spec_t *pvs; + pv_value_t val; + int ret; + + pvs = pv_cache_get(pvdst); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", pvdst->len, pvdst->s); + return -1; + } + + ret = auth_challenge_helper(NULL, realm, flags, + HDR_AUTHORIZATION_T, &hf); + + if(ret<0) + return ret; + + val.rs.s = pv_get_buffer(); + val.rs.len = 0; + if(hf.s!=NULL) { + memcpy(val.rs.s, hf.s, hf.len); + val.rs.len = hf.len; + val.rs.s[val.rs.len] = '\0'; + pkg_free(hf.s); + } + val.flags = PV_VAL_STR; + pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val); + + return (ret==0)?1:ret; +} + /** * */ @@ -1295,6 +1332,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("auth_get_www_authenticate"), + SR_KEMIP_INT, ki_auth_get_www_authenticate, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:7fd502fe: tls: get san entries by index
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: 7fd502fe433695b798249404cae144365d08b9c7 URL: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Author: root <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: get san entries by index - adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400 --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Patch: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443…

1 0

git:master:1f802a96: tls: fix formatting in tls_select.c
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: 1f802a96f0ce4c376d64be65bca27994bb2742cb URL: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Author: Marcus Orchard <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: fix formatting in tls_select.c --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Patch: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 943b7221556..745c005f3ea 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -318,7 +318,7 @@ static int get_version(str* res, sip_msg_t* msg) res->s = buf; res->len = version.len; tcpconn_put(c); - return 0; + return 0; err: if (c) tcpconn_put(c); @@ -1894,7 +1894,3 @@ sr_kemi_xval_t* ki_tls_cget_attr(sip_msg_t* msg, str *aname) sr_kemi_xval_null(&_ksr_kemi_tls_xval, SR_KEMI_XVAL_NULL_EMPTY); return &_ksr_kemi_tls_xval; } - - - -

1 0

[kamailio/kamailio] TLS Module does not expose all entries in the subject alternative name (Issue #3400)
by Marcus Orchard 26 Apr '23

26 Apr '23

### Description Have a certificate with the following Subject Alternative Name value: DNS:www.company.net, DNS:company.com, DNS: company.net Calling `$tls_peer_san_hostname` (and the other pv's/select that reference SAN) only returns `www.company.net` (first entry) This does not support the spec which allows multiple entries (rfc2459 I believe). ### Troubleshooting Logged values of different SAN back select and pseudovariables and only appears to return the first entries. #### Reproduction Create a self signed certificate with multiple alt names (I used this as a guide: https://support.citrix.com/article/CTX135602/how-to-create-a-selfsigned-san…) Updated my Kamailio config to log different tls pv and selects (eg tls_peer_san_hostname, @tls.peer.dns select, but others as well) Confirm only one value is provided. #### Debugging Data ``` [www.company.net] is the only value present in the corresponding variables ``` ### Possible Solutions Update variables to provide access to SAN entries to return all the values Create new variable to provide access to all SAN entries ### Additional Information https://www.kamailio.org/wiki/cookbooks/5.1.x/pseudovariables#tls_peer_san_… http://www.kamailio.org/wiki/cookbooks/5.2.x/selects#tlspeerdns -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3400 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3400(a)github.com>

4 3

[kamailio/kamailio] tls: get san entries by index (PR #3408)
by Marcus Orchard 26 Apr '23

26 Apr '23

- adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400  #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3400 #### Description Fix issue #3400 that describes that tls module cannot properly handle certificates with multiple SAN entries. Add ability to access SAN entries by index. Add ability to get count of supported SAN entries by type of entry. If index is not provided will return first entry (current behavior to remain backwards compatible. Tested by creating a self signed SAN cert with 3 DNS entries and confirmed expected results for: $(tls_peer_san_hostname[2]) $(tls_peer_san_hostname); $tls_peer_san_count(DNS) $tls_peer_san_count(URI) $tls_peer_san_count(EMAIL) $tls_peer_san_count(IP) $sel(tls.peer.dns[1]) $sel(tls.peer.dns) $sel(tls.peer.count[\"DNS\"]) $(tls_peer_san_ip[0]) $(tls_peer_san_uri) $sel(tls.peer.ip[0]) $sel(tls.peer.count[\"EMAIL\"]) $(tls_my_san_hostname[2]) $(tls_my_san_hostname) $tls_my_san_count(DNS) $tls_my_san_count(URI) $tls_my_san_count(EMAIL) $tls_my_san_count(IP) $sel(tls.my.dns[1]) $sel(tls.my.dns) $sel(tls.my.count[\"DNS\"] $(tls_my_san_ip[0])] $(tls_my_san_uri) $sel(tls.my.ip[0]) $sel(tls.my.count[\"EMAIL\"]) Also repeated the test with a self signed cert with 3 DNS entries, 1 IP entry, 1 EMAIL entry and 1 URI entry You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3408 -- Commit Summary -- * tls: get san entries by index -- File Changes -- M src/modules/tls/tls_select.c (314) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3408.patch https://github.com/kamailio/kamailio/pull/3408.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3408 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3408(a)github.com>

3 7

git:master:42351ec9: lost: P-A-I parsing with display name fixed (#3426)
by Wolfgang Kampichler 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: 42351ec91b38ce3f8eff51978d00010f54481924 URL: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2023-04-26T17:56:23+02:00 lost: P-A-I parsing with display name fixed (#3426) - this fix improves P-Asserted-Identity parsing to properly extract the uri from the header value. The uri (sip/tel) is used as identity for HELD requests. --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… Patch: https://github.com/kamailio/kamailio/commit/42351ec91b38ce3f8eff51978d00010… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index f86fcaf015..6f50329574 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -477,50 +477,45 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) */ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) { - p_id_body_t *p_body; - - char *tmp = NULL; + to_body_t *p_pai; char *res = NULL; - int len = 0; *lgth = 0; - if(parse_pai_header(msg) == -1) { - - LM_DBG("failed to parse P-A-I header\n"); - - return res; - } + if((parse_pai_header(msg) == 0) && (msg->pai) && (msg->pai->parsed)) { + /* return the first header entry */ + p_pai = get_pai(msg)->id; + if((p_pai->parsed_uri.user.s == NULL) + && (parse_uri(p_pai->uri.s, p_pai->uri.len, &p_pai->parsed_uri) + < 0)) { + + LM_DBG("failed to parse P-A-I header\n"); + + return res; + } + } else { + + LM_DBG("P-A-I header not found or failed to parse\n"); - if(msg->pai == NULL || get_pai(msg) == NULL) { - LM_ERR("P-A-I header not found\n"); return res; } - p_body = get_pai(msg); - /* warning in case multiple P-A-I headers were found and use first */ - if(p_body->num_ids > 1) { - LM_WARN("multiple P-A-I headers found, selecting first!\n"); + /* warning in case multiple P-A-I headers were found */ + if(get_pai(msg)->num_ids > 1) { + LM_WARN("multiple P-A-I headers found, selected first!\n"); } - LM_DBG("P-A-I body: [%.*s]\n", p_body->id->body.len, p_body->id->body.s); + LM_DBG("P-A-I uri: [%.*s]\n", p_pai->uri.len, p_pai->uri.s); - /* accept any identity string (body), but remove <..> if present */ - tmp = p_body->id->body.s; - len = p_body->id->body.len; - if(tmp[0] == '<' && tmp[len - 1] == '>') { - tmp++; - len -= 2; - } /* allocate memory, copy and \0 terminate string */ - res = (char *)pkg_malloc((len + 1) * sizeof(char)); + res = (char *)pkg_malloc((p_pai->uri.len + 1) * sizeof(char)); if(res == NULL) { PKG_MEM_ERROR; return res; } else { - memset(res, 0, len); - memcpy(res, tmp, len); - res[len] = '\0'; + memset(res, 0, p_pai->uri.len); + memcpy(res, p_pai->uri.s, p_pai->uri.len); + res[p_pai->uri.len] = '\0'; *lgth = strlen(res); }

1 0

[kamailio/kamailio] sanity: implement reserved char check in the header and values (Issue #3421)
by sergey-safarov 26 Apr '23

26 Apr '23

### Description Our partner sending a call with this header ``` From: "COVER JERRY & M" <sip:+12099283442@206.147.236.174:5060;otg=TLMNCAXFDS0_3887>;tag=gK0c7f90e2 ``` According [RFC3261](https://www.rfc-editor.org/rfc/rfc3261#section-25.1) ``` Several rules are incorporated from RFC 2396 [5] but are updated to make them compliant with RFC 2234 [10]. These include: reserved = ";" / "/" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / "," unreserved = alphanum / mark mark = "-" / "_" / "." / "!" / "~" / "*" / "'" / "(" / ")" escaped = "%" HEXDIG HEXDIG ``` Also ``` SIP follows the requirements and guidelines of RFC 2396 [5] when defining the set of characters that must be escaped in a SIP URI, and uses its ""%" HEX HEX" mechanism for escaping. From RFC 2396 [5]: The set of characters actually reserved within any given URI component is defined by that component. In general, a character is reserved if the semantics of the URI changes if the character is replaced with its escaped US-ASCII encoding [5]. Excluded US- ASCII characters (RFC 2396 [5]), such as space and control characters and characters used as URI delimiters, also MUST be escaped. URIs MUST NOT contain unescaped space and control characters. ``` And ``` Expanding the hname and hvalue tokens in Section 25 show that all URI reserved characters in header field names and values MUST be escaped. ``` For now, looks like `the sanity` module does not check reserver char usage. This ticket was created to collect recommendations for feature implementation. Should be checked headers? Maybe a similar check is already present in the code and you can provide a reference? Unscaped reserved char usage in "From", "To", "P-Asserted-Identity" and "Remote-Party-ID" for display name breaking SIP message (for example the "lost" module cannot parse properly "From" header). Should such be implemented in the Kamailio core also? ### Expected behavior One of these expected: 1) Kamailio drop a message with reserved char usage in the header names and values. For TCP and TLS transport drop connection; 2) sanity module allows checking reserved char usage in the header names and values. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3421 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3421(a)github.com>

3 4

git:master:5a2df203: modules: readme files regenerated - call_control ... [skip ci]
by Kamailio Dev 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 5a2df203a244e79a1868910da312f765091d22f5 URL: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-04-25T22:16:28+02:00 modules: readme files regenerated - call_control ... [skip ci] --- Modified: src/modules/call_control/README Modified: src/modules/cfgutils/README Modified: src/modules/janssonrpcc/README Modified: src/modules/jsonrpcs/README Modified: src/modules/jwt/README Modified: src/modules/kazoo/README Modified: src/modules/keepalive/README Modified: src/modules/kemix/README Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76… Patch: https://github.com/kamailio/kamailio/commit/5a2df203a244e79a1868910da312f76…

1 0

git:master:4c8276fc: kex: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 4c8276fcf268a690ea671c4ddeaad1f89e293565 URL: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kex: typos --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/doc/kex_admin.xml Modified: src/modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… Patch: https://github.com/kamailio/kamailio/commit/4c8276fcf268a690ea671c4ddeaad1f… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 565ce4e77d7..816ae39a90f 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -409,7 +409,7 @@ struct rpc_list_params { /** - * Satistic getter RPC callback. + * Statistic getter RPC callback. */ static void rpc_get_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) { @@ -644,7 +644,7 @@ static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) } /** - * Satistic reset/clear-er RPC callback.. + * Statistic reset/clear-er RPC callback.. */ static void rpc_reset_or_clear_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 34484bc4ec8..5c597e97047 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -88,7 +88,7 @@ setsflag("$var(flag)"); <section id="kex.f.issflagset"> <title><function moreinfo="none">issflagset(flag)</function></title> <para> - Return true of the script flag is set. + Return true if the script flag is set. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -179,7 +179,7 @@ setbflag("$var(flag)", "1"); <section id="kex.f.isbflagset"> <title><function moreinfo="none">isbflagset(flag [, branch])</function></title> <para> - Return true of the branch flag is set. + Return true if the branch flag is set. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -762,7 +762,7 @@ resetdebug(); </title> <para>Print the list of available internal statistics.</para> <para>NOTE: the result is an array of strings that have the list of - statistics formated like "name = value", being propagated over the time + statistics formatted like "name = value", being propagated over the time from the MI variant. Use "stats.fetch" or "stats.fetchn"commands to have a more JSON-friendly output.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to @@ -785,7 +785,7 @@ resetdebug(); <para>Print the list of available internal statistics with a more json friendly output. Each printed statistic is a field in the output structure: {"statsgroup.statsname" : "statsvalue"}. The value is - represented as string to accomodate large numbers.</para> + represented as string to accommodate large numbers.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to be printed. If set to 'all' then all statistics are printed; if set to 'statsgroup:' then all statistics in the group are printed; diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index e46e85b5cf4..1927c7343d3 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -141,7 +141,7 @@ static int mod_init(void) register_pkg_proc_stats(); pkg_proc_stats_init_rpc(); - /* per module memmory debugging RPC command */ + /* per module memory debugging RPC command */ mod_stats_init_rpc(); return 0;

1 0

git:master:67a01aa6: kazoo: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 67a01aa6757f19397438457c6665d338f6804f24 URL: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kazoo: typos --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… Patch: https://github.com/kamailio/kamailio/commit/67a01aa6757f19397438457c6665d33… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 2d47ce83c1e..4128e8c834c 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -371,7 +371,7 @@ modparam("kazoo", "consume_messages_on_reconnect", 0) <section> <title><varname>single_consumer_on_reconnect</varname>(int)</title> <para>When the main loop receives a message from rabbitmq it will defer the - execution to a worker in a round-robin manner. this parameter allows to use the + execution to a worker in a round-robin manner. This parameter allows to use the same worker when kazoo reconnects to rabbitmq.</para> <para> <emphasis>Default value is 1.</emphasis> diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 46f1f098b21..989d637bf22 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -176,7 +176,7 @@ static param_export_t params[] = { {"node_hostname", PARAM_STR, &dbk_node_hostname}, {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, - {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, + {"amqp_timer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, {"amqp_consumer_ack_timeout_sec", INT_PARAM, &kz_ack_tv.tv_sec}, {"amqp_interprocess_timeout_micro", INT_PARAM, &kz_sock_tv.tv_usec}, diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 873d6fe421c..1604cea612e 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2353,10 +2353,10 @@ int add_amqp_headers (char * headers, amqp_basic_properties_t * props ) if (header_value != NULL) { num_headers++; } else { - LM_ERR("Header-Value cant be parsed - skipping!\n"); + LM_ERR("Header-Value can't be parsed - skipping!\n"); } } else { - LM_ERR("Header-Name cant be parsed - skipping!\n"); + LM_ERR("Header-Name can't be parsed - skipping!\n"); } kv_pair_str = strtok_r(NULL, headers_delim, &header_saveptr); }

1 0

git:master:e7c8dcb9: keepalive: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: e7c8dcb9507fbd44cc1d00132b433a2d91705a48 URL: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 keepalive: typos --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2… Patch: https://github.com/kamailio/kamailio/commit/e7c8dcb9507fbd44cc1d00132b433a2…

1 0

git:master:79fc3f1f: kemix: update Kamailio URLs to HTTP â HTTPS
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 79fc3f1fc9561f43146a107c824d1d97d3a8b021 URL: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 kemix: update Kamailio URLs to HTTP �� HTTPS --- Modified: src/modules/kemix/doc/kemix_admin.xml Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… Patch: https://github.com/kamailio/kamailio/commit/79fc3f1fc9561f43146a107c824d1d9… --- diff --git a/src/modules/kemix/doc/kemix_admin.xml b/src/modules/kemix/doc/kemix_admin.xml index 0743d7765c5..f28467dc170 100644 --- a/src/modules/kemix/doc/kemix_admin.xml +++ b/src/modules/kemix/doc/kemix_admin.xml @@ -30,8 +30,8 @@ <itemizedlist> <listitem> <para> - <ulink url="http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/"> - http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> + <ulink url="https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/"> + https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> </para> </listitem> </itemizedlist> diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index e6bff3841cf..c710d50ffcf 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -75,7 +75,7 @@ static sr_kemi_xval_t* ki_kx_get_ruri(sip_msg_t *msg) } if(msg->first_line.type == SIP_REPLY) { - /* REPLY doesnt have a ruri */ + /* REPLY doesn't have a ruri */ sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); return &_sr_kemi_kx_xval; } @@ -108,7 +108,7 @@ static sr_kemi_xval_t* ki_kx_get_ouri(sip_msg_t *msg) } if(msg->first_line.type == SIP_REPLY) { - /* REPLY doesnt have a ruri */ + /* REPLY doesn't have a ruri */ sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); return &_sr_kemi_kx_xval; }

1 0

git:master:285a2606: jsonrpcs: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 285a260687d4dce5636531a4ffffc43b0d37e883 URL: https://github.com/kamailio/kamailio/commit/285a260687d4dce5636531a4ffffc43… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 jsonrpcs: typos --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/285a260687d4dce5636531a4ffffc43… Patch: https://github.com/kamailio/kamailio/commit/285a260687d4dce5636531a4ffffc43… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 9e558c4cfd..0e39676edd 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -380,7 +380,7 @@ modparam("jsonrpcs", "dgram_user", "root") <section id="jsonrpcs.p.dgram_timeout"> <title><varname>dgram_timeout</varname> (int)</title> <para> - The reply will expire after trying to sent it for socket_timeout + The reply will expire after trying to send it for socket_timeout milliseconds. </para> <para> diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index e369c62569..8ce008ccb5 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -298,7 +298,7 @@ static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) /** Implementation of rpc_fault function required by the management API. * * This function will be called whenever a management function - * indicates that an error ocurred while it was processing the request. The + * indicates that an error occurred while it was processing the request. The * function takes the reply code and reason phrase as parameters, these will * be put in the body of the reply. * @@ -340,7 +340,7 @@ static void jsonrpc_fault(jsonrpc_ctx_t* ctx, int code, char* fmt, ...) * This is the function that will be called whenever a management function * asks the management interface to send the reply to the client. * The SIP/HTTP reply sent to - * the client will be always 200 OK, if an error ocurred on the server then it + * the client will be always 200 OK, if an error occurred on the server then it * will be indicated in the html document in body. * * @param ctx A pointer to the context structure of the jsonrpc request that @@ -1191,7 +1191,7 @@ static void jsonrpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) (hdr->parsed<(void*)r_ctx->msg || hdr->parsed>=(void*)(r_ctx->msg+r_ctx->msg_shm_block_size))) { /* header parsed filed doesn't point inside uas.request memory - * chunck -> it was added by failure funcs.-> free it as pkg */ + * chunk -> it was added by failure funcs.-> free it as pkg */ DBG("removing hdr->parsed %d\n", hdr->type); clean_hdr_field(hdr); hdr->parsed = 0;

1 0

git:master:8c5a8ce5: jwt: typo algoritm â algorithm
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 8c5a8ce562e5ab98a7e6bdf163bab833ec3a7cf5 URL: https://github.com/kamailio/kamailio/commit/8c5a8ce562e5ab98a7e6bdf163bab83… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 jwt: typo algoritm �� algorithm --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8c5a8ce562e5ab98a7e6bdf163bab83… Patch: https://github.com/kamailio/kamailio/commit/8c5a8ce562e5ab98a7e6bdf163bab83… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index 165ca170f95..5389bb61f30 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -101,7 +101,7 @@ modparam("jwt", "key_mode", 1) </listitem> <listitem> <para> - alg - the algoritm to build the signature, as supported by the + alg - the algorithm to build the signature, as supported by the libjwt (e.g., RS256, HS256, ES256, ...) </para> </listitem> @@ -158,7 +158,7 @@ modparam("jwt", "key_mode", 1) </listitem> <listitem> <para> - alg - the algoritm to build the signature, as supported by the + alg - the algorithm to build the signature, as supported by the libjwt (e.g., RS256, HS256, ES256, ...) </para> </listitem> @@ -210,7 +210,7 @@ modparam("jwt", "key_mode", 1) </listitem> <listitem> <para> - alg - the algoritm to build the signature, as supported by the + alg - the algorithm to build the signature, as supported by the libjwt (e.g., RS256, HS256, ES256, ...) </para> </listitem>

1 0

git:master:5335f6d5: cfgutils: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 5335f6d5a80f804257a2303f05a2b2c5edf02322 URL: https://github.com/kamailio/kamailio/commit/5335f6d5a80f804257a2303f05a2b2c… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 cfgutils: typos --- Modified: src/modules/cfgutils/cfgutils.c Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5335f6d5a80f804257a2303f05a2b2c… Patch: https://github.com/kamailio/kamailio/commit/5335f6d5a80f804257a2303f05a2b2c… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index bf4b0680bbc..740d26f4b46 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -333,7 +333,7 @@ void cfgutils_rpc_get_gflags(rpc_t* rpc, void* ctx) flags = *gflags; if (rpc->rpl_printf(ctx, "0x%X (%u)", flags, flags) < 0) { - rpc->fault(ctx, 500, "Faiure building the response"); + rpc->fault(ctx, 500, "Failure building the response"); return; } } @@ -365,7 +365,7 @@ void cfgutils_rpc_get_prob(rpc_t* rpc, void* ctx) { if (rpc->rpl_printf(ctx, "actual probability: %u percent", (*probability)) < 0) { - rpc->fault(ctx, 500, "Faiure building the response"); + rpc->fault(ctx, 500, "Failure building the response"); return; } } @@ -374,7 +374,7 @@ void cfgutils_rpc_get_hash(rpc_t* rpc, void* ctx) { if (rpc->rpl_printf(ctx, "%.*s", MD5_LEN, config_hash) < 0) { - rpc->fault(ctx, 500, "Faiure building the response"); + rpc->fault(ctx, 500, "Failure building the response"); return; } } @@ -451,12 +451,12 @@ void cfgutils_rpc_check_hash(rpc_t* rpc, void* ctx) if (strncmp(config_hash, tmp, MD5_LEN) == 0) { if (rpc->rpl_printf(ctx, "Identical hash") < 0) { - rpc->fault(ctx, 500, "Faiure building the response"); + rpc->fault(ctx, 500, "Failure building the response"); return; } } else { if (rpc->rpl_printf(ctx, "Different hash") < 0) { - rpc->fault(ctx, 500, "Faiure building the response"); + rpc->fault(ctx, 500, "Failure building the response"); return; } } @@ -976,17 +976,17 @@ static int w_core_hash(struct sip_msg *msg, char *p1, char *p2, char *p3) if (fixup_get_svalue(msg, (gparam_p) p1, &s1) != 0) { - LM_ERR("invalid s1 paramerer\n"); + LM_ERR("invalid s1 parameter\n"); return -1; } if (fixup_get_svalue(msg, (gparam_p) p2, &s2) != 0) { - LM_ERR("invalid s2 paramerer\n"); + LM_ERR("invalid s2 parameter\n"); return -1; } if (fixup_get_ivalue(msg, (gparam_p) p3, &size) != 0) { - LM_ERR("invalid size paramerer\n"); + LM_ERR("invalid size parameter\n"); return -1; } diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 23afd740535..41ebc0435f2 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -80,7 +80,7 @@ <section> <title>Dependencies</title> <para> - The module depends on the following modules (in the other words the + The module depends on the following modules (in other words the listed modules must be loaded before this module): <itemizedlist> <listitem>

1 0

git:master:326ad479: ims_registrar_pcscf: typo
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 326ad479fb9e09f4f3a177606f2b5dcc09fbbd62 URL: https://github.com/kamailio/kamailio/commit/326ad479fb9e09f4f3a177606f2b5dc… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 ims_registrar_pcscf: typo --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/326ad479fb9e09f4f3a177606f2b5dc… Patch: https://github.com/kamailio/kamailio/commit/326ad479fb9e09f4f3a177606f2b5dc… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 88c0c008a8e..db9b7e73877 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -254,7 +254,7 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma } /** - * Save contact based on REGISTER request. this will be a pending save, until we receive response + * Save contact based on REGISTER request. This will be a pending save, until we receive response * from SCSCF. If no response after pending_timeout seconds, the contacts is removed. Can only be used from REQUEST ROUTE */ int save_pending(struct sip_msg* _m, udomain_t* _d) {

1 0

git:master:27e97f17: janssonrpcc: typo
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 27e97f1717e542765125f32f0bde98f6bf47e26b URL: https://github.com/kamailio/kamailio/commit/27e97f1717e542765125f32f0bde98f… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 janssonrpcc: typo --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/27e97f1717e542765125f32f0bde98f… Patch: https://github.com/kamailio/kamailio/commit/27e97f1717e542765125f32f0bde98f… --- diff --git a/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml b/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml index 0d7e78c7085..10a3a732482 100644 --- a/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml +++ b/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml @@ -143,7 +143,7 @@ modparam("janssonrpcc", "result_pv", "$var(result)") modparam("janssonrpcc", "server", "conn=tests;srv=_test1._tcp.example.net"); modparam("janssonrpcc", "server", "conn=tests;srv=_test2._tcp.example.net"); modparam("janssonrpcc", "server", "conn=local;addr=localhost;port=8080;priority=10;weight=10"); -modparam("janssonrpcc", "server", "conn=user_db;addr=rpc.prod.exmaple.net;port=5060;priority=10;weight=10"); +modparam("janssonrpcc", "server", "conn=user_db;addr=rpc.prod.example.net;port=5060;priority=10;weight=10"); ... </programlisting> </example>

1 0

git:master:b1f783df: call_control: typos
by Daniel-Constantin Mierla 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: b1f783df4ceb2a1d4a525c3802707105b6f1a0c6 URL: https://github.com/kamailio/kamailio/commit/b1f783df4ceb2a1d4a525c380270710… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-25T22:11:28+02:00 call_control: typos --- Modified: src/modules/call_control/call_control.c Modified: src/modules/call_control/doc/call_control.8 Modified: src/modules/call_control/doc/call_control_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1f783df4ceb2a1d4a525c380270710… Patch: https://github.com/kamailio/kamailio/commit/b1f783df4ceb2a1d4a525c380270710… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index f9d152f85f2..1da3cf38f82 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -102,7 +102,7 @@ typedef struct AVP_List { typedef struct CallControlSocket { char *name; // name int sock; // socket - int timeout; // how many miliseconds to wait for an answer + int timeout; // how many milliseconds to wait for an answer time_t last_failure; // time of the last failure char data[BUFFER_SIZE]; // buffer for the answer data } CallControlSocket; @@ -124,7 +124,7 @@ int parse_param_stop(unsigned int type, void *val); static CallControlSocket callcontrol_socket = { "/run/callcontrol/socket", // name -1, // sock - 500, // timeout in 500 miliseconds if there is no answer + 500, // timeout in 500 milliseconds if there is no answer 0, // time of the last failure "" // data }; diff --git a/src/modules/call_control/doc/call_control.8 b/src/modules/call_control/doc/call_control.8 index ea3d50d25b4..d94d647dcd3 100644 --- a/src/modules/call_control/doc/call_control.8 +++ b/src/modules/call_control/doc/call_control.8 @@ -115,11 +115,11 @@ see .BR kamailio.cfg(5) .PP Full documentation on Kamailio is available at -.I http://www.kamailio.org/. +.I https://www.kamailio.org/. .PP Mailing lists: .nf -users(a)lists.kamailio.org - Kamailio user community +sr-users(a)lists.kamailio.org - Kamailio user community .nf -devel(a)lists.kamailio.org - Kamailio development, new features and unstable version +sr-dev(a)lists.kamailio.org - Kamailio development, new features and unstable version diff --git a/src/modules/call_control/doc/call_control_admin.xml b/src/modules/call_control/doc/call_control_admin.xml index a7a57a8d735..0dd52f026ad 100644 --- a/src/modules/call_control/doc/call_control_admin.xml +++ b/src/modules/call_control/doc/call_control_admin.xml @@ -76,7 +76,7 @@ <para> Callcontrol is invoked by calling the call_control() function for the initial INVITE of every call we want to apply a limit to. This will end - up as a request to the callcontrol application, which will interogate + up as a request to the callcontrol application, which will interrogate the rating engine for a time limit for the given caller and destination. The rating engine will determine if the destination has any associated cost and if the caller has any credit limit and if so will return the

1 0

[kamailio/kamailio] Typos (PR #3415)
by Дилян Палаузов 25 Apr '23

25 Apr '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3415 -- Commit Summary -- * call_control: typos * cfgutils: typos * ims_registrar_pcscf: typo * janssonrpcc: typo * jsonrpcs: typos * jwt: typo algoritm → algorithm * kazoo: typos * keepalive: typos * kemix: update Kamailio URLs to HTTP → HTTPS * kex: typos -- File Changes -- M src/modules/call_control/call_control.c (4) M src/modules/call_control/doc/call_control.8 (6) M src/modules/call_control/doc/call_control_admin.xml (2) M src/modules/cfgutils/cfgutils.c (16) M src/modules/cfgutils/doc/cfgutils_admin.xml (2) M src/modules/ims_registrar_pcscf/save.c (2) M src/modules/janssonrpcc/doc/janssonrpcc_admin.xml (2) M src/modules/jsonrpcs/doc/jsonrpcs_admin.xml (2) M src/modules/jsonrpcs/jsonrpcs_mod.c (6) M src/modules/jwt/doc/jwt_admin.xml (6) M src/modules/kazoo/doc/kazoo_admin.xml (2) M src/modules/kazoo/kazoo.c (2) M src/modules/kazoo/kz_amqp.c (4) M src/modules/keepalive/doc/keepalive_admin.xml (12) M src/modules/keepalive/keepalive.h (2) M src/modules/keepalive/keepalive_rpc.c (30) M src/modules/kemix/doc/kemix_admin.xml (4) M src/modules/kemix/kemix_mod.c (4) M src/modules/kex/core_stats.c (4) M src/modules/kex/doc/kex_admin.xml (8) M src/modules/kex/kex_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3415.patch https://github.com/kamailio/kamailio/pull/3415.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3415 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3415(a)github.com>

2 1

git:master:b2b4eda3: statistics: convert to memory logging helper
by Henning Westerholt 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: b2b4eda387ec21ebac2db7258cabda2b9c9ed81b URL: https://github.com/kamailio/kamailio/commit/b2b4eda387ec21ebac2db7258cabda2… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-25T11:52:31Z statistics: convert to memory logging helper --- Modified: src/modules/statistics/statistics.c Modified: src/modules/statistics/stats_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b2b4eda387ec21ebac2db7258cabda2… Patch: https://github.com/kamailio/kamailio/commit/b2b4eda387ec21ebac2db7258cabda2… --- diff --git a/src/modules/statistics/statistics.c b/src/modules/statistics/statistics.c index 3ffa58865b2..a8a1de484ad 100644 --- a/src/modules/statistics/statistics.c +++ b/src/modules/statistics/statistics.c @@ -125,7 +125,7 @@ static int fixup_stat(void** param, int param_no) /* var name - string or pv */ sopv = (struct stat_or_pv *)pkg_malloc(sizeof(struct stat_or_pv)); if (sopv==NULL) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset( sopv, 0 , sizeof(struct stat_or_pv) ); @@ -151,7 +151,7 @@ static int fixup_stat(void** param, int param_no) } else if (param_no==2) { lopv = (struct long_or_pv *) pkg_malloc(sizeof(struct long_or_pv)); if (lopv == NULL) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset(lopv, 0, sizeof(struct long_or_pv)); diff --git a/src/modules/statistics/stats_funcs.c b/src/modules/statistics/stats_funcs.c index c75beafae4b..bc3e5cbd56f 100644 --- a/src/modules/statistics/stats_funcs.c +++ b/src/modules/statistics/stats_funcs.c @@ -76,7 +76,7 @@ int reg_statistic( char* name) se = (stat_elem*)pkg_malloc( sizeof(stat_elem) ); if (se==0) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; goto error; }

1 0

git:master:78e658cd: kex: convert to memory logging helper, add missing mem error logging
by Henning Westerholt 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 78e658cd70d23f3665f08f436d8b9a9fa99769f9 URL: https://github.com/kamailio/kamailio/commit/78e658cd70d23f3665f08f436d8b9a9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-25T11:29:37Z kex: convert to memory logging helper, add missing mem error logging --- Modified: src/modules/kex/km_core.c Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/78e658cd70d23f3665f08f436d8b9a9… Patch: https://github.com/kamailio/kamailio/commit/78e658cd70d23f3665f08f436d8b9a9… --- diff --git a/src/modules/kex/km_core.c b/src/modules/kex/km_core.c index f0d97f1af97..583377379b5 100644 --- a/src/modules/kex/km_core.c +++ b/src/modules/kex/km_core.c @@ -76,7 +76,7 @@ int pv_printf_fixup(void** param, int param_no) spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); if(spec==NULL) { - LM_ERR("out of pkg\n"); + PKG_MEM_ERROR; return -1; } memset(spec, 0, sizeof(pv_spec_t)); diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 15ce1dcf2c0..35565cbcd9e 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -78,7 +78,10 @@ int pkg_proc_stats_init(void) _pkg_proc_stats_list = (pkg_proc_stats_t*)shm_malloc( _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); if(_pkg_proc_stats_list==NULL) + { + SHM_MEM_ERROR; return -1; + } memset(_pkg_proc_stats_list, 0, _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); return 0;

1 0

git:master:836dd900: sipcapture: convert to memory logging helper, add missing mem logging and cleanup on errors
by Henning Westerholt 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 836dd90007d82a8d6a3bea1969a21ca349203e05 URL: https://github.com/kamailio/kamailio/commit/836dd90007d82a8d6a3bea1969a21ca… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-25T11:46:12Z sipcapture: convert to memory logging helper, add missing mem logging and cleanup on errors --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/836dd90007d82a8d6a3bea1969a21ca… Patch: https://github.com/kamailio/kamailio/commit/836dd90007d82a8d6a3bea1969a21ca…

1 0

git:master:2264b5ca: call_control: convert to memory logging helper, add cleanup for errors
by Henning Westerholt 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 2264b5ca85256db2c3701575a24865f45b657c6c URL: https://github.com/kamailio/kamailio/commit/2264b5ca85256db2c3701575a24865f… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-25T11:49:47Z call_control: convert to memory logging helper, add cleanup for errors --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/2264b5ca85256db2c3701575a24865f… Patch: https://github.com/kamailio/kamailio/commit/2264b5ca85256db2c3701575a24865f… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index 14455ec967f..f9d152f85f2 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -260,6 +260,10 @@ cc_parse_param(void *val, AVP_List** avps) { } p0 = (char*) pkg_malloc (content.len + 1); + if(!(p0)) { + PKG_MEM_ERROR; + return -1; + } CHECK_ALLOC(p0); memset(p0, 0, content.len + 1); p = p0; @@ -270,10 +274,22 @@ cc_parse_param(void *val, AVP_List** avps) { for (;*p != '\0';) { mp = (AVP_List*) pkg_malloc (sizeof(AVP_List)); + if(!(mp)) { + PKG_MEM_ERROR; + pkg_free(p0); + return -1; + } CHECK_ALLOC(mp); memset(mp, 0, sizeof(AVP_List)); mp->next = *avps; mp->pv = (pv_spec_p) pkg_malloc (sizeof(pv_spec_t)); + if(!(mp->next)) + { + PKG_MEM_ERROR; + pkg_free(p0); + pkg_free(mp); + return -1; + } CHECK_ALLOC(mp->pv); memset(mp->pv, 0, sizeof(pv_spec_t));

1 0

git:master:2c976699: sworker: convert to memory logging helper
by Henning Westerholt 25 Apr '23

25 Apr '23

Module: kamailio Branch: master Commit: 2c976699e0e066659a2b1d2c1888300823c4b773 URL: https://github.com/kamailio/kamailio/commit/2c976699e0e066659a2b1d2c1888300… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-25T11:26:06Z sworker: convert to memory logging helper --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2c976699e0e066659a2b1d2c1888300… Patch: https://github.com/kamailio/kamailio/commit/2c976699e0e066659a2b1d2c1888300… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 6a151caa44b..377fb3cc608 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -192,7 +192,7 @@ int sworker_send_task(sip_msg_t *msg, str *gname) } at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize);

1 0

git:master:04bcef64: rtimer: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 04bcef64e0bf0cff3558ce3cb895439ab2cdd5c7 URL: https://github.com/kamailio/kamailio/commit/04bcef64e0bf0cff3558ce3cb895439… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:43:37Z rtimer: convert to memory logging helper --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/04bcef64e0bf0cff3558ce3cb895439… Patch: https://github.com/kamailio/kamailio/commit/04bcef64e0bf0cff3558ce3cb895439… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index 2b9fa12d431..cde900845cf 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -301,7 +301,7 @@ int stm_t_param(modparam_t type, void *val) nt = (stm_timer_t*)pkg_malloc(sizeof(stm_timer_t)); if(nt==0) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; free_params(params_list); return -1; } @@ -387,7 +387,7 @@ int stm_e_param(modparam_t type, void *val) rt = (stm_route_t*)pkg_malloc(sizeof(stm_route_t)); if(rt==0) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; free_params(params_list); return -1; }

1 0

git:master:b531f6df: drouting: convert to memory logging helper, add missing logging, free mem in errors
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: b531f6df91a5dd75fc6fae47e44041a1f1ebe6ca URL: https://github.com/kamailio/kamailio/commit/b531f6df91a5dd75fc6fae47e44041a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:52:42Z drouting: convert to memory logging helper, add missing logging, free mem in errors --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/drouting.c Modified: src/modules/drouting/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/b531f6df91a5dd75fc6fae47e44041a… Patch: https://github.com/kamailio/kamailio/commit/b531f6df91a5dd75fc6fae47e44041a…

1 0

git:master:a3fe9388: path: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: a3fe9388540ee3ba0331b642e1c26170ca572e60 URL: https://github.com/kamailio/kamailio/commit/a3fe9388540ee3ba0331b642e1c2617… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:30:54Z path: convert to memory logging helper --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/a3fe9388540ee3ba0331b642e1c2617… Patch: https://github.com/kamailio/kamailio/commit/a3fe9388540ee3ba0331b642e1c2617… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index c90aa939004..f1d8a624646 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -68,8 +68,10 @@ static char *path_strzdup(char *src, int len) if(len<0) { len = strlen(src); } - if (!(res = (char *) pkg_malloc(len + 1))) + if (!(res = (char *) pkg_malloc(len + 1))) { + PKG_MEM_ERROR; return NULL; + } strncpy(res, src, len); res[len] = 0; @@ -112,7 +114,7 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, cp = suffix = pkg_malloc(suffix_len); if (!suffix) { - LM_ERR("no pkg memory left for suffix\n"); + PKG_MEM_ERROR_FMT("for suffix\n"); goto out1; } @@ -165,7 +167,7 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, prefix_len = PATH_PREFIX_LEN + (user ? user->len : 0) + 2; prefix = pkg_malloc(prefix_len); if (!prefix) { - LM_ERR("no pkg memory left for prefix\n"); + PKG_MEM_ERROR_FMT("for prefix\n"); goto out2; } if (user && user->len)

1 0

git:master:56a843bb: dmq_usrloc: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 56a843bb18b5f06d4ef88ed525d446a1ff298b3f URL: https://github.com/kamailio/kamailio/commit/56a843bb18b5f06d4ef88ed525d446a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:32:29Z dmq_usrloc: convert to memory logging helper --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/56a843bb18b5f06d4ef88ed525d446a… Patch: https://github.com/kamailio/kamailio/commit/56a843bb18b5f06d4ef88ed525d446a… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 62477198a27..657db6cb7cb 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -203,7 +203,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node) len = rval * 2; buf = dmq_usrloc_malloc(len); if (buf == NULL) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; goto done; } rval = dmq_ul.get_all_ucontacts(buf, len, 0, 0, 1, 0); @@ -453,7 +453,7 @@ static int init_usrloc_dmq_recv() { LM_DBG("Initializing usrloc_dmq_recv for pid (%d)\n", my_pid()); usrloc_dmq_recv = (int*)pkg_malloc(sizeof(int)); if (!usrloc_dmq_recv) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; } *usrloc_dmq_recv = 0;

1 0

git:master:fc52a1e7: prefix_route: convert to memory logging helper, add missing logging
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: fc52a1e73812daaef425727fcf5f59ed6b75b2f9 URL: https://github.com/kamailio/kamailio/commit/fc52a1e73812daaef425727fcf5f59e… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:35:41Z prefix_route: convert to memory logging helper, add missing logging --- Modified: src/modules/prefix_route/tree.c --- Diff: https://github.com/kamailio/kamailio/commit/fc52a1e73812daaef425727fcf5f59e… Patch: https://github.com/kamailio/kamailio/commit/fc52a1e73812daaef425727fcf5f59e… --- diff --git a/src/modules/prefix_route/tree.c b/src/modules/prefix_route/tree.c index a90144d63af..c5e55826539 100644 --- a/src/modules/prefix_route/tree.c +++ b/src/modules/prefix_route/tree.c @@ -72,7 +72,7 @@ struct tree_item *tree_item_alloc(void) root = (struct tree_item *)shm_malloc(sizeof(*root)); if (NULL == root) { - LM_CRIT("shared memory alloc failed\n"); + SHM_MEM_CRITICAL; return NULL; } @@ -241,8 +241,10 @@ static struct tree *tree_alloc(void) struct tree *tree; tree = (struct tree *)shm_malloc(sizeof(*tree)); - if (NULL == tree) + if (NULL == tree) { + SHM_MEM_CRITICAL; return NULL; + } tree->root = NULL; atomic_set(&tree->refcnt, 0); @@ -325,6 +327,7 @@ int tree_init(void) /* Pointer to global tree must be in shared memory */ shared_tree = (struct tree **)shm_malloc(sizeof(*shared_tree)); if (NULL == shared_tree) { + SHM_MEM_ERROR; lock_destroy(shared_tree_lock); lock_dealloc(shared_tree_lock); shared_tree_lock=0;

1 0

git:master:965606b2: rr: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 965606b2fbdad7b868637fb2f35f15507279caf6 URL: https://github.com/kamailio/kamailio/commit/965606b2fbdad7b868637fb2f35f155… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:26:44Z rr: convert to memory logging helper --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/965606b2fbdad7b868637fb2f35f155… Patch: https://github.com/kamailio/kamailio/commit/965606b2fbdad7b868637fb2f35f155… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 8df81d56528..71a38532131 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -316,7 +316,7 @@ static inline int save_ruri(struct sip_msg* _m) + ROUTE_SUFFIX_LEN; s = (char*)pkg_malloc(len); if (!s) { - LM_ERR("No memory pkg left\n"); + PKG_MEM_ERROR; return -3; } diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index b6178cade36..01bbd3e4032 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -172,7 +172,7 @@ static inline struct lump *insert_rr_param_lump(struct lump *before, /* duplicate data in pkg mem */ s1 = (char*)pkg_malloc(l); if (s1==0) { - LM_ERR("no more pkg mem (%d)\n",l); + PKG_MEM_ERROR_FMT("missing (%d)\n",l); return 0; } memcpy( s1, s, l); @@ -233,7 +233,7 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, r2 = pkg_malloc(RR_R2_LEN); if (!prefix || !suffix || !term || !r2) { - LM_ERR("No more pkg memory\n"); + PKG_MEM_ERROR; if (suffix) pkg_free(suffix); if (prefix) pkg_free(prefix); if (term) pkg_free(term); @@ -356,7 +356,7 @@ static int copy_flow_token(str *token, struct sip_msg *_m) token->s = pkg_malloc(puri.user.len * sizeof(char)); if (token->s == NULL) { - LM_ERR("allocating memory\n"); + PKG_MEM_ERROR; return -1; } memcpy(token->s, puri.user.s, puri.user.len); @@ -593,7 +593,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) suffix.s = pkg_malloc(suffix.len); term.s = pkg_malloc(term.len); if (!hdr.s || !suffix.s || !term.s) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; if(hdr.s) pkg_free(hdr.s); if(suffix.s) pkg_free(suffix.s); if(term.s) pkg_free(term.s); @@ -719,7 +719,7 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d r2 = pkg_malloc(RR_R2_LEN); term = pkg_malloc(RR_TERM_LEN); if (!hdr || !trans || !suffix || !term || !r2) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; if (hdr) pkg_free(hdr); if (trans) pkg_free(trans); if (suffix) pkg_free(suffix); diff --git a/src/modules/rr/rr_cb.c b/src/modules/rr/rr_cb.c index 6b66e8c5859..c55f0117295 100644 --- a/src/modules/rr/rr_cb.c +++ b/src/modules/rr/rr_cb.c @@ -59,7 +59,7 @@ int register_rrcb( rr_cb_t f, void *param ) /* build a new callback structure */ if (!(cbp=pkg_malloc( sizeof( struct rr_callback)))) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return -1; }

1 0

git:master:4f44adcf: outbound: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 4f44adcfbfaf84262f09f03afd8912205ce6c13b URL: https://github.com/kamailio/kamailio/commit/4f44adcfbfaf84262f09f03afd89122… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:27:45Z outbound: convert to memory logging helper --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4f44adcfbfaf84262f09f03afd89122… Patch: https://github.com/kamailio/kamailio/commit/4f44adcfbfaf84262f09f03afd89122… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index df9538aace8..bed8c03fbb4 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -101,7 +101,7 @@ static int mod_init(void) if ((ob_key.s = shm_malloc(OB_KEY_LEN)) == NULL) { - LM_ERR("Failed to allocate memory for flow-token key\n"); + SHM_MEM_ERROR_FMT("for flow-token key\n"); return -1; } ob_key.len = OB_KEY_LEN; @@ -210,7 +210,7 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv) flow_token->s = pkg_malloc(base64_enc_len(pos)); if (flow_token->s == NULL) { - LM_ERR("allocating package memory\n"); + PKG_MEM_ERROR; return -1; } flow_token->len = base64_enc(unenc_flow_token, pos,

1 0

git:master:f7588fb8: siputils: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: f7588fb8fb804aa7585db5cb97433b69763ceb62 URL: https://github.com/kamailio/kamailio/commit/f7588fb8fb804aa7585db5cb97433b6… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:17:56Z siputils: convert to memory logging helper --- Modified: src/modules/siputils/chargingvector.c Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/options.c Modified: src/modules/siputils/rpid.c Modified: src/modules/siputils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/f7588fb8fb804aa7585db5cb97433b6… Patch: https://github.com/kamailio/kamailio/commit/f7588fb8fb804aa7585db5cb97433b6…

1 0

git:master:6f68f55c: qos: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 6f68f55c1c654e3cb120c10eb6999d538d943ca2 URL: https://github.com/kamailio/kamailio/commit/6f68f55c1c654e3cb120c10eb6999d5… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:20:16Z qos: convert to memory logging helper --- Modified: src/modules/qos/qos_cb.c Modified: src/modules/qos/qos_ctx_helpers.c --- Diff: https://github.com/kamailio/kamailio/commit/6f68f55c1c654e3cb120c10eb6999d5… Patch: https://github.com/kamailio/kamailio/commit/6f68f55c1c654e3cb120c10eb6999d5… --- diff --git a/src/modules/qos/qos_cb.c b/src/modules/qos/qos_cb.c index e2b0c0f9aee..6c81411d6f0 100644 --- a/src/modules/qos/qos_cb.c +++ b/src/modules/qos/qos_cb.c @@ -34,7 +34,7 @@ int init_qos_callbacks(void) { create_cbs = (struct qos_head_cbl*)shm_malloc(sizeof(struct qos_head_cbl)); if (create_cbs==0) { - LM_ERR("no more shm mem\n"); + SHM_MEM_ERROR; return -1; } create_cbs->first = 0; @@ -88,7 +88,7 @@ int register_qoscb(qos_ctx_t *qos, int types, qos_cb f, void *param ) } cb = (struct qos_callback*)shm_malloc(sizeof(struct qos_callback)); if (cb==0) { - LM_ERR("no more shm mem\n"); + SHM_MEM_ERROR; return -1; } diff --git a/src/modules/qos/qos_ctx_helpers.c b/src/modules/qos/qos_ctx_helpers.c index f36193cf6ce..25143dfdb4d 100644 --- a/src/modules/qos/qos_ctx_helpers.c +++ b/src/modules/qos/qos_ctx_helpers.c @@ -52,7 +52,7 @@ qos_ctx_t *build_new_qos_ctx(void) { if (ctx!=NULL) { memset(ctx, 0, sizeof(qos_ctx_t)); } else { - LM_ERR("No enough shared memory\n"); + SHM_MEM_ERROR; return NULL; } if (!lock_init(&ctx->lock)) { @@ -342,7 +342,7 @@ int add_pending_sdp_session(qos_ctx_t *qos_ctx, unsigned int dir, str *cseq_numb qos_sdp = (qos_sdp_t *)shm_malloc(len); LM_DBG("alloc qos_sdp: %p\n", qos_sdp); if (qos_sdp==NULL) { - LM_ERR("oom %d\n", len); + SHM_MEM_ERROR_FMT("missing %d\n", len); return -1; } else { memset(qos_sdp, 0, len);

1 0

git:master:19df3ad8: uid_auth_db: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 19df3ad8f3e10b6c9fa91e69f288fdbd51be7091 URL: https://github.com/kamailio/kamailio/commit/19df3ad8f3e10b6c9fa91e69f288fdb… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:24:24Z uid_auth_db: convert to memory logging helper --- Modified: src/modules/uid_auth_db/aaa_avps.h Modified: src/modules/uid_auth_db/uid_auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/19df3ad8f3e10b6c9fa91e69f288fdb… Patch: https://github.com/kamailio/kamailio/commit/19df3ad8f3e10b6c9fa91e69f288fdb… --- diff --git a/src/modules/uid_auth_db/aaa_avps.h b/src/modules/uid_auth_db/aaa_avps.h index 62f1062bf3d..25b6cbeda3b 100644 --- a/src/modules/uid_auth_db/aaa_avps.h +++ b/src/modules/uid_auth_db/aaa_avps.h @@ -76,7 +76,7 @@ static int aaa_avps_init(str *avp_list, str **parsed_avps, int *avps_n) cp = pkg_malloc(avp_list->len + 1); if (cp == NULL) { - LM_ERR("can't allocate memory\n"); + PKG_MEM_ERROR; errcode = -1; goto bad; } diff --git a/src/modules/uid_auth_db/uid_auth_db_mod.c b/src/modules/uid_auth_db/uid_auth_db_mod.c index 781ff37220f..2fd206bb970 100644 --- a/src/modules/uid_auth_db/uid_auth_db_mod.c +++ b/src/modules/uid_auth_db/uid_auth_db_mod.c @@ -172,7 +172,7 @@ static int generate_queries(authdb_table_info_t *info) len = sizeof(*result_cols) * (credentials_n + 3); result_cols = pkg_malloc(len); if (!result_cols) { - ERR("can't allocate pkg mem\n"); + PKG_MEM_ERROR; return -1; } memset(result_cols, 0, len); @@ -321,7 +321,7 @@ static authdb_table_info_t *register_table(str *table) info = (authdb_table_info_t*)pkg_malloc(sizeof(authdb_table_info_t) + table->len + 1); if (!info) { - LM_ERR("can't allocate pkg mem\n"); + PKG_MEM_ERROR; return NULL; }

1 0

git:master:7747f91f: stun: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 7747f91f6c482a99cfab4813e3b2ad5e6e970d07 URL: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:06:41Z stun: convert to memory logging helper --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… Patch: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 04f52fa2bfd..0ddbb00ed1c 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -408,7 +408,7 @@ static int stun_create_response( */ res->msg.buf.s = (char *) pkg_malloc(sizeof(char)*STUN_MSG_LEN); if (res->msg.buf.s == NULL) { - LOG(L_ERR, "ERROR: STUN: out of memory\n"); + PKG_MEM_ERROR; return FATAL_ERROR; } @@ -822,7 +822,7 @@ static struct stun_unknown_att* stun_alloc_unknown_attr(USHORT_T type) attr = (struct stun_unknown_att *) pkg_malloc(sizeof(struct stun_unknown_att)); if (attr == NULL) { - LOG(L_ERR, "ERROR: STUN: out of memory\n"); + PKG_MEM_ERROR; return NULL; }

1 0

git:master:d5ab93a1: statsc: convert to memory logging helper, free memory in case of error
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: d5ab93a1e642aec9c842c9ffe9cb712c0f41e4c0 URL: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:08:29Z statsc: convert to memory logging helper, free memory in case of error --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… Patch: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 3b636b81fc5..92447339151 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -202,7 +202,7 @@ int statsc_nmap_add(str *sname, str *rname) + STRLEN_ROUNDUP(sname->len) + STRLEN_ROUNDUP(rname->len); sm = shm_malloc(sz); if(sm==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(sm, 0, sz); @@ -241,7 +241,7 @@ int statsc_init(void) _statsc_info = shm_malloc(sizeof(statsc_info_t)); if(_statsc_info==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_statsc_info, 0, sizeof(statsc_info_t)); @@ -250,7 +250,8 @@ int statsc_init(void) sz = sizeof(statsc_nmap_t) + statsc_items * sizeof(int64_t); sm = shm_malloc(sz); if(sm==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; + shm_free(_statsc_info); return -1; } memset(sm, 0, sz);

1 0

[kamailio/kamailio] Application crash due to intensive "dispather.add" using (Issue #3424)
by Nikolay Shakin 24 Apr '23

24 Apr '23

### Description I want to add addresses to dispatcher.list dynamically ``` modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_inactive_threshold", 1) modparam("dispatcher", "ds_probing_threshold", 1) modparam("dispatcher", "reload_delta", 0) modparam("dispatcher", "ds_timer_mode", 1) ... if(!ds_is_from_list("1","0","$var(contact)")) { jsonrpc_exec( '{ "jsonrpc": "2.0", "method": "dispatcher.add", "params": [1, "$var(contact)"], "id": 1 }' ); } ``` this scheme works with low load(one or two UAs) but it doesn't work with dozens of requests, kamailio crashes ### Troubleshooting ``` Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: CRITICAL: {1 12016 REGISTER db88353a-66cf-4ca6-91e2-6f306e43cee9} <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f2f964578b8), called from dispatcher: dispatch.c: reindex_dests(790), first free dispatcher: dispatch.c: ds_avl_destroy(4013) - ignoring Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: INFO: {1 12016 REGISTER db88353a-66cf-4ca6-91e2-6f306e43cee9} dispatcher [dispatch.c:682]: dp_init_relative_weights(): extra rweight 100 for last active destination in group 1 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6827]: INFO: {1 16898 REGISTER eebaeca9-c642-465f-bc09-67d1448ba6b7} dispatcher [dispatch.c:682]: dp_init_relative_weights(): extra rweight 100 for last active destination in group 1 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: ALERT: <core> [main.c:774]: handle_sigs(): child process 6825 exited by a signal 11 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: ALERT: <core> [main.c:777]: handle_sigs(): core was not generated Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: INFO: <core> [main.c:799]: handle_sigs(): terminating due to SIGCHLD Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6827]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received Apr 22 22:18:10 kamailio /usr/sbin/kamailio[6808]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Main process exited, code=exited, status=1/FAILURE Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Consumed 1.304s CPU time. ``` #### Reproduction use code from Description section on request route #### Debugging Data ``` (gdb) bt full #0 0x000055945e0ccd20 in ?? () No symbol table info available. #1 0x000055945e0cd6ee in qm_malloc () No symbol table info available. #2 0x000055945e0da9c9 in qm_shm_malloc () No symbol table info available. #3 0x00007f325a05e921 in pack_dest () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #4 0x00007f325a060ad4 in add_dest2list () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #5 0x00007f325a087cf9 in ds_filter_dest_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #6 0x00007f325a05affb in ds_iter_set () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #7 0x00007f325a088706 in ds_remove_dst () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #8 0x00007f325a0af7a8 in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #9 0x00007f325e7e82f5 in jsonrpc_exec_ex () from /usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so No symbol table info available. #10 0x00007f325e7e875e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so No symbol table info available. #11 0x000055945ddce3f3 in do_action () No symbol table info available. #12 0x000055945dddd391 in run_actions () No symbol table info available. #13 0x000055945ddce2d3 in do_action () No symbol table info available. #14 0x000055945dddd391 in run_actions () No symbol table info available. #15 0x000055945ddce2d3 in do_action () No symbol table info available. #16 0x000055945dddd391 in run_actions () No symbol table info available. #17 0x000055945ddca244 in do_action () No symbol table info available. --Type <RET> for more, q to quit, c to continue without paging-- #18 0x000055945dddd391 in run_actions () No symbol table info available. #19 0x000055945ddce2d3 in do_action () No symbol table info available. #20 0x000055945dddd391 in run_actions () No symbol table info available. #21 0x000055945ddddc0b in run_top_route () No symbol table info available. #22 0x000055945df3b1b2 in receive_msg () No symbol table info available. #23 0x000055945e09ea5d in udp_rcv_loop () No symbol table info available. #24 0x000055945ddb709b in main_loop () No symbol table info available. #25 0x000055945ddc420c in main () No symbol table info available. ``` ```(gdb) info locals No symbol table info available.``` ```(gdb) list 1 ../sysdeps/unix/sysv/linux/dl-vdso-setup.c: No such file or directory.``` #### SIP Traffic [kamailio.txt](https://github.com/kamailio/kamailio/files/11302151/kamailio.… ### Possible Solutions no idea ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@kamailio:[/etc]: kamailio -v version: kamailio 5.6.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` root@kamailio:[/etc]: uname -a Linux kamailio 5.10.0-21-amd64 #1 SMP Debian 5.10.162-1 (2023-01-21) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3424 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3424(a)github.com>

3 6

[kamailio/kamailio] .github/workflows: added GitHub action script to build Alpine docker (PR #3425)
by sergey-safarov 24 Apr '23

24 Apr '23

#### 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 Created GitHub action script to allow build Alpine docker image and push to GitHub packages as `kamailio/kamailio-ci` docker image You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3425 -- Commit Summary -- * .github/workflows: added GitHub action script to build Alpine based docker image -- File Changes -- A .github/workflows/alpine.yml (179) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3425.patch https://github.com/kamailio/kamailio/pull/3425.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3425 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3425(a)github.com>

2 1

git:master:83789e7e: .github/workflows: added GitHub action script to build Alpine based docker image
by Victor Seva 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 83789e7efe6e1a3479e7742812eaff2ffd7ebdd3 URL: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-24T16:44:52+02:00 .github/workflows: added GitHub action script to build Alpine based docker image --- Added: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2… Patch: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2…

1 0

git:master:338e3d8b: auth: exported proxy_challenge() to kemi
by Daniel-Constantin Mierla 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 338e3d8bab15eb3422a9804a83d92c077960203c URL: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-24T08:32:16+02:00 auth: exported proxy_challenge() to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… Patch: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index e522538e415..5538ffb4f03 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1110,6 +1110,14 @@ static int ki_www_challenge(struct sip_msg *msg, str* realm, int flags) return auth_challenge_hftype(msg, realm, flags, HDR_AUTHORIZATION_T); } +/** + * + */ +static int ki_proxy_challenge(struct sip_msg *msg, str* realm, int flags) +{ + return auth_challenge_hftype(msg, realm, flags, HDR_PROXYAUTH_T); +} + /** * */ @@ -1272,6 +1280,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("proxy_challenge"), + SR_KEMIP_INT, ki_proxy_challenge, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("auth"), str_init("pv_auth_check"), SR_KEMIP_INT, pv_auth_check, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT,

1 0

git:master:9643d65a: submodule udpadate [skip ci]
by Sergey Safarov 23 Apr '23

23 Apr '23

Module: kamailio Branch: master Commit: 9643d65a98574e0739b771b4770101bd747b5966 URL: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-04-23T17:00:02+03:00 submodule udpadate [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… Patch: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… --- diff --git a/pkg/docker b/pkg/docker index 1bcbae2ddd1..d34e8eed774 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1bcbae2ddd1bd7978135760dd3ff742daf6c4563 +Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f

1 0

git:master:569714ea: sl: convert to memory logging helper
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: 569714ea692f751580d902900912caf3c56203dd URL: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:58:01Z sl: convert to memory logging helper --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… Patch: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 746abeda80a..b9c667b42e4 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -498,7 +498,7 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) } rbuf = (char *)pkg_malloc(reason->len); if (rbuf==NULL) { - LM_ERR("not enough memory\n"); + PKG_MEM_ERROR; ret = -1; goto restore; } diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 9b7a64b4299..29213a59633 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -90,7 +90,7 @@ int sl_startup() sl_timeout = (unsigned int*)shm_malloc(sizeof(unsigned int)); if (!sl_timeout) { - LM_ERR("no more free memory!\n"); + SHM_MEM_ERROR; return -1; } *(sl_timeout)=get_ticks_raw(); @@ -244,13 +244,13 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) if ((hf = (hdr_field_t*) pkg_malloc(sizeof(struct hdr_field))) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; goto event_route_error; } if ((cseqb = (struct cseq_body *) pkg_malloc(sizeof(struct cseq_body))) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; pkg_free(hf); goto event_route_error; } @@ -259,7 +259,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) * (msg->first_line.u.request.method.len + 5); if ((tmp = (char *) pkg_malloc(tsize)) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; pkg_free(cseqb); pkg_free(hf); goto event_route_error; @@ -518,7 +518,7 @@ int sl_register_callback(sl_cbelem_t *cbe) p1 = (sl_cbelem_t*)pkg_malloc(sizeof(sl_cbelem_t)); if(p1==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index 9b7cf51259d..826fe544a86 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -109,7 +109,7 @@ int init_sl_stats(void) { sl_stats = (struct sl_stats**)shm_malloc(sizeof(struct sl_stats*)); if (!sl_stats) { - ERR("Unable to allocated shared memory for sl statistics\n"); + SHM_MEM_ERROR_FMT("for sl statistics\n"); return -1; } *sl_stats = 0; @@ -124,7 +124,7 @@ int init_sl_stats_child(void) len = sizeof(struct sl_stats) * get_max_procs(); *sl_stats = shm_malloc(len); if (*sl_stats == 0) { - ERR("No shmem\n"); + SHM_MEM_ERROR; shm_free(sl_stats); return -1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev