sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

[tracker] Comment added: Module drouting, address routeid as string

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Raúl Alexis Betancor Santana (rbetancor) ---------- The module is not abandoned, it's maintained by me. The fact is that I'm working on a full new version of drouting with lot of improments, so if you could add some comments about what you need, maybe I could work on it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment18 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, 3 months

[tracker] User took ownership: Module drouting, address routeid as string

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Raúl Alexis Betancor Santana has taken ownership of the following task: FS#24 - Module drouting, address routeid as string More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24 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, 3 months

git:sr_3.0: modules/lcr and modules_k/nathelper: fixed compiler warnings

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 8b53323dde13c166676378f21f402a79d36b5a23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b53323… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 30 19:22:14 2009 +0200 modules/lcr and modules_k/nathelper: fixed compiler warnings - Fixed compiler warnings that went earlier unnoticed, because I didn't have -Wall gcc option. --- modules/lcr/lcr_mod.c | 2 +- modules_k/nathelper/nathelper.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 7eb3747..9748024 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2054,7 +2054,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) uri_str.len = r_uri_len; LM_DBG("appending branch <%.*s>\n", uri_str.len, uri_str.s); if (append_branch(_m, &uri_str, 0, 0, Q_UNSPECIFIED, 0, 0) == -1) { - LM_ERR("when appending branch <%.*s>\n", rval); + LM_ERR("when appending branch <%.*s>\n", uri_str.len, uri_str.s); return -1; } } diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 27ef349..90fca05 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -283,8 +283,6 @@ static int add_contact_alias_f(struct sip_msg *, char *, char *); static int handle_ruri_alias_f(struct sip_msg *, char *, char *); static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); -static int rr_count_f(struct sip_msg *, char *, char *); -static int rr_top_count_f(struct sip_msg *, char *, char *); static int fix_nated_sdp_f(struct sip_msg *, char *, char *); static int extract_mediaip(str *, str *, int *, char *); static int extract_mediainfo(str *, str *, str *); @@ -1643,8 +1641,6 @@ static int pv_get_rr_top_count_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - unsigned int count; - struct hdr_field *header; str uri; struct sip_uri puri;

14 years, 3 months

[tracker] Comment added: Module drouting, address routeid as string

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Andrey 'Krieger' Utkin (andrey.utkin.2) ---------- > If you want to become a maintainer of this module, I am happy to grant you commit access. Thanks but not this time :) Happy New Year! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment17 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, 3 months

