sr-dev

sr-dev@lists.kamailio.org

15 participants
45351 discussions

commit emails gotchas
by Andrei Pelinescu-Onciul 20 Nov '08

20 Nov '08

The commit email script has some quirks that you should be aware of. Some unexpected feature is that if you create a new branch (git push origin my_branch:new_branch_that_does_not_exist_yet) an email will be sent only for the last commit message in the branch. If you update an existing branch or you don't care that only the last commit will be emailed (the others will be emailed only if/when somebody merges your branch in an existing branch), you can skip this. Example: git checkout -b my_branch master vim file1 git add file1 git commit file1 vim file2 git add file2 git commit file2 git push origin my_branch:tmp/my_new_branch => only the 2nd commit will be emailed to the list. This happens because of the email comit script that tries to send mail only for changes on the branch: it looks at the original branch and at the new branch head and sends an email for all the commits between them . However when creating a new branch, there is not enough information to get the original branch and you either send emails for all the commits since project start (:-)) or only for the last one. Even if that happen to you, all the commits messages will be sent the first time you merge your new branch into some existing branch. A way to avoid it in the first place is to first create a new branch, e.g: git checkout -b my_new_branch master git push origin my_new_branch:tmp/my_new_branch and then push your branch on it: git checkout my_branch git push origin my_branch:tmp/my_new_branch Andrei

2 2

git:sip-router: PV get null helper added
by Daniel-Constantin Mierla 20 Nov '08

20 Nov '08

