sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: modules/textopsx: exported textopsx API
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: 4945d6f77295233918752e5c06add2a607a60e79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4945d6f… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:33:16 2011 +0100 modules/textopsx: exported textopsx API - This is so that I can use msg_apply_changes in app_lua --- modules/textopsx/textopsx.c | 16 ++++++++++++++++ 1 files changed, 16 … [View More]

1 0

git:master: modules_k/presence: added handle_publish() and handle_subscribe () to exported API for use in app_lua
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: a870c322638cbf89aa69fd289716414ed5adbf3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a870c32… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:41:33 2011 +0100 modules_k/presence: added handle_publish() and handle_subscribe() to exported API for use in app_lua --- modules_k/presence/bind_presence.c | 4 ++++ modules_k/presence/… [View More]

1 0

git:master: modules_k/pua_usrloc: exported API for use in app_lua
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: e10ce584c7c6c8fe4a7d2422e92a436f7e8bf27a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e10ce58… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:43:34 2011 +0100 modules_k/pua_usrloc: exported API for use in app_lua --- modules_k/pua_usrloc/pua_usrloc.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git … [View More]

1 0

git:master: modules_k/textops: added is_privacy() to the exported textops API
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: 46d67e70cc3077942802333d49aaef57d2e6d5d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46d67e7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:30:51 2011 +0100 modules_k/textops: added is_privacy() to the exported textops API - For use in app_lua --- modules_k/textops/api.c | 17 +++++++ modules_k/textops/api.h | 2 + … [View More]modules_k/textops/textops.c | 103 +----------------------------------------- modules_k/textops/textops.h | 2 + 4 files changed, 24 insertions(+), 100 deletions(-) diff --git a/modules_k/textops/api.c b/modules_k/textops/api.c index 3180d09..0adf7b5 100644 --- a/modules_k/textops/api.c +++ b/modules_k/textops/api.c @@ -100,6 +100,22 @@ int search_api(struct sip_msg *msg, str *regex){ return retval; } + +int is_privacy_api(struct sip_msg *msg, str* privacy_type){ + int retval; + void **param=pkg_malloc(sizeof(void*)); + *param=pkg_malloc(privacy_type->len+1); + memcpy(*param,privacy_type->s,privacy_type->len); + memset(*param+privacy_type->len,0,1); + + fixup_privacy(param, 1); + retval = is_privacy_f(msg, *param, NULL); + + pkg_free(param); + + return retval; +} + /* * Function to load the textops api. */ @@ -112,5 +128,6 @@ int bind_textops(textops_api_t *tob){ tob->remove_hf=remove_hf_api; tob->search_append=search_append_api; tob->search=search_api; + tob->is_privacy=is_privacy_api; return 0; } diff --git a/modules_k/textops/api.h b/modules_k/textops/api.h index a2b72c4..00ec57a 100644 --- a/modules_k/textops/api.h +++ b/modules_k/textops/api.h @@ -33,6 +33,7 @@ typedef int (*append_hf_t)(struct sip_msg*, str*); typedef int (*remove_hf_t)(struct sip_msg*, str*); typedef int (*search_append_t)(struct sip_msg*, str*, str*); typedef int (*search_t)(struct sip_msg*, str*); +typedef int (*is_privacy_t)(struct sip_msg*, str*); /* * Struct with the textops api. @@ -42,6 +43,7 @@ typedef struct textops_binds { remove_hf_t remove_hf; // Remove a header with the specified name from the message. search_append_t search_append; // Append a str after a match of the specified regex. search_t search; // Check if the regex matches a part of the message. + is_privacy_t is_privacy; } textops_api_t; typedef int (*bind_textops_f)(textops_api_t*); diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index d66631f..8d2a2a7 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -123,9 +123,6 @@ static int set_body_f(struct sip_msg* msg, char*, char *); static int set_rpl_body_f(struct sip_msg* msg, char*, char *); static int is_method_f(struct sip_msg* msg, char* , char *); static int has_body_f(struct sip_msg *msg, char *type, char *str2 ); -static int is_privacy_f(struct sip_msg *msg, char *privacy, char *str2 ); -static int in_list_f(struct sip_msg* _msg, char* _subject, char* _list, - char* _sep); static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); 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 ); @@ -138,9 +135,6 @@ static int free_hname_fixup(void** param, int param_no); static int fixup_method(void** param, int param_no); static int add_header_fixup(void** param, int param_no); static int fixup_body_type(void** param, int param_no); -static int fixup_privacy(void** param, int param_no); -static int fixup_in_list(void** param, int param_no); -static int fixup_free_in_list(void** param, int param_no); int fixup_regexpNL_none(void** param, int param_no); static int mod_init(void); @@ -246,9 +240,6 @@ static cmd_export_t cmds[]={ {"is_privacy", (cmd_function)is_privacy_f, 1, fixup_privacy, 0, ANY_ROUTE}, - {"in_list", (cmd_function)in_list_f, 3, fixup_in_list, - fixup_free_in_list, - ANY_ROUTE}, {"cmp_str", (cmd_function)cmp_str_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, @@ -1757,7 +1748,7 @@ static int fixup_method(void** param, int param_no) /* * Convert char* privacy value to corresponding bit value */ -static int fixup_privacy(void** param, int param_no) +int fixup_privacy(void** param, int param_no) { str p; unsigned int val; @@ -1779,42 +1770,6 @@ static int fixup_privacy(void** param, int param_no) return 0; } -/* - * Fix in_list params: subject and list (strings that may contain pvars), - * separator (string) - */ -static int fixup_in_list(void** param, int param_no) -{ - if ((param_no == 1) || (param_no == 2)) return fixup_spve_null(param, 1); - - if (param_no == 3) { - if ((strlen((char *)*param) != 1) || (*((char *)(*param)) == 0)) { - LM_ERR("invalid separator parameter\n"); - return -1; - } - return 0; - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -/* - * Free in_list params - */ -static int fixup_free_in_list(void** param, int param_no) -{ - if ((param_no == 1) || (param_no == 2)) { - LM_WARN("free function has not been defined for spve\n"); - return 0; - } - - if (param_no == 3) return 0; - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - static int add_header_fixup(void** param, int param_no) { if(param_no==1) @@ -1896,7 +1851,8 @@ static int has_body_f(struct sip_msg *msg, char *type, char *str2 ) return 1; } -static int is_privacy_f(struct sip_msg *msg, char *_privacy, char *str2 ) + +int is_privacy_f(struct sip_msg *msg, char *_privacy, char *str2 ) { if (parse_privacy(msg) == -1) return -1; @@ -1905,59 +1861,6 @@ static int is_privacy_f(struct sip_msg *msg, char *_privacy, char *str2 ) } -/* - * Checks if subject is found in list - */ -int in_list_f(struct sip_msg* _m, char* _subject, char* _list, char* _sep) -{ - str subject, list; - int sep; - char *at, *past, *s; - - if (fixup_get_svalue(_m, (gparam_p)_subject, &subject) != 0) { - LM_ERR("cannot get subject value\n"); - return -1; - } else { - if (subject.len == 0) { - LM_ERR("subject cannot be empty string\n"); - return -1; - } - } - - if (fixup_get_svalue(_m, (gparam_p)_list, &list) != 0) { - LM_ERR("cannot get list value\n"); - return -1; - } else { - if (list.len == 0) return -1; - } - - sep = _sep[0]; - - at = list.s; - past = list.s + list.len; - - while (at < past) { - s = index(at, sep); - if (s == NULL) { - if ((subject.len == (past - at)) && - strncmp(at, subject.s, subject.len) == 0) { - return 1; - } else { - return -1; - } - } else { - if ((subject.len == (s - at)) && - strncmp(at, subject.s, subject.len) == 0) { - return 1; - } else { - at = s + 1; - } - } - } - - return -1; -} - static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ) { str s1; diff --git a/modules_k/textops/textops.h b/modules_k/textops/textops.h index 39168f4..d0855a5 100644 --- a/modules_k/textops/textops.h +++ b/modules_k/textops/textops.h @@ -30,7 +30,9 @@ int search_f(struct sip_msg*, char*, char*); int search_append_f(struct sip_msg*, char*, char*); int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo); int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc); +int is_privacy_f(struct sip_msg *msg, char *privacy, char *str2 ); int fixup_regexp_none(void** param, int param_no); int fixup_free_regexp_none(void** param, int param_no); +int fixup_privacy(void** param, int param_no); #endif /*TEXTOPS_H_*/ [View Less]

1 0

git:master: modules_k/msilo, lib/srdb1/schema: extra headers in MESSAGE requests can now be stored in the silo
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: d0b4bc91ea0a24205e3dc1bb51c3bcbd3a4c3df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0b4bc9… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:14:38 2011 +0100 modules_k/msilo, lib/srdb1/schema: extra headers in MESSAGE requests can now be stored in the silo - Allows extra information relating to a MESSAGE to be preserved when it is … [View More]

1 0

git:master: modules_k/msilo: added missing file from previous commit
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: 0e986a18dea2c6141669a3ddad0c17055ce97e32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e986a1… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 11:25:36 2011 +0100 modules_k/msilo: added missing file from previous commit --- modules_k/msilo/api.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-… [View More]

1 0

git:jh/32plus DELETED: lib/srdb1/schema/mtrees.xml: schema upgrade
by Juha Heinanen 18 Oct '11

18 Oct '11

Module: sip-router Branch: jh/32plus DELETED Commit: 20b73cb697705de6c8d2a058fcee753015d6036e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20b73cb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Sep 30 11:37:11 2011 +0300 lib/srdb1/schema/mtrees.xml: schema upgrade - Added tvalue to unique index, because each prefix can now be associated with more than one value. --- lib/srdb1/schema/mtrees.xml | … [View More]

1 0

New commits on branch master
by Juha Heinanen 18 Oct '11

18 Oct '11

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa85359… Merge: 5bd2add e3eb4e3 Author: Juha Heinanen <jh(a)tutpro.com> Date: Tue Oct 18 16:09:44 2011 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router into 32plus * 'master' of ssh://git.sip-router.org/sip-router: INSTALL: added short note about wiki site Makefile: version set to 3.3.0-dev0 presence_xml: remove unecessary include core and modules: fix … [View More]

1 0

master branch is now open for commits of new features to be in v3.3.0
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Hello, this is a short notice to let everyone know that the GIT master branch is open for commits of new features -- to be part of next major release v3.3.0, as v3.2.0 has been officially released few moments ago. From this moment on, master and 3.2 branches will diverge, 3.2 taking in only bug fixes. So if you want to use stable release of existing features, switch to branch 3.2. You can find guidelines of installing branch 3.2 in the wiki site: * http://www.kamailio.org/wiki/… [View More]

1 0

Kamailio v3.2.0 Released - new major version is out
by Daniel-Constantin Mierla 18 Oct '11

18 Oct '11

Kamailio (OpenSER) SIP Server v3.2.0 is out – a major release with a very large number of new features and improvements. v3.2.0 release is a result of more than 10 months of development and 2 months of testing from the teams of Kamailio (OpenSER) and SIP Express Router (SER) projects. In the year of the 10th celebration of our project (http://sip-router.org/10-years-ser/), this version comes with 12 brand new modules in addition to a lot of fresh features in core and old modules. Full … [View More]

2 2

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011