- sr-dev - kamailio.org

Building with clang
by Ivan Ribakov 01 May '23

01 May '23

Hi all, I looked at Kamailio 5.6.3 makefiles and saw mention of clang being supported. Yet when I try to build it with clang (more precisely, I build a C++ module using clang that includes some Kamailio C headers via "extern C") I get following error: In file included from /tmp/kamailio/kamailio/modules/tm/t_funcs.h:45: /tmp/kamailio/kamailio/modules/tm/timer.h:204:2: error: no matching function for call to 'atomic_cmpxchg_int' Any suggestions on how to overcome this error or any general suggestions for using Kamailio + clang? clang version 14.0.6 (Red Hat 14.0.6-4.el9_1) -- Ivan Ribakov Software Engineer www.zaleos.net

2 3

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

29 Apr '23

Module: kamailio Branch: master Commit: db8258bf9ab7ca772923d237f40fce4381dbcde4 URL: https://github.com/kamailio/kamailio/commit/db8258bf9ab7ca772923d237f40fce4… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z debugger: convert to memory error logging helper, add missing mem error handling --- Modified: src/modules/debugger/debugger_api.c Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/db8258bf9ab7ca772923d237f40fce4… Patch: https://github.com/kamailio/kamailio/commit/db8258bf9ab7ca772923d237f40fce4… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index 5a773661845..b9137594bac 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -557,7 +557,10 @@ int dbg_init_bp_list(void) return -1; _dbg_bp_list = (dbg_bp_t*)shm_malloc(sizeof(dbg_bp_t)); if(_dbg_bp_list==NULL) + { + SHM_MEM_ERROR; return -1; + } memset(_dbg_bp_list, 0, sizeof(dbg_bp_t)); if(_dbg_breakpoint==1) _dbg_bp_list->set |= DBG_ABKPOINT_ON; @@ -580,7 +583,10 @@ int dbg_add_breakpoint(struct action *a, int bpon) len += sizeof(dbg_bp_t) + 1; nbp = (dbg_bp_t*)shm_malloc(len); if(nbp==NULL) + { + SHM_MEM_ERROR; return -1; + } memset(nbp, 0, len); nbp->set |= (bpon)?DBG_ABKPOINT_ON:0; nbp->cline = a->cline; @@ -605,7 +611,10 @@ int dbg_init_pid_list(void) return -1; _dbg_pid_list = (dbg_pid_t*)shm_malloc(_dbg_pid_no*sizeof(dbg_pid_t)); if(_dbg_pid_list==NULL) + { + SHM_MEM_ERROR; return -1; + } memset(_dbg_pid_list, 0, _dbg_pid_no*sizeof(dbg_pid_t)); return 0; } @@ -1202,7 +1211,7 @@ int dbg_init_mod_levels(int dbg_mod_hash_size) _dbg_mod_table = (dbg_mod_slot_t*)shm_malloc(_dbg_mod_table_size*sizeof(dbg_mod_slot_t)); if(_dbg_mod_table==NULL) { - LM_ERR("no more shm.\n"); + SHM_MEM_ERROR; return -1; } memset(_dbg_mod_table, 0, _dbg_mod_table_size*sizeof(dbg_mod_slot_t)); @@ -1367,8 +1376,9 @@ int dbg_set_mod_debug_level(char *mname, int mnlen, int *mlevel) return 0; } itn = (dbg_mod_level_t*)shm_malloc(sizeof(dbg_mod_level_t) + (mnlen+1)*sizeof(char)); - if(itn==NULL) { - LM_ERR("no more shm\n"); + if(itn==NULL) + { + SHM_MEM_ERROR; return -1; } memset(itn, 0, sizeof(dbg_mod_level_t) + (mnlen+1)*sizeof(char)); @@ -1444,7 +1454,7 @@ int dbg_set_mod_debug_facility(char *mname, int mnlen, int *mfacility) } itn = (dbg_mod_facility_t*)shm_malloc(sizeof(dbg_mod_facility_t) + (mnlen+1)*sizeof(char)); if(itn==NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(itn, 0, sizeof(dbg_mod_facility_t) + (mnlen+1)*sizeof(char)); @@ -1594,7 +1604,7 @@ int dbg_init_pvcache() _dbg_pvcache = (dbg_pvcache_t**)pkg_malloc(sizeof(dbg_pvcache_t*)*DBG_PVCACHE_SIZE); if(_dbg_pvcache==NULL) { - LM_ERR("no more memory.\n"); + SHM_MEM_ERROR; return -1; } memset(_dbg_pvcache, 0, sizeof(dbg_pvcache_t*)*DBG_PVCACHE_SIZE); @@ -1616,7 +1626,7 @@ int dbg_assign_add(str *name, pv_spec_t *spec) pvn = (dbg_pvcache_t*)pkg_malloc(sizeof(dbg_pvcache_t)); if(pvn==NULL) { - LM_ERR("no more memory\n"); + SHM_MEM_ERROR; return -1; } memset(pvn, 0, sizeof(dbg_pvcache_t)); diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 3c35a5b033d..b586bb54da8 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -556,7 +556,18 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) /* alloc private mem and copy lumps */ hdr_lumps = pkg_malloc(BUF_SIZE); + if(hdr_lumps==NULL) + { + PKG_MEM_ERROR; + return -1; + } bdy_lumps = pkg_malloc(BUF_SIZE); + if(hdr_lumps==NULL) + { + pkg_free(hdr_lumps); + PKG_MEM_ERROR; + return -1; + } new_buf_offs = 0; process_lumps(msg, msg->add_rm, hdr_lumps, &new_buf_offs, &orig_offs, &send_info, flag);