Module: sip-router Branch: daniel/pv Commit: 3247010ccea606a386cf24e00083dc38ae8b43c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3247010… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 20 14:45:47 2008 +0200 PV get null helper added - PV get null helper function required to stay in the API - removed unused PV types - now AVP type is used to detect the type of parameters, some related to R-URI are used by avpops, to be added if a different solution is not found. Would be hard to manage the types in core and do the implementation in module. --- pvapi.c | 23 ++++++++++++++++++----- pvar.h | 35 ++++------------------------------- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/pvapi.c b/pvapi.c index f6c6399..eb4ea7a 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1,16 +1,16 @@ /* - * $Id: items.h 2111 2007-05-01 11:18:08Z juhe $ + * $Id$ * * Copyright (C) 2001-2003 FhG Fokus * - * This file is part of Kamailio, a free SIP server. + * This file is part of SIP-Router, a free SIP server. * - * Kamailio is free software; you can redistribute it and/or modify + * SIP-Router 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 * - * Kamailio is distributed in the hope that it will be useful, + * SIP-Router 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. @@ -296,7 +296,20 @@ static str pv_str_marker = { PV_MARKER_STR, 1 }; static int pv_get_marker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - return pv_get_strintval(msg, param, res, &pv_str_marker, (int)pv_str_marker.s[0]); + return pv_get_strintval(msg, param, res, &pv_str_marker, + (int)pv_str_marker.s[0]); +} + +static str pv_str_empty = { "", 0 }; +int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + if(res==NULL) + return -1; + + res->rs = pv_str_empty; + res->ri = 0; + res->flags = PV_VAL_NULL; + return 0; } pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) diff --git a/pvar.h b/pvar.h index fcf3982..be7b3bc 100644 --- a/pvar.h +++ b/pvar.h @@ -3,14 +3,14 @@ * * Copyright (C) 2001-2003 FhG Fokus * - * This file is part of Kamailio, a free SIP server. + * This file is part of SIP-Router, a free SIP server. * - * Kamailio is free software; you can redistribute it and/or modify + * SIP-Router 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 * - * Kamailio is distributed in the hope that it will be useful, + * SIP-Router 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. @@ -72,34 +72,7 @@ enum _pv_type { PVT_NONE=0, PVT_EMPTY, PVT_NULL, - PVT_MARKER, PVT_AVP, PVT_HDR, - PVT_PID, PVT_RETURN_CODE, PVT_TIMES, - PVT_TIMEF, PVT_MSGID, PVT_METHOD, - PVT_STATUS, PVT_REASON, PVT_RURI, - PVT_RURI_USERNAME, PVT_RURI_DOMAIN, PVT_RURI_PORT, - PVT_FROM, PVT_FROM_USERNAME, PVT_FROM_DOMAIN, - PVT_FROM_TAG, PVT_TO, PVT_TO_USERNAME, - PVT_TO_DOMAIN, PVT_TO_TAG, PVT_CSEQ, - PVT_CONTACT, PVT_CALLID, PVT_USERAGENT, - PVT_MSG_BUF, PVT_MSG_LEN, PVT_FLAGS, - PVT_HEXFLAGS, PVT_SRCIP, PVT_SRCPORT, - PVT_RCVIP, PVT_RCVPORT, PVT_REFER_TO, - PVT_DSET, PVT_DSTURI, PVT_COLOR, - PVT_BRANCH, PVT_BRANCHES, PVT_CONTENT_TYPE, - PVT_CONTENT_LENGTH, PVT_MSG_BODY, PVT_AUTH_USERNAME, - PVT_AUTH_REALM, PVT_RURI_PROTOCOL, PVT_DSTURI_DOMAIN, - PVT_DSTURI_PORT, PVT_DSTURI_PROTOCOL, PVT_FROM_DISPLAYNAME, - PVT_TO_DISPLAYNAME, PVT_OURI, PVT_OURI_USERNAME, - PVT_OURI_DOMAIN, PVT_OURI_PORT, PVT_OURI_PROTOCOL, - PVT_FORCE_SOCK, PVT_RPID_URI, PVT_DIVERSION_URI, - PVT_ACC_USERNAME, PVT_PPI, PVT_PPI_DISPLAYNAME, - PVT_PPI_DOMAIN, PVT_PPI_USERNAME, PVT_PAI_URI, - PVT_BFLAGS, PVT_HEXBFLAGS, PVT_SFLAGS, - PVT_HEXSFLAGS, PVT_ERR_CLASS, PVT_ERR_LEVEL, - PVT_ERR_INFO, PVT_ERR_RCODE, PVT_ERR_RREASON, - PVT_SCRIPTVAR, PVT_PROTO, PVT_AUTH_USERNAME_WHOLE, - PVT_AUTH_DURI, PVT_DIV_REASON, PVT_DIV_PRIVACY, - PVT_AUTH_DOMAIN, PVT_OTHER, + PVT_MARKER, PVT_AVP, PVT_OTHER, PVT_EXTRA /* keep it last */ };

1 0

git:sip-router: updated pvar.h file according to previous commit
by Daniel-Constantin Mierla 20 Nov '08

20 Nov '08

