sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

git:master:3976224f: presence_conference: fix compiler warnings #612

by Victor Seva

Module: kamailio Branch: master Commit: 3976224f6bb4b790b1752a00174439a1e2de1665 URL: https://github.com/kamailio/kamailio/commit/3976224f6bb4b790b1752a00174439a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-17T13:02:22+02:00 presence_conference: fix compiler warnings #612 > CC (gcc) [M presence_conference.so] pidf.o > In file included from /usr/include/time.h:27:0, > from pidf.c:49: > /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] > # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" --- Modified: modules/presence_conference/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/3976224f6bb4b790b1752a00174439a… Patch: https://github.com/kamailio/kamailio/commit/3976224f6bb4b790b1752a00174439a… --- diff --git a/modules/presence_conference/pidf.c b/modules/presence_conference/pidf.c index 7af6c82..1f64e14 100644 --- a/modules/presence_conference/pidf.c +++ b/modules/presence_conference/pidf.c @@ -41,6 +41,7 @@ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ + #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ #define _DARWIN_C_SOURCE 1 #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */

8 years, 7 months

git:master:3c4fa125: db_mysql: fix compile warning #612

by Victor Seva

Module: kamailio Branch: master Commit: 3c4fa1250c8c3de74e9415a064ba75f97e1cbb4f URL: https://github.com/kamailio/kamailio/commit/3c4fa1250c8c3de74e9415a064ba75f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-17T12:09:02+02:00 db_mysql: fix compile warning #612 > CC (gcc) [M db_mysql.so] my_cmd.o > In file included from /usr/include/string.h:25:0, > from ../../lib/srdb2/../../str.h:24, > from ../../lib/srdb2/db_gen.h:30, > from ../../lib/srdb2/db_drv.h:29, > from my_cmd.h:25, > from my_cmd.c:33: > /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] > # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" --- Modified: modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3c4fa1250c8c3de74e9415a064ba75f… Patch: https://github.com/kamailio/kamailio/commit/3c4fa1250c8c3de74e9415a064ba75f… --- diff --git a/modules/db_mysql/my_cmd.c b/modules/db_mysql/my_cmd.c index 8ee2e00..15c751a 100644 --- a/modules/db_mysql/my_cmd.c +++ b/modules/db_mysql/my_cmd.c @@ -29,6 +29,7 @@ #endif #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #define _SVID_SOURCE 1 /* timegm */ +#define _DEFAULT_SOURCE 1 /* _SVID_SOURCE is deprecated */ #include "my_cmd.h"

8 years, 7 months

git:master:09470aed: lib/srdb1: fix compiler warning #612

by Victor Seva

Module: kamailio Branch: master Commit: 09470aed719b0fad6c600d9c18a339e343550f33 URL: https://github.com/kamailio/kamailio/commit/09470aed719b0fad6c600d9c18a339e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-17T12:08:14+02:00 lib/srdb1: fix compiler warning #612 > CC (gcc) [L libsrdb1.so.1.0] db_ut.o > In file included from /usr/include/time.h:27:0, > from db_ut.c:50: > /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] > # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" --- Modified: lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/09470aed719b0fad6c600d9c18a339e… Patch: https://github.com/kamailio/kamailio/commit/09470aed719b0fad6c600d9c18a339e… --- diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index 6b3bad4..3431104 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -43,6 +43,7 @@ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect * of the above define on * features.h/unistd.h syscall() */ + #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

8 years, 7 months

[kamailio/kamailio] lib/srdb1: fix compiler warning #612 (#620)

by Victor Seva

> CC (gcc) [L libsrdb1.so.1.0] db_ut.o > In file included from /usr/include/time.h:27:0, > from db_ut.c:50: > /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] > # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/620 -- Commit Summary -- * lib/srdb1: fix compiler warning -- File Changes -- M lib/srdb1/db_ut.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/620.patch https://github.com/kamailio/kamailio/pull/620.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/620

8 years, 7 months

git:master:e7365749: Merge pull request #623 from phil-lavin/pua-dialoginfo-dialog-publish-log-level

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e7365749b51be3c2590b84623c6a459237e72bf7 URL: https://github.com/kamailio/kamailio/commit/e7365749b51be3c2590b84623c6a459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-17T10:49:27+02:00 Merge pull request #623 from phil-lavin/pua-dialoginfo-dialog-publish-log-level pua_dialoginfo: reduce the log level of every call to dialog_publish --- Modified: modules/pua_dialoginfo/dialog_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/e7365749b51be3c2590b84623c6a459… Patch: https://github.com/kamailio/kamailio/commit/e7365749b51be3c2590b84623c6a459… --- diff --git a/modules/pua_dialoginfo/dialog_publish.c b/modules/pua_dialoginfo/dialog_publish.c index 54655f6..6a738dc 100644 --- a/modules/pua_dialoginfo/dialog_publish.c +++ b/modules/pua_dialoginfo/dialog_publish.c @@ -383,7 +383,7 @@ void dialog_publish_multi(char *state, struct str_list* ruris, str *entity, str str *localtarget, str *remotetarget, unsigned short do_pubruri_localcheck) { while(ruris) { - LM_INFO("CALLING dialog_publish for URI %.*s\n",ruris->s.len, ruris->s.s); + LM_DBG("CALLING dialog_publish for URI %.*s\n",ruris->s.len, ruris->s.s); dialog_publish(state,&(ruris->s),entity,peer,callid,initiator,lifetime,localtag,remotetag,localtarget,remotetarget,do_pubruri_localcheck); ruris=ruris->next; }

8 years, 7 months

git:master:a5e89b42: pua_dialoginfo: reduce the log level of every call to dialog_publish

by Phil Lavin

Module: kamailio Branch: master Commit: a5e89b42151ba3697835cff4a2a379422a9afc46 URL: https://github.com/kamailio/kamailio/commit/a5e89b42151ba3697835cff4a2a3794… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-05-16T15:20:09+01:00 pua_dialoginfo: reduce the log level of every call to dialog_publish Change the log level of calls to dialog_publish() from INFO to DBG --- Modified: modules/pua_dialoginfo/dialog_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/a5e89b42151ba3697835cff4a2a3794… Patch: https://github.com/kamailio/kamailio/commit/a5e89b42151ba3697835cff4a2a3794… --- diff --git a/modules/pua_dialoginfo/dialog_publish.c b/modules/pua_dialoginfo/dialog_publish.c index 54655f6..6a738dc 100644 --- a/modules/pua_dialoginfo/dialog_publish.c +++ b/modules/pua_dialoginfo/dialog_publish.c @@ -383,7 +383,7 @@ void dialog_publish_multi(char *state, struct str_list* ruris, str *entity, str str *localtarget, str *remotetarget, unsigned short do_pubruri_localcheck) { while(ruris) { - LM_INFO("CALLING dialog_publish for URI %.*s\n",ruris->s.len, ruris->s.s); + LM_DBG("CALLING dialog_publish for URI %.*s\n",ruris->s.len, ruris->s.s); dialog_publish(state,&(ruris->s),entity,peer,callid,initiator,lifetime,localtag,remotetag,localtarget,remotetarget,do_pubruri_localcheck); ruris=ruris->next; }

8 years, 7 months

[kamailio/kamailio] pua_dialoginfo: reduce the log level of every call to dialog_publish (#623)

by Phil Lavin

Change the log level of calls to `dialog_publish()` from `INFO` to `DBG`. This tends to convolute the logs and is certainly no more prevalent that many other calls to `LM_DBG` across the codebase. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/623 -- Commit Summary -- * pua_dialoginfo: reduce the log level of every call to dialog_publish -- File Changes -- M modules/pua_dialoginfo/dialog_publish.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/623.patch https://github.com/kamailio/kamailio/pull/623.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/623

8 years, 7 months

[kamailio/kamailio] Kamailio 4.3.3 and HUAWEI HG8245. Port 1 call port 2. 481Call/Transaction Does Not Exist. Warning: 399 No Dialog match. (#624)

by Max

### Kamailio 4.3.3 and HUAWEI HG8245. Port 1 call port 2. 481 Call/Transaction Does Not Exist. Warning: 399 No Dialog match. In our network we used several ONT Huawei models. But with one model HUAWEI-EchoLife HG8245 / V1R003C00S205 we have the following problem. When connecting to this device in the POTS ports of the two phones. From the first port we can not call to the second and from the second port can not call to the first port. On the other ONT Huawei devices, there is no such problem. Earlier we had set OpenSIP and this device did not have a problem. kamailio -v Version: kamailio 4.3.3 (x86_64/linux) f69971 /var/log/kamailio `May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12379]: INFO: <script>: Callee '123456' is local - M=INVITE RURI=sip:123456@10.10.10.100 F=sip:654321@10.10.10.100 T=sip:123456@10.10.10.100 IP=10.10.10.200 ID=2n8k823jnikjspj2ipppz3k3i434i38n(a)10.10.10.200 May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12379]: INFO: <script>: Call control: dst user '123456' currently has [0/3] active calls - M=INVITE RURI=sip:123456@10.10.10.100 F=sip:654321@10.10.10.100 T=si p:123456@10.10.10.100 IP=10.10.10.200 ID=2n8k823jnikjspj2ipppz3k3i434i38n(a)10.10.10.200 May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12379]: INFO: <script>: Normalize source: sip:654321@10.10.10.100 -> sip:654321@10.10.10.100 May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12379]: INFO: <script>: Request leaving server - M=INVITE RURI=sip:123456@10.10.10.200:5060;transport=udp F=sip:654321@10.10.10.100 T=sip:123456@178.168.4. 37 IP=10.10.10.200 ID=2n8k823jnikjspj2ipppz3k3i434i38n(a)10.10.10.200 May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12381]: INFO: <script>: Reply - S=100 D=Trying F=sip:654321@10.10.10.100 T=sip:123456@10.10.10.100 IP=10.10.10.200 ID=2n8k823jnikjspj2ipppz3k3i434i38n(a)10.1 4.197.135 May 16 09:17:14 kamailio /usr/local/sbin/kamailio[12388]: INFO: <script>: Reply - S=481 D=Call/Transaction Does Not Exist F=sip:654321@10.10.10.100 T=sip:123456@10.10.10.100 IP=10.10.10.200 ID=2n8k823jnikj spj2ipppz3k3i434i38n(a)10.10.10.200 ` sngrep `2016/05/16 09:17:14.111226 10.10.10.200:5060 -> 10.10.10.100:5060 SIP/2.0 481 Call/Transaction Does Not Exist Via: SIP/2.0/UDP 10.10.10.100;branch=z9hG4bK85a8.dd95f1d220b2fe3c0978ebefb5e65d9c.0,SIP/2.0/UDP 10.10.10.200:5060;branch=z9hG4bKpszmps0mj00k3z8nj44kck14s;rport=5060 Call-ID: 2n8k823jnikjspj2ipppz3k3i434i38n(a)10.14.197.135 From: "654321"<sip:654321@10.10.10.100>;tag=8isjcssl To: <sip:123456@10.10.10.100>;tag=0cinjs0z CSeq: 2 INVITE Warning: 399 10.10.10.200 "SS100006F143L3557[05552] No Dialog match" User-Agent: HUAWEI-EchoLife HG8245/V1R003C00S205 Content-Length: 0 ` --- 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/624

8 years, 7 months

git:master:472782d2: cfgutils: added more to docs for route exists functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 472782d2f094b1971543b4d0c3733058d9086d78 URL: https://github.com/kamailio/kamailio/commit/472782d2f094b1971543b4d0c373305… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-17T08:16:12+02:00 cfgutils: added more to docs for route exists functions --- Modified: modules/cfgutils/README Modified: modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/472782d2f094b1971543b4d0c373305… Patch: https://github.com/kamailio/kamailio/commit/472782d2f094b1971543b4d0c373305… --- diff --git a/modules/cfgutils/README b/modules/cfgutils/README index 8948d05..b634eaf 100644 --- a/modules/cfgutils/README +++ b/modules/cfgutils/README @@ -542,7 +542,8 @@ unlock("$rU"); 4.17. check_route_exists(route) - Check if a route block exists + Check if a route block exists. It returns true (1) on found and false + on not found or error. Parameters: @@ -553,7 +554,7 @@ unlock("$rU"); Example 1.21. check_route_exists() usage ... -if(check_route_exists("FROGJUMP") { +if(check_route_exists("JUMP") { $var(jumping_frogs) = 1; }; ... @@ -563,6 +564,9 @@ if(check_route_exists("FROGJUMP") { Execute a routing block only if it is defined. If it's not defined, silently move to the next action in the configuration script. + It returns the code of last action in the route block, if that exists, + or false if the route doesn't exists or was an error executing it. + Parameters: "name" of a route block in the config file, like "route[FROGJUMP]" @@ -572,7 +576,9 @@ if(check_route_exists("FROGJUMP") { Example 1.22. route_if_exists() usage ... -route_if_exists("PRESENCE_SANTA_CLAUS"); +if(route_if_exists("JUMP")) { + exit; +} ... 4.19. core_hash(string1, string2, size) diff --git a/modules/cfgutils/doc/cfgutils_admin.xml b/modules/cfgutils/doc/cfgutils_admin.xml index 0266ab5..3e22fba 100644 --- a/modules/cfgutils/doc/cfgutils_admin.xml +++ b/modules/cfgutils/doc/cfgutils_admin.xml @@ -529,7 +529,8 @@ unlock("$rU"); <section id="cfgutils.f.check_route_exists"> <title><function moreinfo="none">check_route_exists(route)</function></title> <para> - Check if a route block exists + Check if a route block exists. It returns true (1) on found and false on + not found or error. </para> <para>Parameters:</para> <para> @@ -543,7 +544,7 @@ unlock("$rU"); <title><function moreinfo="none">check_route_exists()</function> usage</title> <programlisting format="linespecific"> ... -if(check_route_exists("FROGJUMP") { +if(check_route_exists("JUMP") { $var(jumping_frogs) = 1; }; ... @@ -556,6 +557,10 @@ if(check_route_exists("FROGJUMP") { Execute a routing block only if it is defined. If it's not defined, silently move to the next action in the configuration script. </para> + <para> + It returns the code of last action in the route block, if that exists, or + false if the route doesn't exists or was an error executing it. + </para> <para>Parameters:</para> <para> <quote>name</quote> of a route block in the config file, like <quote>route[FROGJUMP]</quote> @@ -568,7 +573,9 @@ if(check_route_exists("FROGJUMP") { <title><function moreinfo="none">route_if_exists()</function> usage</title> <programlisting format="linespecific"> ... -route_if_exists("PRESENCE_SANTA_CLAUS"); +if(route_if_exists("JUMP")) { + exit; +} ... </programlisting> </example>

8 years, 7 months

git:4.4:053c522e: cfgutils: proper check for return code looking up routing block in route_exists()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 053c522e45fedea8bdb2ed92bd1de0a82331a7bf URL: https://github.com/kamailio/kamailio/commit/053c522e45fedea8bdb2ed92bd1de0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-17T08:10:36+02:00 cfgutils: proper check for return code looking up routing block in route_exists() - when the route block doesn't exist, route_lookup() returns -1, which was used to access routing actions due to condition expecting 0 on not found. The fix should avoid crashing by accessing invalid addresses. Reported by Alex Balashov - fixed return codes in the configuration file to follow the rules with positive being evaluated to true and negative to false - route_exists() returns the code returned by running actions, like a classic sub-route execution (cherry picked from commit 6a3fc200b19500ddd6ed9a2236db6e21f777564a) --- Modified: modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/053c522e45fedea8bdb2ed92bd1de0a… Patch: https://github.com/kamailio/kamailio/commit/053c522e45fedea8bdb2ed92bd1de0a… --- diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c index 262b21f..d6efd60 100644 --- a/modules/cfgutils/cfgutils.c +++ b/modules/cfgutils/cfgutils.c @@ -94,8 +94,8 @@ static int dbg_pkg_status(struct sip_msg*, char*,char*); static int dbg_shm_status(struct sip_msg*, char*,char*); static int dbg_pkg_summary(struct sip_msg*, char*,char*); static int dbg_shm_summary(struct sip_msg*, char*,char*); -static int route_exists(struct sip_msg*, char*); -static int check_route_exists(struct sip_msg*, char*); +static int w_route_exists(struct sip_msg*, char*); +static int w_check_route_exists(struct sip_msg*, char*); static int set_gflag(struct sip_msg*, char *, char *); static int reset_gflag(struct sip_msg*, char *, char *); @@ -183,9 +183,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, - {"check_route_exists", (cmd_function)check_route_exists, 1, 0, 0, + {"check_route_exists", (cmd_function)w_check_route_exists, 1, 0, 0, ANY_ROUTE}, - {"route_if_exists", (cmd_function)route_exists, 1, 0, 0, + {"route_if_exists", (cmd_function)w_route_exists, 1, 0, 0, ANY_ROUTE}, {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, 0, 0, 0}, @@ -860,29 +860,32 @@ static int cfg_unlock(struct sip_msg *msg, char *key, char *s2) /*! Check if a route block exists - only request routes */ -static int check_route_exists(struct sip_msg *msg, char *route) +static int w_check_route_exists(struct sip_msg *msg, char *route) { - if (route_lookup(&main_rt, route)) - return 1; - return 0; + if (route_lookup(&main_rt, route)<0) { + /* not found */ + return -1; + } + return 1; } /*! Run a request route block if it exists */ -static int route_exists(struct sip_msg *msg, char *route) +static int w_route_exists(struct sip_msg *msg, char *route) { struct run_act_ctx ctx; - int newroute, backup_rt; + int newroute, backup_rt, ret; - if (!(newroute = route_lookup(&main_rt, route))) { - return 0; + newroute = route_lookup(&main_rt, route); + if (newroute<0) { + return -1; } backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(main_rt.rlist[newroute], msg, 0); + ret = run_top_route(main_rt.rlist[newroute], msg, &ctx); set_route_type(backup_rt); - return 0; + return ret; } static int mod_init(void)

8 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
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 2016