- sr-dev - kamailio.org

git:master:de23dc10: utils/kamctl: make root host/port configurable
by Daniel-Constantin Mierla 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: de23dc1035e4b885f45bc4150d282c26b294db64 URL: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-28T23:14:16+02:00 utils/kamctl: make root host/port configurable - add support for configuring the DB root host/port connection parameters separate from the ro/rw settings. This allows the user to authenticate over the specific socket configured (tcp/udp/unix) for each connection type (root/ro/rw). - note that support is added for mysql and postgresql connections. no changes to the other DB engine connection parameters. --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Patch: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index ce0bd9d93bc..67af483d9c6 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -44,6 +44,14 @@ ## database access host (from where is kamctl used) # DBACCESSHOST=192.168.0.1 +## database host for super user (useful for specifying a local socket or virtual hostname) +# defaults to value of DBHOST when not set +# DBROOTHOST="localhost" + +## database port for super user (on some DB specifying the port will force TCP connections) +# default value will depend on client DB tool +# DBROOTPORT="" + ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4a3beccaef4..5579c9e8373 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -20,6 +20,9 @@ DBROUSER=${DBROUSER:-kamailioro} # password for read-only user DBROPW=${DBROPW:-kamailioro} +# address of database server for root connections +DBROOTHOST=${DBROOTHOST:-$DBHOST} + # user name column USERCOL=${USERCOL:-username} diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 81a730bbe65..49915dc7954 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -27,23 +27,22 @@ fi # config vars ################################################################# -# full privileges MySQL user -if [ -z "$DBROOTUSER" ]; then - DBROOTUSER="root" -fi - # Set DBROOTPW in kamctlrc or via next line to set the database # root password if you want to run this script without any user prompt. # This is unsafe, but useful e.g. for automatic testing. #DBROOTPW="" - -if [ -z "$DBPORT" ] ; then - CMD="mysql -h $DBHOST -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -u$DBROOTUSER -c -t " -else - CMD="mysql -h $DBHOST -P $DBPORT -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -P $DBPORT -u$DBROOTUSER -c -t " +# build the client base commands one param at a time +# let the client choose defaults where not specified +CMD="mysql -h $DBROOTHOST" +DUMP_CMD="mysqldump -c -t -h $DBROOTHOST" +if [ -n "$DBROOTPORT" ] ; then + CMD="$CMD -P $DBROOTPORT" + DUMP_CMD="$DUMP_CMD -P $DBROOTPORT" +fi +if [ -n "$DBROOTUSER" ]; then + CMD="$CMD -u $DBROOTUSER" + DUMP_CMD="mysqldump -u $DBROOTUSER" fi ################################################################# diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index 1eb5d88d2b8..3b46c04294f 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -51,12 +51,12 @@ if [ -z "$DBROOTUSER" ]; then fi fi -if [ -z "$DBPORT" ] ; then - CMD="psql -q -h $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" +if [ -z "$DBROOTPORT" ] ; then + CMD="psql -q -h $DBROOTHOST -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" + CMD="psql -q -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:f0caa96e: phonenum: clang format cpp file
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: f0caa96e7622c40200d22d730ca904f27e5fe752 URL: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:46:17+02:00 phonenum: clang format cpp file --- Modified: src/modules/phonenum/cphonenumber.cpp --- Diff: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Patch: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f…

1 0

git:master:5b0e1e6d: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: 5b0e1e6d23fb0bf028589ae27949f11be2b22837 URL: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-27T08:46:10+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Patch: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 87cb9e485f5..5d50ebf8f2e 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -191,7 +191,8 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { + number - phone number that is matched + valid - 1 if the matched number has a valid result; 0 otherwise - + normalized - normalized phone number + + normalized - normalized (E164) phone number + + natnum - nationally formatted phone number + cctel - country code for phone number + ccname - country code name + ltype - local network type

1 0

[kamailio/kamailio] phonenum: add national number (PR #3820)
by Daniel Donoghue 27 Apr '24

27 Apr '24

- add natnum property, containing the nationally formatted number, to pv   #### 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) - [x] 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/3820 -- Commit Summary -- * phonenum: add national number -- File Changes -- M src/modules/phonenum/cphonenumber.cpp (12) M src/modules/phonenum/cphonenumber.h (1) M src/modules/phonenum/doc/phonenum_admin.xml (5) M src/modules/phonenum/phonenum_pv.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3820.patch https://github.com/kamailio/kamailio/pull/3820.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3820 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3820(a)github.com>

2 2

git:master:efffd1db: phonenum: add national number
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: efffd1db25f2da411f53fdab4954c60c16c021ae URL: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Author: Daniel Donoghue <daniel.donoghue(a)aurorainnovation.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:44:10+02:00 phonenum: add national number - add natnum property, containing the nationally formatted number, to pv --- Modified: src/modules/phonenum/cphonenumber.cpp Modified: src/modules/phonenum/cphonenumber.h Modified: src/modules/phonenum/doc/phonenum_admin.xml Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Patch: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… --- diff --git a/src/modules/phonenum/cphonenumber.cpp b/src/modules/phonenum/cphonenumber.cpp index 60f5039c88f..94cc9d2cddb 100644 --- a/src/modules/phonenum/cphonenumber.cpp +++ b/src/modules/phonenum/cphonenumber.cpp @@ -128,9 +128,11 @@ telnum_t* telnum_parse(char* number, char* region) return res; } res->valid = 1; - string formattedNumber; - _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumber); - res->normalized = strdup(formattedNumber.c_str()); + string formattedNumberE164, formattedNumberNational; + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumberE164); + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::NATIONAL, &formattedNumberNational); + res->normalized = strdup(formattedNumberE164.c_str()); + res->natnum = strdup(formattedNumberNational.c_str()); string descNumber = _phoneGeoCoder->GetDescriptionForNumber(parsedNumber, Locale("en")); res->ndesc = strdup(descNumber.c_str()); res->ltype = strdup(telnum_linetype(_phoneUtil.GetNumberType(parsedNumber))); @@ -156,6 +158,7 @@ telnum_t* telnum_new(char* number) tn->ltype = NULL; tn->ndesc = NULL; tn->ccname = NULL; + tn->natnum = NULL; tn->error = NULL; return tn; } @@ -183,5 +186,8 @@ void telnum_free(telnum_t* tn) if (tn->ccname) { free(tn->ccname); } + if (tn->natnum) { + free(tn->natnum); + } free(tn); } diff --git a/src/modules/phonenum/cphonenumber.h b/src/modules/phonenum/cphonenumber.h index 1a6a06df861..b9e1dc09d96 100644 --- a/src/modules/phonenum/cphonenumber.h +++ b/src/modules/phonenum/cphonenumber.h @@ -37,6 +37,7 @@ extern "C" char *ltype; char *ndesc; char *ccname; + char *natnum; char *error; int cctel; int valid; diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index f3a3e98ede0..740ec4780a3 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -205,7 +205,10 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { valid result; 0 otherwise </para></listitem> <listitem><para> - <emphasis>normalized</emphasis> - normalized phone number + <emphasis>normalized</emphasis> - normalized (E164) phone number + </para></listitem> + <listitem><para> + <emphasis>natnum</emphasis> - nationally formatted phone number </para></listitem> <listitem><para> <emphasis>cctel</emphasis> - country code for phone number diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index f6bcc025f66..5970c6b9845 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -190,6 +190,8 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in) gpv->type = 0; else if(strncmp(pvs.s, "ccname", 6) == 0) gpv->type = 7; + else if(strncmp(pvs.s, "natnum", 6) == 0) + gpv->type = 8; else goto error; break; @@ -268,6 +270,10 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(gpv->item->r.record->ccname == NULL) return pv_get_null(msg, param, res); return pv_get_strzval(msg, param, res, gpv->item->r.record->ccname); + case 8: /* natnum */ + if(gpv->item->r.record->natnum == NULL) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, gpv->item->r.record->natnum); default: /* number */ if(gpv->item->r.record->number == NULL) return pv_get_null(msg, param, res);

1 0

git:master:465994de: modules: readme files regenerated - ims_usrloc_scscf ... [skip ci]
by Kamailio Dev 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 465994de2859c7863b4cef8457be0a207f15c932 URL: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-26T15:46:09+02:00 modules: readme files regenerated - ims_usrloc_scscf ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Patch: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2…

1 0

git:master:8506a6fe: ims_usrloc_scscf: enclose examples in dotted lines for better visibility
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 8506a6fe781e6e0b0b1418f4087db50480db6b57 URL: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:35:22+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Patch: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50…

1 0

git:master:15d859e1: ims_usrloc_scscf: reformat exported structures
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 15d859e1e96552fca2708cf56047021beae29711 URL: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:24:16+02:00 ims_usrloc_scscf: reformat exported structures --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Patch: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021…

1 0

git:master:9f284503: uid_auth_db: spelling fix in documentation
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 9f28450312749dfbc021a8cbc23472c8a39d3fef URL: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:54:27Z uid_auth_db: spelling fix in documentation --- Modified: src/modules/uid_auth_db/auth_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Patch: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… --- diff --git a/src/modules/uid_auth_db/auth_db.xml b/src/modules/uid_auth_db/auth_db.xml index 25849663c54..99e5eb7c594 100644 --- a/src/modules/uid_auth_db/auth_db.xml +++ b/src/modules/uid_auth_db/auth_db.xml @@ -66,7 +66,7 @@ the <serdoc:module>textops</serdoc:module> module. </para> <para> - The reason for the failure can be determined from the interger + The reason for the failure can be determined from the integer return value stored in the <varname>$?</varname> attribute. A value of <literal>-3</literal> indicates that it was impossible to retrieve credentials from the request. A 400 (Bad Request)

1 0