Module: sip-router Branch: daniel/pv Commit: 7bb4bad1339ae83d9a7ea8d4601ea78bd6d0e803 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bb4bad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 20 14:28:35 2008 +0200 updated pvar.h file according to previous commit - to include only PV and transformation API, no implementation - (still learning GIT to do it in one step :-) ) --- pvar.h | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 160 insertions(+), 25 deletions(-) diff --git a/pvar.h b/pvar.h index d7e84e6..fcf3982 100644 --- a/pvar.h +++ b/pvar.h @@ -1,38 +1,74 @@ /* - * $Id$ + * $Id: items.h 2111 2007-05-01 11:18:08Z juhe $ * - * Copyright (C) 2008 + * Copyright (C) 2001-2003 FhG Fokus * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * This file is part of Kamailio, a free SIP server. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * pvar compatibility wrapper for kamailio - * for now it doesn't do anything (feel free to rm & replace the file) + * Kamailio 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 + * + * Kamailio 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. * - * History: - * -------- - * 2008-11-17 initial version compatible with kamailio pvar.h (andrei) + * 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 + */ + +/*! + * \file + * \brief Definitions for Pseudo-variable support */ -#ifndef _pvar_h_ -#define _pvar_h_ + +#ifndef _PVAR_H_ +#define _PVAR_H_ #include "str.h" #include "usr_avp.h" #include "parser/msg_parser.h" +#define PV_MARKER_STR "$" +#define PV_MARKER '$' + +#define PV_LNBRACKET_STR "(" +#define PV_LNBRACKET '(' +#define PV_RNBRACKET_STR ")" +#define PV_RNBRACKET ')' + +#define PV_LIBRACKET_STR "[" +#define PV_LIBRACKET '[' +#define PV_RIBRACKET_STR "]" +#define PV_RIBRACKET ']' + +#define PV_VAL_NONE 0 +#define PV_VAL_NULL 1 +#define PV_VAL_EMPTY 2 +#define PV_VAL_STR 4 +#define PV_VAL_INT 8 +#define PV_TYPE_INT 16 +#define PV_VAL_PKG 32 +#define PV_VAL_SHM 64 +#define PV_NAME_INTSTR 0 +#define PV_NAME_PVAR 1 +#define PV_IDX_INT 0 +#define PV_IDX_PVAR 1 +#define PV_IDX_ALL 2 + +/*! if PV name is dynamic, integer, or str */ +#define pv_has_dname(pv) ((pv)->pvp.pvn.type==PV_NAME_PVAR) +#define pv_has_iname(pv) ((pv)->pvp.pvn.type==PV_NAME_INTSTR \ + && !((pv)->pvp.pvn.u.isname.type&AVP_NAME_STR)) +#define pv_has_sname(pv) ((pv)->pvp.pvn.type==PV_NAME_INTSTR \ + && (pv)->pvp.pvn.u.isname.type&AVP_NAME_STR) +#define pv_is_w(pv) ((pv)->setf!=NULL) enum _pv_type { PVT_NONE=0, PVT_EMPTY, PVT_NULL, @@ -63,12 +99,14 @@ enum _pv_type { PVT_ERR_INFO, PVT_ERR_RCODE, PVT_ERR_RREASON, PVT_SCRIPTVAR, PVT_PROTO, PVT_AUTH_USERNAME_WHOLE, PVT_AUTH_DURI, PVT_DIV_REASON, PVT_DIV_PRIVACY, - PVT_AUTH_DOMAIN, PVT_EXTRA /* keep it last */ + PVT_AUTH_DOMAIN, PVT_OTHER, + PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t; typedef int pv_flags_t; + typedef struct _pv_value { str rs; /*!< string value */ @@ -114,8 +152,6 @@ typedef struct _pv_spec { void *trans; /*!< transformations */ } pv_spec_t, *pv_spec_p; - - typedef int (*pv_parse_name_f)(pv_spec_p sp, str *in); typedef int (*pv_parse_index_f)(pv_spec_p sp, str *in); typedef int (*pv_init_param_f)(pv_spec_p sp, int param); @@ -142,4 +178,103 @@ typedef struct _pv_export { int iparam; /*!< parameter for the init function */ } pv_export_t; -#endif /* _pvar_h_ */ +typedef struct _pv_elem +{ + str text; + pv_spec_t spec; + struct _pv_elem *next; +} pv_elem_t, *pv_elem_p; + +char* pv_parse_spec(str *in, pv_spec_p sp); +int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value); +int pv_print_spec(struct sip_msg* msg, pv_spec_p sp, char *buf, int *len); +int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len); +int pv_elem_free_all(pv_elem_p log); +void pv_value_destroy(pv_value_t *val); +void pv_spec_free(pv_spec_t *spec); +int pv_spec_dbg(pv_spec_p sp); +int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags); +int pv_get_avp_name(struct sip_msg* msg, pv_param_p ip, int_str *avp_name, + unsigned short *name_type); +int pv_get_spec_name(struct sip_msg* msg, pv_param_p ip, pv_value_t *name); +int pv_parse_format(str *in, pv_elem_p *el); +int pv_init_iname(pv_spec_p sp, int param); +int pv_printf_s(struct sip_msg* msg, pv_elem_p list, str *s); + +typedef struct _pvname_list { + pv_spec_t sname; + struct _pvname_list *next; +} pvname_list_t, *pvname_list_p; + +typedef struct pv_spec_list { + pv_spec_p spec; + struct pv_spec_list *next; +} pv_spec_list_t, *pv_spec_list_p; + +pvname_list_t* parse_pvname_list(str *in, unsigned int type); + +int register_pvars_mod(char *mod_name, pv_export_t *items); +int pv_free_extra_list(void); + +/*! \brief PV helper functions */ +int pv_parse_index(pv_spec_p sp, str *in); + +int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_update_time(struct sip_msg *msg, time_t *t); + +int pv_get_uintval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, unsigned int uival); +int pv_get_sintval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, int sival); +int pv_get_strval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, str *sval); +int pv_get_strintval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, str *sval, int ival); +int pv_get_intstrval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, int ival, str *sval); + +/** + * Transformations + */ +#define TR_LBRACKET_STR "{" +#define TR_LBRACKET '{' +#define TR_RBRACKET_STR "}" +#define TR_RBRACKET '}' +#define TR_CLASS_MARKER '.' +#define TR_PARAM_MARKER ',' + +enum _tr_param_type { TR_PARAM_NONE=0, TR_PARAM_STRING, TR_PARAM_NUMBER, + TR_PARAM_SPEC }; + +typedef struct _tr_param { + int type; + union { + int n; + str s; + void *data; + } v; + struct _tr_param *next; +} tr_param_t, *tr_param_p; + +typedef int (*tr_func_t) (struct sip_msg *, tr_param_t*, int, pv_value_t*); + +typedef struct _trans { + str name; + int type; + int subtype; + tr_func_t trf; + tr_param_t *params; + struct _trans *next; +} trans_t, *trans_p; + +typedef char* (*tr_parsef_t)(str *, trans_t *); +typedef struct _tr_export { + str tclass; + tr_parsef_t tparse; +} tr_export_t, *tr_export_p; + +char* tr_lookup(str *in, trans_t **tr); +tr_export_t* tr_lookup_class(str *tclass); + +#endif +