1 0

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

29 Apr '23

Module: kamailio Branch: master Commit: ea31785f3458bb79d14384734f8fd4f7b628ffa2 URL: https://github.com/kamailio/kamailio/commit/ea31785f3458bb79d14384734f8fd4f… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z ldap: convert to memory error logging helper --- Modified: src/modules/ldap/ld_session.c Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea31785f3458bb79d14384734f8fd4f… Patch: https://github.com/kamailio/kamailio/commit/ea31785f3458bb79d14384734f8fd4f… --- diff --git a/src/modules/ldap/ld_session.c b/src/modules/ldap/ld_session.c index ad0c9a793bf..222d504ed1b 100644 --- a/src/modules/ldap/ld_session.c +++ b/src/modules/ldap/ld_session.c @@ -43,7 +43,7 @@ int add_ld_session(char *_name, LDAP *_ldh, dictionary *_d) new_lds = (struct ld_session *)pkg_malloc(sizeof(struct ld_session)); if(new_lds == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; return -1; } memset(new_lds, 0, sizeof(struct ld_session)); @@ -58,7 +58,7 @@ int add_ld_session(char *_name, LDAP *_ldh, dictionary *_d) _d, get_ini_key_name(_name, CFG_N_LDAP_HOST), CFG_DEF_HOST_NAME); new_lds->host_name = (char *)pkg_malloc(strlen(host_name) + 1); if(new_lds->host_name == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; pkg_free(new_lds); return -1; } @@ -104,7 +104,7 @@ int add_ld_session(char *_name, LDAP *_ldh, dictionary *_d) get_ini_key_name(_name, CFG_N_LDAP_BIND_DN), CFG_DEF_LDAP_BIND_DN); new_lds->bind_dn = (char *)pkg_malloc(strlen(bind_dn) + 1); if(new_lds->bind_dn == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; pkg_free(new_lds->host_name); pkg_free(new_lds); return -1; @@ -117,7 +117,7 @@ int add_ld_session(char *_name, LDAP *_ldh, dictionary *_d) CFG_DEF_LDAP_BIND_PWD); new_lds->bind_pwd = (char *)pkg_malloc(strlen(bind_pwd) + 1); if(new_lds->bind_pwd == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; pkg_free(new_lds->bind_dn); pkg_free(new_lds->host_name); pkg_free(new_lds); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 1fea95e458d..757d3594718 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -328,7 +328,7 @@ static int ldap_result_fixup(void **param, int param_no) lp = (struct ldap_result_params *)pkg_malloc( sizeof(struct ldap_result_params)); if(lp == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset(lp, 0, sizeof(struct ldap_result_params)); @@ -388,7 +388,7 @@ static int ldap_result_check_fixup(void **param, int param_no) lp = (struct ldap_result_check_params *)pkg_malloc( sizeof(struct ldap_result_check_params)); if(lp == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset(lp, 0, sizeof(struct ldap_result_check_params)); @@ -444,7 +444,7 @@ static int ldap_filter_url_encode_fixup(void **param, int param_no) } else if(param_no == 2) { spec_p = (pv_spec_t *)pkg_malloc(sizeof(pv_spec_t)); if(spec_p == NULL) { - LM_ERR("no memory\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } s.s = (char *)*param;

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev