sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
260 discussions

by Ivan Ribakov

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

12 months

git:master:db8258bf: debugger: convert to memory error logging helper, add missing mem error handling

by Henning Westerholt

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 year

git:master:11831568: crypto: convert to memory error logging helper

by Henning Westerholt

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 year

git:master:ea31785f: ldap: convert to memory error logging helper

by Henning Westerholt

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 year

git:master:b1a47746: pua: convert to memory logging helper, add missing log message and mem error handling

by Henning Westerholt

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 year

git:master:89927295: utils: convert to memory logging helper

by Henning Westerholt

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 year

git:master:d77448b3: websocket: convert to memory logging helper, add missing mem error logging

by Henning Westerholt

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 year

[kamailio/kamailio] Early Media on Kamailio 5.X w/rtpengine (Issue #3429)

by ibrahmgarip

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>

1 year

git:master:7ae82075: github: PR use Github Packages registry [skip ci]

by Victor Seva

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 year

git:master:f27d15ba: auth_db: exported www_authenticate_method() to kemi

by Daniel-Constantin Mierla

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 year

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023