git:sr_3.0: modules_k/nathelper: handle_uri_alias() alias handling fix

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 9d98ca32bb131c0fb190e012ed0bff3f9a26557a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d98ca3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 30 12:19:03 2009 +0200 modules_k/nathelper: handle_uri_alias() alias handling fix - handle_uri_alias() now finds ;alias r-uri param even if it is not the first param. --- modules_k/nathelper/nathelper.c | 53 ++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index fadc93f..27ef349 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1501,41 +1501,54 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { - str params, uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri; - unsigned int len, plen, alias_len, proto_type, cur_uri_len; + str uri, proto; + char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest; + unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, + ip_port_len; if ((msg->parsed_uri_ok == 0) && (parse_sip_msg_uri(msg) < 0)) { LM_ERR("while parsing Request-URI\n"); return -1; } - params = msg->parsed_uri.params; - if (params.len == 0) { + rest = msg->parsed_uri.params.s; + rest_len = msg->parsed_uri.params.len; + if (rest_len == 0) { LM_DBG("no params\n"); return 2; } - if ((params.len < ALIAS_LEN) || - (strncmp(params.s, ALIAS, ALIAS_LEN) != 0)) { + while (rest_len >= ALIAS_LEN) { + if (strncmp(rest, ALIAS, ALIAS_LEN) == 0) break; + sep = memchr(rest, 59 /* ; */, rest_len); + if (sep == NULL) { + LM_DBG("no alias param\n"); + return 2; + } else { + rest_len = rest_len - (sep - rest + 1); + rest = sep + 1; + } + } + + if (rest_len < ALIAS_LEN) { LM_DBG("no alias param\n"); return 2; } /* set dst uri based on alias param value */ - val = params.s + ALIAS_LEN; - plen = params.len - ALIAS_LEN; - sep = memchr(val, 116 /* t */, plen); + val = rest + ALIAS_LEN; + val_len = rest_len - ALIAS_LEN; + sep = memchr(val, 116 /* t */, val_len); if (sep == NULL) { - LM_ERR("no 't' in alias param\n"); + LM_ERR("no 't' in alias param value\n"); return -1; } at = &(buf[0]); append_str(at, "sip:", 4); - len = sep - val; - alias_len = SALIAS_LEN + len + 2 /* tn */; - memcpy(at, val, len); - at = at + len; + ip_port_len = sep - val; + alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; + memcpy(at, val, ip_port_len); + at = at + ip_port_len; trans = sep + 1; - if ((len + 2 > plen) || (*trans == ';') || (*trans == '?')) { + if ((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n"); return -1; } @@ -1543,7 +1556,7 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) if (proto_type != PROTO_UDP) { proto_type_to_str(proto_type, &proto); if (proto.len == 0) { - LM_ERR("unkown proto in alias param\n"); + LM_ERR("unknown proto in alias param\n"); return -1; } append_str(at, ";transport=", 11); @@ -1551,7 +1564,7 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) at = at + proto.len; } next = trans + 1; - if ((len + 2 < plen) && (*next != ';') && (*next != '?')) { + if ((ip_port_len + 2 < val_len) && (*next != ';') && (*next != '?')) { LM_ERR("invalid alias param value\n"); return -1; } @@ -1572,11 +1585,11 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) cur_uri_len = msg->first_line.u.request.uri.len; } at = &(buf[0]); - len = params.s - 1 /* ; */ - cur_uri; + len = rest - 1 /* ; */ - cur_uri; memcpy(at, cur_uri, len); at = at + len; len = cur_uri_len - alias_len - len; - memcpy(at, params.s + alias_len - 1, len); + memcpy(at, rest + alias_len - 1, len); uri.s = &(buf[0]); uri.len = cur_uri_len - alias_len; LM_DBG("rewriting r-uri to <%.*s>\n", uri.len, uri.s);

14 years, 3 months

[tracker] Comment added: Module drouting, address routeid as string

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Daniel-Constantin Mierla (miconda) ---------- Thank! At first sight looks good. Probably not many active developers are using this module, there are a lot options to do least cost routing and load balancing. If you want to become a maintainer of this module, I am happy to grant you commit access. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment16 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, 3 months

[tracker] Task opened: Module drouting, address routeid as string (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 - Andrey 'Krieger' Utkin (andrey.utkin.2) Attached to Project - sip-router Summary - Module drouting, address routeid as string Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - drouting in kamailio git looks a bit abandoned. This patch is result of merging with opensips. Patched module reads routeid field of database table 'dr_rules' as string, not as int. Unfortunately this module did not fit my requirements (i need non-numeric prefixes), so patch is not tested. Happy New Year! 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=24 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, 3 months

sr_3.0 release?

by jh＠tutpro.com

is there something still holding release of sr_3.0? i personally don't have any pending issues. -- juha

14 years, 3 months

git:sr_3.0: modules_k/usrloc: changed 'Kamailio' to 'SIP Router' in user agent string.

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 528d9a31d36db969184586b180bf5322c9a32017 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=528d9a3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Dec 29 21:13:05 2009 +0200 modules_k/usrloc: changed 'Kamailio' to 'SIP Router' in user agent string. --- modules_k/usrloc/ul_mi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index d26b36c..1f1f0d9 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -51,7 +51,7 @@ /*! call-id used for ul_add and ul_rm_contact */ static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)openser.mi"); /*! user agent used for ul_add */ -static str mi_ul_ua = str_init("Kamailio MI Server"); +static str mi_ul_ua = str_init("SIP Router MI Server"); /************************ helper functions ****************************/

14 years, 3 months

git:sr_3.0: tls: name the certificates based on $MAIN_NAME

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 5fa3a6acad0f43785e536a2afe2beb2b555ee88b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fa3a6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Dec 11 23:07:27 2009 +0100 tls: name the certificates based on $MAIN_NAME (cherry picked from commit 6ecc6c13f63dab04083f61aa1b7ee767f9441ee0) --- modules/tls/Makefile | 2 +- modules/tls/sip-router_cert.sh | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index f3970a4..0c3aa30 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -23,6 +23,6 @@ include ../../Makefile.modules install-tls-cert: $(cfg_prefix)/$(cfg_dir) - ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-cfg: install-tls-cert diff --git a/modules/tls/sip-router_cert.sh b/modules/tls/sip-router_cert.sh index df08caa..9e1cd7f 100755 --- a/modules/tls/sip-router_cert.sh +++ b/modules/tls/sip-router_cert.sh @@ -3,18 +3,20 @@ # $Id$ # # This script generates a self-signed TLS/SSL certificate that can be -# immediately used with the TLS module of SER. The file was inspired +# immediately used with the TLS module of SIP Router. The file was inspired # by a script from Debian's uw-imapd package. # ############################################################################# # Configuration variables ############################################################################# -DEFAULT_DIR="/usr/local/etc/ser" +NAME=$MAIN_NAME +if [ -z "$NAME" ] ; then NAME="sip-router"; fi; +DEFAULT_DIR="/usr/local/etc/$NAME" DEFAULT_DAYS=365 -DEFAULT_INFO="Self-signed certificate for SER" -DEFAULT_CERT_FILENAME="ser-selfsigned.pem" -DEFAULT_KEY_FILENAME="ser-selfsigned.key" +DEFAULT_INFO="Self-signed certificate for $NAME" +DEFAULT_CERT_FILENAME="$NAME-selfsigned.pem" +DEFAULT_KEY_FILENAME="$NAME-selfsigned.key" DEFAULT_OPENSSL='openssl' @@ -50,19 +52,19 @@ longopts() { usage() { cat <<EOF NAME - $COMMAND - Generate a self-signed TLS/SSL certificate for use with SER. + $COMMAND - Generate a self-signed TLS/SSL certificate for use with $NAME. SYNOPSIS $COMMAND [options] DESCRIPTION This is a simple shell script that generates a self signed TLS/SSL - certificate (and private key) for use with the tls module of SER. The + certificate (and private key) for use with the tls module of $NAME. The self-signed certificate is suitable for testing and/or private setups. You are encouraged to create a proper authorized one if needed. Both certificate and key files are by default stored in the directory - containing the configuration file of SER (unless you change it using + containing the configuration file of $NAME (unless you change it using the options below). OPTIONS @@ -100,7 +102,7 @@ AUTHOR Written by Jan Janak <jan(a)iptel.org> REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)sip-router.org> EOF } #usage @@ -175,7 +177,7 @@ if [ $? != 0 ] ; then exit 1 fi -echo "Creating a new SER self-signed certificate for '$FQDN'" \ +echo "Creating a new $NAME self-signed certificate for '$FQDN'" \ "valid for $DAYS days." openssl req -new -x509 -days "$DAYS" -nodes -out "$DIR/$CERT_FILENAME" \ -keyout "$DIR/$KEY_FILENAME" > /dev/null 2>&1 <<+

14 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009