sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

[tracker] Task closed: kamailio 3.1.3 Presence + XCAP problem, is it a bug?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#133 - kamailio 3.1.3 Presence + XCAP problem, is it a bug? User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Fixes committed in master and 3.1 branches More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=133 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.

12 years, 10 months

git:3.1: presence(k): switch to terminated status if no longer active

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: acf25edbf8047a7511b304e0941d8c6365980e48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acf25ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 6 19:39:36 2011 +0200 presence(k): switch to terminated status if no longer active - if contact is removed via xcap, making the status different than active, set it to terminated states - patch by Laura Testi, FS#133 (cherry picked from commit 73ec9511e3c740304f6376890f0c0b416d84dd8f) --- modules_k/presence/presence.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 5b00ad3..322bc7a 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -716,6 +716,14 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, query_vals[q_wuser_col].val.str_val= subs.from_user; query_vals[q_wdomain_col].val.str_val= subs.from_domain; + /* if status is no longer ACTIVE, switch to terminated */ + if(subs.status!=status && status==ACTIVE_STATUS) + { + subs.status = TERMINATED_STATUS; + subs.reason.s = get_status_str(TERMINATED_STATUS); + subs.reason.len = strlen(subs.reason.s); + } + update_vals[u_status_col].val.int_val= subs.status; update_vals[u_reason_col].val.str_val= subs.reason;

12 years, 10 months

Celebrating 10 years of SER

by Daniel-Constantin Mierla

Hello, the 3rd of September will mark the 10 years since the start of SIP Express Router (aka SER - also the origin for kamailio (openser) and now the two are back together). From last year: * http://sip-router.org/wiki/history/ser-9-years This is a good time to celebrate and I am thinking of at least a social event (e.g., dinner) in Berlin, Germany. Based of private discussion so far, other cities are interested in organizing something similar locally, e.g., Barcelona. If you are a group of people that can gather together for a drink in same place to celebrate the event, let me know and I will add in the list to coordinate - hopefully we will be even able connect between sites with some video/audio if the timezones are convenient. I'm looking as well to do a more formal event, something like a day long conference style, on Friday, 2nd of September. Berlin is the natural choice for location, being the place where the project started. I can take care of location when it is clear that there are people willing to travel. Berlin area alone should be able to get about 20 people, among them several long term developers of the project and companies offering SER/Kamailio-based services. Coming over gives you the opportunity to connect directly with them. At this event, along with presenting shortly the history and future plans, the event should be open to everyone that want to present their usage of SER/Kamailio. Attendance is going to be free, in the limit of available seats. If you think it would be interesting and want to attend, let me know. Also, if you have other ideas of how to celebrate, write us back. Best regards, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

12 years, 10 months

updates to config preprocessor

by Daniel-Constantin Mierla

Hello, just to let you know about some recent additions regarding the config file preprocessor, hopefully they will help you keep the config cleaner and easy to maintain. - you can use either #! or !! as the start marker of preprocessor directive (to make happy those complaining about not able to distinguish quickly from comments) - subsdef was added some time ago to allow defining a token that will replace ID tokens as well as update inside string values. It has the same format as #!subst. For example:| #!substdef "!ABC!XYZ!g"| is pretty much same as: #!define ABC XYZ #!subs "/ABC/XYZ/" - substdefs, like substdef byt the defined value will be added enclosed in double quotes: |#!substdef "!ABC!XYZ!g"| is pretty much same as: #!define ABC "XYZ" #!subs "/ABC/XYZ/" - trydef - similar to define, but if the ID is defined already, ignore this time - redef - similar to define, but if the ID is defined, redefine its value (note that define itself throws error if the ID is already defined) Regarding the inclusion of files, a new option is available, 'import_file'. It is similar to 'include_file', but if the file is not found, it does not throw error. Bot include_file and import_file can be started as well with #! or !!. You can still use them without #! or !!, whatever you like more. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

12 years, 10 months

git:master: tm: remove two dlg related files which are not used and don' t contain real code

by Henning Westerholt

