sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
287 discussions

git:master:84055b2f: core: clone define value to avoid losing the reference

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 84055b2fe963e01a217149991dd1c8cbe8a8aeec URL: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-25T10:24:23+02:00 core: clone define value to avoid losing the reference - impacted also by substdef - GH #2736 --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… Patch: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 2b90fbb66a..ff8096d9f2 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1337,7 +1337,7 @@ IMPORTFILE "import_file" <DEFINE_DATA>\\{CR} { count(); ksr_cfg_print_part(yytext); } /* eat the escaped CR */ <DEFINE_DATA>{CR} { count(); ksr_cfg_print_part(yytext); - if (pp_define_set(strlen(s_buf.s), s_buf.s)) return 1; + if (pp_define_set(strlen(s_buf.s), s_buf.s, KSR_PPDEF_NORMAL)) return 1; memset(&s_buf, 0, sizeof(s_buf)); state = INITIAL; ksr_cfg_print_initial_state(); @@ -2007,7 +2007,7 @@ int pp_define(int len, const char *text) return 0; } -int pp_define_set(int len, char *text) +int pp_define_set(int len, char *text, int mode) { int ppos; @@ -2090,7 +2090,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 627402ba66..a5aa1d3e28 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -143,20 +143,14 @@ int pp_substdef_add(char *data, int mode) LM_ERR("cannot set define name\n"); goto error; } - if(mode==1) { - /* define the value enclosed in double quotes */ - *(defvalue.s-1) = '"'; - defvalue.s[defvalue.len] = '"'; - defvalue.s--; - defvalue.len += 2; - } if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { defvalue = newval; } } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, + (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value\n"); goto error; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 70627268b6..17b19380bc 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -25,6 +25,9 @@ #include "str.h" +#define KSR_PPDEF_NORMAL (0) /* define normal value */ +#define KSR_PPDEF_QUOTED (1<<0) /* define quoted value */ + typedef struct ksr_ppdefine { str name; str value; @@ -39,7 +42,7 @@ int pp_substdef_add(char *data, int mode); int pp_subst_run(char **data); int pp_define(int len, const char *text); -int pp_define_set(int len, char *text); +int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); int pp_define_env(const char * text, int len); diff --git a/src/main.c b/src/main.c index 71a024d5bb..a391f57afb 100644 --- a/src/main.c +++ b/src/main.c @@ -2264,7 +2264,7 @@ int main(int argc, char** argv) } if(p) { p++; - if(pp_define_set(strlen(p), p)<0) { + if(pp_define_set(strlen(p), p, KSR_PPDEF_NORMAL)<0) { fprintf(stderr, "error at define value: -A %s\n", optarg); goto error;

3 years, 7 months

