sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:3.1: modules_k/nathelper: add_contact_alias adds <>s around contact URI

by Juha Heinanen

Module: sip-router Branch: 3.1 Commit: f5ef15fee0c3bf09adf2506effa0895f72af9034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5ef15f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 82c6528..dd737a3 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

14 years, 2 months

[tracker] Comment added: Segfault in allow_trusted2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#102 - Segfault in allow_trusted2 User who did this - Daniel-Constantin Mierla (miconda) ---------- I spotted some other potential issues with the types of parameters used in fixup so I did a bigger patch that should fix also the problem you reported. Can you test the patch from the following commit I did on master branch on v3.1? http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18e67ca… If all ok, I will backport. Thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=102#comment133 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Assignee added: $snd(name) pvar contains local instead of remote socket info

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#103 - $snd(name) pvar contains local instead of remote socket info User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=103 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Task opened: $snd(name) pvar contains local instead of remote socket info

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - $snd(name) pvar contains local instead of remote socket info Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - The following fragment <code> onsend_route { xlog("Sending request to $snd(proto):$snd(af):$snd(ip):$snd(port) len: $ml"); return; } </code> always logs the local listen ip and port of kamailio. Documentation says: "$snd(name) - return attributes of the address where the request is going to be sent." More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=103 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Assignee added: Segfault in allow_trusted2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#102 - Segfault in allow_trusted2 User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=102 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Task opened: Segfault in allow_trusted2 (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - Segfault in allow_trusted2 Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Medium Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - if (allow_trusted("$si", "$proto")) Will cause a segfault. $proto is returned from the following code fragment in pv_core.c: int pv_get_proto(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; if(msg==NULL) return -1; switch(msg->rcv.proto) { case PROTO_UDP: s.s = "udp"; s.len = 3; break; The "udp" string is allocated by the compiler in the TEXT segment, which by its nature is not writable. The tolower() which allow_trusted2() tries to do later is rewarded with a segfault. Attached patch fixes the segfault. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=102 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Assignee added: [regression] proxy_authorize function is missing return values

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#101 - [regression] proxy_authorize function is missing return values User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=101 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

[tracker] Task opened: [regression] proxy_authorize function is missing return values (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - [regression] proxy_authorize function is missing return values Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - In kamailio 1.5 the various _authorize functions return a lot more info on failed authorization attempts. In 3.1 this functionalitity is missing. Attached patch is a first attempt to restore this functionality. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=101 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 2 months

git:3.1: dispatcher(k): note about disabling MI ds_reload

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 7340a8d0d02e22c2541b6e1d0dc82fb194a90c87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7340a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 12 12:26:26 2010 +0100 dispatcher(k): note about disabling MI ds_reload - the MI command ds_reload is disabled for call load based dispatching (algorithm 10) (cherry picked from commit e1371192357f889c35003ea28d0eb2351e27f84d) --- modules_k/dispatcher/README | 5 ++++- modules_k/dispatcher/doc/dispatcher_admin.xml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 781e499..1c747c9 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -857,7 +857,10 @@ onreply_route { 5.3. ds_reload - It reloads the groups and included destinations. + It reloads the groups and included destinations. The command is + disabled for call load based dispatching (algorithm 10) since removal + of destinations may leave the list of active calls with broken + references. Name: ds_reload diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index b05403a..ae857fd 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -1069,7 +1069,10 @@ onreply_route { <function moreinfo="none">ds_reload</function> </title> <para> - It reloads the groups and included destinations. + It reloads the groups and included destinations. The command is + disabled for call load based dispatching (algorithm 10) since + removal of destinations may leave the list of active + calls with broken references. </para> <para> Name: <emphasis>ds_reload</emphasis>

14 years, 2 months

git:3.1: db_flatstore: exported DB API v1 bind function

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 86c16fd9bc30a6b1346c04b2e1bbd3983122dddb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86c16fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 24 22:24:25 2010 +0100 db_flatstore: exported DB API v1 bind function - bind function for DB API v1 was no longer exported upon merging with implementation of DB API V2 - reported by Javier Gallart (cherry picked from commit 3e44fcbe47774d2b157e82228e6266df2a08d627) --- modules/db_flatstore/flatstore_mod.c | 1 + modules/db_flatstore/km_flatstore_mod.h | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 0f7b5b5..b008f20 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -110,6 +110,7 @@ static cmd_export_t cmds[] = { {"db_con", (cmd_function)flat_con, 0, 0, 0}, {"db_cmd", (cmd_function)flat_cmd, 0, 0, 0}, {"db_put", (cmd_function)flat_put, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_flat_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} }; diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index 3ca8c50..36c103b 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -32,6 +32,8 @@ #include <time.h> +#include "../../lib/srdb1/db.h" + /* * Process number used in filenames */ @@ -63,5 +65,7 @@ void km_mod_destroy(void); int km_child_init(int rank); +int db_flat_bind_api(db_func_t *dbb); + #endif /* KM_FLATSTORE_MOD_H */

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev