sr-dev February 2023

sr-dev@lists.kamailio.org

10 participants
297 discussions

[kamailio/kamailio] tos as text does not works (Issue #3368)
by sergey-safarov 13 Feb '23

13 Feb '23

### Description According to [RFC4594](https://datatracker.ietf.org/doc/html/rfc4594#page-19) ``` ------------------------------------------------------------------ | Service | DSCP | DSCP | Application | | Class Name | Name | Value | Examples | |===============+=========+=============+==========================| |Network Control| CS6 | 110000 | Network routing | |---------------+---------+-------------+--------------------------| | Telephony | EF | 101110 | IP Telephony bearer | |---------------+---------+-------------+--------------------------| | Signaling | CS5 | 101000 | IP Telephony signaling | |---------------+---------+-------------+--------------------------| ``` Kamailio should relay SIP messages with DCSP value `CS5` To set this value I can use in config file ``` tos=0xA0 ``` This works as expected But when I use text form this does not work ``` tos=IPTOS_PREC_CRITIC_ECP ``` `IPTOS_PREC_CRITIC_ECP` defined in the `/usr/include/linux/ip.h` as ``` #define IPTOS_PREC_CRITIC_ECP 0xa0 ``` I expect both forms `0xA0` and `IPTOS_PREC_CRITIC_ECP` should works. Tested on 5.6.2 version -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3368 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3368(a)github.com>

3 3

git:master:34ce0de7: presence: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 34ce0de749c20e1b5a2e58fdaaca841d75622d2c URL: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 presence: cast to uint64_t when using time_t value - startup time stored as unsigned int insted of signed int --- Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… Patch: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index d6e287c40e..599e048e4d 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -142,7 +142,7 @@ static int fixup_has_subscribers(void **param, int param_no); int pres_counter = 0; int pres_pid = 0; char pres_prefix = 'a'; -int pres_startup_time = 0; +unsigned int pres_startup_time = 0; str pres_db_url = {0, 0}; int pres_expires_offset = 0; int pres_cseq_offset = 0; @@ -447,7 +447,7 @@ static int mod_init(void) } - pres_startup_time = (int)time(NULL); + pres_startup_time = (unsigned int)(uint64_t)time(NULL); if(pres_clean_period > 0) { if(pres_timer_mode==0) { register_timer(ps_presentity_db_timer_clean, 0, pres_clean_period); diff --git a/src/modules/presence/presence.h b/src/modules/presence/presence.h index 381029184a..390aee49f8 100644 --- a/src/modules/presence/presence.h +++ b/src/modules/presence/presence.h @@ -73,7 +73,7 @@ extern str watchers_table; extern int pres_counter; extern int pres_pid; -extern int pres_startup_time; +extern unsigned int pres_startup_time; extern int pres_expires_offset; extern int pres_cseq_offset; extern str pres_server_address; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 2ac5190495..f9131e9a4e 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -69,7 +69,7 @@ char *generate_ETag(int publ_count) ERR_MEM(PKG_MEM_STR); } memset(etag, 0, ETAG_LEN * sizeof(char)); - size = snprintf(etag, ETAG_LEN, "%c.%d.%d.%d.%d", pres_prefix, + size = snprintf(etag, ETAG_LEN, "%c.%u.%d.%d.%d", pres_prefix, pres_startup_time, pres_pid, pres_counter, publ_count); if(size < 0) { LM_ERR("unsuccessful snprintf\n ");

1 0

git:master:0259eaed: xmlrpc: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 0259eaedd507c314161c59b72eaa4564effac555 URL: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 xmlrpc: cast to uint64_t when using time_t value --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… Patch: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 7cfb856774..bddf864206 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -43,6 +43,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <stdint.h> #include <stdarg.h> #include <sys/types.h> #include <signal.h> @@ -1335,7 +1336,7 @@ static int get_int(int* val, struct xmlrpc_reply* reply, ret=-1; break; case XML_T_DATE: - *val = xmlrpc2time(val_str); + *val = (int)(uint64_t)xmlrpc2time(val_str); break; case XML_T_DOUBLE: *val = (int)strtod(val_str, &end_ptr);

1 0

git:master:c464add1: xprint: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c464add1531aea5fda3f7c5a6670bd90e7ac594b URL: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 xprint: cast to uint64_t when using time_t value --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… Patch: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 06b744fe92..3b1c59e57c 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <time.h> #include <unistd.h> @@ -144,7 +145,7 @@ static int xl_get_times(struct sip_msg *msg, str *res, str *hp, int hi, int hf) msg_tm = time(NULL); msg_id = msg->id; } - ch = int2str_base_0pad(msg_tm, &l, hi, hi==10?0:8); + ch = int2str_base_0pad((unsigned int)(uint64_t)msg_tm, &l, hi, hi==10?0:8); res->s = ch; res->len = l;

1 0

git:master:33b31935: core: sruid - cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 33b319353a097ba8fd80e45dc4f008c2e9dfe813 URL: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 core: sruid - cast to uint64_t when using time_t value --- Modified: src/core/utils/sruid.c --- Diff: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… Patch: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index e7a49f2a62..5888ffbdcb 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <unistd.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include <time.h> @@ -66,7 +67,7 @@ static int sruid_shift_lfsr(unsigned int *lfsr, unsigned int mask) static void sruid_init_lfsr(void) { - sruid_lfsr32 = (unsigned int)time(NULL); + sruid_lfsr32 = (unsigned int)(uint64_t)time(NULL); sruid_lfsr31 = (unsigned int)getpid(); } @@ -101,11 +102,11 @@ int sruid_init(sruid_t *sid, char sep, char *cid, int mode) if(server_id!=0) i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c%x%c", (unsigned int)server_id, sep, - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); else i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c", - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); if(i<=0 || i>SRUID_SIZE-13) { LM_ERR("could not initialize sruid struct - output len: %d\n", i); @@ -141,11 +142,11 @@ int sruid_reinit(sruid_t *sid, int mode) if(server_id!=0) { i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c%x%c", (unsigned int)server_id, sep, - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); } else { i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c", - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); } if(i<=0 || i>SRUID_SIZE-13) {

1 0

git:master:ae3e52da: core: select - cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: ae3e52daec9be45c4663708cb216b13864521a35 URL: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 core: select - cast to uint64_t when using time_t value --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… Patch: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index ff5d6ef6b3..333f7a4513 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -26,7 +26,8 @@ * Module: \ref core */ -#include <stdlib.h> +#include <stdlib.h> +#include <stdint.h> #include "select.h" #include "select_core.h" #include "select_buf.h" @@ -60,7 +61,7 @@ #include "rand/kam_rand.h" #define RETURN0_res(x) {*res=(x);return 0;} -#define TRIM_RET0_res(x) {*res=(x);trim(res);return 0;} +#define TRIM_RET0_res(x) {*res=(x);trim(res);return 0;} #define TEST_RET_res_body(x) if (x){*res=(x)->body;return 0;}else return 1; #define TEST_RET_res_value(x) if (x){*res=(x)->value;return 0;}else return 1; @@ -1485,7 +1486,7 @@ int select_sys_unique(str* res, select_t* s, struct sip_msg* msg) { c = int2str_base_0pad(getpid(), &l, 16, UNIQUE_ID_PID_LEN); memcpy(uniq_id, c, UNIQUE_ID_PID_LEN); uniq_id[UNIQUE_ID_PID_LEN] = '-'; - c = int2str_base_0pad(time(NULL), &l, 16, UNIQUE_ID_TIME_LEN); + c = int2str_base_0pad((unsigned int)(uint64_t)time(NULL), &l, 16, UNIQUE_ID_TIME_LEN); memcpy(uniq_id+UNIQUE_ID_PID_LEN+1, c, UNIQUE_ID_TIME_LEN); uniq_id[UNIQUE_ID_PID_LEN+1+UNIQUE_ID_TIME_LEN] = '-'; @@ -1525,7 +1526,7 @@ int select_sys_unique(str* res, select_t* s, struct sip_msg* msg) { int select_sys_now(str* res, select_t* s, struct sip_msg* msg) { - return uint_to_static_buffer(res, time(NULL)); + return uint_to_static_buffer(res, (unsigned int)(uint64_t)time(NULL)); } int select_sys_now_fmt(str* res, select_t* s, struct sip_msg* msg)

1 0

git:master:cc3ec58c: kmeix: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: cc3ec58c1e3c203c76c59b17ccc14e24ffc6f8cf URL: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 kmeix: cast to uint64_t when using time_t value --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… Patch: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 80d7807740..e6bff3841c 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <time.h> #include "../../core/sr_module.h" @@ -952,7 +953,7 @@ static sr_kemi_xval_t* ki_kx_get_nhuri(sip_msg_t *msg) */ static int ki_kx_get_timestamp(sip_msg_t *msg) { - return (int)time(NULL); + return (int)(uint64_t)time(NULL); } /**

1 0

git:master:c7217d14: mtree: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c7217d147b615da6ebf3841a3915055aa529dd70 URL: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 mtree: cast to uint64_t when using time_t value --- Modified: src/modules/mtree/mtree.c Modified: src/modules/mtree/mtree.h Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… Patch: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… --- diff --git a/src/modules/mtree/mtree.c b/src/modules/mtree/mtree.c index 7ee303749a..ef1dd54ae5 100644 --- a/src/modules/mtree/mtree.c +++ b/src/modules/mtree/mtree.c @@ -122,7 +122,7 @@ m_tree_t* mt_init_tree(str* tname, str *dbtable, str *scols, int type, pt->type = type; pt->multi = multi; - pt->reload_time = (unsigned int)time(NULL); + pt->reload_time = (uint64_t)time(NULL); pt->tname.s = (char*)shm_malloc((1+tname->len)*sizeof(char)); if(pt->tname.s==NULL) { diff --git a/src/modules/mtree/mtree.h b/src/modules/mtree/mtree.h index acc8ef0706..1d5c665f47 100644 --- a/src/modules/mtree/mtree.h +++ b/src/modules/mtree/mtree.h @@ -25,6 +25,8 @@ #ifndef _MTREE_H_ #define _MTREE_H_ +#include <stdint.h> + #include "../../core/str.h" #include "../../core/parser/msg_parser.h" #include "../../core/rpc.h" @@ -76,7 +78,7 @@ typedef struct _m_tree unsigned int nritems; unsigned int memsize; unsigned int reload_count; - unsigned int reload_time; + uint64_t reload_time; mt_node_t *head; struct _m_tree *next; } m_tree_t; diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 66f72bbd02..b8a0ee5722 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -560,7 +560,7 @@ static int mt_load_db(m_tree_t *pt) new_tree.nritems = 0; new_tree.memsize = 0; new_tree.reload_count++; - new_tree.reload_time = (unsigned int)time(NULL); + new_tree.reload_time = (uint64_t)time(NULL); if (mt_dbf.use_table(db_con, &old_tree->dbtable) < 0) @@ -888,13 +888,13 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) rpc->fault(c, 500, "Internal error adding items"); return; } - if(rpc->struct_add(ih, "d", "reload_count", - (int)pt->reload_count) < 0 ) { + if(rpc->struct_add(ih, "j", "reload_count", + pt->reload_count) < 0 ) { rpc->fault(c, 500, "Internal error adding items"); return; } - if(rpc->struct_add(ih, "d", "reload_time", - (int)pt->reload_time) < 0 ) { + if(rpc->struct_add(ih, "J", "reload_time", + pt->reload_time) < 0 ) { rpc->fault(c, 500, "Internal error adding items"); return; }

1 0

git:master:7e29c28e: drouting: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 7e29c28e4da5c7286a75422d6f538b932961a168 URL: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 drouting: cast to uint64_t when using time_t value --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… Patch: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 55d09a57ca..dd601c3c4a 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <string.h> #include <time.h> +#include <stdint.h> #include "../../core/mem/shm_mem.h" #include "dr_time.h" @@ -911,7 +912,7 @@ int dr_check_tmrec(dr_tmrec_p _trp, dr_ac_tm_p _atp, dr_tr_res_p _tsw) int dr_check_freq_interval(dr_tmrec_p _trp, dr_ac_tm_p _atp) { - int _t0, _t1; + uint64_t _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -929,12 +930,12 @@ int dr_check_freq_interval(dr_tmrec_p _trp, dr_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 = (uint64_t)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 = (uint64_t)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1 - _t0) / (24 * 3600)) % _trp->interval == 0) ? REC_MATCH

1 0

git:master:05ea2235: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 05ea223549f4834c5e3b92f9025d5cf8a2b73890 URL: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T09:31:40+01:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/dispatcher/README Modified: src/modules/dlgs/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/pua_usrloc/README Modified: src/modules/secsipid/README Modified: src/modules/tsilo/README Modified: src/modules/uid_avp_db/README Modified: src/modules/uid_uri_db/README Modified: src/modules/uri_db/README --- Diff: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf… Patch: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf…

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2023