[kamailio/kamailio] ims_ipsec_pcscf: more algorithms, SA improvements (#2731)

by riccardv

- add aes-cbc, des-ede3-cbc ipsec encryption algoriyhms - improve nlmsg_seq choice for concurrent multi UEs Registrations at same time - before sending replies over IPsec check the existing of opened TCP sockets   #### Pre-Submission Checklist    - [v] Commit message has the format required by CONTRIBUTING guide - [v] Commits are split per component (core, individual modules, libs, utils, ...) - [v] Each component has a single commit (if not, squash them into one commit) - [v] 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 - [v] Small bug fix (non-breaking change which fixes an issue) - [v] 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 - [v] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2731 -- Commit Summary -- * ims_ipsec_pcscf: more algorithms, SA improvements -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (29) M src/modules/ims_ipsec_pcscf/ipsec.c (34) M src/modules/ims_ipsec_pcscf/ipsec.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2731.patch https://github.com/kamailio/kamailio/pull/2731.diff -- 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/pull/2731

3 years, 7 months

git:master:1c012890: ims_ipsec_pcscf: more algorithms, SA improvements

by Henning Westerholt

Module: kamailio Branch: master Commit: 1c012890fbe611ac1bcf78a6ae9009039d4aa417 URL: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090… Author: riccardv <tafkap(a)gmx.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-24T22:28:06+02:00 ims_ipsec_pcscf: more algorithms, SA improvements - add aes-cbc, des-ede3-cbc ipsec encryption algoriyhms - improve nlmsg_seq choice for concurrent multi UEs Registrations at same time - before sending replies over IPsec check the existing of opened TCP sockets --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h --- Diff: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090… Patch: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090…

3 years, 7 months

git:master:de090680: ims_ipsec_pcscf: use ksr_clock_gettime()

by Henning Westerholt

Module: kamailio Branch: master Commit: de0906809bc265a24dd29aadf3b2f5bbd4a154f0 URL: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… Author: riccardv <tafkap(a)gmx.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-24T22:28:06+02:00 ims_ipsec_pcscf: use ksr_clock_gettime() --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… Patch: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 03474745b2..e874abaa34 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -104,7 +104,7 @@ static uint choose_nlmsg_seq (void) { static double Tini=0; struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); + ksr_clock_gettime(&ts); return(1000*(ts.tv_sec - Tini + (ts.tv_nsec * 1E-9))); // us }

3 years, 7 months

git:master:4b2428f7: cfg_rpc: use directly cfg_get_group_id()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4b2428f75a43cd5bbf2f5810be3c1220551402a2 URL: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-24T16:18:12+02:00 cfg_rpc: use directly cfg_get_group_id() --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122… Patch: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122…

3 years, 7 months

git:master:ffa19ffe: pv: proper increment to check escaped char for s.select

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ffa19ffedeb8db8ac38a742ae8b686525fd906ea URL: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-24T16:18:12+02:00 pv: proper increment to check escaped char for s.select --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… Patch: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2f10f67080..517ce5342d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2752,8 +2752,8 @@ char* tr_parse_string(str* in, trans_t *t) tp->v.s.s = p; tp->v.s.len = 1; if(*p=='\\') { + p++; if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { - p++; tp->v.s.len = 2; } else { LM_ERR("unexpected escape char: %c\n", *p);

3 years, 7 months

[kamailio/kamailio] snmpstats: mibs - fix typo in openserSIPRegUserLookupTable description (#2741)

by arkadiam

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2741 -- Commit Summary -- * Fix typo in openserSIPRegUserLookupTable description -- File Changes -- M src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2741.patch https://github.com/kamailio/kamailio/pull/2741.diff -- 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/pull/2741

3 years, 7 months

git:master:7f017707: snmpstats: Fix typo in MIB

by Olle E. Johansson

Module: kamailio Branch: master Commit: 7f017707c91659641ce9ca87ee4149b2e39379f7 URL: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-05-24T08:27:22+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… Patch: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

3 years, 7 months

git:master:f2973cf0: pv: support escaped chars for s.select separator

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f2973cf0dce0de5c002ac8ee61ac7e829823ed0e URL: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-22T10:00:09+02:00 pv: support escaped chars for s.select separator - \\, \n, \r, \t --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… Patch: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index c9e7438b83..2f10f67080 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -191,6 +191,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { int i, j, max; char *p, *s; + char c; str st, st2; pv_value_t v, w; time_t t; @@ -731,6 +732,28 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } i = v.ri; } + if(tp->next->v.s.len>1) { + switch(tp->next->v.s.s[1]) { + case '\\': + c = '\\'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + default: + LM_ERR("invalid select escape char (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + } else { + c = tp->next->v.s.s[0]; + } val->flags = PV_VAL_STR; val->ri = 0; if(i<0) @@ -741,7 +764,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, i--; while(p>=val->rs.s) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -762,7 +785,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, p = s; while(p<val->rs.s+val->rs.len) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -2728,6 +2751,15 @@ char* tr_parse_string(str* in, trans_t *t) tp->type = TR_PARAM_STRING; tp->v.s.s = p; tp->v.s.len = 1; + if(*p=='\\') { + if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { + p++; + tp->v.s.len = 2; + } else { + LM_ERR("unexpected escape char: %c\n", *p); + goto error; + } + } t->params->next = tp; tp = 0; p++;

3 years, 7 months

git:master:02ad9e1b: pv: more details in err log message for s.select parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64 URL: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-22T10:00:09+02:00 pv: more details in err log message for s.select parsing --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… Patch: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93f126099..c9e7438b83 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2734,8 +2734,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

3 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021