1 0

git:sip-router: pseudo-variable engine api
by Daniel-Constantin Mierla 20 Nov '08

20 Nov '08

Module: sip-router Branch: daniel/pv Commit: d74b7829c6f0c23d786e6e3c3f0cba8b61b438b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d74b782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 20 13:39:29 2008 +0200 pseudo-variable engine api - imported pvar.h and unified PV and transformations interface in pvapi.c - PV engine does not use anymore static array plus a linked list for PV implementations, PVs will be in module and indexed in a hash table (small performance enhancement) - transformations are registered via same model as PV, they will be implemented in modules, the core will held a hash table to index them - the core gets a smaller footprint now and better flexibility in hadling PVs and transformations. pv and transformations will be moved in pv module - compiles but no testing so far --- pvapi.c | 952 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 952 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d74…

1 0

extending module interface
by Daniel-Constantin Mierla 20 Nov '08

20 Nov '08

Hello, working to port PV engine to srouter, but also needed for kamailio's migration of pseudo-variables (PVs) from core to modules, I need to extend the module interface. The srouter has already support to work in dual mode committed by Andrei few days ago, so it should affect only kamailio's module interface if ser side does not need. Here is the issue. In kamailio/openser we have so called transformations that are bound to PV. They are now implemented directly in core. To move them in a module, the interface needs to be extended, like we did in the past to export PVs from modules. The important aspect is that they must become visible immediately after the module is loaded -- this happens also with PVs (so cannot use mod_init, etc...). This is required because they may occur during script parsing, therefore the core/parser should get knowledge of them in very early stage. PVs are exported via a specific structure in module interface. We can do same for transformations. There is another option, which can be used for other purposes in the future - introducing in module interface a callback to be run immediately after a module is loaded. The transformations can be exported inside the callback. Extending this way, in the future, the modules can make other attributes visible to core/other modules immediately after loading without changing the module interface. Therefore I would go for second option. Other opinions? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

2 5

usefull git options
by Andrei Pelinescu-Onciul 20 Nov '08

20 Nov '08

Include one line summaries of the merged commits in commit merge messages (a MUST): git config --global merge.log true Use auto-tracking (behave as if -track is added to every git-pull): git config --global branch.autosetupmerge always Note: --global changes the global configuration ( ~/.gitconfig). Without --global the local per repository configuration will be changed (.git/config). You can either use the commands above or edit by hand the config files. Example ~/.gitconfig: [user] name = Andrei Pelinescu-Onciul email = andrei(a)iptel.org signinkey = 2CF56A2D [color] branch = auto status = auto [merge] log = true [branch] autosetupmerge = always [remote "ser"] url= ssh://git.sip-router.org/ser push=cvshead:andrei/cvshead push=sctp:andrei/sctp [url "ssh://git.sip-router.org/"] insteadOf = sip-router: insteadOf = sip_router: [alias] intercommit = !sh -c 'git show "$0" > /tmp/commit1 && git show "$1" > /tmp/commit2 && interdiff /tmp/commit[12] | less -FRS' funcdiff = !sh -c \"git show \\\"\\$0:\\$2\\\" | sed -n \\\"/^[^ \\t].*\\$3(/,/^}/p\\\" > /tmp/.tmp1 &&\n git show \\\"\\$1:\\$2\\\" | sed -n \\\"/^[^ \\t].*\\$3(/,/^}/p\\\" > /tmp/.tmp2 &&\ngit diff /tmp/.tmp1 /tmp/.tmp2\" The insteadOf lines create aliases for the url (so that I can use git pull sip-router:ser_core cvs-head instead of git pull ssh://git.sip-router.org/ser_core cvs-head The aliases create a new git "commands", for more details see http://git.or.cz/gitwiki/Aliases. The funcdiff alias tries to display the differences in _one_ function between 2 different commits, e.g.: git funcdiff <oldrev> <newrev> <path> <function> The intecommit alias is for seeing differences between a submited patch (local commit into your repository) and the possibly modified version applied: git intercommit <orig_commit> <applied_commit>. Andrei

1 0

Karlsruhe meeting minutes
by Andrei Pelinescu-Onciul 20 Nov '08

20 Nov '08

Hi, I've attached a very brief version of the Karlsruhe meeting minutes. It contains input mostly from me and Daniel (so that you know who to blame :-)). Sorry for the long delay. Hope we haven't missed anything and if we did feel free to reply to this thread. Thanks a lot to 1&1 for hosting the meeting and to everyone who was able to come on such a short notice. Andrei

1 0

Re: [SR-Dev] [Serdev] [jan@iptel.org: Re: git repository online]
by Andrei Pelinescu-Onciul 19 Nov '08

19 Nov '08

