sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:master: textops(s): change_reply_status() moved to textopsx
by Daniel-Constantin Mierla 29 Jul '10

29 Jul '10

Module: sip-router Branch: master Commit: 578114778ae0b93c45f9e97dc55066496da77d43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5781147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 29 18:54:53 2010 +0200 textops(s): change_reply_status() moved to textopsx --- modules_s/textops/README | 308 ++++++++++++++++++++++++++++++++--- modules_s/textops/doc/functions.xml | 30 ---- modules_s/textops/textops.c | 74 --------- 3 files changed, 285 insertions(+), 127 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=578…

1 0

git:master: textops(k): msg_apply_changes() moved to textops
by Daniel-Constantin Mierla 29 Jul '10

29 Jul '10

Module: sip-router Branch: master Commit: 53c5e9c34fee88989f362fb6e3ab83bc67b1eea3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53c5e9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 29 18:53:42 2010 +0200 textops(k): msg_apply_changes() moved to textops --- modules_k/textops/README | 27 ---------- modules_k/textops/doc/textops_admin.xml | 32 ------------ modules_k/textops/textops.c | 82 ------------------------------- 3 files changed, 0 insertions(+), 141 deletions(-) diff --git a/modules_k/textops/README b/modules_k/textops/README index 9797b57..7cad37b 100644 --- a/modules_k/textops/README +++ b/modules_k/textops/README @@ -76,7 +76,6 @@ Juha Heinanen 3.31. cmp_str(str1, str2) 3.32. cmp_istr(str1, str2) 3.33. starts_with(str1, str2) - 3.34. msg_apply_changes() 4. Known Limitations @@ -121,7 +120,6 @@ Juha Heinanen 1.31. cmp_str usage 1.32. cmp_str usage 1.33. starts_with usage - 1.34. msg_apply_changes() usage Chapter 1. Admin Guide @@ -171,7 +169,6 @@ Chapter 1. Admin Guide 3.31. cmp_str(str1, str2) 3.32. cmp_istr(str1, str2) 3.33. starts_with(str1, str2) - 3.34. msg_apply_changes() 4. Known Limitations @@ -244,7 +241,6 @@ From: medabeda 3.31. cmp_str(str1, str2) 3.32. cmp_istr(str1, str2) 3.33. starts_with(str1, str2) - 3.34. msg_apply_changes() 3.1. search(re) @@ -888,29 +884,6 @@ if (starts_with("$rU", "+358")) } ... -3.34. msg_apply_changes() - - Use this function to apply changes done on SIP request content. Be - careful when using this function -- due to special handling of changes - done to SIM message buffer so far, using this function might change the - behaviour of your config as it was so far -- do test properly your - config! - - This function can be used from REQUEST_ROUTE. - - Example 1.34. msg_apply_changes() usage -... -append_hf("My-Header: yes\r\n"); -if(msg_apply_changes()) -{ - # msg buffer has a new content - if(is_present_hf("My-Header")) - { - # will get here always - } -} -... - 4. Known Limitations Search functions are applied to the original request, i.e., they ignore diff --git a/modules_k/textops/doc/textops_admin.xml b/modules_k/textops/doc/textops_admin.xml index 05e8240..0c8ea28 100644 --- a/modules_k/textops/doc/textops_admin.xml +++ b/modules_k/textops/doc/textops_admin.xml @@ -1233,38 +1233,6 @@ if (starts_with("$rU", "+358")) </example> </section> - <section> - <title> - <function moreinfo="none">msg_apply_changes()</function> - </title> - <para> - Use this function to apply changes done on SIP request content. Be - careful when using this function -- due to special handling of changes - done to SIM message buffer so far, using this function might change - the behaviour of your config as it was so far -- do test properly - your config! - </para> - <para> - This function can be used from REQUEST_ROUTE. - </para> - <example> - <title><function>msg_apply_changes()</function> usage</title> - <programlisting format="linespecific"> -... -append_hf("My-Header: yes\r\n"); -if(msg_apply_changes()) -{ - # msg buffer has a new content - if(is_present_hf("My-Header")) - { - # will get here always - } -} -... -</programlisting> - </example> - </section> - </section> <section> <title>Known Limitations</title> diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index e5527e4..cb3907d 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -124,7 +124,6 @@ static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); -static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); static int fixup_substre(void**, int); static int hname_fixup(void** param, int param_no); @@ -247,9 +246,6 @@ static cmd_export_t cmds[]={ {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, - {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, - 0, 0, - REQUEST_ROUTE }, {0,0,0,0,0,0} }; @@ -1878,84 +1874,6 @@ static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ) return -2; } -static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) -{ - struct dest_info dst; - str obuf; - sip_msg_t tmp; - - if(get_route_type()!=REQUEST_ROUTE) - { - LM_ERR("invalid usage - not in request route\n"); - return -1; - } - - init_dest_info(&dst); - dst.proto = PROTO_UDP; - obuf.s = build_req_buf_from_sip_req(msg, - (unsigned int*)&obuf.len, &dst, - BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); - if(obuf.s == NULL) - { - LM_ERR("couldn't update msg buffer content\n"); - return -1; - } - if(obuf.len>=BUF_SIZE) - { - LM_ERR("new buffer overflow (%d)\n", obuf.len); - pkg_free(obuf.s); - return -1; - } - /* temporary copy */ - memcpy(&tmp, msg, sizeof(sip_msg_t)); - - /* reset dst uri and path vector to avoid freeing - restored later */ - if(msg->dst_uri.s!=NULL) - { - msg->dst_uri.s = NULL; - msg->dst_uri.len = 0; - } - if(msg->path_vec.s!=NULL) - { - msg->path_vec.s = NULL; - msg->path_vec.len = 0; - } - - /* free old msg structure */ - free_sip_msg(msg); - memset(msg, 0, sizeof(sip_msg_t)); - - /* restore msg fields */ - msg->buf = tmp.buf; - msg->id = tmp.id; - msg->rcv = tmp.rcv; - msg->set_global_address = tmp.set_global_address; - msg->set_global_port = tmp.set_global_port; - msg->flags = tmp.flags; - msg->msg_flags = tmp.msg_flags; - msg->force_send_socket = tmp.force_send_socket; - msg->fwd_send_flags = tmp.fwd_send_flags; - msg->rpl_send_flags = tmp.rpl_send_flags; - msg->dst_uri = tmp.dst_uri; - msg->path_vec = tmp.path_vec; - - memcpy(msg->buf, obuf.s, obuf.len); - msg->len = obuf.len; - msg->buf[msg->len] = '\0'; - - /* free new buffer - copied in the static buffer from old sip_msg_t */ - pkg_free(obuf.s); - - /* reparse the message */ - LM_DBG("SIP Request content updated - reparsing\n"); - if (parse_msg(msg->buf, msg->len, msg)!=0){ - LM_ERR("parse_msg failed\n"); - return -1; - } - - return 1; -} - int fixup_regexpNL_none(void** param, int param_no) { regex_t* re;

1 0

[tracker] Task opened: presence, add_event(), missing handler on subscribe (Attachment added)
by sip-router 29 Jul '10

29 Jul '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - nikita kozlov (klnikita) Attached to Project - sip-router Summary - presence, add_event(), missing handler on subscribe Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - In the function add_event(pres_ev_t* event), evs_subs_handl is not copied in the new event which is added to presence event list. Find attached a patch fixing this small bug. 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=82 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.

1 0

SF.net SVN: openser:[6033] branches/1.5/modules/registrar/save.c
by Henning Westerholt 29 Jul '10

29 Jul '10

Revision: 6033 http://openser.svn.sourceforge.net/openser/?rev=6033&view=rev Author: henningw Date: 2010-07-29 16:46:49 +0000 (Thu, 29 Jul 2010) Log Message: ----------- reg(k): only store path if indicated by the configuration Modified Paths: -------------- branches/1.5/modules/registrar/save.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: reg(k): only store path if indicated by the configuration
by Henning Westerholt 29 Jul '10

29 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: dadcfdb11c4c5bac986eb6fe553a615349aa72df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dadcfdb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 29 18:42:27 2010 +0200 reg(k): only store path if indicated by the configuration (cherry picked from commit 1ede271e9b669b2f335858edb47dd260f0d28ad2) --- modules_k/registrar/save.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 65b09ca..50bf57b 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -268,10 +268,12 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } if (path.len && path.s) { ci.path = &path; - /* save in msg too for reply */ - if (set_path_vector(_m, &path) < 0) { - rerrno = R_PARSE_PATH; - goto error; + if (path_mode != PATH_MODE_OFF) { + /* save in msg too for reply */ + if (set_path_vector(_m, &path) < 0) { + rerrno = R_PARSE_PATH; + goto error; + } } } }

