- sr-dev - kamailio.org

git:master:a070f5c1: dialog: updated to get the int value for cseq update operations
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: a070f5c132a68111fade7212db6a2bc738e03193 URL: https://github.com/kamailio/kamailio/commit/a070f5c132a68111fade7212db6a2bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T13:19:33+02:00 dialog: updated to get the int value for cseq update operations --- Modified: src/modules/dialog/dlg_cseq.c Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/a070f5c132a68111fade7212db6a2bc… Patch: https://github.com/kamailio/kamailio/commit/a070f5c132a68111fade7212db6a2bc… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 70b2b43c2b..c81cf904d4 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -211,7 +211,6 @@ int dlg_cseq_refresh(sip_msg_t *msg, dlg_cell_t *dlg, unsigned int ninc = 0; unsigned int vinc = 0; str nval; - str *pval; sr_cfgenv_t *cenv = NULL; if(dlg_cseq_prepare_msg(msg)!=0) { @@ -236,18 +235,12 @@ int dlg_cseq_refresh(sip_msg_t *msg, dlg_cell_t *dlg, goto done; } - /* get dialog variable holding cseq diff */ - pval = get_dlg_variable(dlg, &_dlg_cseq_diff_var_name); - if(pval==NULL || pval->s==NULL || pval->len<=0) { + /* get the value of the dialog variable holding cseq diff */ + if(get_dlg_variable_uintval(dlg, &_dlg_cseq_diff_var_name, &vinc) < 0) { LM_DBG("dialog marked with cseq diff but no variable set yet\n"); goto done; } - if(str2int(pval, &vinc)<0) { - LM_ERR("invalid dlg cseq diff var value: %.*s\n", - pval->len, pval->s); - goto done; - } if(vinc==0) { LM_DBG("nothing to increment\n"); goto done; diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index b2a373a501..cd151fd115 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -297,6 +297,34 @@ str * get_dlg_variable(struct dlg_cell *dlg, str *key) return var; } +int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval) +{ + str* var = NULL; + + if( !dlg || !key || key->len <=0 || !uval) { + LM_ERR("BUG - bad parameters\n"); + return -1; + } + + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe(dlg, key); + if(var==NULL || var->s==NULL || var->len<=0) { + LM_DBG("no variable set yet\n"); + goto error; + } + if(str2int(var, uval)<0) { + LM_ERR("invalid unsingned int value: %.*s\n", + var->len, var->s); + goto error; + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + return 0; + +error: + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + return -1; +} + int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) { int ret = -1; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index f13fa458d3..70579810bf 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -62,6 +62,8 @@ typedef struct dlg_var { str* get_dlg_variable(dlg_cell_t *dlg, str *key); int set_dlg_variable(dlg_cell_t *dlg, str *key, str *val); +int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval); + int pv_parse_dialog_var_name(pv_spec_p sp, str *in); int pv_get_dlg_variable(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:44103239: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 44103239ba5cc4c4582ccfacf4a3db3918e4431c URL: https://github.com/kamailio/kamailio/commit/44103239ba5cc4c4582ccfacf4a3db3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-30T13:01:45+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/44103239ba5cc4c4582ccfacf4a3db3… Patch: https://github.com/kamailio/kamailio/commit/44103239ba5cc4c4582ccfacf4a3db3… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index e9fdc28416..6d13e0ed83 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -141,6 +141,7 @@ Daniel-Constantin Mierla 4.54. t_get_status_code() 4.55. t_clean() + 4.56. t_exists() 5. RPC Commands @@ -283,9 +284,10 @@ Daniel-Constantin Mierla 1.100. t_uac_send usage 1.101. t_get_status_code usage 1.102. t_clean usage - 1.103. event_route[tm:branch-failure:id] usage - 1.104. event_route[tm:local-request] usage - 1.105. event_route[tm:local-response] usage + 1.103. t_exists usage + 1.104. event_route[tm:branch-failure:id] usage + 1.105. event_route[tm:local-request] usage + 1.106. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -407,6 +409,7 @@ Chapter 1. Admin Guide 4.53. t_uac_send(method, ruri, nexthop, socket, headers, body) 4.54. t_get_status_code() 4.55. t_clean() + 4.56. t_exists() 5. RPC Commands @@ -1843,6 +1846,7 @@ modparam("tm", "failover_reply_codes", "code=403;code=488;class=5") 4.53. t_uac_send(method, ruri, nexthop, socket, headers, body) 4.54. t_get_status_code() 4.55. t_clean() + 4.56. t_exists() 4.1. t_relay([host, port]) @@ -3025,6 +3029,20 @@ if($var(ts) == 500) { ... } t_clean(); ... +4.56. t_exists() + + Return true of the transaction for current message exists, without + setting the global references. + + Example 1.103. t_exists usage +... +reply_route { + if (!t_exists()) { + drop(); + } +} +... + 5. RPC Commands 5.1. tm.list @@ -3146,7 +3164,7 @@ t_clean(); enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.103. event_route[tm:branch-failure:id] usage + Example 1.104. event_route[tm:branch-failure:id] usage ... request_route { ... @@ -3172,7 +3190,7 @@ event_route[tm:branch-failure:myroute] { The request can still be updated, i.e., changes are possible to R-URI ($ru), destination URI ($du) or the send socket ($fs). - Example 1.104. event_route[tm:local-request] usage + Example 1.105. event_route[tm:local-request] usage ... event_route [tm:local-request] { xlog("L_INFO", "Routing locally generated $rm to $ru\n"); @@ -3185,7 +3203,7 @@ event_route [tm:local-request] { Executed after the tm module sent a local generated, transaction stateful response. - Example 1.105. event_route[tm:local-response] usage + Example 1.106. event_route[tm:local-response] usage ... event_route[tm:local-response] { xlog("tm:local-response replied locally\n");

1 0

git:master:c38b3585: tm: docs for t_exists()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: c38b3585357a2200944cfd8e736f32093786350b URL: https://github.com/kamailio/kamailio/commit/c38b3585357a2200944cfd8e736f320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T12:54:51+02:00 tm: docs for t_exists() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/c38b3585357a2200944cfd8e736f320… Patch: https://github.com/kamailio/kamailio/commit/c38b3585357a2200944cfd8e736f320… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index f9c9837fb23..db070a246d1 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -1907,4 +1907,27 @@ t_clean(); </programlisting> </example> </section> + + <section id="tm.f.t_exists"> + <title> + <function>t_exists()</function> + </title> + <para> + Return true of the transaction for current message exists, without + setting the global references. + </para> + <example> + <title><function>t_exists</function> usage</title> + <programlisting> +... +reply_route { + if (!t_exists()) { + drop(); + } +} +... + </programlisting> + </example> + </section> + </section>

1 0

git:master:f16e76e4: tm: new function t_exists()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: f16e76e432f46d7fc62e8c1c0808149c7ffde0c1 URL: https://github.com/kamailio/kamailio/commit/f16e76e432f46d7fc62e8c1c0808149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T12:49:54+02:00 tm: new function t_exists() - return true if the transaction exists for the current message without setting the global references --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/f16e76e432f46d7fc62e8c1c0808149… Patch: https://github.com/kamailio/kamailio/commit/f16e76e432f46d7fc62e8c1c0808149…

1 0

Build failed in Jenkins: kamailiodev-nightly-repos » amd64,jammy,master #2095
by kamailio＠sipwise.com 30 Aug '22

30 Aug '22

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> Changes: ------------------------------------------ [...truncated 4.03 KB...] + REPOS=jammy ++ dpkg --list jenkins-debian-glue ++ awk '/^ii/ {print $3}' + JENKINS_DEBIAN_GLUE_VERSION=0.21.0+0~20220603135157.361~1.gbp4b90f6 + '[' -n 0.21.0+0~20220603135157.361~1.gbp4b90f6 ']' + echo '*** Running jenkins-debian-glue version 0.21.0+0~20220603135157.361~1.gbp4b90f6 ***' *** Running jenkins-debian-glue version 0.21.0+0~20220603135157.361~1.gbp4b90f6 *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailiodev-nightly ']' + mkdir -p /srv/repository/kamailiodev-nightly/conf ++ id -un + chown jenkins /srv/repository/kamailiodev-nightly/conf + touch /srv/repository/kamailiodev-nightly/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: jammy$' /srv/repository/kamailiodev-nightly/conf/distributions + echo 'Codename/repository jammy exists already, ignoring request to add again.' Codename/repository jammy exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Tue 30 Aug 2022 09:24:15 AM UTC ***' *** Starting /usr/bin/build-and-provide-package at Tue 30 Aug 2022 09:24:15 AM UTC *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=2958 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.21.0+0~20220603135157.361~1.gbp4b90f6 + '[' -n 0.21.0+0~20220603135157.361~1.gbp4b90f6 ']' + echo '*** Running jenkins-debian-glue version 0.21.0+0~20220603135157.361~1.gbp4b90f6 ***' *** Running jenkins-debian-glue version 0.21.0+0~20220603135157.361~1.gbp4b90f6 *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailiodev-nightly ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailiodev-nightly ']' + false + '[' -n '' ']' + '[' -z kamailiodev-nightly-repos/architecture=amd64,distribution=jammy,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailiodev-nightly ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…]>: *** + ls -la ./ total 20 drwxr-xr-x 3 jenkins jenkins 4096 Aug 30 09:24 . drwxr-xr-x 3 jenkins jenkins 4096 Aug 30 09:24 .. drwxr-xr-x 2 jenkins jenkins 12288 Aug 30 09:24 binaries + identify_package_name + PACKAGE=kamailiodev-nightly + PACKAGE=kamailiodev-nightly + '[' -n kamailiodev-nightly ']' + echo '*** Identified Debian package name kamailiodev-nightly ***' *** Identified Debian package name kamailiodev-nightly *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n jammy ']' + echo '*** Using supplied repository name jammy ***' *** Using supplied repository name jammy *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc .dsc + p=kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283 + '[' kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283 = '*' ']' + cur_version=5.7.0~dev1+ubuntu22.04.20220830084435.2283 + '[' -z '' ']' + newest_version=5.7.0~dev1+ubuntu22.04.20220830084435.2283 + echo '*** Found package version 5.7.0~dev1+ubuntu22.04.20220830084435.2283 ***' *** Found package version 5.7.0~dev1+ubuntu22.04.20220830084435.2283 *** + sourcefile='binaries//kamailio_*5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc' + echo '*** Using binaries//kamailio_*5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc (version: 5.7.0~dev1+ubuntu22.04.20220830084435.2283)' *** Using binaries//kamailio_*5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc (version: 5.7.0~dev1+ubuntu22.04.20220830084435.2283) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n jammy ']' + local DIST=jammy + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution jammy ***' *** Using cowbuilder base for distribution jammy *** + COWBUILDER_DIST=jammy + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-jammy-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jammy-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jammy-amd64.cow as cowbuilder base.cow *** + local lockfiles=/run/lock/jammy-amd64 + build_lockfile=/run/lock/jammy-amd64.building.1525 + update_lockfile=/run/lock/jammy-amd64.update + update_lockfile_pid=/run/lock/jammy-amd64.update.1525 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailiodev-nightly ']' + '[' -r /srv/repository/kamailiodev-nightly/conf/distributions ']' + grep -q '^$Codename\|Suite$: jammy$' /srv/repository/kamailiodev-nightly/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository jammy ***' *** Including packages in repository jammy *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailiodev-nightly -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include jammy <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> Could not find a suitable control.tar file within '/srv/repository/kamailiodev-nightly/pool/main/k/kamailio/kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb'! Deleting files just added to the pool but not used. (to avoid use --keepunusednewfiles next time) deleting and forgetting pool/main/k/kamailio/kamailio-autheph-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-berkeley-bin_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-berkeley-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-cnxcc-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-cpl-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-dbg_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-erlang-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-extra-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-geoip-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-geoip2-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-ims-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-json-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-kazoo-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-ldap-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-lua-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-lwsc-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-memcached-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-mongodb-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-mono-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-mqtt-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-mysql-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-nats-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-nth_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-outbound-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-perl-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-phonenum-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-postgres-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-presence-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-python3-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-rabbitmq-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-radius-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-redis-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-ruby-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting There have been errors! and forgetting pool/main/k/kamailio/kamailio-sctp-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-secsipid-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-snmpstats-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-sqlite-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-systemd-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-tls-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-unixodbc-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-utils-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-websocket-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-xml-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio-xmpp-modules_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb deleting and forgetting pool/main/k/kamailio/kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283.dsc deleting and forgetting pool/main/k/kamailio/kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283.tar.xz deleting and forgetting pool/main/k/kamailio/kamailio_5.7.0~dev1+ubuntu22.04.20220830084435.2283_amd64.deb + '[' 249 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in jammy repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in jammy repository.' ']' + echo 'Error: Failed to include binary package in jammy repository.' Error: Failed to include binary package in jammy repository. + rm -f /run/lock/jammy-amd64.building.1525 + '[' -r /run/lock/jammy-amd64.update.1525 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 2958 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=6 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue 30 Aug 2022 09:24:20 AM UTC [running 6 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue 30 Aug 2022 09:24:20 AM UTC [running 6 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 1

