sr-dev

sr-dev@lists.kamailio.org

16 participants
45378 discussions

git:master:236c56f5: tm: prefixed global kill reason variable
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 236c56f5f4c11fb867e545f830182b386f0a0c66 URL: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T09:19:57+01:00 tm: prefixed global kill reason variable --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… Patch: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 2d21eb12eca..7ee7c67470c 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -52,7 +52,7 @@ - sizeof(((tm_cell_t *)0)->md5))) -static enum kill_reason kr; +static enum kill_reason _tm_kr; /* pointer to the big table where all the transaction data lives */ struct s_table *_tm_table; @@ -64,18 +64,18 @@ struct s_table *tm_get_table(void) void reset_kr(void) { - kr = 0; + _tm_kr = 0; } void set_kr(enum kill_reason _kr) { - kr |= _kr; + _tm_kr |= _kr; } enum kill_reason get_kr() { - return kr; + return _tm_kr; }

1 0

git:5.7:893e9ea4: tls_wolfssl: clean-up; remove OpenSSL-isms
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: 5.7 Commit: 893e9ea4364f60c32a5477c5b75bdc24b619dd52 URL: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:53:01+08:00 tls_wolfssl: clean-up; remove OpenSSL-isms (cherry-pick from 3d0e7521c6de4023b6595685fc306129ef57b8ac) --- Modified: src/modules/tls_wolfssl/tls_cfg.c Modified: src/modules/tls_wolfssl/tls_cfg.h Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.c Modified: src/modules/tls_wolfssl/tls_util.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c Removed: src/modules/tls_wolfssl/tls_dump_vf.c Removed: src/modules/tls_wolfssl/tls_dump_vf.h Removed: src/modules/tls_wolfssl/tls_map.c Removed: src/modules/tls_wolfssl/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2… Patch: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2…

1 0

git:5.7:4240cbc1: tls_wolfssl: refactor custom BIO
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: 5.7 Commit: 4240cbc1bdbf9eb5d8b3f7473fbf4ee9d4d90650 URL: https://github.com/kamailio/kamailio/commit/4240cbc1bdbf9eb5d8b3f7473fbf4ee… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:52:46+08:00 tls_wolfssl: refactor custom BIO - remove use of custom BIO at the expense of some memory copies (cherry-pick from 32089e134413200bf5d1a97f207378b7d10e65a2) --- Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_server.h Removed: src/modules/tls_wolfssl/tls_bio.c Removed: src/modules/tls_wolfssl/tls_bio.h --- Diff: https://github.com/kamailio/kamailio/commit/4240cbc1bdbf9eb5d8b3f7473fbf4ee… Patch: https://github.com/kamailio/kamailio/commit/4240cbc1bdbf9eb5d8b3f7473fbf4ee…

1 0

git:5.7:8e7df134: tls_wolfssl: use shared WOLFSSL_CTX
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: 5.7 Commit: 8e7df1345c828eeb6b999c30069e75ccdd440200 URL: https://github.com/kamailio/kamailio/commit/8e7df1345c828eeb6b999c30069e75c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:52:22+08:00 tls_wolfssl: use shared WOLFSSL_CTX (cherry-pick from 88f27e2b89142652ea1b8f133df1ff403f9f61b2) --- Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/8e7df1345c828eeb6b999c30069e75c… Patch: https://github.com/kamailio/kamailio/commit/8e7df1345c828eeb6b999c30069e75c…

1 0

git:5.7:0a481501: tls_wolfssl: clean-up OpenSSL compatibility
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: 5.7 Commit: 0a481501024b0e85bde8fa74cde1df2bebaa167b URL: https://github.com/kamailio/kamailio/commit/0a481501024b0e85bde8fa74cde1df2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:52:08+08:00 tls_wolfssl: clean-up OpenSSL compatibility - remove unneeded OpenSSL-isms (cherry-pick from 255e563e94e9536f0e541c3baeec45cbc68fac5b) --- Modified: src/modules/tls_wolfssl/tls_config.h Modified: src/modules/tls_wolfssl/tls_ct_wrq.h Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_util.h Modified: src/modules/tls_wolfssl/tls_verify.c Modified: src/modules/tls_wolfssl/tls_verify.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c Removed: src/modules/tls_wolfssl/tls_rand.c Removed: src/modules/tls_wolfssl/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/0a481501024b0e85bde8fa74cde1df2… Patch: https://github.com/kamailio/kamailio/commit/0a481501024b0e85bde8fa74cde1df2…

1 0

git:master:3d0e7521: tls_wolfssl: clean-up; remove OpenSSL-isms
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 3d0e7521c6de4023b6595685fc306129ef57b8ac URL: https://github.com/kamailio/kamailio/commit/3d0e7521c6de4023b6595685fc30612… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:32:26+08:00 tls_wolfssl: clean-up; remove OpenSSL-isms --- Modified: src/modules/tls_wolfssl/tls_cfg.c Modified: src/modules/tls_wolfssl/tls_cfg.h Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.c Modified: src/modules/tls_wolfssl/tls_util.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c Removed: src/modules/tls_wolfssl/tls_dump_vf.c Removed: src/modules/tls_wolfssl/tls_dump_vf.h Removed: src/modules/tls_wolfssl/tls_map.c Removed: src/modules/tls_wolfssl/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/3d0e7521c6de4023b6595685fc30612… Patch: https://github.com/kamailio/kamailio/commit/3d0e7521c6de4023b6595685fc30612…

1 0

git:master:33b2e513: tm: release transaction on kill if a final response was sent
by Daniel-Constantin Mierla 23 Jan '24

23 Jan '24

Module: kamailio Branch: master Commit: 33b2e513aefe00bf166cdcae360e305615b223da URL: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-23T21:05:41+01:00 tm: release transaction on kill if a final response was sent - do not send another final response for error cases --- Modified: src/modules/tm/t_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305… Patch: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index b9f9949d0fb..5515a4aba6f 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -177,6 +177,11 @@ int kill_transaction(struct cell *trans, int error) int reply_ret; int ret; + if((trans->uas.request != NULL) + && (trans->uas.request->msg_flags & FL_FINAL_REPLY)) { + return t_release_transaction(trans); + } + /* we reply statefully and enter WAIT state since error might have occurred in middle of forking and we do not want to put the forking burden on upstream client; @@ -205,6 +210,11 @@ int kill_transaction_unsafe(struct cell *trans, int error) int reply_ret; int ret; + if((trans->uas.request != NULL) + && (trans->uas.request->msg_flags & FL_FINAL_REPLY)) { + return t_release_transaction(trans); + } + /* we reply statefully and enter WAIT state since error might have occurred in middle of forking and we do not want to put the forking burden on upstream client;

1 0

git:master:0f8f4d69: auth: reformat exported structures
by Daniel-Constantin Mierla 23 Jan '24

23 Jan '24

Module: kamailio Branch: master Commit: 0f8f4d6926e53ca5e526a11729f6ee6277b185b9 URL: https://github.com/kamailio/kamailio/commit/0f8f4d6926e53ca5e526a11729f6ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-23T14:25:09+01:00 auth: reformat exported structures --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0f8f4d6926e53ca5e526a11729f6ee6… Patch: https://github.com/kamailio/kamailio/commit/0f8f4d6926e53ca5e526a11729f6ee6…

1 0

git:master:aa167c41: auth: removed commented code and prefixed short global variable
by Daniel-Constantin Mierla 23 Jan '24

23 Jan '24

Module: kamailio Branch: master Commit: aa167c410860732918061106c4a84a7c6b030d69 URL: https://github.com/kamailio/kamailio/commit/aa167c410860732918061106c4a84a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-23T14:25:09+01:00 auth: removed commented code and prefixed short global variable --- Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/auth_mod.h Modified: src/modules/auth/nid.c Modified: src/modules/auth/nonce.c --- Diff: https://github.com/kamailio/kamailio/commit/aa167c410860732918061106c4a84a7… Patch: https://github.com/kamailio/kamailio/commit/aa167c410860732918061106c4a84a7… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index fb633a10259..9bf4ac2923a 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -138,7 +138,7 @@ calc_response_t calc_response; /*! SL API structure */ -sl_api_t slb; +sl_api_t _auth_slb; /* * Exported functions @@ -248,8 +248,6 @@ static inline int generate_random_secret(void) secret2.s = sec_rand2; secret2.len = RAND_SECRET_LEN; - /* DBG("Generated secret: '%.*s'\n", secret.len, secret.s); */ - return 0; } @@ -263,7 +261,7 @@ static int mod_init(void) auth_realm_prefix.len = strlen(auth_realm_prefix.s); /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_auth_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -949,8 +947,8 @@ static int auth_send_reply( reason_str.s = reason; reason_str.len = strlen(reason); - return force_stateless_reply ? slb.sreply(msg, code, &reason_str) - : slb.freply(msg, code, &reason_str); + return force_stateless_reply ? _auth_slb.sreply(msg, code, &reason_str) + : _auth_slb.freply(msg, code, &reason_str); } /** diff --git a/src/modules/auth/auth_mod.h b/src/modules/auth/auth_mod.h index ea3617e3d5e..48066750d2d 100644 --- a/src/modules/auth/auth_mod.h +++ b/src/modules/auth/auth_mod.h @@ -38,7 +38,6 @@ extern str secret1; /* secret phrase used to generate nonce */ extern str secret2; /* secret phrase used to generate nonce */ extern int nonce_expire; /* nonce expire interval */ extern int protect_contacts; /* Enable/disable contact hashing in nonce */ -extern sl_api_t sl; extern avp_ident_t challenge_avpid; extern str proxy_challenge_header; extern str www_challenge_header; diff --git a/src/modules/auth/nid.c b/src/modules/auth/nid.c index 408e6ab3e14..3aee167c633 100644 --- a/src/modules/auth/nid.c +++ b/src/modules/auth/nid.c @@ -77,11 +77,6 @@ int init_nonce_id() for(r = 0; r < nid_pool_no; r++) atomic_set(&nid_crt[r].id, random()); return 0; - /* -error: - destroy_nonce_id(); - return -1; -*/ } diff --git a/src/modules/auth/nonce.c b/src/modules/auth/nonce.c index 0304b394bd7..56cd49b7ec2 100644 --- a/src/modules/auth/nonce.c +++ b/src/modules/auth/nonce.c @@ -223,7 +223,7 @@ int calc_nonce(char *nonce, int *nonce_len, int cfg, unsigned int since, len = calc_bin_nonce_md5(&b_nonce, cfg, secret1, secret2, msg); *nonce_len = base64_enc( &b_nonce.raw[0], len, (unsigned char *)nonce, *nonce_len); - assert(*nonce_len >= 0); /*FIXME*/ + assert(*nonce_len >= 0); return 0; }

1 0

git:master:32089e13: tls_wolfssl: refactor custom BIO
by S-P Chan 23 Jan '24

23 Jan '24

Module: kamailio Branch: master Commit: 32089e134413200bf5d1a97f207378b7d10e65a2 URL: https://github.com/kamailio/kamailio/commit/32089e134413200bf5d1a97f207378b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-23T21:02:57+08:00 tls_wolfssl: refactor custom BIO - remove use of custom BIO at the expense of some memory copies --- Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_server.h Removed: src/modules/tls_wolfssl/tls_bio.c Removed: src/modules/tls_wolfssl/tls_bio.h --- Diff: https://github.com/kamailio/kamailio/commit/32089e134413200bf5d1a97f207378b… Patch: https://github.com/kamailio/kamailio/commit/32089e134413200bf5d1a97f207378b…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev