sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

more on asynchronous processing in config
by Daniel-Constantin Mierla 05 Jul '11

05 Jul '11

Hello, over the weekend I exported to config file the two main functions from tm that allow to suspend the execution of a SIP request and resume it in another place. They are exported through tmx module: - t_suspend() - will suspend the execution of current sip request and then you can do something else (like processing the next request) - t_continue(tindex, tlabel, rtname) - continue the processing of SIP request suspended in the transaction identified by tupple (tindex,tlable) with the … [View More]

1 0

git:master: core: added import_file
by Daniel-Constantin Mierla 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 1cdad56cd88cad2b0732818880ae326e6da5735c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cdad56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 5 09:15:34 2011 +0200 core: added import_file - import_file is similar to include_file but does not throws error if the file is not found: - example: import_file "myfile.cfg" --- … [View More]cfg.lex | 115 ++++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 78 insertions(+), 37 deletions(-) diff --git a/cfg.lex b/cfg.lex index d7a3190..0518fea 100644 --- a/cfg.lex +++ b/cfg.lex @@ -158,7 +158,7 @@ } include_stack[MAX_INCLUDE_DEPTH]; static int include_stack_ptr = 0; - static int sr_push_yy_state(char *fin); + static int sr_push_yy_state(char *fin, int mode); static int sr_pop_yy_state(); static struct sr_yy_fname { @@ -177,7 +177,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF +%x PVARID INCLF IMPTF %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -251,8 +251,6 @@ CASE "case" DEFAULT "default" WHILE "while" -INCLUDEFILE "include_file" - CFG_SELECT "cfg_select" CFG_RESET "cfg_reset" @@ -563,6 +561,10 @@ EAT_ABLE [\ \t\b\r] SUBST subst SUBSTDEF substdef +/* include files */ +INCLUDEFILE "include_file" +IMPORTFILE "import_file" + %% @@ -650,6 +652,7 @@ SUBSTDEF substdef <INITIAL>{WHILE} { count(); yylval.strval=yytext; return WHILE; } <INITIAL>{INCLUDEFILE} { count(); BEGIN(INCLF); } +<INITIAL>{IMPORTFILE} { count(); BEGIN(IMPTF); } <INITIAL>{CFG_SELECT} { count(); yylval.strval=yytext; return CFG_SELECT; } <INITIAL>{CFG_RESET} { count(); yylval.strval=yytext; return CFG_RESET; } @@ -1277,7 +1280,17 @@ SUBSTDEF substdef <INCLF>[ \t]* /* eat the whitespace */ <INCLF>[^ \t\n]+ { /* get the include file name */ - if(sr_push_yy_state(yytext)<0) + if(sr_push_yy_state(yytext, 0)<0) + { + LOG(L_CRIT, "error at %s line %d\n", (finame)?finame:"cfg", line); + exit(-1); + } + BEGIN(INITIAL); +} + +<IMPTF>[ \t]* /* eat the whitespace */ +<IMPTF>[^ \t\n]+ { /* get the import file name */ + if(sr_push_yy_state(yytext, 1)<0) { LOG(L_CRIT, "error at %s line %d\n", (finame)?finame:"cfg", line); exit(-1); @@ -1444,14 +1457,16 @@ int yywrap() return 1; } -static int sr_push_yy_state(char *fin) +static int sr_push_yy_state(char *fin, int mode) { struct sr_yy_fname *fn = NULL; + FILE *fp = NULL; char *x = NULL; char *newf = NULL; #define MAX_INCLUDE_FNAME 128 char fbuf[MAX_INCLUDE_FNAME]; int i, j, l; + char *tmpfiname = 0; if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) { @@ -1505,54 +1520,80 @@ static int sr_push_yy_state(char *fin) } fbuf[j] = '\0'; - include_stack[include_stack_ptr].state = YY_CURRENT_BUFFER; - include_stack[include_stack_ptr].line = line; - include_stack[include_stack_ptr].column = column; - include_stack[include_stack_ptr].startline = startline; - include_stack[include_stack_ptr].startcolumn = startcolumn; - include_stack[include_stack_ptr].finame = finame; - include_stack_ptr++; - - line=1; - column=1; - startline=1; - startcolumn=1; - - yyin = fopen(fbuf, "r" ); + fp = fopen(fbuf, "r" ); - if ( ! yyin ) + if ( ! fp ) { - finame = (finame==0)?cfg_file:finame; - if(finame==0 || fbuf[0]=='/') + tmpfiname = (finame==0)?cfg_file:finame; + if(tmpfiname==0 || fbuf[0]=='/') { - LOG(L_CRIT, "cannot open included file: %s\n", fin); - return -1; + if(mode==0) + { + LOG(L_CRIT, "cannot open included file: %s\n", fin); + return -1; + } else { + LOG(L_DBG, "importing file ignored: %s\n", fin); + return 0; + } } - x = strrchr(finame, '/'); - if(x) + x = strrchr(tmpfiname, '/'); + if(x==NULL) { - newf = (char*)pkg_malloc(x-finame+strlen(fbuf)+2); - if(newf==0) + /* nothing else to try */ + if(mode==0) { - LOG(L_CRIT, "no more pkg\n"); + LOG(L_CRIT, "cannot open included file: %s\n", fin); return -1; + } else { + LOG(L_DBG, "importing file ignored: %s\n", fin); + return 0; } - newf[0] = '\0'; - strncat(newf, finame, x-finame); - strcat(newf, "/"); - strcat(newf, fbuf); } - yyin = fopen(newf, "r" ); - if ( ! yyin ) + + newf = (char*)pkg_malloc(x-tmpfiname+strlen(fbuf)+2); + if(newf==0) { - LOG(L_CRIT, "cannot open included file: %s (%s)\n", fbuf, newf); + LOG(L_CRIT, "no more pkg\n"); return -1; } + newf[0] = '\0'; + strncat(newf, tmpfiname, x-tmpfiname); + strcat(newf, "/"); + strcat(newf, fbuf); + + fp = fopen(newf, "r" ); + if ( fp==NULL ) + { + pkg_free(newf); + if(mode==0) + { + LOG(L_CRIT, "cannot open included file: %s (%s)\n", fbuf, newf); + return -1; + } else { + LOG(L_DBG, "importing file ignored: %s (%s)\n", fbuf, newf); + return 0; + } + } LOG(L_DBG, "including file: %s (%s)\n", fbuf, newf); } else { newf = fbuf; } + include_stack[include_stack_ptr].state = YY_CURRENT_BUFFER; + include_stack[include_stack_ptr].line = line; + include_stack[include_stack_ptr].column = column; + include_stack[include_stack_ptr].startline = startline; + include_stack[include_stack_ptr].startcolumn = startcolumn; + include_stack[include_stack_ptr].finame = finame; + include_stack_ptr++; + + line=1; + column=1; + startline=1; + startcolumn=1; + + yyin = fp; + /* make a copy in PKG if does not exist */ fn = sr_yy_fname_list; while(fn!=0) [View Less]

1 0

git:master: core: allow #! or !! in front of include_file and import_file
by Daniel-Constantin Mierla 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 7a2e73a673a723dff90910642cd618f5f4c63d4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a2e73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 5 09:20:59 2011 +0200 core: allow #! or !! in front of include_file and import_file - import_file and include_file can have the same syntax as preprocessor directives --- cfg.lex | … [View More]

1 0

git:master: tm: deactivate compilation for not used test function _test_insert_to_reply
by Henning Westerholt 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: a99aa2035994fd349479ebd2d903bfc99984c388 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a99aa20… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 00:21:39 2011 +0200 tm: deactivate compilation for not used test function _test_insert_to_reply --- modules/tm/test.c | 3 +++ 1 files changed, 3 insertions(+), 0 … [View More]

1 0

git:master: tm: initial round of doxygen documentation for timer.[h, c] - tbc
by Henning Westerholt 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: d28859fd30cbd42e7fe913b248cbcb4a2826e9f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d28859f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 00:17:11 2011 +0200 tm: initial round of doxygen documentation for timer.[h,c] - tbc --- modules/tm/timer.c | 176 ++++++++++++++++++++++++++++----------------------- … [View More]

1 0

git:master: tm: add doxygen docs to callid.[c,h]
by Henning Westerholt 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 7e4dc04b9ac5c4046388974b7135186f173dee9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e4dc04… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 4 23:43:00 2011 +0200 tm: add doxygen docs to callid.[c,h] --- modules/tm/callid.c | 45 ++++++++++++++++++++++++++------------------- modules/tm/callid.h | 24 +++++++++++++… [View More]+---------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/modules/tm/callid.c b/modules/tm/callid.c index a6d1aec..5000ef4 100644 --- a/modules/tm/callid.c +++ b/modules/tm/callid.c @@ -1,8 +1,4 @@ /* - * $Id$ - * - * Fast Call-ID Generator - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of SIP-router, a free SIP server. @@ -30,6 +26,11 @@ /*! * \file * \brief TM :: Fast Call-ID generator + * + * Fast Call-ID generator. The Call-ID has the following form: <callid_nr>-<pid>@<ip> + * - callid_nr is initialized as a random number and continually increases + * - <pid>@<ip> is kept in callid_suffix + * - both are separated by a '-' * \ingroup tm */ @@ -40,21 +41,22 @@ #include "../../socket_info.h" #include "callid.h" +/** + * \brief Length of a Call-ID in TM + */ #define CALLID_NR_LEN 20 -/* Call-ID has the following form: <callid_nr>-<pid>@<ip> - * callid_nr is initialized as a random number and continually - * increases; -<pid>@<ip> is kept in callid_suffix +/** + * \brief Length of the Call-ID suffix */ #define CALLID_SUFFIX_LEN ( 1 /* - */ + \ 5 /* pid */ + \ 42 /* embedded v4inv6 address can be looong '128.' */ + \ - 2 /* parenthesis [] */ + \ + 2 /* parenthesis [] */ + \ 1 /* ZT 0 */ + \ 16 /* one never knows ;-) */ \ ) -#define CID_SEP '-' /* the character which separates random from constant part */ static unsigned long callid_nr; static char callid_buf[CALLID_NR_LEN + CALLID_SUFFIX_LEN]; @@ -63,8 +65,9 @@ str callid_prefix; str callid_suffix; -/* - * Initialize the Call-ID generator -- generates random prefix +/** + * \brief Initialize the Call-ID generator, generates random prefix + * \param 0 on success, -1 on error */ int init_callid(void) { @@ -104,8 +107,10 @@ int init_callid(void) } -/* - * Child initialization -- generates suffix +/** + * \brief Child initialization, generates suffix + * \param rank not used + * \param 0 on success, -1 on error */ int child_init_callid(int rank) { @@ -121,7 +126,7 @@ int child_init_callid(int rank) callid_suffix.s = callid_buf + callid_prefix.len; callid_suffix.len = snprintf(callid_suffix.s, CALLID_SUFFIX_LEN, - "%c%d(a)%.*s", CID_SEP, my_pid(), + "%c%d(a)%.*s", '-', my_pid(), si->address_str.len, si->address_str.s); if ((callid_suffix.len == -1) || (callid_suffix.len > CALLID_SUFFIX_LEN)) { @@ -134,9 +139,10 @@ int child_init_callid(int rank) } -/* - * Increment a character in hex, return - * carry flag +/** + * \brief Increment a character in hex, return the carry flag + * \param _c input character + * \return carry flag */ static inline int inc_hexchar(char* _c) { @@ -155,8 +161,9 @@ static inline int inc_hexchar(char* _c) } -/* - * Get a unique Call-ID +/** + * \brief Get a unique Call-ID + * \param callid returned Call-ID */ void generate_callid(str* callid) { diff --git a/modules/tm/callid.h b/modules/tm/callid.h index ae66a34..2582dc1 100644 --- a/modules/tm/callid.h +++ b/modules/tm/callid.h @@ -1,8 +1,4 @@ /* - * $Id$ - * - * Fast Call-ID Generator - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of SIP-router, a free SIP server. @@ -39,22 +35,30 @@ #include "../../str.h" -/* - * Initialize the Call-ID generator -- generates random prefix +/** + * \brief Initialize the Call-ID generator, generates random prefix + * \param 0 on success, -1 on error */ int init_callid(void); -/* - * Child initialization -- generates suffix +/** + * \brief Child initialization, generates suffix + * \param rank not used + * \param 0 on success, -1 on error */ int child_init_callid(int rank); +/** + * \brief TM API export + */ typedef void (*generate_callid_f)(str*); -/* - * Get a unique Call-ID + +/** + * \brief Get a unique Call-ID + * \param callid returned Call-ID */ void generate_callid(str* callid); [View Less]

1 0

git:master: tm: restrict callid_suffix and callid_prefix visibility to module, not used outside
by Henning Westerholt 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 9e2fc89369794ad58168b1008fb2fb846ccde93b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e2fc89… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 4 23:47:25 2011 +0200 tm: restrict callid_suffix and callid_prefix visibility to module, not used outside --- modules/tm/callid.c | 4 ++-- 1 files changed, 2 insertions(+), … [View More]

1 0

git:master: tm: proper definition for tm_init_timers, one small whitespace fix
by Henning Westerholt 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 80978ef1a337cfae6476c0025895970c932e4000 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80978ef… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 00:20:35 2011 +0200 tm: proper definition for tm_init_timers, one small whitespace fix --- modules/tm/timer.c | 4 ++-- modules/tm/timer.h | 2 +- 2 files changed, 3 … [View More]

1 0

git:master: srdb1: regenerated db creation scripts
by Daniel-Constantin Mierla 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: fbbfac4e2f40be6e42c63307ff1cc5450442b94c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbbfac4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 4 22:07:20 2011 +0200 srdb1: regenerated db creation scripts --- utils/kamctl/db_berkeley/kamailio/aliases | 2 +- utils/kamctl/db_berkeley/kamailio/location | 2 +- utils/… [View More]

1 0

git:master: srdb1: added callid_len entity
by Daniel-Constantin Mierla 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 0a94c6d5d549a438d64006e66c57a66c19cda8f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a94c6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 4 22:02:19 2011 +0200 srdb1: added callid_len entity - used for size of callid columns across tables - set to 255 --- lib/srdb1/schema/acc.xml | 2 +- lib/srdb1/… [View More]schema/aliases.xml | 2 +- lib/srdb1/schema/dialog.xml | 2 +- lib/srdb1/schema/location.xml | 2 +- lib/srdb1/schema/missed_calls.xml | 2 +- lib/srdb1/schema/pr_active_watchers.xml | 2 +- lib/srdb1/schema/rls_watchers.xml | 2 +- lib/srdb1/schema/sip_trace.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/srdb1/schema/acc.xml b/lib/srdb1/schema/acc.xml index cabe9ba..719298e 100644 --- a/lib/srdb1/schema/acc.xml +++ b/lib/srdb1/schema/acc.xml @@ -54,7 +54,7 @@ <name>callid</name> <type>string</type> <natural/> - <size>&description_len;</size> + <size>&callid_len;</size> <default/> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description> </column> diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 653e05e..6fbd840 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -90,7 +90,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default>&DEFAULT_CALLID;</default> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client.</description> </column> diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 1bc3807..8c5e5b4 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -47,7 +47,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <description>Call-ID of the dialog</description> </column> diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index 1411899..e5bef5a 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -90,7 +90,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default>&DEFAULT_CALLID;</default> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client.</description> </column> diff --git a/lib/srdb1/schema/missed_calls.xml b/lib/srdb1/schema/missed_calls.xml index d8332fc..7a66440 100644 --- a/lib/srdb1/schema/missed_calls.xml +++ b/lib/srdb1/schema/missed_calls.xml @@ -52,7 +52,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&domain_len;</size> + <size>&callid_len;</size> <default/> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description> <natural/> diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 8c27d56..35d697a 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -96,7 +96,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&uri_len;</size> + <size>&callid_len;</size> <description>Call ID</description> </column> diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index 1faac29..8362e77 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -97,7 +97,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&uri_len;</size> + <size>&callid_len;</size> <description>Call ID</description> </column> diff --git a/lib/srdb1/schema/sip_trace.xml b/lib/srdb1/schema/sip_trace.xml index 5ff2a02..0b492c4 100644 --- a/lib/srdb1/schema/sip_trace.xml +++ b/lib/srdb1/schema/sip_trace.xml @@ -37,7 +37,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default/> <description>call ID from SIP message</description> <natural/> [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011