sr-dev

sr-dev@lists.kamailio.org

16 participants
45400 discussions

git:5.2:6bb5594f: rtpengine: remove obselete auto-bridge flag (GH #2301)
by Henning Westerholt 27 Apr '20

27 Apr '20

Module: kamailio Branch: 5.2 Commit: 6bb5594f23cf10fb149edbfaf044f7ca9de8f7b8 URL: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:21:23Z rtpengine: remove obselete auto-bridge flag (GH #2301) (cherry picked from commit cf084881d79dc18d8272fc4a9f89c0bfc8e1fde0) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… Patch: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index f3a92412eb..74adc8ae8d 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2114,15 +2114,6 @@ rtpengine_offer(); supports two network interfaces instead of multiple, arbitrarily named ones. </para></listitem> <listitem><para> - <emphasis>auto-bridge</emphasis> - this flag an alternative to the - <quote>internal</quote> and <quote>external</quote> flags - in order to do automatic bridging between IPv4 on the - "internal network" and IPv6 on the "external network". Instead of - explicitly instructing the &rtp; proxy to select a particular address - family, the distinction is done by the given IP in the &sdp; body by - the &rtp; proxy itself. Not supported by Sipwise rtpengine. - </para></listitem> - <listitem><para> <emphasis>address-family=...</emphasis> - instructs the &rtp; proxy that the recipient of this &sdp; body expects to see addresses of a particular family. Possible values are <quote>IP4</quote> and <quote>IP6</quote>. For example,

1 0

git:5.3:be8a7c4c: rtpengine: remove obselete auto-bridge flag (GH #2301)
by Henning Westerholt 27 Apr '20

27 Apr '20

Module: kamailio Branch: 5.3 Commit: be8a7c4c2857a24dc208f58f5ebfa7426f550633 URL: https://github.com/kamailio/kamailio/commit/be8a7c4c2857a24dc208f58f5ebfa74… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:21:00Z rtpengine: remove obselete auto-bridge flag (GH #2301) (cherry picked from commit cf084881d79dc18d8272fc4a9f89c0bfc8e1fde0) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/be8a7c4c2857a24dc208f58f5ebfa74… Patch: https://github.com/kamailio/kamailio/commit/be8a7c4c2857a24dc208f58f5ebfa74… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index d4cd2e4fc1..cafd6b6ef4 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2163,15 +2163,6 @@ rtpengine_offer(); supports two network interfaces instead of multiple, arbitrarily named ones. </para></listitem> <listitem><para> - <emphasis>auto-bridge</emphasis> - this flag an alternative to the - <quote>internal</quote> and <quote>external</quote> flags - in order to do automatic bridging between IPv4 on the - "internal network" and IPv6 on the "external network". Instead of - explicitly instructing the &rtp; proxy to select a particular address - family, the distinction is done by the given IP in the &sdp; body by - the &rtp; proxy itself. Not supported by Sipwise rtpengine. - </para></listitem> - <listitem><para> <emphasis>address-family=...</emphasis> - instructs the &rtp; proxy that the recipient of this &sdp; body expects to see addresses of a particular family. Possible values are <quote>IP4</quote> and <quote>IP6</quote>. For example,

1 0

git:master:cf084881: rtpengine: remove obselete auto-bridge flag (GH #2301)
by Henning Westerholt 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: cf084881d79dc18d8272fc4a9f89c0bfc8e1fde0 URL: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:19:35Z rtpengine: remove obselete auto-bridge flag (GH #2301) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… Patch: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index d9230209f6..8e91da5ae9 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2167,15 +2167,6 @@ rtpengine_offer(); supports two network interfaces instead of multiple, arbitrarily named ones. </para></listitem> <listitem><para> - <emphasis>auto-bridge</emphasis> - this flag an alternative to the - <quote>internal</quote> and <quote>external</quote> flags - in order to do automatic bridging between IPv4 on the - "internal network" and IPv6 on the "external network". Instead of - explicitly instructing the &rtp; proxy to select a particular address - family, the distinction is done by the given IP in the &sdp; body by - the &rtp; proxy itself. Not supported by Sipwise rtpengine. - </para></listitem> - <listitem><para> <emphasis>address-family=...</emphasis> - instructs the &rtp; proxy that the recipient of this &sdp; body expects to see addresses of a particular family. Possible values are <quote>IP4</quote> and <quote>IP6</quote>. For example,

1 0

Custom kamailio modules
by Tyler Moore 27 Apr '20

27 Apr '20

Hey devs got a question about loading custom modules. This is my first kamailio module so if I am missing some gotchas please refer me to the proper documentation. I created a shared lib and included the module version info like so: #define NAME "kamailio" #define VERSION "5.3" #define ARCH "x86_64" #define OS_QUOTED "GNU/Linux" ... MODULE_VERSION I tried loading the module in a vanilla kamailio 5.3 install on debian 9 (stretch) and it seems sr_module.c can't find the module version info: ERROR: <core> [core/sr_module.c:325]: version_control(): no version info in module </usr/lib/x86_64-linux-gnu/kamailio/modules/dsiprouter.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/dsiprouter.so: undefined symbol: module_version But MODULE_VERSION should be defining this variable.. Running string on the shared lib shows it is being defined: > strings lib/dsiprouter.so | grep module_version module_version MODULE_VERSION char *module_version=SER_FULL_VERSION; char *module_flags=SER_COMPILE_FLAGS; unsigned int module_interface_ver=MODULE_INTERFACE_VER; module_version Is this a linking issue? Why does is seem that module_versino is referenced before being defined when i'm following the example from https://github.com/kamailio/kamailio/blob/5.1/src/modules/print/print.c ? Regards, *Tyler Moore* <https://devopsec.net/> Full Stack Software Engineer <http://www.google.com/search?q=full+stack+software+engineer+job+description> Flyball Labs <http://goflyball.com/> Office: 888-907-2085, ext: 34 <8889072085;ext=34> Cell: 248-909-2769 <2489092769> Email: tmoore(a)goflyball.com [image: FLYBALL TECHNICAL SOLUTIONS, LLC]

2 1

git:master:3366bf4f: app_python: use -fno-strict-aliasing for gcc
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 3366bf4f3746285d9dc29e8a2461f53983f0acf0 URL: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:25:28+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… Patch: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 0d8bc98701..d22e63e6a4 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -29,5 +29,9 @@ endif DEFS+=-I${PYTHON_INCDIR} +ifeq ($(CC_NAME), gcc) +DEFS+= -fno-strict-aliasing +endif + include ../../Makefile.modules

1 0

git:master:86ebb4ee: pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 86ebb4eef482b37a3bb8bf033caa4d87fd8aeb87 URL: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:47:48+02:00 pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning - GH #2298 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… Patch: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index b72ecf7f29..1ab15af2e7 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -189,6 +189,8 @@ static int pdb_msg_format_send(struct pdb_msg *msg, } +/* two chars to short-int without caring of memory alignment in char buffer */ +#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -199,7 +201,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct struct pdb_msg msg; struct timeval tstart, tnow; struct server_item_t *server; - short int carrierid, *_id; + short int carrierid, _id; short int _idv; char buf[sizeof(struct pdb_msg)]; size_t reqlen; @@ -345,8 +347,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break; @@ -368,8 +370,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = (short int *)&(buf[reqlen]); - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break;

1 0

git:master:e64b2914: Makefile.defs: expose CC_NAME variable
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: e64b29141afddf06bf7d5d68aa88679b54c5076c URL: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:25:06+02:00 Makefile.defs: expose CC_NAME variable --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Patch: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b36b0b56e..9efb93704a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2166,10 +2166,10 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - CC_MKDEP_OPTS \ + CC_NAME CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \

1 0

git:master:f1de08ee: redis: init variables to get rid of compile warnings
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: f1de08eef86dc2cd98509c90fa8b28212d47ca37 URL: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:36:36+02:00 redis: init variables to get rid of compile warnings - GH #2298 --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Patch: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index a35e7dc786..e59bd5ba29 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -496,13 +496,13 @@ int db_redis_parse_keys(km_redis_con_t *con) { str column_name; str version_code; - struct str_hash_entry *table_entry; - redis_table_t *table; - redis_type_t *type; - redis_type_t *type_target; - redis_key_t *key; - redis_key_t **key_target; - redis_key_t *key_location; + struct str_hash_entry *table_entry = NULL; + redis_table_t *table = NULL; + redis_type_t *type = NULL; + redis_type_t *type_target = NULL; + redis_key_t *key = NULL; + redis_key_t **key_target = NULL; + redis_key_t *key_location = NULL; enum { DBREDIS_KEYS_TABLE_ST, @@ -657,13 +657,13 @@ int db_redis_parse_schema(km_redis_con_t *con) { struct dirent* dent; char *dir_name; - str table_name; + str table_name = str_init(""); str column_name; str type_name; - struct str_hash_entry *table_entry; - struct str_hash_entry *column_entry; - redis_table_t *table; + struct str_hash_entry *table_entry = NULL; + struct str_hash_entry *column_entry = NULL; + redis_table_t *table = NULL; char full_path[_POSIX_PATH_MAX + 1]; int path_len;

1 0

Check if Kamailio is going to CANCEL branch
by Ivan Ribakov 27 Apr '20

27 Apr '20

Hi all, Recently I’ve asked the below question in the users mailing list but I didn’t get any response. I was wondering if someone in this mailing list could at least tell me whether what I’m trying to achieve is event doable or not so that I know whether I should invest more effort into finding out the “how” part? > Upon receiving a provisional response from callee in a branch route, is there a way of telling if Kamailio > is going to automatically CANCEL that branch because a final reply was received from another branch before that? > > The closest I got is finding “cancel_b_method” parameter of the TM module, but that is not what I’m after. > Previously I was recommended to debug via logging onreply_route but I’m not really sure what information may contain > hints of intention to send CANCEL. Does anyone have any suggestions/guesses in which direction I should be digging? Thanks in advance, Ivan

1 0

git:master:a0fb220a: db2_local: replace timelocal() with mktime()
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: a0fb220a8b60b135cabf6741882437317116d868 URL: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:00:21+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/man/3/timegm - GH #2298 --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Patch: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 867c873e8f..7af731f077 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src) * of expiration by one hour when daylight saving is used */ time.tm_isdst = -1; - *dst = timelocal(&time); + *dst = mktime(&time); } return 0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev