sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:e64b2914: Makefile.defs: expose CC_NAME variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e64b29141afddf06bf7d5d68aa88679b54c5076c URL: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:25:06+02:00 Makefile.defs: expose CC_NAME variable --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Patch: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b36b0b56e..9efb93704a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2166,10 +2166,10 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - CC_MKDEP_OPTS \ + CC_NAME CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \

4 years, 7 months

git:master:f1de08ee: redis: init variables to get rid of compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f1de08eef86dc2cd98509c90fa8b28212d47ca37 URL: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:36:36+02:00 redis: init variables to get rid of compile warnings - GH #2298 --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Patch: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index a35e7dc786..e59bd5ba29 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -496,13 +496,13 @@ int db_redis_parse_keys(km_redis_con_t *con) { str column_name; str version_code; - struct str_hash_entry *table_entry; - redis_table_t *table; - redis_type_t *type; - redis_type_t *type_target; - redis_key_t *key; - redis_key_t **key_target; - redis_key_t *key_location; + struct str_hash_entry *table_entry = NULL; + redis_table_t *table = NULL; + redis_type_t *type = NULL; + redis_type_t *type_target = NULL; + redis_key_t *key = NULL; + redis_key_t **key_target = NULL; + redis_key_t *key_location = NULL; enum { DBREDIS_KEYS_TABLE_ST, @@ -657,13 +657,13 @@ int db_redis_parse_schema(km_redis_con_t *con) { struct dirent* dent; char *dir_name; - str table_name; + str table_name = str_init(""); str column_name; str type_name; - struct str_hash_entry *table_entry; - struct str_hash_entry *column_entry; - redis_table_t *table; + struct str_hash_entry *table_entry = NULL; + struct str_hash_entry *column_entry = NULL; + redis_table_t *table = NULL; char full_path[_POSIX_PATH_MAX + 1]; int path_len;

4 years, 7 months

Check if Kamailio is going to CANCEL branch

by Ivan Ribakov

Hi all, Recently I’ve asked the below question in the users mailing list but I didn’t get any response. I was wondering if someone in this mailing list could at least tell me whether what I’m trying to achieve is event doable or not so that I know whether I should invest more effort into finding out the “how” part? > Upon receiving a provisional response from callee in a branch route, is there a way of telling if Kamailio > is going to automatically CANCEL that branch because a final reply was received from another branch before that? > > The closest I got is finding “cancel_b_method” parameter of the TM module, but that is not what I’m after. > Previously I was recommended to debug via logging onreply_route but I’m not really sure what information may contain > hints of intention to send CANCEL. Does anyone have any suggestions/guesses in which direction I should be digging? Thanks in advance, Ivan

4 years, 7 months

git:master:a0fb220a: db2_local: replace timelocal() with mktime()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a0fb220a8b60b135cabf6741882437317116d868 URL: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:00:21+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/man/3/timegm - GH #2298 --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Patch: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 867c873e8f..7af731f077 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src) * of expiration by one hour when daylight saving is used */ time.tm_isdst = -1; - *dst = timelocal(&time); + *dst = mktime(&time); } return 0;

4 years, 7 months

