sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:8cb948cc: dialog: fetch directly the int value for dlg variable used in dlg_cseq_update()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 8cb948cc07e2d577cdd14efdfe38f3e9bbf11d79 URL: https://github.com/kamailio/kamailio/commit/8cb948cc07e2d577cdd14efdfe38f3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T13:34:38+02:00 dialog: fetch directly the int value for dlg variable used in dlg_cseq_update() --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb948cc07e2d577cdd14efdfe38f3e… Patch: https://github.com/kamailio/kamailio/commit/8cb948cc07e2d577cdd14efdfe38f3e… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index c81cf904d4..e5555441fe 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -131,7 +131,6 @@ int dlg_cseq_update(sip_msg_t *msg) unsigned int ninc = 0; unsigned int vinc = 0; str nval; - str *pval; sr_cfgenv_t *cenv = NULL; if(dlg_cseq_prepare_msg(msg)!=0) { @@ -164,16 +163,10 @@ int dlg_cseq_update(sip_msg_t *msg) /* take the increment value from dialog */ if((dlg->iflags&DLG_IFLAG_CSEQ_DIFF)==DLG_IFLAG_CSEQ_DIFF) { /* 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) { + 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; - } } vinc += ninc; if(vinc==0) {

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev