sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
278 discussions

git:master:590d00f0: tm: exported t_exists() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 590d00f04ce714ad7ce3ae6a9ca7bd2853925cba URL: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-31T09:54:54+02:00 tm: exported t_exists() to kemi --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… Patch: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 15dc85dc7b..470e33e663 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -3507,6 +3507,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_exists"), + SR_KEMIP_INT, ki_t_exists, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

1 year, 8 months

[kamailio/kamailio] Add More Logging Option (PR #3228)

by Andrew Webster

#### Pre-Submission Checklist    - [x] 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  Will you accept this? I find this extremely useful for troubleshooting. If accepted I'd like to add to most of the routing blocks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3228 -- Commit Summary -- * Add More Logging Option -- File Changes -- M etc/kamailio.cfg (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3228.patch https://github.com/kamailio/kamailio/pull/3228.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3228 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3228(a)github.com>

1 year, 8 months

git:master:8cb948cc: dialog: fetch directly the int value for dlg variable used in dlg_cseq_update()

by Daniel-Constantin Mierla

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 year, 8 months

git:master:aded00bb: dialog: safer version for getting dlg variable value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aded00bbfe75771cef8d0ee9ae8401772f7644a9 URL: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T13:32:16+02:00 dialog: safer version for getting dlg variable value - clone to ensure that reference is not becoming invalid over the time --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… Patch: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index cd151fd115..04e48fa636 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -279,22 +279,46 @@ void print_lists(struct dlg_cell *dlg) { } } +static str _dlg_var_strval = STR_NULL; + str * get_dlg_variable(struct dlg_cell *dlg, str *key) { - str* var = NULL; + str* var = NULL; - if( !dlg || !key || key->len > strlen(key->s)) - { - LM_ERR("BUG - bad parameters\n"); + if( !dlg || !key || key->len > strlen(key->s)) + { + LM_ERR("BUG - bad parameters\n"); - return NULL; - } + return NULL; + } - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); - var = get_dlg_variable_unsafe( dlg, key); - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe( dlg, key); + if(var) { + _dlg_var_strval.len = pv_get_buffer_size(); + if(_dlg_var_strval.len < var->len+1) { + LM_ERR("pv buffer too small (%d) - needed %d\n", + _dlg_var_strval.len, var->len); + _dlg_var_strval.s = NULL; + _dlg_var_strval.len = 0; + var = NULL; + } else { + _dlg_var_strval.s = pv_get_buffer(); + strncpy(_dlg_var_strval.s, var->s, var->len); + _dlg_var_strval.len = var->len; + _dlg_var_strval.s[_dlg_var_strval.len] = '\0'; + } + } else { + _dlg_var_strval.s = NULL; + _dlg_var_strval.len = 0; + } + + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - return var; + if(var) { + return &_dlg_var_strval; + } + return NULL; } int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval)

1 year, 8 months

git:master:a070f5c1: dialog: updated to get the int value for cseq update operations

by Daniel-Constantin Mierla

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 year, 8 months

git:master:44103239: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

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 year, 8 months

git:master:c38b3585: tm: docs for t_exists()

by Daniel-Constantin Mierla

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 year, 8 months

git:master:f16e76e4: tm: new function t_exists()

by Daniel-Constantin Mierla

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 year, 8 months

Build failed in Jenkins: kamailiodev-nightly-repos » amd64,jammy,master #2095

by kamailio＠sipwise.com

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 year, 8 months

git:master:837d7eab: tsilo: restore also the global t branch index

by Daniel-Constantin Mierla

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 year, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022