git:master:db176a49: core: spelling fix in comment and log message
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: db176a4918c0b500f5f051cad16fd8d442450ab7 URL: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:53:30Z core: spelling fix in comment and log message --- Modified: src/core/switch.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Patch: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… --- diff --git a/src/core/switch.c b/src/core/switch.c index 79cee21c501..e12b7e5f6d1 100644 --- a/src/core/switch.c +++ b/src/core/switch.c @@ -203,7 +203,7 @@ int fix_switch(struct action *t) return E_BUG; } if(rval_expr_eval_long(0, 0, &c->label.match_int, c->ct_rve) < 0) { - LM_ERR("case expression (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-integer type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; } diff --git a/src/core/ut.h b/src/core/ut.h index ff8d964e559..1efd7abd242 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -315,7 +315,7 @@ static inline char *int2strbuf(unsigned long l, char *r, int r_size, int *len) } extern char ut_buf_int2str[INT2STR_MAX_LEN]; -/** interger(long) to string conversion. +/** integer(long) to string conversion. * This version uses a static buffer (shared with sint2str()). * WARNING: other function calls might overwrite the static buffer, so * either always save the result immediately or use int2strbuf(...).

1 0

[kamailio/kamailio] ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif (Issue #3826)
by FeTristan 25 Apr '24

25 Apr '24

Hi, I am trying to learn Kamailio to set up a SIP/RTP proxy for WebRTC with FreeSWITCH, and I wanted to use this configuration file template as a starting point. (Source: https://github.com/havfo/WEBRTC-to-SIP) ``` #!KAMAILIO # #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_TLS #!define WITH_HOMER #!define WITH_WEBSOCKETS #!define WITH_ANTIFLOOD #!define WITH_IPV6 ##!define WITH_BRIDGE_ON_FAIL #!define WITH_LOCALHOST_WS ##!define WITH_LOCALHOST_SIP #!substdef "!MY_SIP_PORT!5060!g" #!substdef "!MY_SIPS_PORT!5061!g" #!substdef "!MY_WS_PORT!8080!g" #!substdef "!MY_WSS_PORT!4443!g" #!substdef "!MY_IP4_ADDR!XXXXX-XXXXX!g" #!substdef "!IP4_LOCALHOST!127.0.0.1!g" #!substdef "!MY_WS4_ADDR!tcp:MY_IP4_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS4_ADDR!tls:MY_IP4_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS4_ADDR!tcp:IP4_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS4_ADDR!tls:IP4_LOCALHOST:MY_WSS_PORT!g" #!ifdef WITH_IPV6 #!substdef "!MY_IP6_ADDR![XXXXXX-XXXXXX]!g" #!substdef "!IP6_LOCALHOST![::1]!g" #!substdef "!MY_WS6_ADDR!tcp:MY_IP6_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS6_ADDR!tls:MY_IP6_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS6_ADDR!tcp:IP6_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS6_ADDR!tls:IP6_LOCALHOST:MY_WSS_PORT!g" #!endif #!substdef "!MY_DOMAIN!XXXX-XXXX!g" # *** Value defines - IDs used later in config #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!endif # - flags # FLT_ - per transaction (message) flags # FLB_ - per branch flags #!define FLT_NATS 5 #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 #!define FLB_RTPWS 8 #!define FLB_IPV6 9 #!define FLB_V4V6 10 #!define FLB_BRIDGE 11 ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=no #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 fork=yes children=4 port=MY_SIP_PORT tls_port_no=MY_SIPS_PORT #!ifdef WITH_TLS enable_tls=yes #!endif listen=MY_IP4_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP4_LOCALHOST #!endif #!ifdef WITH_IPV6 listen=MY_IP6_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP6_LOCALHOST #!endif #!endif #!ifdef WITH_WEBSOCKETS listen=MY_WS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS6_ADDR #!endif #!endif #!ifdef WITH_TLS listen=MY_WSS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WSS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS6_ADDR #!endif #!endif #!endif #!endif use_dns_cache = on # Use KAMAILIO internal DNS cache use_dns_failover = on # Depends on KAMAILIO internal DNS cache dns_srv_loadbalancing = on # dns_try_naptr = on # dns_retr_time=1 # Time in seconds before retrying a DNS request dns_retr_no=3 # Number of DNS retransmissions before giving up # Set protocol preference order - ignore target priority dns_naptr_ignore_rfc= yes # Ignore target NAPTR priority dns_tls_pref=50 # First priority: TLS dns_tcp_pref=30 # Second priority: TCP dns_udp_pref=10 # Third priority: UDP tcp_connection_lifetime=3604 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH mpath="modules/" #!else mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!endif #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "sdpops.so" loadmodule "textopsx.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_HOMER loadmodule "siptrace.so" #!endif #!ifdef WITH_WEBSOCKETS loadmodule "xhttp.so" loadmodule "websocket.so" loadmodule "nathelper.so" loadmodule "rtpengine.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) # max value for expires of registrations modparam("registrar", "max_expires", 3600) # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", 1) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif ##!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:22222") modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@XXXX-XXXX") modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) ##!endif # ----- corex params ----- modparam("corex", "alias_subdomains", "MY_DOMAIN") #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") modparam("tls", "tls_force_run", 1) #!endif #!ifdef WITH_WEBSOCKETS modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") #!endif #!ifdef WITH_HOMER #Siptrace modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:9060") modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", 22) modparam("siptrace", "trace_on", 1) #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- # ip ban htable with autoexpire after 5 minutes modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) #!endif ####### Routing Logic ######## request_route { #!ifdef WITH_HOMER # start duplicate the SIP message here sip_trace(); setflag(22); #!endif # per request initial checks route(REQINIT); xlog("L_INFO", "START: $rm from $fu (IP:$si:$sp)\n"); #!ifdef WITH_WEBSOCKETS if (nat_uac_test(64)) { # Do NAT traversal stuff for requests from a WebSocket # connection - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. force_rport(); if (is_method("REGISTER")) { fix_nated_register(); } else if (!add_contact_alias()) { xlog("L_ERR", "Error aliasing contact <$ct>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) t_check_trans(); # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU == $null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # user location service route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if (!t_is_set("branch_route")) { t_on_branch("MANAGE_BRANCH"); } } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if (!t_is_set("onreply_route")) { t_on_reply("MANAGE_REPLY"); } } if (is_method("INVITE")) { if (!t_is_set("failure_route")) { t_on_failure("MANAGE_FAILURE"); } } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { #!ifdef WITH_ANTIFLOOD # flood dection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if (src_ip != myself) { if ($sht(ipban=>$si) != $null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if (!sanity_check("1511", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { #!ifdef WITH_WEBSOCKETS if ($du == "") { if (!handle_ruri_alias()) { xlog("L_ERR", "Bad alias <$ru>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif route(DLGURI); if (is_method("ACK")) { # ACK is forwarded statelessy route(NATMANAGE); } else if (is_method("NOTIFY")) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); } else { if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if (is_method("ACK")) { if (t_check_trans()) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); } exit; } } # Handle SIP registrations route[REGISTRAR] { if (is_method("REGISTER")) { if (isflagset(FLT_NATS)) { setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging ## setbflag(FLB_NATSIPPING); } #!ifdef WITH_IPV6 if (af == INET6) { setbflag(FLB_IPV6); } #!endif if (!save("location")) { sl_reply_error(); } exit; } } # USER location service route[LOCATION] { if (!lookup("location")) { $var(rc) = $rc; t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } route(RELAY); exit; } # Presence server route route[PRESENCE] { if (!is_method("PUBLISH|SUBSCRIBE")) { return; } if (is_method("SUBSCRIBE") && $hdr(Event) == "message-summary") { # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if (is_method("PUBLISH")) { handle_publish(); t_release(); } else if (is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU == $null) { sl_send_reply("404", "Not here"); exit; } return; } # Authentication route route[AUTH] { #!ifdef WITH_AUTH if (is_method("REGISTER") || from_uri == myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if (!is_method("REGISTER|PUBLISH")) { consume_credentials(); } } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri != myself && uri != myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route route[NATDETECT] { #!ifdef WITH_IPV6 if(af==INET6) { return; } #!endif force_rport(); if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else if (is_first_hop()) { set_contact_alias(); } setflag(FLT_NATS); } return; } # NAT handling route[NATMANAGE] { if (is_request()) { if (has_totag()) { if (check_route_param("nat=yes")) { setbflag(FLB_NATB); } if (check_route_param("rtp=bridge")) { setbflag(FLB_BRIDGE); } if (check_route_param("rtp=ws")) { setbflag(FLB_RTPWS); } #!ifdef WITH_IPV6 if (check_route_param("rtp=v46")) { setbflag(FLB_V4V6); } #!endif } } if (!isbflagset(FLB_BRIDGE)) { return; } if ( !(isflagset(FLT_NATS) || isbflagset(FLB_NATB) || isbflagset(FLB_RTPWS) #!ifdef WITH_IPV6 || isbflagset(FLB_V4V6) #!endif ) ) { return; } $xavp(r=>$T_branch_idx) = "replace-origin replace-session-connection"; if (!nat_uac_test("8")) { $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " trust-address"; } if (is_request()) { if (!has_totag()) { if (!t_is_failure_route()) { $avp(extra_id) = @via[1].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } } } if (is_reply()) { $avp(extra_id) = @via[2].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } #!ifdef WITH_IPV6 if (af == INET && isbflagset(FLB_IPV6)) { # IPv4 --> IPv6 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP6"; } else if (af == INET6 && !isbflagset(FLB_IPV6)) { # IPv6 --> IPv4 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP4"; } #!endif if (isbflagset(FLB_RTPWS)) { if ($proto =~ "ws") { # web --> SIP $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-demux DTLS=off SDES-off ICE=remove RTP/AVP"; } else { # SIP --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-offer generate-mid DTLS=passive SDES-off ICE=force RTP/SAVPF"; } } else { if ($proto =~ "ws") { # web --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " generate-mid DTLS=passive SDES-off ICE=force"; } # else { # $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + ""; # } } xlog("L_INFO", "NATMANAGE branch_id:$T_branch_idx ruri: $ru, method:$rm, status:$rs, extra_id: $avp(extra_id), rtpengine_manage: $xavp(r=>$T_branch_idx)\n"); rtpengine_manage($xavp(r=>$T_branch_idx)); if (is_request()) { if (!has_totag()) { if (t_is_branch_route()) { if (isbflagset(FLB_NATB)) { add_rr_param(";nat=yes"); } if (isbflagset(FLB_BRIDGE)) { add_rr_param(";rtp=bridge"); } if (isbflagset(FLB_RTPWS)) { add_rr_param(";rtp=ws"); } #!ifdef WITH_IPV6 if (isbflagset(FLB_V4V6)) { add_rr_param(";rtp=v46"); } #!endif } } } if (is_reply()) { if (isbflagset(FLB_NATB)) { if (is_first_hop()) { if (af == INET) { set_contact_alias(); } } } } return; } # URI update for dialog requests route[DLGURI] { if (!isdsturiset()) { handle_ruri_alias(); } return; } # Routing to foreign domains route[SIPOUT] { if (!uri == myself) { append_hf("P-hint: outbound\r\n"); route(RELAY); } } route[BRIDGING] { if (!has_totag()) { if ($proto =~ "ws" && !($ru =~ "transport=ws")) { # Coming from WS, NOT to WS setbflag(FLB_RTPWS); # Need bridging } else if (!($proto =~ "ws") && $ru =~ "transport=ws") { # Coming from NOT WS, going to WS setbflag(FLB_RTPWS); # Need bridging } #!ifdef WITH_IPV6 if (af == INET6 && !isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } else if(af == INET && isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } #!endif } } # manage outgoing branches branch_route[MANAGE_BRANCH] { xlog("L_INFO", "MANAGE_BRANCH: New branch [$T_branch_idx] to $ru\n"); t_on_branch_failure("rtpengine"); #!ifndef WITH_BRIDGE_ON_FAIL setbflag(FLB_BRIDGE); #!endif route(BRIDGING); route(NATMANAGE); } # manage incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if (status =~ "[12][0-9][0-9]") { route(NATMANAGE); } } # manage failure routing cases failure_route[MANAGE_FAILURE] { xlog("L_INFO", "Failure: $rs"); } #!ifdef WITH_WEBSOCKETS onreply_route { if ((($Rp == MY_WS_PORT || $Rp == MY_WSS_PORT) && !(proto == WS || proto == WSS))) { xlog("L_WARN", "SIP response received on $Rp\n"); drop; } if (nat_uac_test(64)) { # Do NAT traversal stuff for replies to a WebSocket connection # - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. add_contact_alias(); } } event_route[tm:branch-failure:rtpengine] { xlog("L_INFO", "BRANCH FAILED: $sel(via[1].branch) + $T_branch_idx"); #!ifdef WITH_BRIDGE_ON_FAIL if (!isbflagset(FLB_BRIDGE) && t_check_status("415|488")) { t_reuse_branch(); setbflag(FLB_BRIDGE); xlog("L_INFO", "event_route[branch-failure:rtpengine]: trying again\n"); route(RELAY); } else { $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); xlog("L_INFO", "event_route[branch-failure:rtpengine]: failed\n"); } #!else $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); #!endif } event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if ($Rp != MY_WS_PORT #!ifdef WITH_TLS && $Rp != MY_WSS_PORT #!endif ) { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } xlog("L_INFO", "HTTP Request Received\n"); if ($hdr(Upgrade) =~ "websocket" && $hdr(Connection) =~ "Upgrade" && $rm =~ "GET" ) { # Validate Host - make sure the client is using the correct # alias for WebSockets if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } # Optional... validate Origin - make sure the client is from an # authorised website. For example, # # if ($hdr(Origin) != "https://example.com" # && $hdr(Origin) != "https://example.com") { # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); # xhttp_reply("403", "Forbidden", "", ""); # exit; # } # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file # processing of the request) when complete. if (ws_handle_handshake()) { # Optional... cache some information about the # successful connection exit; } } xhttp_reply("404", "Not Found", "", ""); } event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); } #!endif ``` But i have the error : **ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif** I don't understand because I checked and everything seems okay with the if/endif statements to me. ``` # grep '#!ifndef' kamailio.cfg | wc -l 2 # grep '#!ifdef' kamailio.cfg | wc -l 49 # grep '#!endif' kamailio.cfg | wc -l 51 ``` And it's ok for chat gpt too : ``` #!ifdef : 49 occurrences #!ifndef : 2 occurrences Total (#!ifdef and #!ifndef) : 51 occurrences #!endif : 51 occurrences ``` Is there a problem with the parser or a compatibility problem (i am on 5.6.3) ? Thank. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3826 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3826(a)github.com>

2 2

git:master:36fc03ea: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 36fc03eaa49ba8ff02acd451699185ac18d8618e URL: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:16:08+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Patch: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 75f47f5f445..00b6a209c81 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -852,6 +852,7 @@ sht_rm_value_re("ha=>.*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables. @@ -871,6 +872,7 @@ sht_rm_name("ha", "re", ".*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables.

1 0

git:5.8:03ff5051: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: 03ff5051b640d2478dd68ea89ad74d516752ab0f URL: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Patch: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

git:master:39a2679f: htable: docs for in operator for remove functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 39a2679fe165e34a225615ec32c58692fdcaf6a8 URL: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T14:00:40+02:00 htable: docs for in operator for remove functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Patch: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c5cc20e22ed..23a159c6982 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -916,6 +916,11 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -962,6 +967,11 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:c0d80f9e: htable: added in operator for rm functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: c0d80f9eb42b025802c4680f19d788d01497301a URL: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:53:31+02:00 htable: added in operator for rm functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Patch: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index afda3dc6c54..ecc49b547d6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1389,8 +1389,12 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) == 0) { match = 1; } + } else if(op == HT_RM_OP_IN) { + if(sre->len <= it->name.len + && str_search(&it->name, sre) != NULL) { + match = 1; + } } - } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1410,6 +1414,13 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_IN) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && str_search(&it->value.s, sre) != NULL) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 7c7642ef5df..f7bd8ed42c0 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -126,6 +126,8 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_SW 3 #define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 +#define HT_RM_OP_IN 5 + int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 7577e445a76..5388d8e00df 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -40,7 +40,8 @@ typedef enum HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, HT_DMQ_RM_CELL_SW, - HT_DMQ_RM_CELL_EW + HT_DMQ_RM_CELL_EW, + HT_DMQ_RM_CELL_IN } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 6f775bb33ce..414bd5556b1 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -527,6 +527,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_IN, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_IN) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:5.8:e76d755d: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: e76d755de6482e51c9ddac5bba3834cb58ad79b2 URL: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:50:44+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Patch: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:fe8f052c: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: fe8f052c29528b656062927626f9784b32b7c8f6 URL: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:49:58+02:00 tcpops: removed unused variable introduced recently --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Patch: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/bb48da13adfe36716c3d958ed1d9c41… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:15+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 40a50243f0bae782b7acd97cf0a9b1138185068b) - URL: https://github.com/kamailio/kamailio/commit/f337f13cdbc7e8805c0130dbae3befa… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:21+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 6faa180661e799187eff3a498f8b13e96719fa92) - URL: https://github.com/kamailio/kamailio/commit/855c76780c4399d6d9881ce3c525a7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:31:50+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) - URL: https://github.com/kamailio/kamailio/commit/7295607e680ad1dd5290b15dab7fed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:32:18+02:00 core: parser/sdp - rename parameter to suggest better its role (cherry picked from commit b03ec73589c12e566b11ce2c653401daa915c805) - URL: https://github.com/kamailio/kamailio/commit/8d312ded02559b325cdd691bde61c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:01+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri (cherry picked from commit d1118064d04bb77c818540e68edf1766db1d560a) - URL: https://github.com/kamailio/kamailio/commit/800ed174b9402d1b253b2cb4ab04b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:24+02:00 ims_ipsec_pcscf: log error message made info (cherry picked from commit 92d3573b500374d100639484e5a84cb640dc6b1d) - URL: https://github.com/kamailio/kamailio/commit/595d3f472179402dce7a51672c2dbfb… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:34:17+02:00 corex: Fix unknown af in list_sockets (cherry picked from commit 8bc64a9e6820243336387d9cd9acf81f24d89993) - URL: https://github.com/kamailio/kamailio/commit/d2cf78f5c70977639f3b7f66b852350… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-25T13:35:18+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) - URL: https://github.com/kamailio/kamailio/commit/2661594bf7f31558e6ac7524f33ebb3… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:38+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) - URL: https://github.com/kamailio/kamailio/commit/0c070443b585c597d2d6249ac6ac324… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:45+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) - URL: https://github.com/kamailio/kamailio/commit/a19e6e0e49d9881ab990d23ad31a957… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:57+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) - URL: https://github.com/kamailio/kamailio/commit/7d103cf3887401fca32d95f7ea7ee10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:25+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) - URL: https://github.com/kamailio/kamailio/commit/3052565e3ce14d5d3c45d790877a562… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:39+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) - URL: https://github.com/kamailio/kamailio/commit/28bbcd5a50f45b8217125481706180a… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-25T13:37:16+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. (cherry picked from commit 49276a1f43b1a3bf4a8d681888df964000360c79) - URL: https://github.com/kamailio/kamailio/commit/db2e96ec2aacde1bd50b65ea6357388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:37+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) - URL: https://github.com/kamailio/kamailio/commit/c9fe59d6cd73179aa75e21b3b215bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:46+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) - URL: https://github.com/kamailio/kamailio/commit/069de99576b5f8bff002176331ed2f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:54+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) - URL: https://github.com/kamailio/kamailio/commit/7e987d8937349246f2abfa041679f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:01+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) - URL: https://github.com/kamailio/kamailio/commit/794c2edeaffe059bf8de6ab1d3df5db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:09+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) - URL: https://github.com/kamailio/kamailio/commit/eaacc171adbcd84fb2b95b4c182cd1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:17+02:00 regex: init globals for safer shutdown on failure (cherry picked from commit 84517c14ca38a8371c67b858077a42019c2217a8) - URL: https://github.com/kamailio/kamailio/commit/c8f685359c411ac43000dd77cbc2e4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:24+02:00 regex: allocate pcres array - GH #3812 (cherry picked from commit 2cc62133db4f6875f55e73e044f37dafbb2274c2) - URL: https://github.com/kamailio/kamailio/commit/3ff024fd0057d3a9d045d3f20df5d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:34+02:00 regex: reformat exported structures (cherry picked from commit 0ebfddd20b43396d602b4c68a88f7c2bc58ed211)

1 0

[kamailio/kamailio] Chaining Transformations {uri.param,received}{uri.host} does not work for IPv6 (Issue #3794)
by ChristianBergerSipgate 25 Apr '24

25 Apr '24

### Description Chaining the transformations {uri.param,received} and {uri.host} does not work if the address is IPv6. It works for IPv4 addresses. #### Reproduction We tested this with the following code: ``` if ($du != $null) { $var(received_uri)=$(du{uri.param,received}); if ($var(received_uri)!="") { $var(subscriber_host)=$(var(received_uri){uri.host}); } $var(test_tmp)=$(du{uri.param,received}{uri.host}); xlog("L_ERR", "WURST subscriber_host=$var(subscriber_host) test_tmp=$var(test_tmp) du=$du received_uri=$var(received_uri)"); } } #### Log Messages For IPv6 this gives us: ``` "module": "pv", "file": "pv_trans.c", "line": 1545, "function": "tr_eval_uri", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": **"invalid uri [ab:cdef:dead:beef]:1234]\n"** "module": "core", "file": "core/lvalue.c", "line": 351, "function": "lval_pvar_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "non existing right pvar\n" "module": "core", "file": "core/lvalue.c", "line": 411, "function": "lval_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "assignment failed at pos: (1432,19-1432,53)\n" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=[2001:db8:0123:4567:89ab:cdef:dead:beef] test_tmp=0 du=sip:1.2.4.129;lr;received=sip[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234 received_uri=sip:[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "determineSubscribeIpFamily: contacts worked path=0 ip=[2001:db8:0123:4567:89ab:cdef:dead:beef] af=6" ``` For IPv4 it works: `{ "idx": 8, "pid": 577, "level": "ERROR", "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=12.34.56.78 test_tmp=12.34.56.78 du=sip:1.2.4.149;lr;received=sip:12.34.56.78:1234 received_uri=sip:12.34.56.78:1234" } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3794 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3794(a)github.com>

3 3

[kamailio/kamailio] Error by installing new Rel. 5.8 (Issue #3825)
by leila Mohammadinafchi 25 Apr '24

25 Apr '24

I am using this docker file for installaing kamailio. I wana use it with open5gs for trynig VoNR , I used before it for VoLTE it works but right now I have this error in installation process. ![log](https://github.com/kamailio/kamailio/assets/161492387/42017f48-3a7f-4cbe-bdf0-48dbb3443f5f) and there is docker file that Im using: FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive # Install updates and dependencies RUN apt-get update && \ apt-get -y install mysql-server tcpdump screen tmux ntp ntpdate git-core dkms \ gcc flex bison libmysqlclient-dev make libssl-dev libcurl4-openssl-dev \ libxml2-dev libpcre2-dev bash-completion g++ autoconf libmnl-dev \ libsctp-dev libradcli-dev libradcli4 libjson-c-dev pkg-config iproute2 net-tools \ iputils-ping # Fetch Kamailio code (branch 5.3) RUN mkdir -p /usr/local/src/ && cd /usr/local/src/ && \ git clone https://github.com/kamailio/kamailio && \ cd kamailio && git checkout 5.8 # Build and Install Kamailio RUN cd /usr/local/src/kamailio && make cfg COPY modules.lst /usr/local/src/kamailio/src RUN cd /usr/local/src/kamailio && \ make -j`nproc` Q=0 all | tee make_all.txt && \ make install | tee make_install.txt && \ ldconfig COPY kamailio_init.sh / CMD /kamailio_init.sh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3825 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3825(a)github.com>

2 3

[kamailio/kamailio] ndb_reids module in event_route[tcp:closed] route block error: "no redis context for server" (Issue #3768)
by liangbaolin 25 Apr '24

25 Apr '24

### Description The process of using kamailio prompts the following error： ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN I did not encounter similar errors in version 5.4.8, and there were no similar errors in other routing blocks. Suspect that the new core version has unknown logical issues with the routing block of the module in event_route.  #### Log Messages  ``` 2024-02-26T03:39:11.161557654Z 51(97) DEBUG: <core> [core/tcp_read.c:280]: tcp_read_data(): EOF on connection 0x7f24539006a0 (state: 0, flags: c018) - FD 24, bytes 0, rd-flags 10000 ([12.0.1.6]:22827 -> [12.0.1.6]:5060)51(97) DEBUG: <core> [core/tcp_read.c:343]: tcp_read(): read 0 bytes: 2024-02-26T03:39:11.161563494Z 2024-02-26T03:39:11.161567864Z 51(97) DEBUG: <core> [core/tcp_read.c:1532]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 2024-02-26T03:39:11.161574144Z 51(97) DEBUG: <core> [core/tcp_read.c:1534]: tcp_read_req(): last char=0x00, parsed msg= 2024-02-26T03:39:11.161579134Z 2024-02-26T03:39:11.161584594Z 51(97) DEBUG: <core> [core/tcp_read.c:1544]: tcp_read_req(): EOF 2024-02-26T03:39:11.161598914Z 51(97) DEBUG: <core> [core/io_wait.h:598]: io_watch_del(): DBG: io_watch_del (0x563e1ce29740, 24, -1, 0x10) fd_no=2 called 2024-02-26T03:39:11.161604494Z 51(97) DEBUG: <core> [core/tcp_read.c:1927]: handle_io(): removing from list 0x7f24539006a0 id 1 fd 24, state 2, flags c018, main fd 132, refcnt 2 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161610294Z 51(97) DEBUG: <core> [core/tcp_read.c:1702]: release_tcpconn(): releasing con 0x7f24539006a0, state -1, fd=24, id=1 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161615934Z 51(97) DEBUG: <core> [core/tcp_read.c:1705]: release_tcpconn(): extra_data (nil) 2024-02-26T03:39:11.162263374Z 83(129) DEBUG: <core> [core/tcp_main.c:3747]: handle_tcp_child(): reader response= 7f24539006a0, -1 from 0 2024-02-26T03:39:11.162286594Z 83(129) DEBUG: <core> [core/tcp_main.c:3671]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 2024-02-26T03:39:11.162293034Z 83(129) DEBUG: tcpops [tcpops.c:311]: tcpops_handle_tcp_closed(): received TCP closed event 2024-02-26T03:39:11.162299134Z 83(129) DEBUG: tcpops [tcpops.c:261]: tcpops_tcp_closed_run_route(): event reason id: 0 rt: 1 2024-02-26T03:39:11.162304234Z 83(129) ERROR: tcpops [tcpops.c:278]: tcpops_tcp_closed_run_route(): run_top_route() before tev->id: 1 2024-02-26T03:39:11.162311444Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162316784Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162322944Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162328584Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162333764Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162338674Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162343764Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162349254Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162355494Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 101 2024-02-26T03:39:11.162360924Z 83(129) ERROR: <script>: tcp connection closed conid: (1), tcp(conid): 1, Ri: 12.0.1.185, Rp: 5060 , si: 12.0.1.6 , sp: 22827 2024-02-26T03:39:11.162375744Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162381944Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162388024Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162395164Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162400884Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162406634Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162412284Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162417034Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162422294Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 27 2024-02-26T03:39:11.162427844Z 83(129) ERROR: <script>: tcp connection closed (1) 2024-02-26T03:39:11.162433574Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162439254Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162444184Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162449324Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162454724Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 1 2024-02-26T03:39:11.162460094Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162466084Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162471724Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162477324Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162482144Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162487154Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162501164Z 83(129) DEBUG: ndb_redis [redis_client.c:399]: redisc_get_server(): Hash 2100282857 (srvN) 2024-02-26T03:39:11.162508124Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162514104Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162520554Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162526404Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162532034Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162537324Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162542824Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162548064Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162554074Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100306023 (srvTPS), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162559184Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162564524Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162569904Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162575334Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162580154Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162585964Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162592294Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162597644Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162611324Z 83(129) DEBUG: ndb_redis [redis_client.c:413]: redisc_get_server(): Using entry 2100282857 (srvN) 2024-02-26T03:39:11.162617084Z 83(129) DEBUG: ndb_redis [redis_client.c:960]: redisc_exec(): rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162622004Z 83(129) ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN 2024-02-26T03:39:11.162627834Z 83(129) ERROR: tcpops [tcpops.c:280]: tcpops_tcp_closed_run_route(): run_top_route() after tev->id: 1 2024-02-26T03:39:11.162633294Z 83(129) DEBUG: <core> [core/tcp_main.c:3904]: handle_tcp_child(): case CONN_EOF tcp_emit_closed_event before 5 ``` #### SIP Traffic  ``` event_route[tcp:closed] { xlog("L_ERR", "$proto connection closed conid: ($conid), tcp(conid): $tcp(conid), Ri: $Ri, Rp: $Rp , si: $si , sp: $sp\n"); if($conid ne $null) { xlog("L_ERR", "$proto connection closed ($conid)\n"); route(TCPEVENT); } } route[TCPEVENT] { if(redis_cmd("srvN", "get %s", "$conid", "r")) { ..... } } #redis module config loadmodule "ndb_redis" modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "server", "name=srvN;addr=NDB_N_REDIS_CLUSTER_MAINADDR;port=NDB_N_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=srvM;addr=NDB_M_REDIS_CLUSTER_MAINADDR;port=NDB_M_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7369;addr=12.0.1.7;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7369;addr=12.0.1.8;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7369;addr=12.0.1.9;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7469;addr=12.0.1.7;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7469;addr=12.0.1.8;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7469;addr=12.0.1.9;port=7469;pass=NDB_REDIS_PASSWORD") ``` * **Operating System**:  ``` version: kamailio 5.7.4 (x86_64/linux) 9920d9-dirty flags: , EXTRA_DEBUGUSE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9920d9 -dirty compiled on 09:59:52 Feb 26 2024 with gcc 7.5.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3768 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3768(a)github.com>

3 10

git:master:0ebfddd2: regex: reformat exported structures
by Daniel-Constantin Mierla 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 0ebfddd20b43396d602b4c68a88f7c2bc58ed211 URL: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-24T21:34:28+02:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Patch: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 4bb4d7cdcee..292af692136 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -113,48 +113,54 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* * Exported functions */ +/* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"file", PARAM_STRING, &file}, - {"max_groups", INT_PARAM, &max_groups}, - {"group_max_size", INT_PARAM, &group_max_size}, - {"pcre_caseless", INT_PARAM, &pcre_caseless}, - {"pcre_multiline", INT_PARAM, &pcre_multiline}, - {"pcre_dotall", INT_PARAM, &pcre_dotall}, - {"pcre_extended", INT_PARAM, &pcre_extended}, {0, 0, 0}}; +static param_export_t params[] = { + {"file", PARAM_STRING, &file}, + {"max_groups", INT_PARAM, &max_groups}, + {"group_max_size", INT_PARAM, &group_max_size}, + {"pcre_caseless", INT_PARAM, &pcre_caseless}, + {"pcre_multiline", INT_PARAM, &pcre_multiline}, + {"pcre_dotall", INT_PARAM, &pcre_dotall}, + {"pcre_extended", INT_PARAM, &pcre_extended}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /*!< dlopen flags */ + cmds, /*!< exported functions */ + params, /*!< exported parameters */ + 0, /*!< exported RPC functions */ + 0, /*!< exported pseudo-variables */ + 0, /*!< response handling function */ + mod_init, /*!< module initialization function */ + 0, /*!< per-child init function */ + destroy /*!< destroy function */ }; +/* clang-format on */ static void *pcre2_malloc(size_t size, void *ext)

1 0

[kamailio/kamailio] ERROR cfgtrace:dbg_cfg_trace() (Issue #3821)
by happytulubi 24 Apr '24

24 Apr '24

May I ask what the problem is? It prompts an error but does not affect the program's operation. Is it that the configuration file and the deployed version are inconsistent? 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=706 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) INFO: <script>: Call from Websocket endpoint at the DURI {sip:117.80.229.36:15060} for callee {3008} 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=691 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=685 a=25 n=has_body Here is the code for my kamailio.cfg section branch_route[MANAGE_BRANCH]{ xlog("L_INFO","Call to ru:{$ru} '$du'/'$proto'\n"); if(($du=~"transport=ws") || ($du=~"transport=wss")){ if ($du=~"transport=tls") { #sdp_remove_media("video"); xlog("L_INFO","Call to TLS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=6:$ci force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_TLS"); $fs="tls:MY_IP_ADDR:MY_WSS_PORT"; } else if ($du=~"transport=ws") { xlog("L_INFO","Call to Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_WS"); $du = $du + ";transport=ws"; $fs="tcp:MY_IP_ADDR:MY_WS_PORT"; } }else { if ($proto=~ "tls") { #sdp_remove_media("video"); xlog("L_INFO","Call from WSS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=8:$ci trust-address replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_TLS"); } else if ($proto =~ "ws"){ xlog("L_INFO","Call from Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_WS"); } if (($proto=~ "udp") || ($proto=~"tcp")) { #sdp_remove_media("video"); xlog("L_INFO","UDP Branch is {$du} for {$tU}\n"); # $avp(mediaAddr) = ''; if ( has_body('application/sdp')) { #rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection"); } t_on_reply("STANDART"); } } xlog("L_INFO", "t_on_reply set\n"); if is_method("BYE|CANCEL") { rtpengine_manage(); } } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3821 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3821(a)github.com>

2 2

[kamailio/kamailio] tools/kemi: escape docstrings when required (PR #3824)
by tsearle 24 Apr '24

24 Apr '24

some of the documentation contains \ which need escaping   #### 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 - [x] 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/3824 -- Commit Summary -- * tools/kemi: escape docstrings when required -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3824.patch https://github.com/kamailio/kamailio/pull/3824.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3824 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3824(a)github.com>

1 1

git:master:999d0c65: tools/kemi: escape docstrings when required (#3824)
by GitHub 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 999d0c65402c99491683d694d77a01a5c1f91ecf URL: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-24T11:28:49+02:00 tools/kemi: escape docstrings when required (#3824) some of the documentation contains \ which need escaping --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Patch: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 145fcb34b3a..918551a1887 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -129,7 +129,7 @@ def generate_function_doc(module_name, func, prefix): print(prefix + "\t\"\"\"") documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") for line in documentation_lines: - print(prefix + "\t" + line) + print(prefix + "\t" + line.replace("\\", "\\\\\\\\")) print(prefix + "\t\"\"\"") break

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev