sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

git:master:e8b90500: kazoo: add kz prefix to str_split utility function

by Henning Westerholt

Module: kamailio Branch: master Commit: e8b905006e1a768cd8e328bd836ac43e5a2bc2f2 URL: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-02T19:27:27+01:00 kazoo: add kz prefix to str_split utility function - add kz prefix to str_split utility function, to prevent overlapping with a function with similar name in the json module --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… Patch: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 4fd30998f6..5ab8f68c79 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -49,7 +49,7 @@ enum json_type kz_json_get_type(struct json_object *jso) typedef str* json_key; typedef json_key* json_keys; -json_keys str_split(char* a_str, const char a_delim, int* c) +json_keys kz_str_split(char* a_str, const char a_delim, int* c) { json_keys result = 0; int count = 0; @@ -145,7 +145,7 @@ struct json_object * kz_json_get_field_object(str* json, str* field) dup = pkg_malloc(field->len+1); memcpy(dup, field->s, field->len); dup[field->len] = '\0'; - keys = str_split(dup, '.', &parts); + keys = kz_str_split(dup, '.', &parts); pkg_free(dup); if (keys)

5 years, 5 months

Build failed in Jenkins: kamailio44-nightly-binaries » i386,squeeze,slave #128

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> ------------------------------------------ [...truncated 360.27 KB...] + '[' 3600 -eq 0 ']' + touch /var/run/lock/squeeze-i386.building.3467 + case "$architecture" in + linux32 sudo DIST=squeeze ARCH=i386 cowbuilder --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --build <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --basepath /var/cache/pbuilder/base-squeeze-i386.cow --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_cwE6xn ' --configfile=/tmp/tmp.9M3renpBjV -> Copying COW directory forking: rm -rf /var/cache/pbuilder/build//cow.11132 forking: cp -al /var/cache/pbuilder/base-squeeze-i386.cow /var/cache/pbuilder/build//cow.11132 I: removed stale ilistfile /var/cache/pbuilder/build//cow.11132/.ilist forking: chroot /var/cache/pbuilder/build//cow.11132 cowdancer-ilistcreate /.ilist find . -xdev -path ./home -prune -o $ \( -type l -o -type f $ -a -links +1 -print0 \) | xargs -0 stat --format '%d %i ' -> Invoking pbuilder forking: pbuilder build --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts /tmp/apt-jdg_cwE6xn --configfile /tmp/tmp.9M3renpBjV --buildplace /var/cache/pbuilder/build//cow.11132 --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --debbuildopts -B --no-targz --internal-chrootexec chroot /var/cache/pbuilder/build//cow.11132 cow-shell <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: using fakeroot in build. I: pbuilder: network access will be disabled during build I: Current time: Tue Oct 30 04:27:20 UTC 2018 I: pbuilder-time-stamp: 1540873640 I: copying local configuration I: mounting /proc filesystem I: mounting /run/shm filesystem I: mounting /dev/pts filesystem I: Mounting /tmp/apt-jdg_cwE6xn I: policy-rc.d already exists I: Obtaining the cached apt archive contents I: Installing the build-deps I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D10-man-db starting I: Preseed man-db/auto-update to false I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D10-man-db finished I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D20releaserepo starting + set -- /tmp/apt-jdg_cwE6xn/ + TMPAPT=/tmp/apt-jdg_cwE6xn/ + [ -d /tmp/apt-jdg_cwE6xn/ ] + UPDATE_PKGLIST=0 + ls /tmp/apt-jdg_cwE6xn/*.list + [ -e /tmp/apt-jdg_cwE6xn//keyring.gpg ] + [ 0 = 1 ] I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D20releaserepo finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: i386 Maintainer: Debian Pbuilder Team <pbuilder-maint(a)lists.alioth.debian.org> Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: bison, debhelper (>= 8), libmysqlclient-dev, docbook-xml, erlang-dev, flex, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libev-dev, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), libjson0-dev, libldap2-dev, liblua5.1-0-dev, libmemcached-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libpq-dev, libradiusclient-ng-dev, libreadline-dev, libsasl2-dev, libsnmp-dev, libsqlite3-dev, libunistring-dev, libxml2-dev, libxmlrpc-c3-dev, openssl, pkg-config, python, python-dev, unixodbc-dev, uuid-dev, xsltproc, zlib1g-dev dpkg-deb: building package `pbuilder-satisfydepends-dummy' in `/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'. Selecting previously deselected package pbuilder-satisfydepends-dummy. (Reading database ... 10562 files and directories currently installed.) Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ... dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested: pbuilder-satisfydepends-dummy depends on bison; however: Package bison is not installed. pbuilder-satisfydepends-dummy depends on debhelper (>= 8); however: Package debhelper is not installed. pbuilder-satisfydepends-dummy depends on libmysqlclient-dev; however: Package libmysqlclient-dev is not installed. pbuilder-satisfydepends-dummy depends on docbook-xml; however: Package docbook-xml is not installed. pbuilder-satisfydepends-dummy depends on erlang-dev; however: Package erlang-dev is not installed. pbuilder-satisfydepends-dummy depends on flex; however: Package flex is not installed. pbuilder-satisfydepends-dummy depends on libconfuse-dev; however: Package libconfuse-dev is not installed. pbuilder-satisfydepends-dummy depends on libcurl4-openssl-dev; however: Package libcurl4-openssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libdb-dev (>= 4.6.19); however: Package libdb-dev is not installed. pbuilder-satisfydepends-dummy depends on libev-dev; however: Package libev-dev is not installed. pbuilder-satisfydepends-dummy depends on libevent-dev; however: Package libevent-dev is not installed. pbuilder-satisfydepends-dummy depends on libexpat1-dev; however: Package libexpat1-dev is not installed. pbuilder-satisfydepends-dummy depends on libgeoip-dev (>= 1.4.5); however: Package libgeoip-dev is not installed. pbuilder-satisfydepends-dummy depends on libjson0-dev; however: Package libjson0-dev is not installed. pbuilder-satisfydepends-dummy depends on libldap2-dev; however: Package libldap2-dev is not installed. pbuilder-satisfydepends-dummy depends on liblua5.1-0-dev; however: Package liblua5.1-0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmemcached-dev; however: Package libmemcached-dev is not installed. pbuilder-satisfydepends-dummy depends on libncurses5-dev; however: Package libncurses5-dev is not installed. pbuilder-satisfydepends-dummy depends on libpcre3-dev; however: Package libpcre3-dev is not installed. pbuilder-satisfydepends-dummy depends on libperl-dev; however: Package libperl-dev is not installed. pbuilder-satisfydepends-dummy depends on libpq-dev; however: Package libpq-dev is not installed. pbuilder-satisfydepends-dummy depends on libradiusclient-ng-dev; however: Package libradiusclient-ng-dev is not installed. pbuilder-satisfydepends-dummy depends on libreadline-dev; however: Package libreadline-dev is not installed. pbuilder-satisfydepends-dummy depends on libsasl2-dev; however: Package libsasl2-dev is not installed. pbuilder-satisfydepends-dummy depends on libsnmp-dev; however: Package libsnmp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsqlite3-dev; however: Package libsqlite3-dev is not installed. pbuilder-satisfydepends-dummy depends on libunistring-dev; however: Package libunistring-dev is not installed. pbuilder-satisfydepends-dummy depends on libxml2-dev; however: Package libxml2-dev is not installed. pbuilder-satisfydepends-dummy depends on libxmlrpc-c3-dev; however: Package libxmlrpc-c3-dev is not installed. pbuilder-satisfydepends-dummy depends on openssl; however: Package openssl is not installed. pbuilder-satisfydepends-dummy depends on pkg-config; however: Package pkg-config is not installed. pbuilder-satisfydepends-dummy depends on python; however: Package python is not installed. pbuilder-satisfydepends-dummy depends on python-dev; however: Package python-dev is not installed. pbuilder-satisfydepends-dummy depends on unixodbc-dev; however: Package unixodbc-dev is not installed. pbuilder-satisfydepends-dummy depends on uuid-dev; however: Package uuid-dev is not installed. pbuilder-satisfydepends-dummy depends on xsltproc; however: Package xsltproc is not installed. pbuilder-satisfydepends-dummy depends on zlib1g-dev; however: Package zlib1g-dev is not installed. Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ... Reading package lists... Building dependency tree... Reading state information... Initializing package states... Writing extended state information... The following NEW packages will be installed: bison{a} bsdmainutils{a} ca-certificates{a} comerr-dev{a} debhelper{a} docbook-xml{a} erlang-base{a} erlang-dev{a} file{a} flex{a} fontconfig{a} fontconfig-config{a} gettext{a} gettext-base{a} groff-base{a} html2text{a} intltool-debian{a} krb5-multidev{a} libaudio2{a} libconfuse-dev{a} libconfuse0{a} libcroco3{a} libcurl3{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb4.8-dev{a} libev-dev{a} libev3{a} libevent-1.4-2{a} libevent-core-1.4-2{a} libevent-dev{a} libevent-extra-1.4-2{a} libexpat1{a} libexpat1-dev{a} libfontconfig1{a} libfreetype6{a} libgcrypt11{a} libgeoip-dev{a} libgeoip1{a} libglib2.0-0{a} libgnutls26{a} libgpg-error0{a} libgssapi-krb5-2{a} libgssrpc4{a} libhashkit0{a} libice6{a} libidn11{a} libidn11-dev{a} libjpeg62{a} libjson0{a} libjson0-dev{a} libk5crypto3{a} libkadm5clnt-mit7{a} libkadm5srv-mit7{a} libkdb5-4{a} libkeyutils1{a} libkrb5-3{a} libkrb5-dev{a} libkrb5support0{a} liblcms1{a} libldap-2.4-2{a} libldap2-dev{a} libltdl-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic1{a} libmemcached-dev{a} libmemcached5{a} libmemcachedprotocol0{a} libmemcachedutil0{a} libmng1{a} libmysqlclient-dev{a} libmysqlclient16{a} libncurses5-dev{a} libodbcinstq1c2{a} libpcre3{a} libpcre3-dev{a} libpcrecpp0{a} libperl-dev{a} libperl5.10{a} libpng12-0{a} libpopt0{a} libpq-dev{a} libpq5{a} libpython2.6{a} libqt3-mt{a} libradiusclient-ng-dev{a} libradiusclient-ng2{a} libreadline-dev{a} libreadline6-dev{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules{a} libsensors4{a} libsensors4-dev{a} libsm6{a} libsnmp-base{a} libsnmp-dev{a} libsnmp-perl{a} libsnmp15{a} libsqlite3-dev{a} libssh2-1{a} libssh2-1-dev{a} libssl-dev{a} libtasn1-3{a} libunistring-dev{a} libunistring0{a} libwrap0{a} libwrap0-dev{a} libx11-6{a} libx11-data{a} libxau6{a} libxcb1{a} libxcursor1{a} libxdmcp6{a} libxext6{a} libxfixes3{a} libxft2{a} libxi6{a} libxinerama1{a} libxml2{a} libxml2-dev{a} libxmlrpc-c3{a} libxmlrpc-c3-dev{a} libxrandr2{a} libxrender1{a} libxslt1.1{a} libxt6{a} m4{a} makedev{a} man-db{a} mime-support{a} mysql-common{a} odbcinst{a} odbcinst1debian2{a} openssl{a} pkg-config{a} po-debconf{a} procps{a} python{a} python-dev{a} python-minimal{a} python2.6{a} python2.6-dev{a} python2.6-minimal{a} sgml-base{a} sgml-data{a} ttf-dejavu-core{a} ucf{a} unixodbc{a} unixodbc-dev{a} uuid-dev{a} x11-common{a} xml-core{a} xsltproc{a} zlib1g-dev{a} 0 packages upgraded, 157 newly installed, 0 to remove and 0 not upgraded. Need to get 68.8 MB/69.0 MB of archives. After unpacking 190 MB will be used. WARNING: untrusted versions of the following packages will be installed! Untrusted packages could compromise your system's security. You should only proceed with the installation if you are certain that this is what you want to do. libkeyutils1 libconfuse-dev libkrb5-3 libodbcinstq1c2 libpopt0 ttf-dejavu-core libxfixes3 xsltproc libkrb5support0 libperl-dev libevent-1.4-2 liblcms1 python2.6-minimal mime-support procps libidn11 debhelper libsensors4 libwrap0 libhashkit0 pkg-config intltool-debian libsnmp15 libevent-core-1.4-2 libkadm5clnt-mit7 libradiusclient-ng2 bison libx11-data comerr-dev libssh2-1-dev libpcre3-dev libgeoip-dev libxmlrpc-c3 libevent-dev docbook-xml libsasl2-modules m4 libsqlite3-dev libxslt1.1 po-debconf libpcre3 mysql-common groff-base python-dev libfontconfig1 fontconfig-config libgnutls26 unixodbc-dev libkrb5-dev odbcinst libsasl2-dev libmysqlclient-dev xml-core libradiusclient-ng-dev python2.6 libtasn1-3 libmemcachedutil0 python-minimal libdb-dev libldap2-dev libexpat1 libk5crypto3 libgssrpc4 libpcrecpp0 unixodbc fontconfig libjson0 libxmlrpc-c3-dev gettext libxcb1 libunistring-dev libsensors4-dev libxau6 libcurl3 libreadline-dev odbcinst1debian2 libjson0-dev krb5-multidev python libxft2 libssl-dev libssh2-1 libcroco3 libice6 ca-certificates libxdmcp6 libgcrypt11 makedev libpython2.6 libxml2 erlang-dev zlib1g-dev libmemcached5 file libxml2-dev libwrap0-dev bsdmainutils libgpg-error0 python2.6-dev libxrender1 flex sgml-base ucf libsnmp-perl libev3 gettext-base libsnmp-dev uuid-dev libpng12-0 libjpeg62 libgeoip1 libperl5.10 liblua5.1-0-dev libconfuse0 libpq-dev libkadm5srv-mit7 libmysqlclient16 libldap-2.4-2 libfreetype6 libmemcachedprotocol0 libexpat1-dev libreadline6-dev libunistring0 libglib2.0-0 liblua5.1-0 libmemcached-dev x11-common libncurses5-dev sgml-data libsnmp-base libx11-6 libsasl2-2 libpq5 man-db html2text libdb4.8-dev openssl libev-dev libsm6 libkdb5-4 libqt3-mt libgssapi-krb5-2 libevent-extra-1.4-2 libxi6 libaudio2 libxcursor1 libxt6 libxinerama1 libltdl-dev libxext6 libxrandr2 libmng1 libidn11-dev libltdl7 libmagic1 libcurl4-openssl-dev erlang-base Do you want to ignore this warning and proceed anyway? To continue, enter "Yes"; to abort, enter "No": Abort. E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_cwE6xn filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.11132 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/squeeze-i386.building.3467 + '[' -r /var/run/lock/squeeze-i386.update.3467 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…'> + '[' -n /tmp/tmp.9M3renpBjV ']' + rm -rf /tmp/tmp.9M3renpBjV + '[' -n /tmp/apt-jdg_cwE6xn ']' + sudo rm -rf /tmp/apt-jdg_cwE6xn + '[' -n 12477 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=25 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:32 UTC 2018 [running 25 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:32 UTC 2018 [running 25 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

5 years, 5 months

git:master:3605e28a: pkg/kamailio/deb: version set to 5.2.0~pre2

by Victor Seva

Module: kamailio Branch: master Commit: 3605e28af86ec3db1aba215891de3d96e41ba3ad URL: https://github.com/kamailio/kamailio/commit/3605e28af86ec3db1aba215891de3d9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-02T15:25:49+01:00 pkg/kamailio/deb: version set to 5.2.0~pre2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/3605e28af86ec3db1aba215891de3d9… Patch: https://github.com/kamailio/kamailio/commit/3605e28af86ec3db1aba215891de3d9…

5 years, 5 months

Branching GIT repository for 5.2.x release series

by Daniel-Constantin Mierla

Hello, if there is no other opinion, I am considering to create git branch 5.2 at the beginning of next week (likely on Monday evening), to be used for 5.2.x release series. >From that moment, the master branch can get new features and the appropriate bug fixes have to be backported to branch 5.2 as well. With this step, the first release in 5.2.x series, respectively v5.2.0, should be out in about 2-3 weeks. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

5 years, 5 months

git:master:0580ad2e: Merge pull request #1704 from micmac1/dp_replace

by GitHub

Module: kamailio Branch: master Commit: 0580ad2eb7f5fd829a2c7c7394ffadc0ca7f85a9 URL: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-02T11:11:49+01:00 Merge pull request #1704 from micmac1/dp_replace dialplan: fix dp_replace() in cmd_export_t struct --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… Patch: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 39ba1ceeff..a96b246b72 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"dp_match",(cmd_function)w_dp_match, 2, fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, - {"dp_replace",(cmd_function)w_dp_replace, 2, dp_replace_fixup, + {"dp_replace",(cmd_function)w_dp_replace, 3, dp_replace_fixup, dp_replace_fixup_free, ANY_ROUTE}, {0,0,0,0,0,0} };

5 years, 5 months

git:master:cbff3590: dialplan: fix dp_replace() in cmd_export_t struct

by Sebastian Kemper

Module: kamailio Branch: master Commit: cbff35909edccffe778d04f3871d880195d82b7a URL: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2018-11-02T10:10:46+01:00 dialplan: fix dp_replace() in cmd_export_t struct In the struct 'int param_no' is set to '2'. But dp_replace() has actually three parameters (dpid, inval, outvar), so kamailio's cfg parser fails when dp_replace() is called: yyparse(): cfg. parser: failed to find command dp_replace (params 3) yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 366, column 45: unknown command, missing loadmodule? This commit fixes 'int param_no' to address this. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… Patch: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 39ba1ceeff..a96b246b72 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"dp_match",(cmd_function)w_dp_match, 2, fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, - {"dp_replace",(cmd_function)w_dp_replace, 2, dp_replace_fixup, + {"dp_replace",(cmd_function)w_dp_replace, 3, dp_replace_fixup, dp_replace_fixup_free, ANY_ROUTE}, {0,0,0,0,0,0} };

5 years, 5 months

[kamailio/kamailio] dialplan: fix dp_replace() in cmd_export_t struct (#1704)

by micmac1

In the struct `int param_no` is set to `2`. But `dp_replace()` has actually three parameters `(dpid, inval, outvar)`, so kamailio's cfg parser fails when `dp_replace()` is called: ``` yyparse(): cfg. parser: failed to find command dp_replace (params 3) yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 366, column 45: unknown command, missing loadmodule? ``` This commit fixes `int param_no` to address this. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### Pre-Submission Checklist    - [+] Commit message has the format required by CONTRIBUTING guide - [+] Commits are split per component (core, individual modules, libs, utils, ...) - [+] Each component has a single commit (if not, squash them into one commit) - [+] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [+] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [+] PR should be backported to stable branches - [+] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, When trying out dp_replace() kamailio (5.1.6) wouldn't start. It was expecting 2 parameters instead of 3. This PR fixes that. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1704 -- Commit Summary -- * dialplan: fix dp_replace() in cmd_export_t struct -- File Changes -- M src/modules/dialplan/dialplan.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1704.patch https://github.com/kamailio/kamailio/pull/1704.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1704

5 years, 5 months

git:master:05846d00: Makefile.defs: version set to 5.2.0-pre2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 05846d00a063c069ec4b2c9bf589af111cd7992f URL: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-02T10:27:58+01:00 Makefile.defs: version set to 5.2.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… Patch: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 52167a5899..19e7d87e72 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

5 years, 5 months

git:master:2159e7b2: modules: readme files regenerated - db_redis ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2159e7b2af772beebe3af290c92f8e88ed864daf URL: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-02T09:16:27+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… Patch: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index 75f31cf213..1a5c33caef 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -134,6 +134,12 @@ nce/string,server_id/int,connection_id/int,keepalive/int,partition/int 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' modparam of 'db_redis' for 'address' table needs to be defined. + Important Note: at this moment the module requires at least one 'keys' + parameter, but it does not need to be related to the table loaded from + Redis server -- for example, if used only for permissions module with + 'address' table, then the 'keys' parameter can be specified for + 'version' table. + The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -231,6 +237,7 @@ loadmodule "db_redis.so" #!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") +modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid")

5 years, 5 months

git:master:47a22c49: db_redis: docs - added note that keys parameter must be specified

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47a22c49a84941c8065c0dfa91fb0d07716126c1 URL: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-02T09:11:11+01:00 db_redis: docs - added note that keys parameter must be specified --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… Patch: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 9e5a7a2cbd..9c147a022b 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -76,6 +76,13 @@ username/string,domain/string,contact/string,received/string,path/string,expires records can be: 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' modparam of 'db_redis' for 'address' table needs to be defined. </para> + <para> + Important Note: at this moment the module requires at least one 'keys' + parameter, but it does not need to be related to the table loaded + from Redis server -- for example, if used only for permissions module with + 'address' table, then the 'keys' parameter can be specified for + 'version' table. + </para> <para> The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -219,6 +226,7 @@ loadmodule "db_redis.so" #!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") +modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain")

5 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018