git:master:837d7eab: tsilo: restore also the global t branch index
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 837d7eab397547a4a67158e4da719288e20a0bb4 URL: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T11:17:03+02:00 tsilo: restore also the global t branch index --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… Patch: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 2781deffc42..fece9b40970 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -100,14 +100,16 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * struct sip_msg *orig_msg; int ret; str stable; + int orig_branch; if(contact->s!=NULL && contact->len > 0) { LM_DBG("trying to append based on specific contact <%.*s>\n", contact->len, contact->s); } - /* lookup a transaction based on its identifier (hash_index:label) */ orig_t = _tmb.t_gett(); + orig_branch = _tmb.t_gett_branch(); + /* lookup a transaction based on its identifier (hash_index:label) */ if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { LM_ERR("transaction [%u:%u] not found\n", tindex, tlabel); @@ -155,7 +157,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * /* unref the transaction which had been referred by t_lookup_ident() call. * Restore the original transaction (if any) */ if(t) _tmb.unref_cell(t); - _tmb.t_sett(orig_t, T_BR_UNDEFINED); + _tmb.t_sett(orig_t, orig_branch); return ret; }

1 0

git:master:72234f9e: pv_headers: use t_unset() based on vref instead of resetting global t always
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 72234f9efbb5b299823b33dc4eda84a43d5f6384 URL: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:58:39+02:00 pv_headers: use t_unset() based on vref instead of resetting global t always --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… Patch: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 7da426c184..b900ae5be6 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -555,12 +555,12 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) xavi_set_list(backup_xavis); LM_DBG("restored backup_xavis:%p\n", *backup_xavis); } - if(t && vref) { - tmb.unref_cell(t); + if(t != NULL && t != T_UNDEFINED && vref != 0) { + /* t_find() above has the side effect of setting T and + REFerencing T => we must unref and unset it */ + tmb.t_unset(); LM_DBG("T:%p unref\n", t); } - tmb.t_sett(T_UNDEFINED, T_BR_UNDEFINED); - LM_DBG("reset tm\n"); return 1; }

1 0