[kamailio/kamailio] sr_kemi_modules_add(sr_kemi_kazoo_exports) (#2302)

by hance2010

### Description // kamailio 5.3.3 // kazoo.c static sr_kemi_t sr_kemi_kazoo_exports[] = int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(kz_tr_init_buffers()<0) { LM_ERR("failed to initialize transformations buffers\n"); return -1; } // sr_kemi_modules_add(sr_kemi_kazoo_exports); return register_trans_mod(path, mod_trans); }  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**: Debian9  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2302

4 years, 7 months

git:master:d949907d: core: error.{c, h} - coherent use of camel case in error and reason texts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d949907df4b0dd57d6b337c4ddbc968861e33536 URL: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-26T10:34:52+02:00 core: error.{c,h} - coherent use of camel case in error and reason texts - indentation and whitespacing --- Modified: src/core/error.c Modified: src/core/error.h --- Diff: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968… Patch: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968…

4 years, 7 months

git:master:42285284: presence: consider watchers in active status when in no-db mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42285284bcb941563f431046262c06dc1c8119d7 URL: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-25T12:27:39+02:00 presence: consider watchers in active status when in no-db mode - there is no persistent storage for watchers, status is lost on restart anyhow (similar to force active) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… Patch: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3ab831f205..40421befb6 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -46,8 +46,8 @@ int get_stored_info( struct sip_msg *msg, subs_t *subs, int *error_ret, str *reply_str); int get_database_info( struct sip_msg *msg, subs_t *subs, int *error_ret, str *reply_str); -int get_db_subs_auth(subs_t *subs, int *found); -int insert_db_subs_auth(subs_t *subs); +static int ps_get_subs_auth(subs_t *subs, int *found); +static int ps_insert_subs_auth(subs_t *subs); static str su_200_rpl = str_init("OK"); static str pu_481_rpl = str_init("Subscription does not exist"); @@ -1069,8 +1069,9 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) reply_str = pu_400_rpl; goto error; } - } else + } else { goto bad_event; + } /* search event in the list */ parsed_event = (event_t *)msg->event->parsed; @@ -1149,11 +1150,11 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) subs.updated = NO_UPDATE_TYPE; subs.updated_winfo = NO_UPDATE_TYPE; - if(!event->req_auth) + if(!event->req_auth) { subs.status = ACTIVE_STATUS; - else { + } else { /* query in watchers_table */ - if(get_db_subs_auth(&subs, &found) < 0) { + if(ps_get_subs_auth(&subs, &found) < 0) { LM_ERR("getting subscription status from watchers table\n"); goto error; } @@ -1184,7 +1185,7 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) goto error; } - if(insert_db_subs_auth(&subs) < 0) { + if(ps_insert_subs_auth(&subs) < 0) { LM_ERR("while inserting record in watchers table\n"); goto error; } @@ -2668,7 +2669,7 @@ int restore_db_subs(void) return -1; } -int get_db_subs_auth(subs_t *subs, int *found) +static int ps_get_db_subs_auth(subs_t *subs, int *found) { db_key_t db_keys[5]; db_val_t db_vals[5]; @@ -2755,7 +2756,20 @@ int get_db_subs_auth(subs_t *subs, int *found) return -1; } -int insert_db_subs_auth(subs_t *subs) +static int ps_get_subs_auth(subs_t *subs, int *found) +{ + if(pa_db==NULL) { + /* expecting the cache only mode -- watchers considered active */ + subs->reason.s = NULL; + subs->status = ACTIVE_STATUS; + *found = 1; + return 0; + } else { + return ps_get_db_subs_auth(subs, found); + } +} + +static int ps_insert_db_subs_auth(subs_t *subs) { db_key_t db_keys[10]; db_val_t db_vals[10]; @@ -2837,6 +2851,17 @@ int insert_db_subs_auth(subs_t *subs) return -1; } +static int ps_insert_subs_auth(subs_t *subs) +{ + if(pa_db==NULL) { + /* expecting the cache only mode + * - no insert, watchers considered active */ + return 0; + } else { + return ps_insert_db_subs_auth(subs); + } +} + int get_subscribers_count_from_mem(struct sip_msg *msg, str pres_uri, str event) { subs_t *s;

4 years, 7 months

git:master:a675ab88: dmq: test of if reply code and reason are set to send the response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a675ab88fefac75145a7d563fee0431458630529 URL: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-24T21:14:24+02:00 dmq: test of if reply code and reason are set to send the response --- Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… Patch: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… --- diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 38b49e4512..a2ccc636bf 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -126,12 +126,17 @@ void worker_loop(int id) } } /* send the reply */ - if(slb.freply(current_job->msg, peer_response.resp_code, - &peer_response.reason) - < 0) { - LM_ERR("error sending reply\n"); + if(peer_response.resp_code>0 && peer_response.reason.s!=NULL + && peer_response.reason.len>0) { + if(slb.freply(current_job->msg, peer_response.resp_code, + &peer_response.reason) + < 0) { + LM_ERR("error sending reply\n"); + } else { + LM_DBG("done sending reply\n"); + } } else { - LM_DBG("done sending reply\n"); + LM_WARN("no reply sent\n"); } worker->jobs_processed++;

4 years, 7 months

git:master:7f618c2d: dmq: set 202 response for empty_peer_callback() handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7f618c2d855ac268df905eb3d6e18733c8773047 URL: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-24T21:09:26+02:00 dmq: set 202 response for empty_peer_callback() handling --- Modified: src/modules/dmq/peer.c --- Diff: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… Patch: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… --- diff --git a/src/modules/dmq/peer.c b/src/modules/dmq/peer.c index 6c5ddf8954..7c2bf298e7 100644 --- a/src/modules/dmq/peer.c +++ b/src/modules/dmq/peer.c @@ -99,5 +99,11 @@ dmq_peer_t *find_peer(str peer_id) int empty_peer_callback( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *dmq_node) { + static str _dmq_202_reason = str_init("Accepted DMQ"); + + memset(resp, 0, sizeof(peer_reponse_t)); + resp->resp_code = 202; + resp->reason = _dmq_202_reason; + return 0; }

4 years, 7 months

git:5.3:cb4307c4: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: cb4307c4d863537a5d9ffaba71e9f7680a9d7618 URL: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-24T14:31:57+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76… Patch: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76…

4 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020