Module: sip-router Branch: master Commit: fc9dba1286c0e3c9ee4e28a7959cb03178f6b121 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc9dba1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 6 23:48:44 2011 +0200 tm: remove two dlg related files which are not used and don't contain real code --- modules/tm/t_dlg.c | 46 ---------------------------------------------- modules/tm/t_dlg.h | 47 ----------------------------------------------- 2 files changed, 0 insertions(+), 93 deletions(-) diff --git a/modules/tm/t_dlg.c b/modules/tm/t_dlg.c deleted file mode 100644 index cbc88d4..0000000 --- a/modules/tm/t_dlg.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * $Id$ - * - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of ser, a free SIP server. - * - * ser is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "defs.h" - -#include "t_dlg.h" - -dlg_t dlg=0; - -int t_newdlg( struct sip_msg *msg ) -{ - /* place-holder */ - dlg=0; - return 0; -} - -dlg_t t_getdlg() { - return dlg; -} - diff --git a/modules/tm/t_dlg.h b/modules/tm/t_dlg.h deleted file mode 100644 index 87c5a50..0000000 --- a/modules/tm/t_dlg.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * $Id$ - * - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of ser, a free SIP server. - * - * ser is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef _T_DLG_H -#define _T_DLG_H - -#include "defs.h" - - -#include "../../parser/msg_parser.h" - -struct dialog { - int place_holder; -}; - -typedef struct dialog *dlg_t; - -int t_newdlg( struct sip_msg *msg ); -dlg_t t_getdlg() ; - -#endif

12 years, 10 months

git:master: core: typedef'ed struct sip_uri to sip_uri_t

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d354265484278f285df3a747b6e1a910db736df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d354265… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 6 23:16:49 2011 +0200 core: typedef'ed struct sip_uri to sip_uri_t --- parser/msg_parser.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 9298eb7..4d8f58d 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -232,6 +232,8 @@ struct sip_uri { #endif }; +typedef struct sip_uri sip_uri_t; + struct msg_body; typedef void (*free_msg_body_f)(struct msg_body** ptr);

12 years, 10 months

git:master: core: added #!substdefs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8198fd2b82181ef7e37f5bc0c7bbbbd197b4daa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8198fd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 6 15:17:12 2011 +0200 core: added #!substdefs - similar to substdef but the defined value will be enclosed in double quotes --- cfg.lex | 2 ++ cfg.y | 5 ++++- ppcfg.c | 20 +++++++++++++++++--- ppcfg.h | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/cfg.lex b/cfg.lex index 68ce3ff..dd67ea8 100644 --- a/cfg.lex +++ b/cfg.lex @@ -563,6 +563,7 @@ EAT_ABLE [\ \t\b\r] /* pre-processing blocks */ SUBST subst SUBSTDEF substdef +SUBSTDEFS substdefs /* include files */ INCLUDEFILE "include_file" @@ -1245,6 +1246,7 @@ IMPORTFILE "import_file" <INITIAL>{PREP_START}{SUBST} { count(); return SUBST;} <INITIAL>{PREP_START}{SUBSTDEF} { count(); return SUBSTDEF;} +<INITIAL>{PREP_START}{SUBSTDEFS} { count(); return SUBSTDEFS;} <INITIAL,IFDEF_SKIP>{PREP_START}{IFDEF}{EAT_ABLE}+ { count(); if (pp_ifdef_type(1)) return 1; diff --git a/cfg.y b/cfg.y index 5d0d10b..b0e18bc 100644 --- a/cfg.y +++ b/cfg.y @@ -563,6 +563,7 @@ extern char *finame; /*pre-processor*/ %token SUBST %token SUBSTDEF +%token SUBSTDEFS /* operators, C like precedence */ %right EQUAL @@ -1969,8 +1970,10 @@ event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } + | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; /*exp: rval_expr diff --git a/ppcfg.c b/ppcfg.c index 7eb4e64..032e97d 100644 --- a/ppcfg.c +++ b/ppcfg.c @@ -81,7 +81,7 @@ int pp_subst_add(char *data) return 0; } -int pp_substdef_add(char *data) +int pp_substdef_add(char *data, int mode) { char c; char *p; @@ -131,17 +131,31 @@ found_regexp: found_repl: defvalue.len = p - defvalue.s; + pp_define_set_type(0); if(pp_define(defname.len, defname.s)<0) { LM_ERR("cannot set define name\n"); goto error; } + if(mode==1) { + /* define the value enclosed in double quotes */ + *(defvalue.s-1) = '"'; + defvalue.s[defvalue.len] = '"'; + defvalue.s--; + defvalue.len += 2; + } if(pp_define_set(defvalue.len, defvalue.s)<0) { LM_ERR("cannot set define value\n"); goto error; } + if(mode==1) { + defvalue.s++; + defvalue.len -= 2; + *(defvalue.s-1) = c; + defvalue.s[defvalue.len] = c; + } - LM_DBG("### added substdef: [%.*s]=[%.*s]\n", defname.len, defname.s, - defvalue.len, defvalue.s); + LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, + defvalue.len, defvalue.s, mode); return 0; diff --git a/ppcfg.h b/ppcfg.h index 754d83b..b806daf 100644 --- a/ppcfg.h +++ b/ppcfg.h @@ -23,7 +23,7 @@ #define _PPCFG_H_ int pp_subst_add(char *data); -int pp_substdef_add(char *data); +int pp_substdef_add(char *data, int mode); int pp_subst_run(char **data); int pp_define(int len, const char *text);

12 years, 10 months

git:master: presence(k): switch to terminated status if no longer active

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 73ec9511e3c740304f6376890f0c0b416d84dd8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73ec951… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 6 19:39:36 2011 +0200 presence(k): switch to terminated status if no longer active - if contact is removed via xcap, making the status different than active, set it to terminated states - patch by Laura Testi, FS#133 --- modules_k/presence/presence.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index df1a4ac..e97df6c 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -728,6 +728,14 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, query_vals[q_wuser_col].val.str_val= subs.from_user; query_vals[q_wdomain_col].val.str_val= subs.from_domain; + /* if status is no longer ACTIVE, switch to terminated */ + if(subs.status!=status && status==ACTIVE_STATUS) + { + subs.status = TERMINATED_STATUS; + subs.reason.s = get_status_str(TERMINATED_STATUS); + subs.reason.len = strlen(subs.reason.s); + } + update_vals[u_status_col].val.int_val= subs.status; update_vals[u_reason_col].val.str_val= subs.reason;

12 years, 10 months

Re: [sr-dev] [tracker] Comment added: kamailio 3.1.3 Presence + XCAP problem, is it a bug?

by laura testi

It's for v3.1.4. But I think the problem is also in devel. # diff -u presence.c.orig presence.c.patch ------ cut here --------------- --- presence.c.orig 2011-06-10 15:35:49.000000000 +0200 +++ presence.c.patch 2011-06-17 18:44:05.000000000 +0200 @@ -712,6 +712,13 @@ (reason.s && subs.reason.s && strncmp(reason.s, subs.reason.s, reason.len))) { + if(subs.status!=status && status==1) + { + subs.status= TERMINATED_STATUS; + subs.reason.s= "deleted"; + subs.reason.len= 7; + } + /* update in watchers_table */ query_vals[q_wuser_col].val.str_val= subs.from_user; query_vals[q_wdomain_col].val.str_val= subs.from_domain; --------- end cut ------------------------------ # On Wed, Jul 6, 2011 at 2:23 PM, sip-router <admin(a)sip-router.org> wrote: > THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. > > The following task has a new comment added: > > FS#133 - kamailio 3.1.3 Presence + XCAP problem, is it a bug? > User who did this - Daniel-Constantin Mierla (miconda) > > ---------- > Can you send the unified diff, ie., taken as: > > diff -u presence.c.orig presence.c.patch > > Is it for v3.1.x or devel? > > ---------- > > More information can be found at the following URL: > http://sip-router.org/tracker/**index.php?do=details&task_id=** > 133#comment235<http://sip-router.org/tracker/index.php?do=details&task_id=133#comment235> > > > 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. >

12 years, 10 months

git:3.1: utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: ec63ebad94faaf2800aa9738b9da9c25687dfe3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec63eba… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 6 18:26:16 2011 +0200 utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot (cherry picked from commit 7ca54b8867ca325fd318536e29f8ae8e028611c9) --- utils/kamctl/kamctl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a68093f..d465d67 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1604,9 +1604,9 @@ openser_start() { exit 1 fi if [ $SYSLOG = 1 ] ; then - $OSERBIN -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null + $OSERBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null else - $OSERBIN -P $PID_FILE -E $STARTOPTIONS + $OSERBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then

12 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011