sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

Start a nNew thread

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,trusty,slave #469

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 9 months

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,squeeze,slave #469

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 9 months

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,precise,slave #469

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 9 months

[kamailio] Invalid XAVP use causes a crash (#511)

by Hugh Waite

The following code is accepted by the cfg parser and will run: ``` $xavp(test1=>stuff) = "america"; # Good $xavp(test2->stuff) = "bahamas"; # Bad - Hyphen instead of equals $xavp(test3) = "cuba"; # Bad - No name given xlog("L_WARN", "1: $xavp(test1)\n"); xlog("L_WARN", "2: $xavp(test2)\n"); xlog("L_WARN", "3: $xavp(test3)\n"); xlog("L_WARN", "4: $xavp(test1=>stuff)\n"); xlog("L_WARN", "5: $xavp(test2=>stuff)\n"); xlog("L_WARN", "6: $xavp(test3=>stuff)\n"); ``` This prints: ``` 1: <<xavp:0x7ff16f82c898>> 2: <null> 3: cuba 4: america 5: null <null> or general protection fault/ core was generated...... ``` The crash can be fixed by checking the child node type (incoming), but could there be more validation of the (x)avp variables. I notice that $avp's can be treated as $xavps i.e. the following is accepted. `$avp(test4=>stuff) = "dominica";` Is the usage above intended to be acceptable? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/511

8 years, 9 months

[kamailio] append_fromtag on upstream in-dialog requests (#537)

by schoberw

Record-Routing in in-dialog request are not needed by RFC 3261. But there are many clients out there not sending initial route-set in in-dialog requests. To provided them with the initial route-set together with UAC modified requests the ;ftag parameter must be the to-tag on upstream requests. append_fromtag parameter added the tag value from "from" header always, even on upstream. This is fixed here. It is not done on record_route_preset(). Handles issue #536 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/537 -- Commit Summary -- * append_fromtag on upstream in-dialog requests * Merge pull request #1 from schoberw/append_fromtag_upstream -- File Changes -- M modules/rr/record.c (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/537.patch https://github.com/kamailio/kamailio/pull/537.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/537

8 years, 9 months

git:master:92054daa: rr: append_fromtag on upstream in-dialog requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92054daa6b1a70a33912c52e6e6ff3dcc4bd7a77 URL: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3d… Author: schoberw <walter.schober(a)neotel.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-09T11:04:30+01:00 rr: append_fromtag on upstream in-dialog requests Record-Routing for in-dialog request are not needed by RFC 3162. But there are many clients out there not sending initial route-set in in-dialog requests. To provided them with the initial route-set together with UAC modified requests the ;ftag parameter must be the to-tag on upstream requests. append_fromtag parameter added the tag value from "from" header always, even on upstream. This is fixed here. It is not done on record_route_preset(). This should not be called on record routing anyway. --- Modified: modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3d… Patch: https://github.com/kamailio/kamailio/commit/92054daa6b1a70a33912c52e6e6ff3d… --- diff --git a/modules/rr/record.c b/modules/rr/record.c index 3af771d..b8f526e 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -40,6 +40,7 @@ #include "../../data_lump.h" #include "record.h" #include "rr_mod.h" +#include "loose.h" #define RR_PREFIX_SIP "Record-Route: <sip:" @@ -375,7 +376,6 @@ int record_route(struct sip_msg* _m, str *params) { struct lump* l, *l2; str user = {NULL, 0}; - struct to_body* from = NULL; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; int sips; @@ -404,13 +404,21 @@ int record_route(struct sip_msg* _m, str *params) } if (append_fromtag) { - if (parse_from_header(_m) < 0) { - LM_ERR("From parsing failed\n"); - ret = -2; - goto error; + if (is_direction(_m, RR_FLOW_UPSTREAM) == 0) { + if (parse_to_header(_m) < 0) { + LM_ERR("To parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->to->parsed)->tag_value; + } else { + if (parse_from_header(_m) < 0) { + LM_ERR("From parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->from->parsed)->tag_value; } - from = (struct to_body*)_m->from->parsed; - tag = &from->tag_value; } else { tag = 0; } @@ -777,12 +785,23 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) } if (append_fromtag) { - if (parse_from_header(_m) < 0) { - LM_ERR("From parsing failed\n"); - ret = -2; - goto error; + if (is_direction(_m, RR_FLOW_UPSTREAM) == 0) { + if (parse_to_header(_m) < 0) { + LM_ERR("To parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->to->parsed)->tag_value; + } else { + if (parse_from_header(_m) < 0) { + LM_ERR("From parsing failed\n"); + ret = -2; + goto error; + } + tag = &((struct to_body*)_m->from->parsed)->tag_value; } - tag = &((struct to_body*)_m->from->parsed)->tag_value; + } else { + tag = 0; } sips = rr_is_sips(_m);

8 years, 9 months

git:master:924a861f: Merge pull request #535 from wdoekes/wjd-typo-connectons

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 924a861f1fc5eeade24b7ba6916afefb39a9cba5 URL: https://github.com/kamailio/kamailio/commit/924a861f1fc5eeade24b7ba6916afef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-09T11:02:05+01:00 Merge pull request #535 from wdoekes/wjd-typo-connectons websocket: Fix stats "connectons" typo's. --- Modified: modules/websocket/ws_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/924a861f1fc5eeade24b7ba6916afef… Patch: https://github.com/kamailio/kamailio/commit/924a861f1fc5eeade24b7ba6916afef… --- diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 827dd61..e513d09 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -108,9 +108,9 @@ static stat_export_t stats[] = { "ws_current_connections", 0, &ws_current_connections }, { "ws_max_concurrent_connections", 0, &ws_max_concurrent_connections }, { "ws_sip_current_connections", 0, &ws_sip_current_connections }, - { "ws_sip_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, - { "ws_msrp_current_connections", 0, &ws_msrp_current_connections }, - { "ws_msrp_max_concurrent_connectons", 0, &ws_msrp_max_concurrent_connections }, + { "ws_sip_max_concurrent_connections", 0, &ws_sip_max_concurrent_connections }, + { "ws_msrp_current_connections", 0, &ws_msrp_current_connections }, + { "ws_msrp_max_concurrent_connections", 0, &ws_msrp_max_concurrent_connections }, /* ws_frame.c */ { "ws_failed_connections", 0, &ws_failed_connections }, @@ -135,6 +135,10 @@ static stat_export_t stats[] = { "ws_sip_successful_handshakes", 0, &ws_sip_successful_handshakes }, { "ws_msrp_successful_handshakes", 0, &ws_msrp_successful_handshakes }, + /* legacy typo's, fixed in 4.4 */ + { "ws_sip_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, + { "ws_msrp_max_concurrent_connectons", 0, &ws_msrp_max_concurrent_connections }, + { 0, 0, 0 } };

8 years, 9 months

[kamailio] websocket: Fix stats "connectons" typo's. (#535)

by Walter Doekes

The stats now list: ws_sip_max_concurrent_connections ws_msrp_max_concurrent_connections Instead of: ws_sip_max_concurrent_connectons ws_msrp_max_concurrent_connectons Note that the latter still exist as aliases to the corrected values for a while. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/535 -- Commit Summary -- * websocket: Fix stats "connectons" typo's. -- File Changes -- M modules/websocket/ws_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/535.patch https://github.com/kamailio/kamailio/pull/535.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/535

8 years, 9 months

git:master:3320ed6d: websocket: Fix stats "connectons" typo's.

by Walter Doekes

Module: kamailio Branch: master Commit: 3320ed6df304e45a89d1cb2eba9b3c327008a0d5 URL: https://github.com/kamailio/kamailio/commit/3320ed6df304e45a89d1cb2eba9b3c3… Author: Walter Doekes <walter+github(a)wjd.nu> Committer: Walter Doekes <walter+github(a)wjd.nu> Date: 2016-03-09T08:58:53+01:00 websocket: Fix stats "connectons" typo's. The stats now list: ws_sip_max_concurrent_connections ws_msrp_max_concurrent_connections Instead of: ws_sip_max_concurrent_connectons ws_msrp_max_concurrent_connectons Note that the latter still exist as aliases to the corrected values for a while. --- Modified: modules/websocket/ws_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3320ed6df304e45a89d1cb2eba9b3c3… Patch: https://github.com/kamailio/kamailio/commit/3320ed6df304e45a89d1cb2eba9b3c3… --- diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 827dd61..e513d09 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -108,9 +108,9 @@ static stat_export_t stats[] = { "ws_current_connections", 0, &ws_current_connections }, { "ws_max_concurrent_connections", 0, &ws_max_concurrent_connections }, { "ws_sip_current_connections", 0, &ws_sip_current_connections }, - { "ws_sip_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, - { "ws_msrp_current_connections", 0, &ws_msrp_current_connections }, - { "ws_msrp_max_concurrent_connectons", 0, &ws_msrp_max_concurrent_connections }, + { "ws_sip_max_concurrent_connections", 0, &ws_sip_max_concurrent_connections }, + { "ws_msrp_current_connections", 0, &ws_msrp_current_connections }, + { "ws_msrp_max_concurrent_connections", 0, &ws_msrp_max_concurrent_connections }, /* ws_frame.c */ { "ws_failed_connections", 0, &ws_failed_connections }, @@ -135,6 +135,10 @@ static stat_export_t stats[] = { "ws_sip_successful_handshakes", 0, &ws_sip_successful_handshakes }, { "ws_msrp_successful_handshakes", 0, &ws_msrp_successful_handshakes }, + /* legacy typo's, fixed in 4.4 */ + { "ws_sip_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, + { "ws_msrp_max_concurrent_connectons", 0, &ws_msrp_max_concurrent_connections }, + { 0, 0, 0 } };

8 years, 9 months

git:master:00cde821: modules/ims_usrloc_scscf: fix synchronize argument count

by jaybeepee

Module: kamailio Branch: master Commit: 00cde82125a2271171fe4c25cba09f2147888206 URL: https://github.com/kamailio/kamailio/commit/00cde82125a2271171fe4c25cba09f2… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-09T11:09:20+02:00 modules/ims_usrloc_scscf: fix synchronize argument count --- Modified: modules/ims_usrloc_scscf/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00cde82125a2271171fe4c25cba09f2… Patch: https://github.com/kamailio/kamailio/commit/00cde82125a2271171fe4c25cba09f2… --- diff --git a/modules/ims_usrloc_scscf/ul_mod.c b/modules/ims_usrloc_scscf/ul_mod.c index 8d77de0..d416264 100644 --- a/modules/ims_usrloc_scscf/ul_mod.c +++ b/modules/ims_usrloc_scscf/ul_mod.c @@ -467,7 +467,7 @@ static void destroy(void) { if (ul_dbh) { ul_unlock_locks(); - if (synchronize_all_udomains() != 0) { + if (synchronize_all_udomains(0, 1) != 0) { LM_ERR("flushing cache failed\n"); } ul_dbf.close(ul_dbh); @@ -477,7 +477,6 @@ static void destroy(void) { ul_destroy_locks(); subs_destroy_locks(); destroy_contacts_locks(); - /* free callbacks list */ destroy_ulcb_list(); }

8 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016