sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
266 discussions

git:master:2fe5a0d1: tls: set module name using MOD_NAME define

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2fe5a0d165082d7acde4695bffeb2d194e4bab58 URL: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:29:25+02:00 tls: set module name using MOD_NAME define --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Patch: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 30a533994d..6e421635cb 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -256,12 +256,15 @@ static param_export_t params[] = { {0, 0, 0} }; +#ifndef MOD_NAME +#define MOD_NAME "tls" +#endif /* * Module interface */ struct module_exports exports = { - "tls", /* module name */ + MOD_NAME, /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported parameters */

2 years, 8 months

git:master:f614c39a: siputils: functions to compare uri and aor exported to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f614c39a693cea39e3d96920fda3aa7a111c1d67 URL: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 siputils: functions to compare uri and aor exported to kemi --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Patch: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 4cba3c3181..5aba445b02 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -40,6 +40,18 @@ #include "sipops.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_uri_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) { str s1; @@ -64,6 +76,18 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_aor_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) { str s1; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 9926358e0a..7cbe77bd98 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -34,7 +34,9 @@ #include "../../core/parser/msg_parser.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index a23408ab79..747bf408fa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -740,6 +740,16 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_uri"), + SR_KEMIP_INT, ki_cmp_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("cmp_aor"), + SR_KEMIP_INT, ki_cmp_aor, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("cmp_hdr_name"), SR_KEMIP_INT, ki_cmp_hdr_name, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

2 years, 8 months

git:master:fa6245ce: core: cmp hdrname fix on checking type of second header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa6245ce33602eeff1d776b921fd41400ae5bb48 URL: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 core: cmp hdrname fix on checking type of second header --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Patch: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7b6a40ee3e..25d58747d9 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -477,7 +477,7 @@ int cmp_hdrname_str(str *s1, str *s2) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2); @@ -508,7 +508,7 @@ int cmp_hdrname_strzn(str *s1, char *s2, size_t len) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2);

2 years, 8 months

[kamailio/kamailio] add debuginfo on dist other then x86 (#2789)

by sergey-safarov

### Description I want to debug `Kamailio` using `GDB` and compiled sources on `aarch64` architecture (`t4g` AWS instance). But produces object files do not contain debug info. Then executed ``` make -n ``` And found that no `-g` options used during compilation. I have specified `CFLAGS` and `CPPFLAGS` but with wont help. ### Expected behavior On all dist used `-g` compilation flag by default. If I have specified `CFLAGS` and `CPPFLAGS` as environment variables, then these flags used by GCC during compilation. #### Actual observed behavior `-g` flag do not used by default on `aarch64` architecture. `CFLAGS` and `CPPFLAGS` as environment variables do not used during compilation time. ### Additional info as hotfix I have used this patch ```diff diff --git a/src/Makefile.defs b/src/Makefile.defs index 027c985798..c91c34a7bb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -885,7 +885,7 @@ endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm + C_DEFS+= -g -DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) ``` -- 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/2789

2 years, 9 months

[kamailio/kamailio] core: enabled compilation with debug symbols by default (#2811)

by sergey-safarov

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description closes GH #2789 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2811 -- Commit Summary -- * core: enabled compilation with debug symbols by default -- File Changes -- M src/Makefile.defs (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2811.patch https://github.com/kamailio/kamailio/pull/2811.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/2811

2 years, 9 months

git:master:ed46adad: core: enables compilation with debug symbols by default for other architectures

by Henning Westerholt

Module: kamailio Branch: master Commit: ed46adad82e7b6569eb42704c5460263d2af75f7 URL: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-01T11:40:26Z core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Patch: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026…

2 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021