git:master:f69c13a5: tm: added t_unset() intermodule API function
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: f69c13a587df53fb93999d81cd02dc99ab223187 URL: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:53:15+02:00 tm: added t_unset() intermodule API function - reset global t and branch without releasing the transaction - useful for cases when global t needs to be set in callbacks and then reset before config execution is finished --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… Patch: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index ad41f0de93..dd2ed6f0ae 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -167,6 +167,19 @@ struct cell* t_find(struct sip_msg *msg, int *branch, int *vref) return T; } +/** + * unref and reset T globals + */ +void t_unset(void) +{ + if(T == NULL || T == T_UNDEFINED) { + return; + } + + UNREF( T ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); +} + static inline int parse_dlg( struct sip_msg *msg ) { if (parse_headers(msg, HDR_FROM_F | HDR_CSEQ_F | HDR_TO_F, 0)==-1) { diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index de65be8365..c4b5404cf8 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -71,6 +71,9 @@ struct cell *get_t(void); typedef struct cell* (*tfind_f)(struct sip_msg*, int*, int*); struct cell* t_find(struct sip_msg *msg, int *branch, int *vref); +typedef void (*tunset_f)(void); +void t_unset(void); + typedef int (*tgett_branch_f)(void); int get_t_branch(void); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index c9f39b576e..d5fc6e7884 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -93,6 +93,7 @@ int load_tm( struct tm_binds *tmb) tmb->print_dlg = print_dlg; tmb->t_gett = get_t; tmb->t_find = t_find; + tmb->t_unset = t_unset; tmb->t_gett_branch = get_t_branch; tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 1f97061d1e..130d01503a 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -72,6 +72,7 @@ struct tm_binds { print_dlg_f print_dlg; tgett_f t_gett; tfind_f t_find; + tunset_f t_unset; tgett_branch_f t_gett_branch; tsett_f t_sett; calculate_hooks_f calculate_hooks;

1 0

git:master:294a0098: tmx: use t_unset() instead of t_unref() for pv_get_tm_reply_reason()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 294a00985b2cf4a397ffc81782f9ce6e4bc1ca15 URL: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:54:53+02:00 tmx: use t_unset() instead of t_unref() for pv_get_tm_reply_reason() --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… Patch: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 2fac9605a8..64a81e591b 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -587,7 +587,7 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, /* t_find() above has the side effect of setting T and REFerencing T => we must unref and unset it for the main/core onreply_route. */ - _tmx_tmb.t_unref(msg); + _tmx_tmb.t_unset(); } /* no break */ case TM_ONREPLY_ROUTE:

1 0

git:master:07877fe6: tmx: use t_find() for pv_get_tm_reply_reason()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 07877fe6686139032d4d2f85b5f119b2cdf93cf6 URL: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:36:53+02:00 tmx: use t_find() for pv_get_tm_reply_reason() --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… Patch: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 3e977c98777..2fac9605a81 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -246,7 +246,7 @@ int pv_t_update_inv(struct sip_msg *msg) return 1; } - if (_pv_tinv.label == t->label && _pv_tinv.index == t->hash_index) + if (_pv_tinv.label == t->label && _pv_tinv.index == t->hash_index) goto done; /* make a copy */ @@ -569,23 +569,26 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, { struct cell *t; struct sip_msg *reply; - int branch; + int branch = -1; + int vref = 0; if(msg==NULL || res==NULL) return -1; /* first get the transaction */ - if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; - if ( (t=_tmx_tmb.t_gett())==0) { + t = _tmx_tmb.t_find(msg, &branch, &vref); + if (t==T_NULL_CELL || t==T_UNDEFINED) { /* no T */ return pv_get_strempty(msg, param, res); } else { switch (get_route_type()) { case CORE_ONREPLY_ROUTE: - /* t_check() above has the side effect of setting T and - REFerencing T => we must unref and unset it for the - main/core onreply_route. */ - _tmx_tmb.t_unref(msg); + if(vref) { + /* t_find() above has the side effect of setting T and + REFerencing T => we must unref and unset it for the + main/core onreply_route. */ + _tmx_tmb.t_unref(msg); + } /* no break */ case TM_ONREPLY_ROUTE: /* use the reason of the current reply */

1 0

[kamailio/kamailio] added rtpengine to comment (PR #3227)
by Andrew Webster 30 Aug '22

30 Aug '22

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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 - [ 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 - [X ] 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/3227 -- Commit Summary -- * added rtpengine to comment -- File Changes -- M etc/kamailio.cfg (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3227.patch https://github.com/kamailio/kamailio/pull/3227.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3227 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3227(a)github.com>

2 3

git:master:887ea442: etc/kamailio.cfg: comment for route[NATMANAGE] made generic
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 887ea4420f2a11e9d26c031c8c75e897b0fd8072 URL: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T09:07:58+02:00 etc/kamailio.cfg: comment for route[NATMANAGE] made generic --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… Patch: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 11a91100ce..3915f3e719 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -854,7 +854,7 @@ route[NATDETECT] { return; } -# RTPProxy control and signaling updates for NAT traversal +# RTP relaying management and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) {

1 0

git:master:836d122a: pv_headers: use tm.t_find API
by Victor Seva 29 Aug '22

29 Aug '22

Module: kamailio Branch: master Commit: 836d122af8575c66651232f3ad25bad085bfb972 URL: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:59:44+02:00 pv_headers: use tm.t_find API --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… Patch: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index e555e0265bb..7da426c184f 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -526,6 +526,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + int vref = 0; tm_cell_t *t = NULL; sr_xavp_t **backup_xavis = NULL; sr_xavp_t **list = NULL; @@ -534,18 +535,12 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) return 1; LM_DBG("msg:%p previous branch:%d\n", msg, _branch); - if(tmb.t_check(msg, &_branch) == -1) { - LM_ERR("failed find UAC branch\n"); - } else { - t = tmb.t_gett(); - if(t == NULL || t == T_UNDEFINED) { - LM_DBG("cannot lookup the transaction\n"); - } else { - LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t, - _branch, &t->xavis_list, t->nr_of_outgoings); - list = &t->xavis_list; - backup_xavis = xavi_set_list(&t->xavis_list); - } + t = tmb.t_find(msg, &_branch, &vref); + if(t != NULL && t != T_UNDEFINED) { + LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t, + _branch, &t->xavis_list, t->nr_of_outgoings); + list = &t->xavis_list; + backup_xavis = xavi_set_list(&t->xavis_list); } pvh_get_branch_index(msg, &_branch); @@ -560,7 +555,7 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) xavi_set_list(backup_xavis); LM_DBG("restored backup_xavis:%p\n", *backup_xavis); } - if(t) { + if(t && vref) { tmb.unref_cell(t); LM_DBG("T:%p unref\n", t); }

1 0

git:master:7a53ac8e: pkg/kamailio/deb: sync dirs contents [skip ci]
by Victor Seva 28 Aug '22

28 Aug '22

Module: kamailio Branch: master Commit: 7a53ac8e8d92dbb375378b49562a7842055d7fb3 URL: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:44:13+02:00 pkg/kamailio/deb: sync dirs contents [skip ci] --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784… Patch: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784…

1 0

git:master:46d03563: pkg/kamailio/deb: version set 5.7.0~dev1 [skip ci]
by Victor Seva 28 Aug '22

28 Aug '22

Module: kamailio Branch: master Commit: 46d0356386bcf2a70671fd73979ef97bd5528d74 URL: https://github.com/kamailio/kamailio/commit/46d0356386bcf2a70671fd73979ef97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:44:25+02:00 pkg/kamailio/deb: version set 5.7.0~dev1 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/46d0356386bcf2a70671fd73979ef97… Patch: https://github.com/kamailio/kamailio/commit/46d0356386bcf2a70671fd73979ef97…

1 0

[kamailio/kamailio] Ability to reload location attributes at runtime (#2299)
by Sergiu Pojoga 26 Aug '22

26 Aug '22

### Description Looking for a mechanism to reload Location attributes at runtime. Having both registered and permanent Contacts under AoR, with Attributes from `usrloc` to be used for various routing decisions. This is about attributes of permanent Contacts. Registered ones have `xavp_contact` of `usrloc` to store attributes during registration. **Problem:** Only way to make it work is: 1. adding a permanent Contact using `rpc ul.add` 2. assigning attributes in DB `location_attr` per RUID (can't find an rpc function for attributes) 3. restart Kamailio modparam("usrloc", "db_mode", 1) modparam("usrloc", "db_load", 1) This however is far from ideal, having to restart Kamailio for every change in attributes of a Contact. ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.3.3 (x86_64/linux) 44ccb9 * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2299

3 8

[kamailio/kamailio] dialog: not able to set the hangup_reason , when we hangup calls using xmlrpc. (#1737)
by Surendra Tiwari 26 Aug '22

26 Aug '22

### Description We are using xmlrpc to terminate the calls once customer balance reaches to zero. call got terminated but we will not be able to set the dialog variable related to hangup_reason. There should be a way during dlg.terminate_dlg xmlrpc request that if i mention the some parameter then it should set before sending bye to callee and caller.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/etc/kamailio# kamailio -version version: kamailio 5.1.4 (x86_64/linux) 6ebfda flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6ebfda compiled on 11:48:26 Sep 7 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/etc/kamailio# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty root@ip-172-31-4-160:/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1737

2 5

[kamailio/kamailio] keep new features in a file in the repository (#668)
by Victor Seva 26 Aug '22

26 Aug '22

This will allow us to point https://www.kamailio.org/wiki/features/new-in-devel to the file and "force" developers to update that file with the new features when they are introduced in the repository Remaining developers to upgrade the wiki seems pointless and anyone can create a PR for changes --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/668

4 4

[kamailio/kamailio] kazoo: consuming of events fails if message has no body (#1837)
by mihovilkolaric 26 Aug '22

26 Aug '22

### Description Consuming messages without message body fails due to a JSON parsing error: ``` ERROR: kazoo [kz_json.c:287]: kz_json_parse(): Error parsing json: unexpected end of data ERROR: kazoo [kz_json.c:288]: kz_json_parse(): ERROR: kazoo [kz_amqp.c:2960]: kz_amqp_send_worker_event(): error parsing json body ``` This makes it unable to consume messages from RabbitMQ's event exchange plugin ( https://www.rabbitmq.com/event-exchange.html ), as the documentatin states: **"The message body is always blank."** ### Possible Solutions As a possible fix I tried following change in kz_amqp.c: ``` void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* envelope, kz_amqp_bind_ptr bind) { char buffer[100]; kz_amqp_cmd_ptr cmd = NULL; kz_amqp_consumer_delivery_ptr ptr = NULL; json_obj_ptr json_obj = NULL; json_object* JObj = NULL; str* message_id = NULL; int idx = envelope->channel-1; int worker = 0; int _kz_server_id = server_ptr->id; int msg_size = envelope->message.body.len; //begin of changes int routingkey_size = envelope->routing_key.len; if (msg_size == 0 && routingkey_size > 0 ) { char *routingkey_data = pkg_malloc(routingkey_size + 1); memset(routingkey_data, 0, routingkey_size + 1); memcpy(routingkey_data, (char*)envelope->routing_key.bytes, routingkey_size); LM_DBG("Message size: %d\n", msg_size); LM_DBG("Routing Key: %s\n", routingkey_data); char *pos = strchr(routingkey_data,'.'); while (pos){ *pos = '_'; pos = strchr(pos,'.'); } LM_DBG("New Routing Key: %s\n", routingkey_data); sprintf(buffer, "kazoo:%s", routingkey_data); if(kz_amqp_consumer_fire_event(buffer) != 0) { LM_ERR("kazoo:%s not found", routingkey_data); } pkg_free(routingkey_data); return; } char *json_data = pkg_malloc(msg_size + 1); if(!json_data) { LM_ERR("no more package memory available. needed %d\n", msg_size + 1); return; } char *json_data = pkg_malloc(msg_size + 1); //end of changes if(!json_data) { LM_ERR("no more package memory available. needed %d\n", msg_size + 1); return; } ``` The change is rather simple: If there is no message-body supplied, the event-route _kazoo:<binding_key>_ is called (after replacing any '.' with '_' in the routing_key). -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1837

3 6

[kamailio/kamailio] dialog: set $rs when failed TCP send (#2867)
by sergey-safarov 26 Aug '22

26 Aug '22

### Description I use TCP transport to relay SIP messages. When Kamailio cannot connect to another server then Kamailio generates response `408 Request Timeout`. inside `event_route[dialog:failed]` route block I check error code `$rs` but this value is `null`. This happens because Kamailio does not able to relay SIP messages and is not able to receive responses. But `tm` module generates a response `408 Request Timeout` and will be fine to init `$rs` pseudo-variable using tm module response. ### Expected behavior `$rs` pseudo-variable contains `tm` module response when kamailio does not receive a response from another server. #### Actual observed behavior `$rs` pseudo-variable contains `null` value when kamailio does not receive a response from another server. To check you can use ``` event_route[dialog:failed] { $var(code_xxx) = $(rs{re.subst,/([0-9])[0-9]{2}/\1xx/}); xlog("L_INFO", "websocket|log|dialog failed $rs; $var(code_xxx)\n"); } ``` And relay SIP message to host that reachable. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2867

3 4

[kamailio/kamailio] Path MTU handling; implicit IPv4 assumption, suggested solution for IPv6 (Issue #3119)
by vanrein 26 Aug '22

26 Aug '22

### Description Larger SIP frames get dropped when sent over UDP and IPv6. The sending side has MTU 1500 and the receiving side has MTU 1492. This is an IPv6-only setup, so this is problematic. Also, pulling down the MTU of a general server for a tunneled peer would smear like an oil stain. The suggestion to fallback on TCP feels like a hack. ### Troubleshooting #### Reproduction Send a SIP message to a network interface with a lower MTU than the submitted frame size. #### Debugging Data None, transmission works fine. #### Log Messages None, transmission works fine. #### SIP Traffic Irrelevant. #### Code Investigation I explored the Kamailio source code for MTU handling. https://github.com/kamailio/kamailio/blob/81265e41b52cfda9a284233c93683522a… * This defaults to switching off the Don't Fragment bit on IPv4 frames, to allow them to be broken up downstream. * This should check for an IPv4 socket, because (at least) Linux has a separate symbolic value `IPV6_MTU_DISCOVER` * Note that IPv6 is never broken up by routers; they always return ICMPv6 message Packet Too Big * Note that IPv6 Path MTU discovery by the kernel is automatic only for connected UDP sockets * Since Kamailio uses unconnected UDP sockets, Path MTU issues cause packets to be dropped * Note that such packet drops depend on a somewhat dynamic SIP message size, causing random behaviour * I therefore suggest that Kamailio is lacking in some of its IPv6 logic https://github.com/kamailio/kamailio/blob/81265e41b52cfda9a284233c93683522a… * This enables the reporting of ICMP errors, including Path MTU but also other useful things like Host Not Found * This should check for an IPv4 socket, because (at least) Linux has a separate symbolic value `IPV6_RECVERR` * Note that the same behaviour is available on BSD, so it need not be specific to Linux * Note that handling errors is done with `recvmsg()` with a flag `MSG_ERRQUEUE`, which is not used in Kamailio * Note that the ancillary data from `recvmsg()` holds data to cleverly handle ICMP or ICMPv6 responses * I therefore suggest that Kamailio is lacking a fair chunk of its ICMP and ICMPv6 logic * I expect that this may bring efficiency gains due to faster closing of transactions ### Possible Solutions I have been thinking about ways to lower MTU values only for some peers. 1. Using connected sockets might work, possibly as an alternative when Path MTU problems arise. It might not scale however. 2. Every socket could have an extra sending socket set to a lower MTU. The use of `SO_REUSEADDR` seems to allow for that. 3. Before falling back on an extra socket, the desired MTU could be set. Alternatively, as for IPv6, an MTU of 1280 might be considered in many cases: - *If you can carry 6 out of 8 coffee mugs from the kitchen, you need to walk twice, and 4+4 is easier than 6+2* - Anything over the MTU splits into at least 2 frames - The headers added are 40 bytes IPv6 header and 8 bytes Fragment Extension Header - 2 frames can hold a single frame of 2*1280-40-8 = 2512 bytes - Up to 2512 bytes original MTU, breakup in 1280 byte frames will be fine - 3 frames are going to be useful for larger frames, then a similar style can be used - This might help to decide whether 1280 or a higher MTU is most desirable ### Additional Information ``` Kamailio 5.2.1 from Debian stable ``` * **Operating System**: ``` Linux Debian stable on kernel 4.19.0 ``` (I don't suppose it matters, this code has been around for ages. I used permalinks for stable reference). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3119 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3119(a)github.com>

3 12

[kamailio/kamailio] dispatcher: socket atribute usage for initial OPTIONS (#2853)
by sergey-safarov 26 Aug '22

26 Aug '22

### Description I use TCP sockets to relay calls to backend servers. Also, I have enabled `tcp_reuse_port` and enabled `socket` attribute in dispatcher settings. INVITE messages to backend servers are now properly send from port 5060. ### Expected behavior For all messages are used the same TCP socket and same source port for all messages (including OPTIONS). #### Actual observed behavior But initial OPTIONS (before the first call send) uses a random source port. ### Additional Information * **Kamailio Version** - output of `kamailio -v` used current c503d2bd31a580138a67f1d4a265ccde5791d271 with small customization. * **Operating System**: aarch64 ``` [root@sbc-a0 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2853

2 2

[kamailio/kamailio] dialog: set context iuid for CANCEL requests (PR #3096)
by descartin 26 Aug '22

26 Aug '22

set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call   #### 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 - [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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Using kamailio 5.4 version, we have seen that dlg_isflagset is not detecting a dialog flag set in the request route for the initial INVITE, when a CANCEL request arrives. We have applied this change to set the dialog context unique ide for this request. Since it's done on dlg_onreply, dlg_onroute and dlg_ontimeout functions. This way, dlg_get_by_iuid(&dctx->iuid) in the function ki_dlg_isflagset is not NULL and dialog flags are detected. Is this change correct? Or can it generate any kind of issues? thanks a lot and regards David You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3096 -- Commit Summary -- * dialog: set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call -- File Changes -- M src/modules/dialog/dlg_handlers.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3096.patch https://github.com/kamailio/kamailio/pull/3096.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3096 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3096(a)github.com>

3 6

git:master:c5d48f8e: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: c5d48f8ee3884934bd8b910a2dae1888fead3cf1 URL: https://github.com/kamailio/kamailio/commit/c5d48f8ee3884934bd8b910a2dae188… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-26T12:16:27+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/c5d48f8ee3884934bd8b910a2dae188… Patch: https://github.com/kamailio/kamailio/commit/c5d48f8ee3884934bd8b910a2dae188…

1 0

git:master:353aa1c8: dialog: docs for dlg_ctxiuid_mode params
by Daniel-Constantin Mierla 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: 353aa1c821f2889c0a6dbadf9b1b1c1ed039deb6 URL: https://github.com/kamailio/kamailio/commit/353aa1c821f2889c0a6dbadf9b1b1c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T12:11:08+02:00 dialog: docs for dlg_ctxiuid_mode params --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/353aa1c821f2889c0a6dbadf9b1b1c1… Patch: https://github.com/kamailio/kamailio/commit/353aa1c821f2889c0a6dbadf9b1b1c1… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 00c1d4f9775..162ad965331 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1707,6 +1707,32 @@ modparam("dialog", "bye_early_reason", "Call terminated") </example> </section> + <section id="dialog.p.dlg_ctxiuid_mode"> + <title><varname>dlg_ctxiuid_mode</varname> (int)</title> + <para> + Set dialog context iuid mode, which can specify additional cases + when the internal unique id should be set: + </para> + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> - set it when processing CANCEL requests. + </para></listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dlg_ctxiuid_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "dlg_ctxiuid_mode", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:02b960d8: core: parse - added IS_SIP_MSG() macro to check if message type is SIP
by Daniel-Constantin Mierla 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: 02b960d84d479b001cf94b2b53063deca1d7256d URL: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T10:15:22+02:00 core: parse - added IS_SIP_MSG() macro to check if message type is SIP - defined also IS_SIP_REQUEST() same as IS_SIP() but with more explicit name for detecting SIP requests --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… Patch: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 8b44ce4159..595c1be895 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -147,11 +147,20 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((req)->first_line.type == SIP_REQUEST) && \ ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) +/* sip request */ +#define IS_SIP_REQUEST(req) \ + (((req)->first_line.type == SIP_REQUEST) && \ + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) + /* sip reply */ #define IS_SIP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ ((rpl)->first_line.flags & FLINE_FLAG_PROTO_SIP)) +/* sip message */ +#define IS_SIP_MSG(req) \ + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP) + /* http request */ #define IS_HTTP(req) \ (((req)->first_line.type == SIP_REQUEST) && \

1 0

git:master:d7e8ae72: core: dprint - simplified sip msg check
by Daniel-Constantin Mierla 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: d7e8ae72a0258aa6c3bcf850ea410a929da003cb URL: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T10:15:58+02:00 core: dprint - simplified sip msg check --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… Patch: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index f4780bb4d4..ff63fd9ff1 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -504,7 +504,7 @@ void log_prefix_set(sip_msg_t *msg) log_callid_set(msg); if(log_prefix_pvs == NULL) return; - if(msg==NULL || !(IS_SIP(msg) || IS_SIP_REPLY(msg))) { + if(msg==NULL || !IS_SIP_MSG(msg)) { log_prefix_val = NULL; return; }

1 0

git:master:a770c495: dialog: added modparam dlg_ctxiuid_mode to control when iuid is set
by Daniel-Constantin Mierla 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: a770c4957a31c143a29c68cb71e705c3f9cfcbad URL: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T11:24:30+02:00 dialog: added modparam dlg_ctxiuid_mode to control when iuid is set --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… Patch: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 8eb9f78eec..83a10b3b56 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -154,6 +154,7 @@ str dlg_xavp_cfg = {0}; int dlg_ka_timer = 0; int dlg_ka_interval = 0; int dlg_clean_timer = 90; +int dlg_ctxiuid_mode = 0; str dlg_lreq_callee_headers = {0}; @@ -361,6 +362,8 @@ static param_export_t mod_params[]={ { "dlg_filter_mode", INT_PARAM, &dlg_filter_mode }, { "bye_early_code", PARAM_INT, &bye_early_code }, { "bye_early_reason", PARAM_STR, &bye_early_reason }, + { "dlg_ctxiuid_mode", PARAM_INT, &dlg_ctxiuid_mode }, + { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 794aa7c7d2..81525de21b 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -72,6 +72,7 @@ extern int dlg_event_rt[DLG_EVENTRT_MAX]; extern int dlg_wait_ack; extern int dlg_enable_dmq; extern int dlg_filter_mode; +extern int dlg_ctxiuid_mode; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -91,6 +92,9 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' +/*! flags for dlg_ctxiuid */ +#define DLG_CTXIUID_MODE_CANCEL 1 + int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int mode); int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg); @@ -1258,9 +1262,10 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } - if(msg->first_line.u.request.method_value == METHOD_CANCEL) { - dlg_set_ctx_iuid(dlg); - } + if((dlg_ctxiuid_mode & DLG_CTXIUID_MODE_CANCEL) && IS_SIP_REQUEST(msg) + && (msg->first_line.u.request.method_value == METHOD_CANCEL)) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; }

1 0

git:master:654f22a0: dialog: set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call
by Daniel-Constantin Mierla 26 Aug '22

26 Aug '22

Module: kamailio Branch: master Commit: 654f22a03e874f86c4b2b2d29eb969a1be3bb25e URL: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… Author: David Escartin <descartin(a)sonoc.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T09:49:42+02:00 dialog: set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… Patch: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 39f1f83dd7..794aa7c7d2 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1258,6 +1258,9 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } + if(msg->first_line.u.request.method_value == METHOD_CANCEL) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; }

1 0

git:master:a9cf4577: tm: new inter-module API function t_find(...)
by Daniel-Constantin Mierla 25 Aug '22

25 Aug '22

Module: kamailio Branch: master Commit: a9cf4577c25d7933531b8969a1941bac4faf8d68 URL: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-25T14:51:23+02:00 tm: new inter-module API function t_find(...) - combines get_t() with t_check_msg(...) to get the transaction, returning also if it was referenced or not --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… Patch: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index f041116bb8..ad41f0de93 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -145,6 +145,28 @@ int get_t_branch() return T_branch; } +/** + * return the transaction by combining get() and t_check_msg() + * - if T is not set, checks the transactions table for msg, and if found, + * sets T and *branch as well as *vref=1 to signal that T was ref'ed + */ +struct cell* t_find(struct sip_msg *msg, int *branch, int *vref) +{ + if(vref) { + *vref = 0; + } + if(T != NULL && T != T_UNDEFINED) { + return T; + } + t_check_msg(msg, branch); + if(T != NULL && T != T_UNDEFINED) { + if(vref) { + *vref = 1; + } + } + return T; +} + static inline int parse_dlg( struct sip_msg *msg ) { if (parse_headers(msg, HDR_FROM_F | HDR_CSEQ_F | HDR_TO_F, 0)==-1) { diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 1f6596a90d..de65be8365 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -68,6 +68,9 @@ int t_check_msg(struct sip_msg* , int *branch ); typedef struct cell * (*tgett_f)(void); struct cell *get_t(void); +typedef struct cell* (*tfind_f)(struct sip_msg*, int*, int*); +struct cell* t_find(struct sip_msg *msg, int *branch, int *vref); + typedef int (*tgett_branch_f)(void); int get_t_branch(void); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 8635b90eae..c9f39b576e 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -92,6 +92,7 @@ int load_tm( struct tm_binds *tmb) tmb->free_dlg = free_dlg; tmb->print_dlg = print_dlg; tmb->t_gett = get_t; + tmb->t_find = t_find; tmb->t_gett_branch = get_t_branch; tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 4695a8f7e1..1f97061d1e 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -71,6 +71,7 @@ struct tm_binds { free_dlg_f free_dlg; print_dlg_f print_dlg; tgett_f t_gett; + tfind_f t_find; tgett_branch_f t_gett_branch; tsett_f t_sett; calculate_hooks_f calculate_hooks;

1 0

[kamailio/kamailio] Make usrloc keepalive call-id more random (Issue #3225)
by Matteo 25 Aug '22

25 Aug '22

### Description Right now, usrloc keepalive method use a somewhat static call-id, built with the prefix `ksrulka-` followed by the number of keepalives sent and the contact index of each AoR pinged. This means that pings to different contacts from different processes (when using timer_procs in usrloc) or when you have multiple proxies each handling a subset of registrar requests, you can have duplicated call-ids. Basically the following happens: - user1 registers to proxy - user2 registers to proxy - different timer processes handles the keepalives - call-ids are the same (it start always from `ksrulka-1.1`) OR - user1 registers to proxyA - user2 registers to proxyB - both proxies start sending keepalives - call-ids are the same (it start always from `ksrulka-1.1`) from both proxies. While this is not a routing problem, bug or whatever, it can be annoying if traffic is analyzed with tools like sngrep, which group messages by the Call-ID header, and if you run sngrep on the edge proxy you'll see both keepalive messages under the same call. Can be also annoying if logs from all proxies are aggregated, making a bit problematic filtering by call-id. ### Expected behavior Call-id should be somewhat random. #### SIP Traffic This is an example for same call-id used for pinging two different AoR on same proxy. ``` 2022/08/23 08:53:35.717668 172.23.42.2:5060 -> 172.23.42.1:5060 OPTIONS sip:user1@192.168.10.123:23045;transport=udp SIP/2.0 Via: SIP/2.0/UDP 172.23.42.2:5060;branch=z9hG4bKx.323.1.0 Route: <sip:172.23.42.1;lr;received=sip:client.public.ip:23045;r2=on>,<sip:kamailio.public.ip;lr;received=sip:client.public.ip:23045;r2=on> From: <sip:pinger@test.proxy>;tag=uloc-1-6304863f-61-2-8a27955a-6304958f-af2a3-143.1 To: <sip:user1@example.com> Call-ID: ksrulka-323.1 CSeq: 80 OPTIONS Content-Length: 0 ``` and ``` 2022/08/23 08:53:35.897076 172.23.42.2:5060 -> 172.23.42.1:5060 OPTIONS sip:user2@192.168.10.130:5060 SIP/2.0 Via: SIP/2.0/UDP 172.23.42.2:5060;branch=z9hG4bKx.323.1.0 Route: <sip:172.23.42.1;lr;received=sip:client.public.ip:60058;r2=on>,<sip:kamailio.public.ip;lr;received=sip:client.public.ip:60058;r2=on> From: <sip:pinger@test.proxy>;tag=uloc-1-6304863f-61-1-86c70e53-6304958f-dafc7-143.1 To: <sip:user2@example.com> Call-ID: ksrulka-323.1 CSeq: 80 OPTIONS Content-Length: 0 ``` ### Possible Solutions To be 100% honest I don't get why such method of generating call-ids has been chosen. The only useful thing I see is that you can have a clue of how many keepalives ping have been sent by each process / proxy while inspecting sip traces. I don't see any usage of the fixed call-id in handling responses. But I may be wrong, since I'm new to kamailio. What could be done is to add a random string to the call-id, like nathelper does. If this is acceptable, I can try to create a PR for that. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: unknown compiled with gcc 9.4.0 ``` * **Operating System**: Using official docker images of kamailio 5.6.1. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3225 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3225(a)github.com>

3 5

git:master:721daf5c: usrloc: adde random and pid to call-id for keepalive requests
by Daniel-Constantin Mierla 25 Aug '22

25 Aug '22

Module: kamailio Branch: master Commit: 721daf5ca55a8fb366cff2821e249bfff64d8f87 URL: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-25T10:48:16+02:00 usrloc: adde random and pid to call-id for keepalive requests - GH #3225 --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… Patch: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index ffe37fdc73..ba855eb011 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -38,6 +38,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_rr.h" +#include "../../core/rand/fastrand.h" #include "ul_keepalive.h" @@ -66,7 +67,7 @@ Content-Length: 0\r\n\r\n" "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ - "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ + "Call-ID: " ULKA_CALLID_PREFIX "%x-%x-%x.%x\r\n" \ "CSeq: 80 %.*s\r\n" \ "Content-Length: 0\r\n\r\n" @@ -243,6 +244,7 @@ int ul_ka_urecord(urecord_t *ur) ur->aor.len, ur->aor.s, (aortype==1)?"":"@", (aortype==1)?0:ul_ka_domain.len, (aortype==1)?"":ul_ka_domain.s, + fastrand(), my_pid(), _ul_ka_counter, bcnt, ul_ka_method.len, ul_ka_method.s); if(kabuf_len<=0 || kabuf_len>=ULKA_BUF_SIZE) {

1 0

git:master:03dffaad: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Aug '22

24 Aug '22

Module: kamailio Branch: master Commit: 03dffaad07952568bd40e22d5b23aaa4bcfe613a URL: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-24T09:31:46+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… Patch: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 28bc21c69a..4a1f805154 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -694,8 +694,11 @@ xavi_child_rm("WhatEver", "FoO"); at the index idx becomes the first and the ones before it are at the end of the list. - The first parameter has to be the name of XAVP in the root list. The - second parameter is the index of the XAVP that becomes the first one. + The first parameter has to be the name of XAVP in the root list. + + The second parameter is the index of the XAVP that becomes the first + one (if it is greater than the number of XAVPs, modulo operation is + done first; if it is negative, it counts from the end of the list). The parameters can be with variables.

1 0

git:master:1a33c8b7: pv: updated docs for xavp_lshift()
by Daniel-Constantin Mierla 24 Aug '22

24 Aug '22

Module: kamailio Branch: master Commit: 1a33c8b7c70e7f629868d926965ec456bf2eecae URL: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-24T09:18:08+02:00 pv: updated docs for xavp_lshift() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… Patch: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 409ecaa4dac..30b09eab807 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -747,8 +747,12 @@ xavi_child_rm("WhatEver", "FoO"); </para> <para> The first parameter has to be the name of XAVP in the root list. + </para> + <para> The second parameter is the index of the XAVP that becomes the - first one. + first one (if it is greater than the number of XAVPs, modulo + operation is done first; if it is negative, it counts from the + end of the list). </para> <para> The parameters can be with variables.

1 0

[kamailio/kamailio] core: added parser mode check (PR #3226)
by korayvt 23 Aug '22

23 Aug '22

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When I upgraded kamailio version to 5.6.1, some http requests hit msg headers control and failed. I think ksr_sip_parser_mode check should be added here for backward compatibility. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3226 -- Commit Summary -- * core: added parser mode check -- File Changes -- M src/core/parser/msg_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3226.patch https://github.com/kamailio/kamailio/pull/3226.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3226 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3226(a)github.com>

2 2

git:master:4598f0a0: core: added parser mode check
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: 4598f0a0df90ad81e192be55a89fbd5cca52a40e URL: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T14:05:19+02:00 core: added parser mode check --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… Patch: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 6455c9e5393..7a3855531ed 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -623,9 +623,11 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int skip: msg->unparsed=tmp; - if(msg->headers==NULL) { - /* nothing parsed - invalid input sip message */ - goto error1; + if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { + if(msg->headers==NULL) { + /* nothing parsed - invalid input sip message */ + goto error1; + } } /* restore original flags */ msg->parsed_flag |= orig_flag;

1 0

[kamailio/kamailio] Korayvt/parse headers change (PR #3224)
by korayvt 23 Aug '22

23 Aug '22

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When I upgraded kamailio version to 5.6.1, some http requests hit msg headers control and failed. I think ksr_sip_parser_mode check should be added here for backward compatibility. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3224 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * Merge branch 'kamailio:master' into master * core: added parser mode check -- File Changes -- M src/core/parser/msg_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3224.patch https://github.com/kamailio/kamailio/pull/3224.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3224 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3224(a)github.com>

1 1

[kamailio/kamailio] pv: add monotonic clock to TimeVal pseudovariable (PR #3191)
by Matteo 23 Aug '22

23 Aug '22

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Sometime is helpful to have a monotonic timer to attach to events in order to discard out-of-order ones on receiving side. Current time values are not ideal since are subject to clock skews, adjustment and so on. Since we have system monotonic clock we can use that value to have a monotonic counter. To be 100% fair CLOCK_MONOTONIC can still be skewed only by ntp adjustment, that's why we try to use CLOCK_MONOTONIC_RAW which is linux-only (afaik) that do not suffer from such adjustments. The new pseudovariable is `$TV(Sm)`, which returns the monotonic counter as a string. Note that even if is based on clock, it starts from an unspecified point in time, so should really be treated as an always increasing counter. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3191 -- Commit Summary -- * pv: add monotonic clock to TimeVal pseudovariable -- File Changes -- M src/modules/pv/pv_time.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3191.patch https://github.com/kamailio/kamailio/pull/3191.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3191 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3191(a)github.com>

2 5

git:master:5d09caf0: pv: add monotonic clock to TimeVal pseudovariable
by Henning Westerholt 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: 5d09caf029ed4271ac6dc856cb70cbf375b4c7f1 URL: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… Author: Matteo Brancaleoni <matteo.brancaleoni(a)voismart.it> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-23T11:11:47+02:00 pv: add monotonic clock to TimeVal pseudovariable - adds $TV(Sm) pseudovariable which returns the system monotonic clock as a string - on Linux, tries to use CLOCK_MONOTONIC_RAW which does not suffer from ntp time adjustement --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… Patch: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 4a9cc14dd1..a05134f5e4 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -23,6 +23,8 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> #include <stdio.h> #include <time.h> #include <sys/time.h> @@ -33,6 +35,12 @@ #include "pv_time.h" +#if defined(CLOCK_MONOTONIC_RAW) +#define PV_MONOTONIC_CLOCK CLOCK_MONOTONIC_RAW +#else +#define PV_MONOTONIC_CLOCK CLOCK_MONOTONIC +#endif + int pv_parse_time_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) @@ -306,6 +314,7 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct timeval tv; + struct timespec ts; str s; struct tm lt; char lbuf[64]; @@ -355,7 +364,18 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); - + case 6: + if (!clock_gettime(PV_MONOTONIC_CLOCK, &ts)) { + s.len = snprintf(_timeval_ts_buf, 64, "%" PRIu64, + (u_int64_t)ts.tv_sec * 1000000000 + (u_int64_t)ts.tv_nsec); + if(s.len<0) + return pv_get_null(msg, param, res); + s.s = _timeval_ts_buf; + return pv_get_strval(msg, param, res, &s); + } else { + LM_ERR("unable to get monotonic clock value\n"); + return pv_get_null(msg, param, res); + } default: msg_set_time(msg); return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_sec); @@ -385,6 +405,8 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "Fn", 2)==0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "Sm", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; else goto error; break; default:

1 0

git:master:181bc683: core: aliased dns_rev_via to rev_dns
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: 181bc683f6f0496b80c5997a4de30a21c04ce0bc URL: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:03+02:00 core: aliased dns_rev_via to rev_dns --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… Patch: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d11406b1b5..edb8a1bb73 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -312,7 +312,7 @@ DOMAIN domain SR_AUTO_ALIASES auto_aliases SR_AUTO_DOMAINS auto_domains DNS dns -REV_DNS rev_dns +REV_DNS rev_dns|dns_rev_via DNS_TRY_IPV6 dns_try_ipv6 DNS_TRY_NAPTR dns_try_naptr DNS_SRV_LB dns_srv_lb|dns_srv_loadbalancing

1 0

git:master:a10da3a8: pv: parse header name given with variable to $hdr() and $hdrc()
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: a10da3a8802fd02bab9e8c655aa845d121370fd4 URL: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:02+02:00 pv: parse header name given with variable to $hdr() and $hdrc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… Patch: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5d310ecea7..1410d80b43 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2128,6 +2128,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int idx; int idxf; pv_value_t tv = {0}; + hdr_field_t thdr = {0}; if(msg==NULL || res==NULL || param==NULL) return -1; @@ -2138,6 +2139,15 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_null(msg, param, res); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) { tv.flags = PV_VAL_STR; @@ -2162,6 +2172,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { pv_value_t tv; struct hdr_field *hf; + hdr_field_t thdr = {0}; int hcount; if(msg==NULL || res==NULL || param==NULL) @@ -2177,6 +2188,15 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_sintval(msg, param, res, 0); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) {

1 0

git:master:31ff79be: core: aliased dns_use_cache to use_dns_cache
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: 31ff79be68c262dc74ec4baaae8f9991ffbe7438 URL: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:02+02:00 core: aliased dns_use_cache to use_dns_cache --- Modified: src/core/cfg.lex Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… Patch: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a5a595f98c..76fd8d704d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -329,7 +329,7 @@ DNS_SEARCH_FMATCH dns_search_full_match DNS_NAPTR_IGNORE_RFC dns_naptr_ignore_rfc /* dns cache */ DNS_CACHE_INIT dns_cache_init -DNS_USE_CACHE use_dns_cache +DNS_USE_CACHE use_dns_cache|dns_use_cache DNS_USE_FAILOVER use_dns_failover DNS_CACHE_FLAGS dns_cache_flags DNS_CACHE_NEG_TTL dns_cache_negative_ttl diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1410d80b43..ab5bdc4887 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2259,7 +2259,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); - return pv_get_sintval(msg, param, res, 0); + return pv_get_null(msg, param, res); } if(thdr.type!=HDR_OTHER_T) { tv.flags = 0;

1 0

git:master:f71d984e: core: aliased dns_use_failover to use_dns_failover
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: f71d984edc21c015fc4c81682b115b510169b713 URL: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:03+02:00 core: aliased dns_use_failover to use_dns_failover --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… Patch: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 76fd8d704d..d11406b1b5 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -330,7 +330,7 @@ DNS_NAPTR_IGNORE_RFC dns_naptr_ignore_rfc /* dns cache */ DNS_CACHE_INIT dns_cache_init DNS_USE_CACHE use_dns_cache|dns_use_cache -DNS_USE_FAILOVER use_dns_failover +DNS_USE_FAILOVER use_dns_failover|dns_use_failover DNS_CACHE_FLAGS dns_cache_flags DNS_CACHE_NEG_TTL dns_cache_negative_ttl DNS_CACHE_MIN_TTL dns_cache_min_ttl

1 0

[kamailio/kamailio] Corrected a typo ("endabled") (PR #3223)
by Ash-v-G 23 Aug '22

23 Aug '22

Very minor change correcting a misspelled word in the main config file.  #### 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 - [ 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/3223 -- Commit Summary -- * Corrected a typo ("endabled") -- File Changes -- M etc/kamailio.cfg (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3223.patch https://github.com/kamailio/kamailio/pull/3223.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3223 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3223(a)github.com>

2 2

git:master:b46afeca: etc/kamailio.cfg: corrected a typo ("endabled"), GH #3223
by Henning Westerholt 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: b46afeca6c515f5baf1812ca821321117df6478b URL: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-23T07:30:30Z etc/kamailio.cfg: corrected a typo ("endabled"), GH #3223 --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… Patch: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index eb41c14d41f..11a91100ce7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -24,7 +24,7 @@ # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog -# - debugger module loaded with cfgtrace endabled +# - debugger module loaded with cfgtrace enabled # # *** To enable mysql: # - define WITH_MYSQL

1 0

[kamailio/kamailio] incomplete values and Wrong Counting for $hfl and $hflc (Issue #3194)
by patrickarton 22 Aug '22

22 Aug '22

### Description the counting and values provides by $hfl and $hflc are wrong and imcomplete  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` route { $var(hname) = "Record-Route"; if (is_present_hf_pv("$var(hname)")){ $var(i) = 0; $var(hdrc) = $hflc($var(hname)); xlog("there are $var(hdrc) values for $var(hname)\r\n"); xlog("------------------------------------------\r\n"); while ($var(i) < $var(hdrc)){ $var(val) = $(hfl($var(hname))[$var(i)]); $var(sip_header_ip) = $(var(val){nameaddr.uri}{uri.host}); if ($var(sip_header_ip) != 0){ xlog("checking $var(sip_header_ip) in $var(hname) \r\n"); } $var(i) = $var(i) + 1; } } } ``` #### Log Messages  ``` 0(3729) ERROR: <script>: there are 2 values for Record-Route 0(3729) ERROR: <script>: ------------------------------------------ 0(3729) ERROR: <script>: checking 1.1.1.1 in Record-Route 0(3729) ERROR: <script>: checking 2.2.2.2 in Record-Route ``` #### Expected Results ``` 0(3729) ERROR: <script>: there are 3 values for Record-Route 0(3729) ERROR: <script>: ------------------------------------------ 0(3729) ERROR: <script>: checking 1.1.1.1 in Record-Route 0(3729) ERROR: <script>: checking 2.2.2.2 in Record-Route 0(3729) ERROR: <script>: checking 3.3.3.3 in Record-Route ``` #### SIP Traffic  ``` INVITE sip:+3226200866;trunk=PkGHOlui@127.0.0.1:5060;cid=EMDLfGdgrDD SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:3030;branch=z9hG4bK-3708-1-0 Record-Route: <sip:1.1.1.1;lr=on;nat=yes> Record-Route: <sip:2.2.2.2:5060;lr;transport=udp>,<sip:3.3.3.3:22506;lr;transport=udp> From: <sip:8325000000@127.0.0.1:5060>;tag=3708SIPpTag091 To: <sip:++212-94939-43433226200866@127.0.0.1:5060> Call-ID: 1-3708(a)127.0.0.1 CSeq: 1 INVITE Max-Forwards: 70 Content-Type: application/sdp ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3194 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3194(a)github.com>

3 4

git:master:fb13cf36: pv: detect known headers provided with variable for $hfl(...) and $hflc(...)
by Daniel-Constantin Mierla 22 Aug '22

22 Aug '22

Module: kamailio Branch: master Commit: fb13cf364870895dec94fa1ddf6a1afd3c099715 URL: https://github.com/kamailio/kamailio/commit/fb13cf364870895dec94fa1ddf6a1af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-22T12:38:14+02:00 pv: detect known headers provided with variable for $hfl(...) and $hflc(...) - GH #3194 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/fb13cf364870895dec94fa1ddf6a1af… Patch: https://github.com/kamailio/kamailio/commit/fb13cf364870895dec94fa1ddf6a1af… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index afccbd4c7f6..5d310ecea7c 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2223,6 +2223,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) rr_t *rrb = NULL; contact_t *cb = NULL; hdr_field_t *hf = NULL; + hdr_field_t thdr = {0}; int n = 0; str sval = STR_NULL; @@ -2235,6 +2236,15 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_sintval(msg, param, res, 0); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) { tv.flags = PV_VAL_STR; @@ -2458,6 +2468,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) rr_t *rrb = NULL; contact_t *cb = NULL; hdr_field_t *hf = NULL; + hdr_field_t thdr = {0}; int n = 0; if(msg==NULL || res==NULL || param==NULL) @@ -2469,6 +2480,15 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, 0); } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_sintval(msg, param, res, 0); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) { tv.flags = PV_VAL_STR;

1 0

[kamailio/kamailio] The kamailio 5.6.0 seqfault on restart (Issue #3207)
by pkv12 22 Aug '22

22 Aug '22

### Description The kamailio 5.6.0 segfault on restart ### Troubleshooting Kamailio sends a Ping Options packet to the registered UA with keepalive functional of usrloc module. When you restart the kamailio with the systemctl restart kamailio command, the kamailio is segfault. In version the 5.5.4 same as in 5.6.0 #### Reproduction 1. Enabled keepalive functional of usrloc module. 2. Registered UA on wss protocol. 3. Restart the kamailio parameters on usrloc module ``` loadmodule "usrloc.so" modparam("usrloc", "user_column", "username") modparam("usrloc", "contact_column", "contact") modparam("usrloc", "expires_column", "expires") modparam("usrloc", "q_column", "q") modparam("usrloc", "callid_column", "callid") modparam("usrloc", "cseq_column", "cseq") modparam("usrloc", "methods_column", "methods") modparam("usrloc", "flags_column", "flags") modparam("usrloc", "cflags_column", "cflags") modparam("usrloc", "user_agent_column", "user_agent") modparam("usrloc", "received_column", "received") modparam("usrloc", "ruid_column", "ruid") modparam("usrloc", "keepalive_column", "keepalive") modparam("usrloc", "use_domain", 0) modparam("usrloc", "db_url", "DBURL") modparam("usrloc", "db_mode", 1) modparam("usrloc", "matching_mode", 1) modparam("usrloc", "preload", "location") modparam("usrloc", "nat_bflag", FLB_NATB) modparam("usrloc", "handle_lost_tcp", 1) modparam("usrloc", "timer_interval", 10) modparam("usrloc", "version_table", 0) # modparam("usrloc", "ka_mode", 1) modparam("usrloc", "ka_method", "OPTIONS") modparam("usrloc", "ka_from", "sip:keepalive_test@own.domain") modparam("usrloc", "ka_domain", "own.domain") modparam("usrloc", "ka_timeout", 30) modparam("usrloc", "ka_loglevel", 3) ``` #### Debugging Data ``` [root@dev /]# gdb core.26872 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... [New LWP 26872] Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. Missing separate debuginfo for Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/28/2d891905d3d759f5eebb335af499da3efa03ab [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.'. Program terminated with signal 11, Segmentation fault. #0 0x00007f54e6ee9594 in atomic_cmpxchg_int (var=0x0, old=0, new_v=1) at ../../core/atomic/atomic_x86.h:224 224 ATOMIC_FUNC_CMPXCHG(cmpxchg, "cmpxchgl %2, %1", int , int) Missing separate debuginfos, use: debuginfo-install MariaDB-compat-10.4.21-1.el7.centos.x86_64 cyrus-sasl-lib-2.1.26-23.el7.x86_64 glibc-2.17-324.el7_9.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-50.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libcurl-7.29.0-59.el7_9.1.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-15.el7.x86_64 libssh2-1.8.0-4.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 libunistring-0.9.3-9.el7.x86_64 libuv-1.42.0-2.el7.x86_64 libwebsockets-3.0.1-2.el7.x86_64 nspr-4.25.0-2.el7_9.x86_64 nss-3.53.1-7.el7_9.x86_64 nss-softokn-freebl-3.53.1-6.el7_9.x86_64 nss-util-3.53.1-1.el7_9.x86_64 openldap-2.4.44-24.el7_9.x86_64 openssl-libs-1.0.2k-25.el7_9.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) set follow-fork-mode child (gdb) set detach-on-fork off (gdb) set print pretty on (gdb) set print elements 0 (gdb) set height 0 (gdb) bt full #0 0x00007f54e6ee9594 in atomic_cmpxchg_int (var=0x0, old=0, new_v=1) at ../../core/atomic/atomic_x86.h:224 ret = 0 #1 0x00007f54e6ee95e0 in futex_get (lock=0x0) at ../../core/futexlock.h:99 v = 32596 i = 1024 #2 0x00007f54e6eefa76 in wsconn_get (id=1990) at ws_conn.c:463 id_hash = 966 wsc = 0x100000001 __FUNCTION__ = "wsconn_get" #3 0x00007f54e6f04386 in ws_frame_transmit (evp=0x7fff118f9e30) at ws_frame.c:728 wsev = 0x7fff118f9e70 frame = { fin = 1, rsv1 = 0, rsv2 = 0, rsv3 = 0, opcode = 1, mask = 0, payload_len = 366, masking_key = "\000\000\000", payload_data = 0x7fff118fa4a0 "OPTIONS sip:loginUA@own.domain:5071;transport=ws SIP/2.0\r\nVia: SIP/2.0/WS x.x.x.x:5071;branch=z9hG4bKx.2.1.0\r\nFrom: <sip:keepalive_test@own.domain>;tag=uloc-62e8f62c-690e-7d1-300862f3-62eb7d2c-7d154-2.1\r\nTo: <sip:loginUA@own.domain>\r\nCall-ID: ksrulka-2.1\r\nCSeq: 80 OPTIONS\r\nContent-Length: 0\r\n\r\n", wsc = 0x0 } __FUNCTION__ = "ws_frame_transmit" #4 0x000000000052a8e1 in sr_event_exec (type=11, evp=0x7fff118f9e30) at core/events.c:305 ret = 0 i = 33998 #5 0x000000000057c5cc in wss_send (dst=0x7fff118fa230, buf=0x7fff118fa4a0 "OPTIONS sip:loginUA@own.domain:5071;transport=ws SIP/2.0\r\nVia: SIP/2.0/WS x.x.x.x:5071;branch=z9hG4bKx.2.1.0\r\nFrom: <sip:keepalive_test@own.domain>;tag=uloc-62e8f62c-690e-7d1-300862f3-62eb7d2c-7d154-2.1\r\nTo: <sip:loginUA@own.domain>\r\nCall-ID: ksrulka-2.1\r\nCSeq: 80 OPTIONS\r\nContent-Length: 0\r\n\r\n", len=366) at core/tcp_main.c:5321 port = 33998 ip = { af = 2, len = 4, u = { addrl = {2894360143, 140733488013344}, addr32 = {2894360143, 0, 294625312, 32767}, addr16 = {28239, 44164, 0, 0, 40992, 4495, 32767, 0}, addr = "On\204\254\000\000\000\000 \240\217\021\377\177\000" } } from = 0x0 local_addr = { s = { sa_family = 0, sa_data = "\000\000\000\000\000\000\207\035r\000\000\000\000" }, sin = { sin_family = 0, sin_port = 0, sin_addr = { s_addr = 0 }, sin_zero = "\207\035r\000\000\000\000" }, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = { __in6_u = { __u6_addr8 = "\207\035r\000\000\000\000\000\000\000\217\021\377\177\000", __u6_addr16 = {7559, 114, 0, 0, 0, 4495, 32767, 0}, __u6_addr32 = {7478663, 0, 294584320, 32767} } }, sin6_scope_id = 0 }, sas = { ss_family = 0, __ss_padding = "\000\000\000\000\000\000\207\035r\000\000\000\000\000\000\000\217\021\377\177\000\000\000\000\000\000\000\000\000\000\365h", '\000' <repeats 14 times>, "\370\n\177", '\000' <repeats 13 times>, "\\\271\204\000\000\000\000\000\005\000\000\000\000\000\000\000\377\377\377\377\377\177\000\000\350\030i\000\000\000\000\000\360\237\217\021\377\177\000\000\200\020\017wU\177\000\000\000\000\000\000\000\000\000", __ss_align = 140733488014064 } } con = 0x7f54eeeaf040 wsev = { type = 11, buf = 0x7fff118fa4a0 "OPTIONS sip:loginUA@own.domain:5071;transport=ws SIP/2.0\r\nVia: SIP/2.0/WS x.x.x.x:5071;branch=z9hG4bKx.2.1.0\r\nFrom: <sip:keepalive_test@own.domain>;tag=uloc-62e8f62c-690e-7d1-300862f3-62eb7d2c-7d154-2.1\r\nTo: <sip:loginUA@own.domain>\r\nCall-ID: ksrulka-2.1\r\nCSeq: 80 OPTIONS\r\nContent-Length: 0\r\n\r\n", len = 366, id = 1990 } evp = { data = 0x7fff118f9e70, obuf = { s = 0x0, len = 0 }, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0 } ret = 0 __FUNCTION__ = "wss_send" #6 0x00007f54e96275c0 in ul_ka_send (kamsg=0x7fff118fa490, kadst=0x7fff118fa230) at ul_keepalive.c:259 __FUNCTION__ = "ul_ka_send" #7 0x00007f54e96274d1 in ul_ka_urecord (ur=0x7f54eefa0898) at ul_keepalive.c:239 uc = 0x7f54eef67a90 kabuf = "OPTIONS sip:loginUA@own.domain:5071;transport=ws SIP/2.0\r\nVia: SIP/2.0/WS x.x.x.x:5071;branch=z9hG4bKx.2.1.0\r\nFrom: <sip:keepalive_test@own.domain>;tag=uloc-62e8f62c-690e-7d1-300862f3-62eb7d2c-7d154-2.1\r\nTo: <sip:loginUA@own.domain>\r\nCall-ID: ksrulka-2.1\r\nCSeq: 80 OPTIONS\r\nContent-Length: 0\r\n\r\n\000\000\326\301b\312\326\301b\312\326\301b\312\326\301b\312", '\000' <repeats 112 times>, "SXPF\214\n\000\000\347\002\000\000\000\000\000\000\210\n", '\000' <repeats 30 times>, "\003\002", '\000' <repeats 318 times>, "\240'\004\001\000\000\000\000;W\327vU\177\000\000\000\000\000\000\000\000\000\000\345*n\000\000\000\000\000`\250\217\021\377\177\000\000\020ЏnU\177\000\000\210\004JoU\177\000\000\020ЏnU\177\000\000\240\250\217\021\377\177\000\000\235L\316\347T\177\000\000\320ӏnU\177", '\000' <repeats 13 times>, "\b\000\000\000\000\b\327@\a\000\000\000\000 %\224\000\000\000\000\000\370(\277\000\000\000\000\000\230\347\277\000\000\000\000\000\b\000\000\000\000\000\000\000\023\000\000\000\000\000\000\000\210\004JoU\177\000\000Ш\217\021\377\177\000\000\005\357\205\000\000\000\000\000\377\001\000\000\370\001\000\000\236\335\060\346T\177\000\000\370S\355\355T\177\000\000\000\000\263\355T\177\000\000\020\252\217\021\377\177\000\000k\234m\000\000\000\000\000\360\212\037\354T\177", '\000' <repeats 74 times>, "\370S\355\355T\177\000\000\000\000\263\355T\177\000\000\370\n\177\000\004\000\000\000P\003\263\355T\177\000\000\\\271\204\000\a\000\000\000PR\337\356T\177\000\000Ъ\217\021\377\177\000\000]\275m\000\000\000\000\000Щ\217\021\377\177\000\000\005\357\205\000\000\000\000\000\067\002\000\000\027\002\000\000\236\335\060\346T\177\000\000\230D\354\355T\177\000\000\000\000\263\355T\177\000\000\230$\224\000\000\000\000\000\240'\277\000\000\000\000\000\230\347\277\000\000\000\000\000\001\000\000\000\b\000\000\000\026\000\000\000\000\000\000\000\210\004JoU\177\000\000\000\252\217\021\377\177\000\000\000\000\000\000\000\000̇\300\334\060\346T\177\000\000\345*n\000\020\000\000\000\060\252\217\021\377\177\000\000_zm\000\000\000\000\000\230D\354\355T\177\000\000\000\000\263\355T\177\000\000\230D\354\355\004\000\000\000`́\000\000\000\000\000Xj\231\356\003\b\000\000Xj\231\356T\177\000\000 \253\217\021\377\177\000\000\070\375T\000\000\000\000\000\067\002\000\000\313\000\000\000\236\335\060\346T\177\000\000\020,\354\355T\177\000\000\000\000\263\355T\177\000\000\230T\355\355T\177\000\000\210S\355\355T\177\000\000\001\000\000\000\000\000\000\000P\253\217\021\377\177", '\000' <repeats 14 times>, "\306\a\000\000\067\002\000\000\233\017\000\000\v\343A\347T\177\000\000`\261\353\355T\177\000\000\000\000\263\355T\177\000\000\360\252\217\021\377\177\000\000_zm\000\000\000\000\000\001\000\000\000\000\000\000\000\370ֻ\355T\177\000\000\067\002\000\000\233\017\000\000\v\343A\347\306\003\000\000 \253\217\021\001\000\000\000\370ֻ\355T\177\000\000 \253\217\021\377\177\000\000\300\032S\000\000\000\000\000\370\n\177\000\000\000\000\000\370ֻ\355T\177\000\000\\\271\204\000\000\000\000\000\270\361\352\356\001\000\000\000\200\253\217\021\377\177\000\000\267\006U", '\000' <repeats 33 times>, "\306\a\000\000\067\002\000\000\233\017\000\000\v\343A\347T\177\000\000\060\235\353\355T\177\000\000\000\000\263\355T\177\000\000po\362\356\000\000\000\000@\360\352\356T\177\000\000\260\253\217\021\377\177\000\000\370\006U\000\000\000\000\000\067\002\000\000\000\000\000\000\270\361\352\356T\177", '\000' <repeats 14 times>, "\306\a\000\000\340\253\217\021\377\177\000\000N\211_\351T\177\000\000\067\002\000\000_\000\000\000\220z\366\356T\177\000\000@\360\352\356T\177\000\000\220z\366\356T\177\000\000\020\255\217\021\377\177\000\000K\245_\351T\177\000\000\070N\343\355T\177\000\000\000\000\263\355T\177\000\000@\254\217\021\377\177\000\000_zm\000\000\000\000\000xT\343\355T\177\000\000\000\000\000\000\000\200\021\200\070N\343\355T\177\000\000\000\000\263\355T\177\000\000\070N\343\355T\177\000\000\240 \263\355T\177\000\000\000\t\263\355J\000\000\000\240 \263\355T\177\000\000\300\255\217\0 kabuf_len = 366 kamsg = { s = 0x7fff118fa4a0 "OPTIONS sip:loginUA@own.domain:5071;transport=ws SIP/2.0\r\nVia: SIP/2.0/WS x.x.x.x:5071;branch=z9hG4bKx.2.1.0\r\nFrom: <sip:keepalive_test@own.domain>;tag=uloc-62e8f62c-690e-7d1-300862f3-62eb7d2c-7d154-2.1\r\nTo: <sip:loginUA@own.domain>\r\nCall-ID: ksrulka-2.1\r\nCSeq: 80 OPTIONS\r\nContent-Length: 0\r\n\r\n", len = 366 } vaddr = { s = 0x7f556f4999f8 "x.x.x.x", len = 13 } vport = { s = 0x7f556f499988 "5071", len = 4 } sdst = { s = 0x7f54eef745b0 "sip:y.y.y.y:33998;transport=ws", len = 37 } sproto = { s = 0x84501d "WS", len = 2 } duri = { user = { s = 0x0, len = 0 }, passwd = { s = 0x0, len = 0 }, host = { s = 0x7f54eef745b4 "y.y.y.y:33998;transport=ws", len = 14 }, port = { s = 0x7f54eef745c3 "33998;transport=ws", len = 5 }, params = { s = 0x7f54eef745c9 "transport=ws", len = 12 }, sip_params = { s = 0x7f54eef745c9 "transport=ws", len = 12 }, headers = { s = 0x0, len = 0 }, port_no = 33998, proto = 5, type = SIP_URI_T, flags = (unknown: 0), transport = { s = 0x7f54eef745c9 "transport=ws", len = 12 }, ttl = { s = 0x0, len = 0 }, user_param = { s = 0x0, len = 0 }, maddr = { s = 0x0, len = 0 }, method = { s = 0x0, len = 0 }, lr = { s = 0x0, len = 0 }, r2 = { s = 0x0, len = 0 }, gr = { s = 0x0, len = 0 }, transport_val = { s = 0x7f54eef745d3 "ws", len = 2 }, ttl_val = { s = 0x0, len = 0 }, user_param_val = { s = 0x0, len = 0 }, maddr_val = { s = 0x0, len = 0 }, method_val = { s = 0x0, len = 0 }, lr_val = { s = 0x0, len = 0 }, r2_val = { s = 0x0, len = 0 }, gr_val = { s = 0x0, len = 0 } } dproto = 5 '\005' he = 0xb53580 <he.7561> ssock = 0x7f556e9a3948 idst = { send_sock = 0x7f556e9a3948, to = { s = { sa_family = 2, sa_data = "\204\316On\204\254\000\000\000\000\000\000\000" }, sin = { sin_family = 2, sin_port = 52868, sin_addr = { s_addr = 2894360143 }, sin_zero = "\000\000\000\000\000\000\000" }, sin6 = { sin6_family = 2, sin6_port = 52868, sin6_flowinfo = 2894360143, sin6_addr = { __in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0} } }, sin6_scope_id = 0 }, sas = { ss_family = 2, __ss_padding = "\204\316On\204\254", '\000' <repeats 111 times>, __ss_align = 0 } }, id = 0, send_flags = { f = 0, blst_imask = 0 }, proto = 5 '\005', proto_pad0 = 0 '\000', proto_pad1 = 0 } bcnt = 1 aortype = 0 i = 23 tv = { tv_sec = 1659600172, tv_usec = 512340 } tnow = 1659600172 __FUNCTION__ = "ul_ka_urecord" #8 0x00007f54e95f2985 in mem_timer_udomain (_d=0x7f54ede28b88, istart=0, istep=1) at udomain.c:1287 ptr = 0x7f54eefa0898 t = 0x7f54ede34e38 i = 755 #9 0x00007f54e9624b28 in synchronize_all_udomains (istart=0, istep=1) at dlist.c:968 res = 0 ptr = 0x7f54ede28a88 #10 0x00007f54e9601a67 in destroy () at usrloc_mod.c:512 __FUNCTION__ = "destroy" #11 0x00000000005d08c4 in destroy_modules () at core/sr_module.c:839 t = 0x7f556e9bcf98 foo = 0x7f556e9bc240 __FUNCTION__ = "destroy_modules" #12 0x000000000041e0fa in cleanup (show_status=1) at main.c:561 memlog = 0 __FUNCTION__ = "cleanup" #13 0x000000000041f9d5 in shutdown_children (sig=15, show_status=1) at main.c:704 __FUNCTION__ = "shutdown_children" #14 0x000000000042054a in handle_sigs () at main.c:735 chld = 0 chld_status = 0 any_chld_stopped = 0 memlog = -301737376 __FUNCTION__ = "handle_sigs" #15 0x000000000042ecf1 in main_loop () at main.c:1900 i = 2 pid = 26897 si = 0x0 si_desc = "udp receiver child=1 sock=x.x.x.x:5060\000\177\000\000\250\240\020oU\177\000\000\000,@oU\177\000\000\360\263\217\021\377\177\000\000\070\365\234nU\177\000\000\360\256\201\000\000\000\000\000 \242\020oU\177\000\000c\276\201\000\000\000\000\000\373\257\201\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\263\355T\177\000" nrprocs = 2 woneinit = 1 __FUNCTION__ = "main_loop" #16 0x00000000004377eb in main (argc=13, argv=0x7fff118fba48) at main.c:3074 cfg_stream = 0xcbc030 c = -1 r = 0 tmp = 0x7fff118fcf2e "" tmp_len = 1408 port = 896 proto = 32597 ahost = 0x0 aport = 0 options = 0x7f3c80 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1300414379 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7fff118fb900 p = 0x0 st = { st_dev = 20, st_ino = 13137, st_nlink = 2, st_mode = 16832, st_uid = 990, st_gid = 986, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1658932830, tv_nsec = 26739696 }, st_mtim = { tv_sec = 1659434539, tv_nsec = 91576515 }, st_ctim = { tv_sec = 1659434539, tv_nsec = 91576515 }, __unused = {0, 0, 0} } tbuf = '\000' <repeats 392 times>, "\204ƢwU\177\000\000\000\000\000\000\000\000\000\000`џ\021\377\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000&\260be\000\000\000\000X\316\242wU\177\000\000\000\000\000\000\000\000\000\000\240\267\217\021\377\177\000\000\300\212\225\001\000\000\000\000\300џ\021\377\177\000\000\260\270\217\021\377\177\000\000&", '\000' <repeats 22 times> option_index = 0 long_options = {{ name = 0x7f60af "help", has_arg = 0, flag = 0x0, val = 104 }, { name = 0x7f0f54 "version", has_arg = 0, flag = 0x0, val = 118 }, { name = 0x7f60b4 "alias", has_arg = 1, flag = 0x0, val = 1024 }, { name = 0x7f60ba "subst", has_arg = 1, flag = 0x0, val = 1025 }, { name = 0x7f60c0 "substdef", has_arg = 1, flag = 0x0, val = 1026 }, { name = 0x7f60c9 "substdefs", has_arg = 1, flag = 0x0, val = 1027 }, { name = 0x7f60d3 "server-id", has_arg = 1, flag = 0x0, val = 1028 }, { name = 0x7f60dd "loadmodule", has_arg = 1, flag = 0x0, val = 1029 }, { name = 0x7f60e8 "modparam", has_arg = 1, flag = 0x0, val = 1030 }, { name = 0x7f60f1 "log-engine", has_arg = 1, flag = 0x0, val = 1031 }, { name = 0x7f60fc "debug", has_arg = 1, flag = 0x0, val = 1032 }, { name = 0x7f6102 "cfg-print", has_arg = 0, flag = 0x0, val = 1033 }, { name = 0x7f610c "atexit", has_arg = 1, flag = 0x0, val = 1034 }, { name = 0x0, has_arg = 0, flag = 0x0, val = 0 }} __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0xcbc030 c = -1 r = 0 tmp = 0x7fff118fcf2e "" tmp_len = 1408 port = 896 proto = 32597 ahost = 0x0 aport = 0 options = 0x7f3c80 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1300414379 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7fff118fb900 p = 0x0 st = { st_dev = 20, st_ino = 13137, st_nlink = 2, st_mode = 16832, st_uid = 990, st_gid = 986, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1658932830, tv_nsec = 26739696 }, st_mtim = { tv_sec = 1659434539, tv_nsec = 91576515 }, st_ctim = { tv_sec = 1659434539, tv_nsec = 91576515 }, __unused = {0, 0, 0} } tbuf = '\000' <repeats 392 times>, "\204ƢwU\177\000\000\000\000\000\000\000\000\000\000`џ\021\377\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000&\260be\000\000\000\000X\316\242wU\177\000\000\000\000\000\000\000\000\000\000\240\267\217\021\377\177\000\000\300\212\225\001\000\000\000\000\300џ\021\377\177\000\000\260\270\217\021\377\177\000\000&", '\000' <repeats 22 times> option_index = 0 long_options = {{ name = 0x7f60af "help", has_arg = 0, flag = 0x0, val = 104 }, { name = 0x7f0f54 "version", has_arg = 0, flag = 0x0, val = 118 }, { name = 0x7f60b4 "alias", has_arg = 1, flag = 0x0, val = 1024 }, { name = 0x7f60ba "subst", has_arg = 1, flag = 0x0, val = 1025 }, { name = 0x7f60c0 "substdef", has_arg = 1, flag = 0x0, val = 1026 }, { name = 0x7f60c9 "substdefs", has_arg = 1, flag = 0x0, val = 1027 }, { name = 0x7f60d3 "server-id", has_arg = 1, flag = 0x0, val = 1028 }, { name = 0x7f60dd "loadmodule", has_arg = 1, flag = 0x0, val = 1029 }, { name = 0x7f60e8 "modparam", has_arg = 1, flag = 0x0, val = 1030 }, { name = 0x7f60f1 "log-engine", has_arg = 1, flag = 0x0, val = 1031 }, { name = 0x7f60fc "debug", has_arg = 1, flag = 0x0, val = 1032 }, { name = 0x7f6102 "cfg-print", has_arg = 0, flag = 0x0, val = 1033 }, { name = 0x7f610c "atexit", has_arg = 1, flag = 0x0, val = 1034 }, { name = 0x0, has_arg = 0, flag = 0x0, val = 0 }} __FUNCTION__ = "main" (gdb) list 219 ATOMIC_FUNC_DECL2(and, "andl %1, %0", int) 220 ATOMIC_FUNC_DECL2(or, "orl %1, %0", int) 221 ATOMIC_FUNC_TEST(inc_and_test, "incl %0", int, int) 222 ATOMIC_FUNC_TEST(dec_and_test, "decl %0", int, int) 223 ATOMIC_FUNC_XCHG(get_and_set, "xchgl %1, %0", int) 224 ATOMIC_FUNC_CMPXCHG(cmpxchg, "cmpxchgl %2, %1", int , int) 225 ATOMIC_FUNC_XADD(add, "xaddl %0, %1", int) 226 #ifdef __CPU_x86_64 227 ATOMIC_FUNC_DECL1(inc, "incq %0", long) 228 ATOMIC_FUNC_DECL1(dec, "decq %0", long) (gdb) ``` #### Log Messages /var/log/kamailio.log ``` Aug 4 11:02:52 dev [26872]: NOTICE: <core> [main.c:733]: handle_sigs(): Thank you for flying kamailio!!! ``` /var/log/messages ``` Aug 4 11:02:52 dev systemd: Stopping Kamailio (OpenSER) - the Open Source SIP Server... Aug 4 11:02:52 dev kernel: kamailio[26872]: segfault at 0 ip 00007f54e6ee9594 sp 00007fff118f9b10 error 6 in websocket.so[7f54e6edf000+32000] Aug 4 11:02:57 dev systemd: kamailio.service: main process exited, code=dumped, status=11/SEGV Aug 4 11:02:57 dev systemd: Stopped Kamailio (OpenSER) - the Open Source SIP Server. Aug 4 11:02:57 dev systemd: Unit kamailio.service entered failed state. Aug 4 11:02:57 dev systemd: kamailio.service failed. Aug 4 11:02:57 dev systemd: Starting Kamailio (OpenSER) - the Open Source SIP Server... Aug 4 11:02:58 dev kamailio: loading modules under config path: /usr/lib64/kamailio/modules/ ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@dev ~]# /usr/sbin/kamailio -v version: kamailio 5.6.0 (x86_64/linux) b0d6a6 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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 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: b0d6a6 compiled on 13:24:32 May 30 2022 with gcc 4.8.5 ``` * **Operating System**: ``` [root@dev ~]# uname -a Linux own.domain 3.10.0-1160.42.2.el7.x86_64 #1 SMP Tue Sep 7 14:49:57 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3207 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3207(a)github.com>

2 4

[kamailio/kamailio] BUG: modules msrp file: msrp_cmap.c msrp cmap_save method have logic bug (Issue #3215)
by liangbaolin 22 Aug '22

22 Aug '22

### Description I found some failures in the stress test of MSRP messages and prompted the following error log： DEBUG: msrp [msrp_netio.c:98]: msrp_relay(): To-Path has only one URI -- nowehere to forward；  After adding the log embedding point, it is found that there is a problem in the logic of adding the linked list of "_msrp_cmap_head - > cslots". The node with a smaller hash value will be added behind the node with a larger "citemid" value, so that the linked list is not arranged strictly in the ascending order of "citemid", resulting in the failure of subsequent queries such as "msrp_cmap_lookup", and thus the normal relay cannot be performed. 37(81) ERROR: msrp [msrp_cmap.c:291]: msrp_cmap_save(): _msrp_cmap_head->cslots[**492932**] item citemid is [**2183628164**], sessionid is [xxxxxxxx] 37(81) ERROR: msrp [msrp_cmap.c:291]: msrp_cmap_save(): _msrp_cmap_head->cslots[**492932**] item citemid is [**2174190980**], sessionid is [xxxxxxxx] **2183628164>2174190980, out of order.** ### Troubleshooting source code: for(itb=_msrp_cmap_head->cslots[idx].first; itb; itb=itb->next) { if(itb->citemid>it->citemid || itb->next==NULL) { **if(itb->next==NULL)** { itb->next=it; it->prev = itb; } else { it->next = itb; if(itb->prev==NULL) { _msrp_cmap_head->cslots[idx].first = it; } else { itb->prev->next = it; } it->prev = itb->prev; itb->prev = it; } break; } } #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information Tested against kamailio 5.4.x and actually all versions are affected` ``` fixed code: for(itb=_msrp_cmap_head->cslots[idx].first; itb; itb=itb->next) { if(itb->citemid>it->citemid || itb->next==NULL) { //modifed code if(itb->next==NULL && (itb->citemid < it->citemid)) { itb->next=it; it->prev = itb; } else { it->next = itb; if(itb->prev==NULL) { _msrp_cmap_head->cslots[idx].first = it; } else { itb->prev->next = it; } it->prev = itb->prev; itb->prev = it; } break; } } ``` * **Operating System**:  ``` Ubuntu 16.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3215 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3215(a)github.com>

3 4

[kamailio/kamailio] Add parameter to disable comma separated values in one Single Via, Record-Route or Route from topos and topoh (Issue #3216)
by patrickarton 22 Aug '22

22 Aug '22

### Description Hello , i would like to have parameter in topos and topoh to disable comma separated values in one single **Via**, **Record-Route** or **Route** header. some ua we are interacting with dont handle that (even if its rfc compliant). and so most scenario calls fail with those particular ua.  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3216 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3216(a)github.com>

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev