sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

[kamailio/kamailio] strange result from avp_db_query (#792)

by mtryfoss

Kamailio version 4.4.2. Consider this logic: $avp(s:testvar) = 'test'; avp_db_query("select value from test where id = 1","$avp(s:testvar)"); I don't know if this is intended behaviour. If row exists but "value" field is empty (not NULL), $avp(s:testvar) still seems to contain 'test' as value after the query. I think it should be ''. This can be confusing. -- 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/792

7 years, 8 months

git:4.4:e43d82db: presence: fix crash when no dialog.id on dialog-info xml

by Victor Seva

Module: kamailio Branch: 4.4 Commit: e43d82db89e57a47418d4ccdd283d8b2de82e7e6 URL: https://github.com/kamailio/kamailio/commit/e43d82db89e57a47418d4ccdd283d8b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-09-23T13:35:35+02:00 presence: fix crash when no dialog.id on dialog-info xml Fix #794 (cherry picked from commit 53b139567cd2c828cf2cf387029396ef55351289) --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/e43d82db89e57a47418d4ccdd283d8b… Patch: https://github.com/kamailio/kamailio/commit/e43d82db89e57a47418d4ccdd283d8b… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index e601153..00fdbfd 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -691,13 +691,13 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } check_if_dialog(*body, &is_dialog, &dialog_id); + if (is_dialog == 1) { + if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { + goto error; + } - if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { - goto error; + free(dialog_id); } - - free(dialog_id); - LM_DBG("inserting %d cols into table\n",n_query_cols); if (pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0)

7 years, 8 months

git:master:59dd3976: Merge pull request #795 from linuxmaniac/vseva/3855

by GitHub

Module: kamailio Branch: master Commit: 59dd3976f52c71482123da8adc0939165c5476b4 URL: https://github.com/kamailio/kamailio/commit/59dd3976f52c71482123da8adc09391… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-09-23T13:34:49+02:00 Merge pull request #795 from linuxmaniac/vseva/3855 presence: fix crash when no dialog.id on dialog-info xml --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/59dd3976f52c71482123da8adc09391… Patch: https://github.com/kamailio/kamailio/commit/59dd3976f52c71482123da8adc09391… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index e601153..00fdbfd 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -691,13 +691,13 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } check_if_dialog(*body, &is_dialog, &dialog_id); + if (is_dialog == 1) { + if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { + goto error; + } - if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { - goto error; + free(dialog_id); } - - free(dialog_id); - LM_DBG("inserting %d cols into table\n",n_query_cols); if (pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0)

7 years, 8 months

git:master:53b13956: presence: fix crash when no dialog.id on dialog-info xml

by Victor Seva

Module: kamailio Branch: master Commit: 53b139567cd2c828cf2cf387029396ef55351289 URL: https://github.com/kamailio/kamailio/commit/53b139567cd2c828cf2cf387029396e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-09-23T11:11:56+02:00 presence: fix crash when no dialog.id on dialog-info xml Fix #794 --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/53b139567cd2c828cf2cf387029396e… Patch: https://github.com/kamailio/kamailio/commit/53b139567cd2c828cf2cf387029396e… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index e601153..00fdbfd 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -691,13 +691,13 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } check_if_dialog(*body, &is_dialog, &dialog_id); + if (is_dialog == 1) { + if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { + goto error; + } - if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { - goto error; + free(dialog_id); } - - free(dialog_id); - LM_DBG("inserting %d cols into table\n",n_query_cols); if (pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0)

7 years, 8 months

[kamailio/kamailio] presence: fix crash when no dialog.id on dialog-info xml (#795)

by Victor Seva

Fix #794 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/795 -- Commit Summary -- * presence: fix crash when no dialog.id on dialog-info xml -- File Changes -- M modules/presence/presentity.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/795.patch https://github.com/kamailio/kamailio/pull/795.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/795

7 years, 8 months

[kamailio/kamailio] presence: crash at delete_presentity_if_dialog_id_exists() if dialog_id is NULL (#794)

by Victor Seva

``` Core was generated by `/usr/sbin/kamailio -f /etc/kamailio/proxy/kamailio.cfg -P /var/run/kamailio/kam'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f0376725d8e in ?? () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007f0376725d8e in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f03606b5a9c in delete_presentity_if_dialog_id_exists (presentity=0x1333680, dialog_id=0x0) at presentity.c:417 #2 0x00007f03606b8558 in update_presentity (msg=0x1333680, presentity=0x7f0375a9b5d0, body=0x7ffc28292100, new_t=20339088, sent_reply=0x100, sphere=0x1365920 "\220Y6\001") at presentity.c:690 #3 0x00007f03606cc521 in handle_publish (msg=0x7f0375aad0f0, sender_uri=0x0, str2=0x0) at publish.c:460 #4 0x0000000000446840 in do_action (h=0x7ffc28292860, a=0x7f03759f2fd0, msg=0x7f0375aad0f0) at action.c:1060 # ``` check that the xml has no dialog.id ``` (gdb) f 1 #1 0x00007f03606b5a9c in delete_presentity_if_dialog_id_exists (presentity=0x1333680, dialog_id=0x0) at presentity.c:417 417 presentity.c: No such file or directory. (gdb) p db_dialog_id $1 = 0x1333680 "1649760492-8" (gdb) p dialog_id $2 = 0x0 (gdb) f 2 #2 0x00007f03606b8558 in update_presentity (msg=0x1333680, presentity=0x7f0375a9b5d0, body=0x7ffc28292100, new_t=20339088, sent_reply=0x100, sphere=0x1365920 "\220Y6\001") at presentity.c:690 690 in presentity.c (gdb) p dialog_id $3 = 0x0 (gdb) p is_dialog $4 = 0 (gdb) p body $5 = (str *) 0x7ffc28292100 (gdb) p *body $6 = { s = 0x9b5b32 <buf+370> "<?xml version=\"1.0\"?>\n<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"55\" state=\"full\" entity=\"sip:88102@10.15.20.192\">\n</dialog-info>\r\n", len = 153} ``` -- 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/794

7 years, 8 months

git:master:38971b53: Merge pull request #793 from dunst0/freebsdfix/module_ipops

by GitHub

Module: kamailio Branch: master Commit: 38971b5312dfeb9cedc1566f37ec4edc7740f283 URL: https://github.com/kamailio/kamailio/commit/38971b5312dfeb9cedc1566f37ec4ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-09-23T08:46:57+02:00 Merge pull request #793 from dunst0/freebsdfix/module_ipops ipops: fix compilation under FreeBSD --- Modified: modules/ipops/detailed_ip_type.c --- Diff: https://github.com/kamailio/kamailio/commit/38971b5312dfeb9cedc1566f37ec4ed… Patch: https://github.com/kamailio/kamailio/commit/38971b5312dfeb9cedc1566f37ec4ed… --- diff --git a/modules/ipops/detailed_ip_type.c b/modules/ipops/detailed_ip_type.c index 3e3854d..aeff77c 100644 --- a/modules/ipops/detailed_ip_type.c +++ b/modules/ipops/detailed_ip_type.c @@ -26,6 +26,9 @@ #include <stdio.h> #include <stdlib.h> #include <arpa/inet.h> +#if defined (__OS_freebsd) +#include <sys/socket.h> +#endif #include <string.h> #include <unistd.h> #include "../../dprint.h"

7 years, 8 months

git:master:57106763: ipops: fix compilation under FreeBSD

by Rick Barenthin

Module: kamailio Branch: master Commit: 5710676321c145d83904d919960ae7a12bd148d9 URL: https://github.com/kamailio/kamailio/commit/5710676321c145d83904d919960ae7a… Author: Rick Barenthin <rb(a)terralink.de> Committer: Rick Barenthin <rb(a)terralink.de> Date: 2016-09-22T21:19:11+02:00 ipops: fix compilation under FreeBSD - unable to compile detailed_ip_type.c under FreeBSD needs extra header --- Modified: modules/ipops/detailed_ip_type.c --- Diff: https://github.com/kamailio/kamailio/commit/5710676321c145d83904d919960ae7a… Patch: https://github.com/kamailio/kamailio/commit/5710676321c145d83904d919960ae7a… --- diff --git a/modules/ipops/detailed_ip_type.c b/modules/ipops/detailed_ip_type.c index 3e3854d..aeff77c 100644 --- a/modules/ipops/detailed_ip_type.c +++ b/modules/ipops/detailed_ip_type.c @@ -26,6 +26,9 @@ #include <stdio.h> #include <stdlib.h> #include <arpa/inet.h> +#if defined (__OS_freebsd) +#include <sys/socket.h> +#endif #include <string.h> #include <unistd.h> #include "../../dprint.h"

7 years, 8 months

[kamailio/kamailio] ipops: fix compilation under FreeBSD (#793)

by Rick

- unable to compile detailed_ip_type.c under FreeBSD needs extra header You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/793 -- Commit Summary -- * ipops: fix compilation under FreeBSD -- File Changes -- M modules/ipops/detailed_ip_type.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/793.patch https://github.com/kamailio/kamailio/pull/793.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/793

7 years, 8 months

Re: [sr-dev] [kamailio/kamailio] ipops: adding detailed_ip_type() functions (2cf9dba)

by Rick

``` gmake[1]: Entering directory '/usr/src/kamailio/modules/ipops' Makefile.defs defs skipped clang -fPIC -DPIC -g -m64 -DNAME='"kamailio"' -DVERSION='"5.0.0-dev6"' -DARCH='"x86_64"' -DOS='freebsd_' -DOS_QUOTED='"freebsd"' -DCOMPILER='"clang 3.4"' -D__CPU_x86_64 -D__OS_freebsd -DSER_VER=5000000 -DCFG_DIR='"/usr/local/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM -DHAVE_NETINET_IN_SYSTM -DUSE_RAW_SOCKS -DHAVE_KQUEUE -DHAVE_SELECT -DKAMAILIO_MOD_INTERFACE -DMOD_NAME='"ipops"' -c detailed_ip_type.c -o detailed_ip_type.o detailed_ip_type.c:103:17: error: use of undeclared identifier 'AF_INET6' if (inet_pton(AF_INET6, in6_string, in6_addr) != 1) return 0; ^ detailed_ip_type.c:131:17: error: use of undeclared identifier 'AF_INET' if (inet_pton(AF_INET, in4_string, &in4_addr) != 1) return 0; ^ 2 errors generated. gmake[1]: *** [../../Makefile.rules:97: detailed_ip_type.o] Error 1 gmake[1]: Leaving directory '/usr/src/kamailio/modules/ipops' gmake: *** [Makefile:511: modules] Error 1 ``` `#include <sys/socket.h>` is missing to compile it on FreeBSD maschine. Because AF_INET and AF_INET6 are defined in this file. -- 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/commit/2cf9dbadfc4a294927798a1aaf50601…

7 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016