> > Here is some more information on the git repository: > > > Synchronization with SER CVS > ============================ > The repository git.sip-router.org/ser is pulls commits from the SER CVS > repository automatically. The synchronization works one-way only, changes > commited to the SER CVS are automatically imported into the Git repository, > but not vice versa. In other words if you want to commit something in the > SER CVS repository then you have to do it manually, git won't help you here. To push changes I've done in the git ser repo to ser cvs I use: git log --pretty=oneline # to get the commit id I want to "export" git cvsexportcommit -c -p -w ~/ser.cvs/ -v <commitid> e.g.: git cvsexportcommit -c -p -w ~/ser.cvs/ -v <commitid> a9d929f558a6a620034fac8aa06c503b72c30fd8 in ~/ser.cvs I have an up-to-date checkout of ser from berlios cvs with the following small change: cd ~/ser.cvs; rm ser; ln -s . ser I need this because in the git repo ser is under the ser subdir, while in cvs it's in the "root" dir (or at least this is the way I checkout it). Another way to do it is to generate patches in git (e.g. git format-patch <comitid>) and the apply it manually on cvs, but this requires also a copy-paste for the commit message. > > Clone the repository: > $ git clone git://git.sip-router.org/ser > > and display the list of branches in the cloned repository: > $ git branch -a > > origin/HEAD > origin/MAIN > origin/Maintainer > origin/andrei_cvs-head > origin/cancel_fix > origin/cvs-head > origin/janakj > origin/jj/cvshead > origin/jj/doxygen > origin/master > origin/rel_0_8_11 > origin/rel_0_8_12 > origin/rel_0_8_14 > origin/rel_0_9_0 > origin/rel_2_0_0 > origin/rel_janakj > origin/start > origin/testing_0_8_12 > origin/vendor > > Several of the branches above are automatically updated from CVS, namely > origin/cvs-head receives cvs commits to HEAD and origin/rel_2_0_0 > receives commits to the branch rel_2_0_0 in CVS, and so on. > > These branches will be updated with latest commits from the CVS repository > every time you do: > > $ git pull > > Note that after the steps described above you have the whole CVS commit history > of SER on your local machine, starting with day 1 until today, and including > all branches from the CVS repository. This is convenient because you can > work with the history offline and pretty much all common operations are > blazingly fast because they only work with local files. > Note also that you can push changes only to branches starting with tmp/ , with your <your_username>/ or master (which is unused). The cvs sync branches are read-only, Andrei [...]

1 0

git:sip-router: script: variable number of params for functions
by Andrei Pelinescu-Onciul 18 Nov '08

18 Nov '08

