sr-dev August 2023

sr-dev@lists.kamailio.org

15 participants
207 discussions

git:master:1435618b: sqlops: number fields kept as long

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1435618b71ed749bc33982a00c8caf6b8de7b80a URL: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-28T09:06:41+02:00 sqlops: number fields kept as long --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sql_api.h --- Diff: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… Patch: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 93a9b36528a..b76edbd480e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -357,17 +357,17 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) case DB1_INT: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.int_val; + (long)RES_ROWS(db_res)[i].values[j].val.int_val; break; case DB1_DATETIME: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.time_val; + (long)RES_ROWS(db_res)[i].values[j].val.time_val; break; case DB1_BITMAP: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; + (long)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; case DB1_BIGINT: res->vals[i][j].flags = PV_VAL_STR; diff --git a/src/modules/sqlops/sql_api.h b/src/modules/sqlops/sql_api.h index b1189561054..0051a61a53c 100644 --- a/src/modules/sqlops/sql_api.h +++ b/src/modules/sqlops/sql_api.h @@ -41,7 +41,7 @@ typedef struct _sql_col typedef struct _sql_val { int flags; - int_str value; + numstr_ut value; } sql_val_t; typedef struct _sql_result

1 year, 3 months

git:master:1ea23314: pv: updates for helper functions taking now long instead of int

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1ea23314d46ce566be97a189569a01bbff5cf477 URL: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-25T11:03:52+02:00 pv: updates for helper functions taking now long instead of int --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b… Patch: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b…

1 year, 3 months

git:master:3e6cd549: cplc: casts for proper adjusting on storage size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e6cd549716ab7ee0b2ff0df3ee52784d9478ee1 URL: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T14:00:01+02:00 cplc: casts for proper adjusting on storage size --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… Patch: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index 4120f4ef2bf..b22fe5e8cf9 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -264,7 +264,7 @@ int cpl_ac_print(cpl_ac_tm_p _atp) return -1; } - printf("\nSys time: %d\nTime: %02d:%02d:%02d\n", (int)_atp->time, + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (unsigned long long)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year + 1900, _atp->t.tm_mon + 1, _atp->t.tm_mday); @@ -490,17 +490,17 @@ int cpl_tr_print(cpl_tmrec_p _trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %d\n", (int)_trp->dtstart); + printf("Sys time: %llu\n", (unsigned long long)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year + 1900, _trp->ts.tm_mon + 1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %d\n", (int)_trp->dtend); - printf("Duration: %d\n", (int)_trp->duration); - printf("Until: %d\n", (int)_trp->until); - printf("Freq: %d\n", (int)_trp->freq); - printf("Interval: %d\n", (int)_trp->interval); + printf("End time: %llu\n", (unsigned long long)_trp->dtend); + printf("Duration: %llu\n", (unsigned long long)_trp->duration); + printf("Until: %llu\n", (unsigned long long)_trp->until); + printf("Freq: %d\n", _trp->freq); + printf("Interval: %d\n", _trp->interval); if(_trp->byday) { printf("Byday: "); for(i = 0; i < _trp->byday->nr; i++) @@ -965,7 +965,7 @@ int cpl_check_tmrec(cpl_tmrec_p _trp, cpl_ac_tm_p _atp, cpl_tr_res_p _tsw) int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) { - int _t0, _t1; + unsigned long long _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -983,12 +983,12 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) _tm.tm_year = _trp->ts.tm_year; _tm.tm_mon = _trp->ts.tm_mon; _tm.tm_mday = _trp->ts.tm_mday; - _t0 = (int)mktime(&_tm); + _t0 = (unsigned long long)mktime(&_tm); memset(&_tm, 0, sizeof(struct tm)); _tm.tm_year = _atp->t.tm_year; _tm.tm_mon = _atp->t.tm_mon; _tm.tm_mday = _atp->t.tm_mday; - _t1 = (int)mktime(&_tm); + _t1 = (unsigned long long)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1 - _t0) / (24 * 3600)) % _trp->interval == 0) ? REC_MATCH

1 year, 3 months

git:master:90356a68: auth_ephemeral: additional cast to avoid storage size warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90356a685e8861d89057e8cbbe977599ab4a70b1 URL: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T13:31:46+02:00 auth_ephemeral: additional cast to avoid storage size warning --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… Patch: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 638d97aa835..92633d0983f 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -156,7 +156,7 @@ static inline int do_auth(struct sip_msg *_m, struct hdr_field *_h, str *_realm, int autheph_verify_timestamp(str *_username) { - int pos = 0, cur_time = (int)time(NULL); + int pos = 0, cur_time = (int)(unsigned long long)time(NULL); unsigned int expires; str time_str = {0, 0};

1 year, 3 months

[kamailio/kamailio] smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (PR #3546)

by Supreeth Herle

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes the conversion from UCS2 to UTF-8 and viceversa. Previously the code was not handling emojis and certain characters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3546 -- Commit Summary -- * smsops: Fix conversion from UCS-2 to UTF-8 and viceversa -- File Changes -- M src/modules/smsops/smsops_impl.c (219) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3546.patch https://github.com/kamailio/kamailio/pull/3546.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3546 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3546(a)github.com>

1 year, 3 months

git:master:76de00a4: core: mem - check if fragmet exists before setting function field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76de00a483c7ed0dbfeadde2685d2800bf291cef URL: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T10:36:04+02:00 core: mem - check if fragmet exists before setting function field --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… Patch: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index e1b48ecd63f..1605cba5990 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -807,7 +807,8 @@ void qm_setfunc(void *qmp, void *p, char *func) } f = (struct qm_frag *)((char *)p - sizeof(struct qm_frag)); - f->func = func; + if(f) + f->func = func; #endif }

1 year, 3 months

git:master:c11fcbbe: msilo: cast to fix storage size warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c11fcbbe9ed19bc54b800100d15d9ae269735f0c URL: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T13:03:02+02:00 msilo: cast to fix storage size warning --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Patch: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index a5d3b74c0c1..00cf593811f 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -741,7 +741,7 @@ static int m_store_addrs(sip_msg_t *msg, str *owner, str *srcaddr, str *dstaddr) } /* current time */ - val = (int)time(NULL); + val = (int)(unsigned long long)time(NULL); /* add expiration time */ db_keys[nr_keys] = &sc_exp_time;

1 year, 3 months

git:master:5633026f: pv_headers: compare result of pvh_set_xavi() with NULL for error cases

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5633026f90e46f7d6da8c1a658d425e8926f6949 URL: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:55:35+02:00 pv_headers: compare result of pvh_set_xavi() with NULL for error cases - the function returns a pointer --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Patch: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b772262691d..441a2a664af 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -619,11 +619,11 @@ int pvh_set_header( xavi->name.len, xavi->name.s, hname->len, hname->s); } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, idx, 0) - < 0) + == NULL) goto err; } } else if(val->flags & (PV_VAL_STR | PV_TYPE_INT | PV_VAL_INT)) { @@ -642,7 +642,7 @@ int pvh_set_header( } if(idx == 0 && idxf == PV_IDX_NONE) { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, 1) - < 0) + == NULL) goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { @@ -652,11 +652,11 @@ int pvh_set_header( } if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, hname_cnt ? 0 : 1) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, idx, 0) - < 0) + == NULL) goto err; } if(pv_format) @@ -694,7 +694,7 @@ xavp_c_data_t *pvh_set_parsed( if(pvh_merge_uri(msg, SET_URI_T, cur, val, c_data) < 0) goto err; if(pvh_set_xavi(msg, &xavi_parsed_xname, hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; LM_DBG("c_data from pvh_merge_uri hname:%.*s\n", hname->len, hname->s); @@ -857,12 +857,12 @@ int pvh_set_uri(struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val) /* LM_DBG("xavi:%.*s hname:%.*s value:%.*s\n", xavi_name.len, xavi_name.s, hname.len, hname.s, c_data->value.len, c_data->value.s); */ if(pvh_set_xavi(msg, &xavi_name, &hname, &c_data->value, SR_XTYPE_STR, 0, 0) - < 0) + == NULL) goto err; if(pvh_set_xavi( msg, &xavi_parsed_xname, &hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; if(pv_format) @@ -1127,7 +1127,7 @@ int pvh_set_reply_sr( case 2: // reason if(pvh_set_xavi(msg, &xavi_name, &_hdr_reply_reason, &fval, SR_XTYPE_STR, 0, 0) - < 0) { + == NULL) { LM_ERR("set reply: cannot set reply reason\n"); goto err; }

1 year, 3 months

git:master:027c2b30: db_redis: free db_keys in case of failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 027c2b30b39a7596c8630c06995ddc49bb42d789 URL: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:52+02:00 db_redis: free db_keys in case of failure --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Patch: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c53a1593aa6..ff41aa45282 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2584,6 +2584,8 @@ static int db_redis_perform_update(const db1_con_t *_h, km_redis_con_t *con, LM_ERR("failed to perform the update\n"); if(reply) db_redis_free_reply(&reply); + if(db_keys) + pkg_free(db_keys); db_redis_key_free(&query_v); db_redis_key_free(&all_type_keys); db_redis_key_free(&type_keys);

1 year, 3 months

git:master:81c1ede6: core: allow space for ending string when creating socket structure at startup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81c1ede698f8dd6f2147c71ee6f3bb49ed4a682c URL: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:02+02:00 core: allow space for ending string when creating socket structure at startup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Patch: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 04a2e609323..6786ecaf6cc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,7 +329,7 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); if(si->useinfo.name.s == 0) goto error; strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1);

1 year, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2023