sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,jessie #1668
by kamailio＠sipwise.com 19 May '20

19 May '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 5.35 KB...] + ls -la ./ total 8780 drwxr-xr-x 2 admin admin 4096 May 17 01:02 . drwxr-xr-x 3 admin admin 4096 May 17 01:02 .. -rw-r--r-- 1 admin admin 4926 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686.dsc -rw-r--r-- 1 admin admin 5701 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686_source.changes -rw-r--r-- 1 admin admin 8954008 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686.tar.xz -rw-r--r-- 1 admin admin 4156 May 17 00:57 lintian.txt + identify_package_name + PACKAGE=kamailiodev-nightly-binaries/architecture=i386,distribution=jessie + PACKAGE=kamailiodev-nightly + '[' -n kamailiodev-nightly ']' + echo '*** Identified Debian package name kamailiodev-nightly ***' *** Identified Debian package name kamailiodev-nightly *** + set_base_path + '[' -n '' ']' + BASE_PATH=<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> + echo '*** Using $WORKSPACE [<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…]> as default for BASE_PATH ***' *** Using $WORKSPACE [<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…]> as default for BASE_PATH *** + build_info + '[' -n '' ']' + REPOS=kamailiodev-nightly + REPOS=kamailiodev-nightly + '[' -z jessie ']' + REPOS=kamailiodev-nightly-jessie + echo '*** No repository supplied but distribution has been set, using repository name kamailiodev-nightly-jessie ***' *** No repository supplied but distribution has been set, using repository name kamailiodev-nightly-jessie *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> + SOURCE_PACKAGE=kamailio ++ basename <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> .dsc + p=kamailio_5.4.0~dev4+bpo8.20200517005639.1686 + '[' kamailio_5.4.0~dev4+bpo8.20200517005639.1686 = '*' ']' + cur_version=5.4.0~dev4+bpo8.20200517005639.1686 + '[' -z '' ']' + newest_version=5.4.0~dev4+bpo8.20200517005639.1686 + echo '*** Found package version 5.4.0~dev4+bpo8.20200517005639.1686 ***' *** Found package version 5.4.0~dev4+bpo8.20200517005639.1686 *** + sourcefile='<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + echo '*** Using <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> (version: 5.4.0~dev4+bpo8.20200517005639.1686)' *** Using <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> (version: 5.4.0~dev4+bpo8.20200517005639.1686) + dist_and_arch_settings + '[' -z i386 ']' + '[' i386 = all ']' + arch=i386 + echo '*** architecture is set to i386 ***' *** architecture is set to i386 *** + '[' -n jessie ']' + local DIST=jessie + '[' -n jessie ']' + echo '*** COWBUILDER_DIST is set to jessie - using it for base.cow if it does not exist yet. ***' *** COWBUILDER_DIST is set to jessie - using it for base.cow if it does not exist yet. *** + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-jessie-i386.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jessie-i386.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jessie-i386.cow as cowbuilder base.cow *** + local lockfiles=/var/run/lock/jessie-i386 + build_lockfile=/var/run/lock/jessie-i386.building.7033 + update_lockfile=/var/run/lock/jessie-i386.update + update_lockfile_pid=/var/run/lock/jessie-i386.update.7033 + '[' -n '' ']' + cowbuilder_init ++ mktemp + pbuilderrc=/tmp/tmp.k2xcvcT5qy ++ date + echo '# pbuilder config file generated by jenkins-debian-glue on Sun May 17 01:02:59 UTC 2020' + '[' -n '' ']' + '[' '' = true ']' + use_eatmydata + '[' '' = false ']' + '[' '' = true ']' + grep -q '^install' + dpkg-query --show '--showformat=${Status}' eatmydata ++ dpkg-query --show '--showformat=${Version}' eatmydata + dpkg --compare-versions 105-5 gt 26-2 + echo '*** eatmydata is present on host system, now checking distribution support ***' *** eatmydata is present on host system, now checking distribution support *** + case "${COWBUILDER_DIST}" in + echo '*** Distribution jessie should provide recent eatmydata support, enabling eatmydata ***' *** Distribution jessie should provide recent eatmydata support, enabling eatmydata *** + enable_eatmydata + echo 'EXTRAPACKAGES="$EXTRAPACKAGES eatmydata"' + echo 'export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so"' + echo '# builtin support available with pbuilder >=0.225 (otherwise ignored):' + echo EATMYDATA=yes + use_ccache + '[' '' = true ']' + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config ***' *** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config *** + '[' -r /etc/jenkins/pbuilderrc ']' + echo '*** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile ***' *** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile *** + echo '# /etc/jenkins/pbuilderrc added via jenkins-debian-glue:' + cat /etc/jenkins/pbuilderrc + '[' -n '' ']' + echo '*** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround ***' *** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround *** + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround ***' *** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround *** + echo '*** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes '\''universe'\'' ***' *** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes 'universe' *** + grep -q Ubuntu + lsb_release --id + echo '*** Listing pbuilder configuration file as reference: ***' *** Listing pbuilder configuration file as reference: *** + cat /tmp/tmp.k2xcvcT5qy # pbuilder config file generated by jenkins-debian-glue on Sun May 17 01:02:59 UTC 2020 EXTRAPACKAGES="$EXTRAPACKAGES eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" # builtin support available with pbuilder >=0.225 (otherwise ignored): EATMYDATA=yes # /etc/jenkins/pbuilderrc added via jenkins-debian-glue: # distribution specific configuration case "$distribution" in xenial|bionic) MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; trusty|precise) # lacks eatmydata package, so explicitly configure it MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # ensure it's unset unset LD_PRELOAD ;; wheezy) # nowadays also resides on archive MIRRORSITE="http://archive.debian.org/debian/" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; jessie|stretch|buster) MIRRORSITE="http://deb.debian.org/debian" # security and updates OTHERMIRROR="deb http://security.debian.org/debian-security ${distribution}/updates main" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; bullseye|*) MIRRORSITE="http://deb.debian.org/debian" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; esac + ls '/var/cache/pbuilder/base-jessie-i386.cow.building.*' + ls '/var/run/lock/jessie-i386.update*' + flock --nonblock 9 + touch /var/run/lock/jessie-i386.update.7033 + '[' '!' -d /var/cache/pbuilder/base-jessie-i386.cow ']' + '[' '' = true ']' + echo '*** Updating cowbuilder cow base ***' *** Updating cowbuilder cow base *** + sudo DIST=jessie ARCH=i386 cowbuilder --update --basepath /var/cache/pbuilder/base-jessie-i386.cow --configfile=/tmp/tmp.k2xcvcT5qy I: Copying COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.7077 I: forking: cp -al /var/cache/pbuilder/base-jessie-i386.cow /var/cache/pbuilder/build/cow.7077 I: removed stale ilistfile /var/cache/pbuilder/build/cow.7077/.ilist I: Invoking pbuilder I: forking: pbuilder update --configfile /tmp/tmp.k2xcvcT5qy --buildplace /var/cache/pbuilder/build/cow.7077 --extrapackages eatmydata --no-targz --internal-chrootexec 'chroot /var/cache/pbuilder/build/cow.7077 cow-shell' W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: Current time: Sun May 17 01:03:00 UTC 2020 I: pbuilder-time-stamp: 1589677380 I: copying local configuration I: mounting /proc filesystem I: mounting /sys filesystem I: creating /{dev,run}/shm I: mounting /dev/pts filesystem I: redirecting /dev/ptmx to /dev/pts/ptmx I: policy-rc.d already exists I: using eatmydata during job I: Refreshing the base.tgz I: upgrading packages Ign http://deb.debian.org jessie InRelease Hit http://deb.debian.org jessie Release.gpg Hit http://deb.debian.org jessie Release Get:1 http://security.debian.org jessie/updates InRelease [44.9 kB] Hit http://deb.debian.org jessie/main i386 Packages Hit http://security.debian.org jessie/updates/main i386 Packages Fetched 44.9 kB in 10s (4223 B/s) W: Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/main/binary… Hash Sum mismatch E: Some index files failed to download. They have been ignored, or old ones used instead. I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem E: pbuilder update failed E: could not update with cowdancer, try --no-cowdancer-update option I: forking: rm -rf /var/cache/pbuilder/build/cow.7077 + '[' 1 -eq 0 ']' + exit 3 + case "$?" in + bailout 1 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' ']' + echo 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow. + rm -f /var/run/lock/jessie-i386.building.7033 + '[' -r /var/run/lock/jessie-i386.update.7033 ']' + rm -f /var/run/lock/jessie-i386.update.7033 + rm -f /var/run/lock/jessie-i386.update + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.k2xcvcT5qy ']' + rm -rf /tmp/tmp.k2xcvcT5qy + '[' -n '' ']' + '[' -n 215 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=20 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sun May 17 01:03:19 UTC 2020 [running 20 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sun May 17 01:03:19 UTC 2020 [running 20 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?

1 1

git:master:d500589d: dmq: use module prefix for global variables
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: d500589d1503b62df0db9a837f1a80ae8425b840 URL: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T12:06:05+02:00 dmq: use module prefix for global variables - avoid potential conflicts with other globals, given that this module is used by other modules to perform replication --- Modified: src/modules/dmq/bind_dmq.h Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/message.h Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/peer.h Modified: src/modules/dmq/worker.c Modified: src/modules/dmq/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a… Patch: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a…

1 0

git:master:17d30403: core: kemi - added KSR.is_KDQM()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 17d3040365400d14d251247c9c3319fc003f2cb2 URL: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T11:28:20+02:00 core: kemi - added KSR.is_KDQM() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Patch: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 7a5ba1068d..c15621690a 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1067,6 +1067,15 @@ static int sr_kemi_core_is_method_message(sip_msg_t *msg) } +/** + * + */ +static int sr_kemi_core_is_method_kdmq(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_KDMQ); +} + + /** * */ @@ -1755,6 +1764,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_KDMQ"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_kdmq, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] KSR.is_MESSAGE() Not implemented (#2331)
by hance2010 18 May '20

18 May '20

### Description KSR.is_MESSAGE() Not implemented. kamailio v5.3.4  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2331

2 2

git:master:8db5a12f: core: kemi - added missing is_MESSAGE()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 8db5a12f7fab1a1fc7d50c87bbf1aee325b067c2 URL: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T08:29:09+02:00 core: kemi - added missing is_MESSAGE() - GH #2331 --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Patch: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8a77c227b7..7a5ba1068d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1057,6 +1057,16 @@ static int sr_kemi_core_is_method_prack(sip_msg_t *msg) return sr_kemi_core_is_method_type(msg, METHOD_PRACK); } + +/** + * + */ +static int sr_kemi_core_is_method_message(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_MESSAGE); +} + + /** * */ @@ -1740,6 +1750,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_MESSAGE"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_message, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:7749069c: uid_uri_db: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 7749069cd05b9619ee32237773097441e241bac4 URL: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:18+02:00 uid_uri_db: use file specific include guard --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Patch: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.h b/src/modules/uid_uri_db/uid_uri_db_mod.h index e4848ecd93..aa72a2aa5b 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.h +++ b/src/modules/uid_uri_db/uid_uri_db_mod.h @@ -27,8 +27,8 @@ */ -#ifndef URIDB_MOD_H -#define URIDB_MOD_H +#ifndef _UID_URI_DB_MOD_H_ +#define _UID_URI_DB_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:master:9053c70f: auth_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 9053c70fe7e147b784c53a57014796282701c74d URL: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:00+02:00 auth_diameter: use file specific include guard --- Modified: src/modules/auth_diameter/diameter_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Patch: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… --- diff --git a/src/modules/auth_diameter/diameter_msg.h b/src/modules/auth_diameter/diameter_msg.h index 7ab5a8c383..e8e7eea875 100644 --- a/src/modules/auth_diameter/diameter_msg.h +++ b/src/modules/auth_diameter/diameter_msg.h @@ -13,15 +13,15 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _AUTH_DIAM_MESSAGE_H_ +#define _AUTH_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:3d73e8cb: acc_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 3d73e8cb9f7431383c5a4ce798e2610f37ff92dc URL: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:00:28+02:00 acc_diameter: use file specific include guard --- Modified: src/modules/acc_diameter/diam_message.h --- Diff: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Patch: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… --- diff --git a/src/modules/acc_diameter/diam_message.h b/src/modules/acc_diameter/diam_message.h index 9051f0f7a1..7ca1caf27e 100644 --- a/src/modules/acc_diameter/diam_message.h +++ b/src/modules/acc_diameter/diam_message.h @@ -26,8 +26,8 @@ * - Module: \ref acc */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _ACC_DIAM_MESSAGE_H_ +#define _ACC_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:c0e687d8: websocket: use signature macro instead of offsetting inside server hdr define
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: c0e687d820f9bbf2b6b1ef6892e5b34c30f25a63 URL: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:21:43+02:00 websocket: use signature macro instead of offsetting inside server hdr define - pass rcv info structure by address - remove function name from logs --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Patch: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 87cf4e3a5f..5cef5d6b1a 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -210,8 +210,8 @@ static int mod_init(void) } if(ws_ping_application_data.len < 1 || ws_ping_application_data.len > 125) { - ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA + 8; - ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN - 8; + ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA; + ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN; } if(ws_keepalive_mechanism != KEEPALIVE_MECHANISM_NONE) { diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a4442ae0d8..8570afa086 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -184,14 +184,14 @@ void wsconn_destroy(void) } } -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) { int cur_cons, max_cons; - int id = rcv.proto_reserved1; + int id = rcv->proto_reserved1; int id_hash = tcp_id_hash(id); ws_connection_t *wsc; - LM_DBG("wsconn_add id [%d]\n", id); + LM_DBG("connection id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -203,13 +203,13 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; - wsc->rcv = rcv; + wsc->rcv = *rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; wsc->frag_buf.s = ((char *)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); - LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); WSCONN_LOCK; @@ -229,7 +229,7 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) WSCONN_UNLOCK; - LM_DBG("wsconn_add added to conn_table wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("added to conn_table wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); /* Update connection statistics */ diff --git a/src/modules/websocket/ws_conn.h b/src/modules/websocket/ws_conn.h index 9319238e4d..f8aa93543c 100644 --- a/src/modules/websocket/ws_conn.h +++ b/src/modules/websocket/ws_conn.h @@ -95,7 +95,7 @@ extern stat_var *ws_msrp_max_concurrent_connections; int wsconn_init(void); void wsconn_destroy(void); -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol); +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol); int wsconn_rm(ws_connection_t *wsc, ws_conn_eventroute_t run_event_route); int wsconn_update(ws_connection_t *wsc); void wsconn_close_now(ws_connection_t *wsc); diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d0f8d84ed0..51a62e04c8 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -49,8 +49,8 @@ extern int ws_keepalive_mechanism; #define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ extern str ws_ping_application_data; -#define DEFAULT_PING_APPLICATION_DATA SERVER_HDR -#define DEFAULT_PING_APPLICATION_DATA_LEN SERVER_HDR_LEN +#define DEFAULT_PING_APPLICATION_DATA SRVAPP_SIGNATURE +#define DEFAULT_PING_APPLICATION_DATA_LEN SRVAPP_SIGNATURE_LEN extern stat_var *ws_failed_connections; extern stat_var *ws_local_closed_connections; diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 58e6077bb5..878c483f2a 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -310,7 +310,7 @@ int ws_handle_handshake(struct sip_msg *msg) (unsigned char *)reply_key.s, base64_enc_len(SHA_DIGEST_LENGTH)); /* Add the connection to the WebSocket connection table */ - wsconn_add(msg->rcv, sub_protocol); + wsconn_add(&msg->rcv, sub_protocol); /* Make sure Kamailio core sends future messages on this connection directly to this module */

1 0

git:master:d26ccdea: core: define macro for signature to be used for server and user-agent
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: d26ccdea61230bfc7720a2523c7b6dd8d2692d6d URL: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:20:45+02:00 core: define macro for signature to be used for server and user-agent --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Patch: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… --- diff --git a/src/core/config.h b/src/core/config.h index 63ff8dc26c..e35fd6daba 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -79,12 +79,15 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: " NAME \ +#define SRVAPP_SIGNATURE NAME \ " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SRVAPP_SIGNATURE_LEN (sizeof(SRVAPP_SIGNATURE)-1) + + +#define USER_AGENT "User-Agent: " SRVAPP_SIGNATURE #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: " NAME \ - " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020