Module: sip-router Branch: andrei/mod_f_params Commit: a2da0c5890f7c02538f0acb3197e6753dc9708bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2da0c5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Nov 19 00:10:46 2008 +0100 script: variable number of params for functions - support for true variable number of parameters module functions ( f(sip_msg, param_no, param_array[]) ) - support for functions with 3-6 parameters using kamailio extended interface. The implementation is however different: while in kamailio all module functions where called with 6 parameters (even if they declared only 2), this version will generate different function calls (small performance benefit by avoiding unneeded stack pushes and register saving for the most common 2 parameter functions and works also with other calling conventions). For performance reasons, a separate script engine command is now generated for each type of function: module functions calls with 0-2 parameters (MODULE_T), 3 (MODULE3_T), 4 (MODULE4_T), 5 (MODULE5_T) and 6 (MODULE6_T) parameters. In case of name conflicts with variable param. number function, it's undefined which actual function will get executed (it will be the "first" one, but the order depends on the module loading order a.s.o.). --- action.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- cfg.y | 37 +++++++++++++++++++++-- route.c | 5 +++ route_struct.c | 5 +++ route_struct.h | 10 ++++-- sr_module.c | 3 +- 6 files changed, 138 insertions(+), 12 deletions(-) diff --git a/action.c b/action.c index 4dc7aba..ea69e3a 100644 --- a/action.c +++ b/action.c @@ -46,6 +46,7 @@ * (andrei) * 2007-06-14 run_actions & do_action need a ctx or handle now, no more * static vars (andrei) + * 2008-11-18 support for variable parameter module functions (andrei) */ @@ -101,6 +102,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct dest_info dst; char* tmp; char *new_uri, *end, *crt; + void* f; int len; int user; struct sip_uri uri, next_hop; @@ -717,11 +719,89 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) break; case MODULE_T: if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && - ((union cmd_export_u*)a->val[0].u.data)->c.function){ - ret=((union cmd_export_u*)a->val[0].u.data)->c.function(msg, - (char*)a->val[2].u.data, - (char*)a->val[3].u.data - ); + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function)f)(msg, + (char*)a->val[2].u.data, + (char*)a->val[3].u.data + ); + if (ret==0) h->run_flags|=EXIT_R_F; + h->last_retcode=ret; + } else { + LOG(L_CRIT,"BUG: do_action: bad module call\n"); + } + break; + /* instead of using the parameter number, we use different names + * for calls to functions with 3, 4, 5, 6 or variable number of + * parameters due to performance reasons */ + case MODULE3_T: + if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function3)f)(msg, + (char*)a->val[2].u.data, + (char*)a->val[3].u.data, + (char*)a->val[4].u.data + ); + if (ret==0) h->run_flags|=EXIT_R_F; + h->last_retcode=ret; + } else { + LOG(L_CRIT,"BUG: do_action: bad module call\n"); + } + break; + case MODULE4_T: + if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function4)f)(msg, + (char*)a->val[2].u.data, + (char*)a->val[3].u.data, + (char*)a->val[4].u.data, + (char*)a->val[5].u.data + ); + if (ret==0) h->run_flags|=EXIT_R_F; + h->last_retcode=ret; + } else { + LOG(L_CRIT,"BUG: do_action: bad module call\n"); + } + break; + case MODULE5_T: + if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function5)f)(msg, + (char*)a->val[2].u.data, + (char*)a->val[3].u.data, + (char*)a->val[4].u.data, + (char*)a->val[5].u.data, + (char*)a->val[6].u.data + ); + if (ret==0) h->run_flags|=EXIT_R_F; + h->last_retcode=ret; + } else { + LOG(L_CRIT,"BUG: do_action: bad module call\n"); + } + break; + case MODULE6_T: + if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function6)f)(msg, + (char*)a->val[2].u.data, + (char*)a->val[3].u.data, + (char*)a->val[4].u.data, + (char*)a->val[5].u.data, + (char*)a->val[6].u.data, + (char*)a->val[7].u.data + ); + if (ret==0) h->run_flags|=EXIT_R_F; + h->last_retcode=ret; + } else { + LOG(L_CRIT,"BUG: do_action: bad module call\n"); + } + break; + case MODULEX_T: + if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && + (f=((union cmd_export_u*)a->val[0].u.data)->c.function)){ + ret=((cmd_function_var)f)(msg, + a->val[1].u.number, + &a->val[2] + ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; } else { diff --git a/cfg.y b/cfg.y index ab485e6..5adc111 100644 --- a/cfg.y +++ b/cfg.y @@ -88,6 +88,7 @@ * 2007-11-28 added TCP_OPT_{FD_CACHE, DEFER_ACCEPT, DELAYED_ACK, SYNCNT, * LINGER2, KEEPALIVE, KEEPIDLE, KEEPINTVL, KEEPCNT} (andrei) * 2008-01-24 added cfg_var definition (Miklos) + * 2008-11-18 support for variable parameter module functions (andrei) */ %{ @@ -2359,7 +2360,8 @@ cmd: $$=0; yyerror("bad argument, [proto:]host[:port] expected"); } | FORCE_SEND_SOCKET error {$$=0; yyerror("missing '(' or ')' ?"); } - | ID {mod_func_action = mk_action(MODULE_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0); } LPAREN func_params RPAREN { + | ID {mod_func_action = mk_action(MODULE_T, 2, MODEXP_ST, NULL, NUMBER_ST, + 0); } LPAREN func_params RPAREN { mod_func_action->val[0].u.data = find_export_record($1, mod_func_action->val[1].u.number, rt, &u_tmp); @@ -2372,6 +2374,33 @@ cmd: } pkg_free(mod_func_action); mod_func_action=0; + }else{ + switch( ((union cmd_export_u*) + mod_func_action->val[0].u.data)->c.param_no){ + case 0: + case 1: + case 2: + /* MODULE_T used for 0-2 params */ + break; + case 3: + mod_func_action->type=MODULE3_T; + break; + case 4: + mod_func_action->type=MODULE4_T; + break; + case 5: + mod_func_action->type=MODULE5_T; + break; + case 6: + mod_func_action->type=MODULE6_T; + break; + case VAR_PARAM_NO: + mod_func_action->type=MODULEX_T; + break; + default: + yyerror("too many parameters for function\n"); + break; + } } $$ = mod_func_action; } @@ -2385,8 +2414,10 @@ func_params: func_param: NUMBER { if (mod_func_action->val[1].u.number < MAX_ACTIONS-2) { - mod_func_action->val[mod_func_action->val[1].u.number+2].type = NUMBER_ST; - mod_func_action->val[mod_func_action->val[1].u.number+2].u.number = $1; + mod_func_action->val[mod_func_action->val[1].u.number+2].type = + NUMBER_ST; + mod_func_action->val[mod_func_action->val[1].u.number+2].u.number = + $1; mod_func_action->val[1].u.number++; } else { yyerror("Too many arguments\n"); diff --git a/route.c b/route.c index b222bfa..5c39764 100644 --- a/route.c +++ b/route.c @@ -503,6 +503,11 @@ static int fix_actions(struct action* a) break; case MODULE_T: + case MODULE3_T: + case MODULE4_T: + case MODULE5_T: + case MODULE6_T: + case MODULEX_T: cmd = t->val[0].u.data; if (cmd && cmd->c.fixup) { int i; diff --git a/route_struct.c b/route_struct.c index 0c00c61..c5fb76b 100644 --- a/route_struct.c +++ b/route_struct.c @@ -350,6 +350,11 @@ void print_action(struct action* t) DBG("if ("); break; case MODULE_T: + case MODULE3_T: + case MODULE4_T: + case MODULE5_T: + case MODULE6_T: + case MODULEX_T: DBG(" external_module_call("); break; case FORCE_RPORT_T: diff --git a/route_struct.h b/route_struct.h index 814517b..22b92d9 100644 --- a/route_struct.h +++ b/route_struct.h @@ -70,7 +70,7 @@ enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, - IF_T, MODULE_T, + IF_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, LEN_GT_T, PREFIX_T, STRIP_T,STRIP_TAIL_T, @@ -133,13 +133,17 @@ typedef struct { } u; } action_u_t; -#define MAX_ACTIONS 4 +/* maximum internal array/params + * for module function calls val[0] and val[1] store a pointer to the + * function and the number of params, the rest are the function params + */ +#define MAX_ACTIONS (2+6) struct action{ int type; /* forward, drop, log, send ...*/ int count; - action_u_t val[MAX_ACTIONS]; struct action* next; + action_u_t val[MAX_ACTIONS]; }; struct expr* mk_exp(int op, struct expr* left, struct expr* right); diff --git a/sr_module.c b/sr_module.c index d59dc6d..21d89ac 100644 --- a/sr_module.c +++ b/sr_module.c @@ -353,7 +353,8 @@ union cmd_export_u* find_mod_export_record(char* mod, char* name, for(i=0, cmd=(void*)&t->exports->VER.cmds[0]; cmd->VER.name; \ i++, cmd=(void*)&t->exports->VER.cmds[i]){\ if((strcmp(name, cmd->VER.name)==0)&& \ - (cmd->VER.param_no==param_no) && \ + ((cmd->VER.param_no==param_no) || \ + (cmd->VER.param_no==VAR_PARAM_NO)) && \ ((cmd->VER.flags & flags) == flags) \ ){ \ DBG("find_export_record: found <%s> in module %s [%s]\n", \

1 0

photos from Karlsruhe meeting
by Daniel-Constantin Mierla 18 Nov '08

18 Nov '08

Hello, a photo album that includes pictures (thanks to Jerome and Henning) from last week's Karlsruhe meeting of SIP Router project is available at: http://sip-router.org/pub/photos/album-sip-router-karlsruhe/ Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

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