1 0

git:master: reg(k): only store path if indicated by the configuration
by Henning Westerholt 29 Jul '10

29 Jul '10

Module: sip-router Branch: master Commit: 1ede271e9b669b2f335858edb47dd260f0d28ad2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ede271… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 29 18:42:27 2010 +0200 reg(k): only store path if indicated by the configuration --- modules_k/registrar/save.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 4483972..d22def0 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -269,10 +269,12 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } if (path.len && path.s) { ci.path = &path; - /* save in msg too for reply */ - if (set_path_vector(_m, &path) < 0) { - rerrno = R_PARSE_PATH; - goto error; + if (path_mode != PATH_MODE_OFF) { + /* save in msg too for reply */ + if (set_path_vector(_m, &path) < 0) { + rerrno = R_PARSE_PATH; + goto error; + } } } }

1 0

kamailio gets frozen when rsyslog-mysql cannot send the SQL query
by Iñaki Baz Castillo 29 Jul '10

29 Jul '10

Hi, finally I've discovered the cause of important issues with my Kamailio deployments which sometimes get frozen "with no reason": - We use Debian Lenny with rsyslog writting the logs in local files (/var/log/kamailio.log) and also rsyslog-mysql extension to send the logs to a remote MySQL server using mysql TCP protocol. - For "external" reason (external to me) such MySQL server sometimes fails or it's down. - Then kamailio tries to log to syslog. rsyslog receives the request and tries to send it via MySQL. Unfortunatelly it gets frozen as the DB doesn't work, and it neither writes the log to the local log file !!! (this is really surprising to me). - Worse is the fact the rsyslog replies nothing to kamailio process so the kamailio process gets 100% *blocked* waiting for the response (this is what I suspect). - As a dirty workaround, stopping the local rsyslog server makes kamailio to work again. So, I think this is mostly a bug in rsyslog-mysql as it shouldn't get frozen if the MySQL server doesn't work. However I also think that Kamailio should not depend on it, and perhaps it shouldn't wait indefinitely for the rsyslog response. What do you think? Would make sense a "ping" mechanism like with RtpProxy servers in order to enable/dissable the syslog logging? Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

4 15

git:master: acc_radius(k): new module for RADIUS accounting
by Daniel-Constantin Mierla 29 Jul '10

29 Jul '10

Module: sip-router Branch: master Commit: d4031fa7e9ad917969c04f946f8dd986f8ba0e48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4031fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 29 14:48:21 2010 +0200 acc_radius(k): new module for RADIUS accounting - the modules is built out of acc module radius part - acc module still has the RADIUS accounting inside, available with RAD_ACC define like so far - subject to be removed if everyone agrees - this module can be used together with acc avoiding to recompile acc module to enable RAD_ACC, making at least packaging easier - same cfg parameters and functions used for radius accounting in acc module are available in acc_radius --- modules_k/acc_radius/Makefile | 20 ++ modules_k/acc_radius/README | 195 ++++++++++++ modules_k/acc_radius/acc_radius_mod.c | 416 +++++++++++++++++++++++++ modules_k/acc_radius/acc_radius_mod.h | 39 +++ modules_k/acc_radius/doc/Makefile | 4 + modules_k/acc_radius/doc/acc_radius.xml | 43 +++ modules_k/acc_radius/doc/acc_radius_admin.xml | 199 ++++++++++++ 7 files changed, 916 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d40…

1 0

git:master: acc(k): exported acc API
by Daniel-Constantin Mierla 29 Jul '10

29 Jul '10

Module: sip-router Branch: master Commit: 56fa1561014ef4f24daa6a3c591b0a0a272881c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56fa156… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 29 14:45:23 2010 +0200 acc(k): exported acc API - internal functions and structures were exported as API to be available for new acc engines out of acc module --- modules_k/acc/acc.c | 52 ++++++++++++++- modules_k/acc/acc.h | 2 + modules_k/acc/acc_api.h | 157 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/acc/acc_extra.c | 1 + modules_k/acc/acc_extra.h | 13 ---- modules_k/acc/acc_logic.c | 28 ++++++++ modules_k/acc/acc_logic.h | 21 +----- modules_k/acc/acc_mod.c | 118 ++++++++++++++++++++++++++++++++++ 8 files changed, 359 insertions(+), 33 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=56f…

1 0

Kamailio Transformation Assignment to an AVP
by Brandon Armstead 29 Jul '10

29 Jul '10

Hello, I have the following transformation on the SDP Body: $(rb{re.subst,/^(.*)m=audio ([0-9]+) RTP\/AVP ([0-9 ]+)\015\012(.*)$/\3/s}) However when I assign this to an AVP, i.e. $avp(s:sdp-payloads) = $(rb{re.subst,/^(.*)m=audio ([0-9]+) RTP\/AVP ([0-9 ]+)\015\012(.*)$/\3/s}); I receive back a NULL result / transformation "regex does not match" is what I receive with high verbose syslog on kamailio. HOWEVER. When I do something like this: xlog("L_INFO", "Payloads Available: $(rb{re.subst,/^(.*)m=audio ([0-9]+) RTP\/AVP ([0-9 ]+)\015\012(.*)$/\3/s})"); It executes properly -- transformation regex matches and the payloads are displayed as expected. If anyone can provide any insight as to what I may be doing wrong it would be greatly appreciated. P.S. Kamailio SVN Revision # 2:5906M (1.5.2-notls). Also I CC'ed devel list (as I do believe this may be a bug). Thanks! Sincerely, Brandon Armstead

3 5

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010