sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

planning v3.1.5
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Hello, it's being quite some time since we released 3.1.4, so I am thinking of packaging soon v3.1.5 out of stable branch 3.1. My plan is to release it Wednesday, September 14, 2011. Any other opinions? 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

4 4

moving is_audio_on_hold() to sdpops module
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Hello, some time ago you added is_audio_on_hold() function to textops. Now there is a sdpops module more suitable for such operations. Is it ok to move it there? is_audio_on_hold() is new in upcoming 3.2.0 so it is better to have it in right place before first major release where it is present. Thanks, 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

2 1

git:master: pv: moved in is_int() from utils module
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Module: sip-router Branch: master Commit: c8fb53ac59b4fba5d16de9745a723a18897b282b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8fb53a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 11:48:49 2011 +0200 pv: moved in is_int() from utils module - function added by Juha Heinanen in utils module but works on pseudo-variables, thus is here is a more appropriate place --- modules_k/pv/README | 46 +++++++++++++++++++++++++++++----------- modules_k/pv/doc/pv.xml | 6 ++++- modules_k/pv/doc/pv_admin.xml | 22 +++++++++++++++++++ modules_k/pv/pv.c | 22 +++++++++++++++++++ 4 files changed, 82 insertions(+), 14 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 4485a76..57e824b 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -11,7 +11,9 @@ Daniel-Constantin Mierla <daniel(a)asipto.com> - Copyright © 2008 Daniel-Constantin Mierla (asipto.com) + Copyright � 2008-2011 Daniel-Constantin Mierla (asipto.com) + + Copyright � 2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -34,6 +36,7 @@ Daniel-Constantin Mierla 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) + 4.3. is_int(pvar) 5. MI Commands @@ -47,8 +50,9 @@ Daniel-Constantin Mierla 1.3. avp_aliases parameter usage 1.4. pv_isset usage 1.5. pv_unset usage - 1.6. shv_set usage - 1.7. shv_get usage + 1.6. is_int() usage + 1.7. shv_set usage + 1.8. shv_get usage Chapter 1. Admin Guide @@ -70,6 +74,7 @@ Chapter 1. Admin Guide 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) + 4.3. is_int(pvar) 5. MI Commands @@ -113,11 +118,11 @@ Chapter 1. Admin Guide _value_ * _name_: shared variable name * _type_: type of the value - + “i”: integer value - + “s”: string value + + "i": integer value + + "s": string value * _value_: value to be set - Default value is “NULL”. + Default value is "NULL". Example 1.1. shvset parameter usage ... @@ -134,11 +139,11 @@ modparam("pv", "shvset", "pstngw=s:sip:10.10.10.10") _value_ * _name_: shared variable name * _type_: type of the value - + “i”: integer value - + “s”: string value + + "i": integer value + + "s": string value * _value_: value to be set - Default value is “NULL”. + Default value is "NULL". Example 1.2. varset parameter usage ... @@ -161,6 +166,7 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) + 4.3. is_int(pvar) 4.1. pv_isset(pvar) @@ -193,6 +199,20 @@ if(pv_isset("$avp("s:x")")) pv_unset("$avp("s:x")"); ... +4.3. is_int(pvar) + + Function checks if pvar argument contains integer value and returns 1 + if it does and -1 otherwise. + + Function can be used from all kinds of routes. + + Example 1.6. is_int() usage +... +if (is_int("$var(foo)")) { + xlog("L_INFO", "variable foo contains integer value\n"); +} +... + 5. MI Commands 5.1. shv_set @@ -205,8 +225,8 @@ pv_unset("$avp("s:x")"); Parameters: * _name_: shared variable name * _type_: type of the value - + “int”: integer value - + “str”: string value + + "int": integer value + + "str": string value * _value_: value to be set MI FIFO Command Format: @@ -216,7 +236,7 @@ pv_unset("$avp("s:x")"); _value_ _empty_line_ - Example 1.6. shv_set usage + Example 1.7. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -234,7 +254,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.7. shv_get usage + Example 1.8. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules_k/pv/doc/pv.xml b/modules_k/pv/doc/pv.xml index c082b99..1ca758a 100644 --- a/modules_k/pv/doc/pv.xml +++ b/modules_k/pv/doc/pv.xml @@ -31,9 +31,13 @@ </editor> </authorgroup> <copyright> - <year>2008</year> + <year>2008-2011</year> <holder>Daniel-Constantin Mierla (asipto.com)</holder> </copyright> + <copyright> + <year>2011</year> + <holder>Juha Heinanen</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/modules_k/pv/doc/pv_admin.xml b/modules_k/pv/doc/pv_admin.xml index 86da6ec..7d56850 100644 --- a/modules_k/pv/doc/pv_admin.xml +++ b/modules_k/pv/doc/pv_admin.xml @@ -199,6 +199,28 @@ pv_unset("$avp("s:x")"); </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">is_int(pvar)</function> + </title> + <para> + Function checks if pvar argument contains integer value + and returns 1 if it does and -1 otherwise. + </para> + <para> + Function can be used from all kinds of routes. + </para> + <example> + <title><function>is_int()</function> usage</title> + <programlisting format="linespecific"> +... +if (is_int("$var(foo)")) { + xlog("L_INFO", "variable foo contains integer value\n"); +} +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 3beb7bc..c195a06 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -419,6 +419,7 @@ static int mod_init(void); static void mod_destroy(void); static int pv_isset(struct sip_msg* msg, char* pvid, char *foo); static int pv_unset(struct sip_msg* msg, char* pvid, char *foo); +static int is_int(struct sip_msg* msg, char* pvar, char* s2); static cmd_export_t cmds[]={ {"pv_isset", (cmd_function)pv_isset, 1, fixup_pvar_null, 0, @@ -429,6 +430,9 @@ static cmd_export_t cmds[]={ {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, #endif + {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, + ANY_ROUTE}, + {0,0,0,0,0,0} }; @@ -509,3 +513,21 @@ static int add_avp_aliases(modparam_t type, void* val) return 0; } +/** + * Copyright (C) 2011 Juha Heinanen + * + * Checks if pvar argument contains int value + */ +static int is_int(struct sip_msg* msg, char* pvar, char* s2) +{ + pv_spec_t *pvar_sp; + pv_value_t pv_val; + + pvar_sp = (pv_spec_t *)pvar; + + if (pvar_sp && (pv_get_spec_value(msg, pvar_sp, &pv_val) == 0)) { + return (pv_val.flags & PV_VAL_INT)?1:-1; + } + + return -1; +}

1 0

git:master: kamctl: added mtrees tables for dbtext and berkeley db
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Module: sip-router Branch: master Commit: 43ba6803e884cc3e6c9d06e88e17a394c2c0c737 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43ba680… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 11:54:28 2011 +0200 kamctl: added mtrees tables for dbtext and berkeley db --- utils/kamctl/db_berkeley/kamailio/mtrees | 12 ++++++++++++ utils/kamctl/dbtext/kamailio/mtrees | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/mtrees b/utils/kamctl/db_berkeley/kamailio/mtrees new file mode 100644 index 0000000..1a31057 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/mtrees @@ -0,0 +1,12 @@ +METADATA_COLUMNS +id(int) tname(str) tprefix(str) tvalue(str) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|''|'' +mtrees| +mtrees|1 diff --git a/utils/kamctl/dbtext/kamailio/mtrees b/utils/kamctl/dbtext/kamailio/mtrees new file mode 100644 index 0000000..d4d806a --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/mtrees @@ -0,0 +1,2 @@ +id(int,auto) tname(string) tprefix(string) tvalue(string) +mtrees:1

1 0

git:master: utils: is_int() function moved to pv module
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Module: sip-router Branch: master Commit: b383c20861adc64b8628d6db1933edbeeb036ef5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b383c20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 11:52:57 2011 +0200 utils: is_int() function moved to pv module --- modules/utils/README | 52 ++++++++++++------------------------- modules/utils/doc/utils_admin.xml | 22 --------------- modules/utils/functions.c | 18 ------------- modules/utils/functions.h | 5 --- modules/utils/utils.c | 2 - 5 files changed, 17 insertions(+), 82 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index aaf7d35..b2a82e0 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -4,7 +4,7 @@ Juha Heinanen TutPro Inc. - Copyright © 2008-2009 Juha Heinanen + Copyright � 2008-2009 Juha Heinanen __________________________________________________________________ Table of Contents @@ -28,7 +28,6 @@ Juha Heinanen 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) - 4.3. is_int(pvar) 5. MI Commands @@ -47,11 +46,10 @@ Juha Heinanen 1.4. Set xcap_table parameter 1.5. http_query() usage 1.6. xcap_auth_status() usage - 1.7. is_int() usage - 1.8. forward_list usage - 1.9. forward_switch usage - 1.10. forward_filter usage - 1.11. forward_proxy usage + 1.7. forward_list usage + 1.8. forward_switch usage + 1.9. forward_filter usage + 1.10. forward_proxy usage Chapter 1. Admin Guide @@ -74,7 +72,6 @@ Chapter 1. Admin Guide 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) - 4.3. is_int(pvar) 5. MI Commands @@ -101,7 +98,7 @@ Chapter 1. Admin Guide deactivated. Function xcap_auth_status can be used to check from presence server - database, if watcher is authorized to subscribe event “presence” of + database, if watcher is authorized to subscribe event "presence" of presentity. 2. Dependencies @@ -142,7 +139,7 @@ modparam("utils", "http_query_timeout", 2) Defines if the forwarding callback should be installed. - Default value is “0”. + Default value is "0". Example 1.2. Set forward_active parameter ... @@ -165,7 +162,7 @@ modparam("utils", "pres_db_url", "mysql://foo:secret@localhost/pres") Defines name of xcap table in presence server database. - Default value is “xcap”. + Default value is "xcap". Example 1.4. Set xcap_table parameter ... @@ -176,15 +173,14 @@ modparam("utils", "xcap_table", "pres_xcap") 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) - 4.3. is_int(pvar) -4.1. http_query(url, result) +4.1. http_query(url, result) - Sends HTTP GET request according to URL given in “url” parameter, which + Sends HTTP GET request according to URL given in "url" parameter, which is a string that may contain pseudo variables. If HTTP server returns a class 2xx or 3xx reply, first line of reply's - body (if any) is stored in “result” parameter, which must be a writable + body (if any) is stored in "result" parameter, which must be a writable pseudo variable. Function returns reply code of HTTP reply or -1 if something went @@ -203,10 +199,10 @@ switch ($retcode) { } ... -4.2. xcap_auth_status(watcher_uri, presentity_uri) +4.2. xcap_auth_status(watcher_uri, presentity_uri) Function checks from presence server database if watcher is authorized - to subscribe event “presence” of presentity. Sphere checking is not + to subscribe event "presence" of presentity. Sphere checking is not included. Both watcher_uri and presentity_uri are pseudo variables. Function @@ -229,20 +225,6 @@ if (method=="MESSAGE") { } ... -4.3. is_int(pvar) - - Function checks if pvar argument contains integer value and returns 1 - if it does and -1 otherwise. - - Function can be used from all kinds of routes. - - Example 1.7. is_int() usage -... -if (is_int("$var(foo)")) { - xlog("L_INFO", "variable foo contains integer value\n"); -} -... - 5. MI Commands 5.1. forward_list @@ -256,7 +238,7 @@ if (is_int("$var(foo)")) { No parameters. - Example 1.8. forward_list usage + Example 1.7. forward_list usage ... kamctl fifo forward_list id switch filter proxy @@ -269,7 +251,7 @@ id switch filter proxy The syntax of this configuration string is described in 1.6. (switch_setting_list). - Example 1.9. forward_switch usage + Example 1.8. forward_switch usage ... kamctl fifo sp_forward_switch 0=on ... @@ -288,7 +270,7 @@ kamctl fifo sp_forward_switch 0=on The syntax of this configuration string is described in 1.6. (filter_setting_list). - Example 1.10. forward_filter usage + Example 1.9. forward_filter usage ... kamctl fifo sp_forward_filter 0=REGISTER:INVITE ... @@ -301,7 +283,7 @@ kamctl fifo sp_forward_filter 0=REGISTER:INVITE switch). The syntax of this configuration string is described in 1.6. (proxy_setting_list). - Example 1.11. forward_proxy usage + Example 1.10. forward_proxy usage ... kamctl fifo sp_forward_proxy 0=host-c.domain-c:5060 ... diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 23527d0..f683f51 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -229,28 +229,6 @@ if (method=="MESSAGE") { </programlisting> </example> </section> - <section> - <title> - <function moreinfo="none">is_int(pvar)</function> - </title> - <para> - Function checks if pvar argument contains integer value - and returns 1 if it does and -1 otherwise. - </para> - <para> - Function can be used from all kinds of routes. - </para> - <example> - <title><function>is_int()</function> usage</title> - <programlisting format="linespecific"> -... -if (is_int("$var(foo)")) { - xlog("L_INFO", "variable foo contains integer value\n"); -} -... - </programlisting> - </example> - </section> </section> <section> diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 878073a..aadfdd5 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -139,21 +139,3 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) return stat; } - - -/* - * Checks if pvar argument contains int value - */ -int is_int(struct sip_msg* _m, char* _pvar, char* _s2) -{ - pv_spec_t *pvar_sp; - pv_value_t pv_val; - - pvar_sp = (pv_spec_t *)_pvar; - - if (pvar_sp && (pv_get_spec_value(_m, pvar_sp, &pv_val) == 0)) { - return (pv_val.flags & PV_VAL_INT)?1:-1; - } - - return -1; -} diff --git a/modules/utils/functions.h b/modules/utils/functions.h index df34211..5e666f9 100644 --- a/modules/utils/functions.h +++ b/modules/utils/functions.h @@ -42,9 +42,4 @@ int http_query(struct sip_msg* _m, char* _page, char* _params, char* _dst); -/* - * Checks if pvar argument contains int value - */ -int is_int(struct sip_msg* _m, char* _pvar, char* _s2); - #endif /* UTILS_FUNCTIONS_H */ diff --git a/modules/utils/utils.c b/modules/utils/utils.c index b5fa5b1..86f71ea 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -101,8 +101,6 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"xcap_auth_status", (cmd_function)xcap_auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, - {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master: utils: removed invalid lib path from Makefile
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Module: sip-router Branch: master Commit: 0704fc5368f04ca90e6dcbc6bb6408b6339a96a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0704fc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 11:53:44 2011 +0200 utils: removed invalid lib path from Makefile --- modules/utils/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/utils/Makefile b/modules/utils/Makefile index ec45631..e0a2718 100644 --- a/modules/utils/Makefile +++ b/modules/utils/Makefile @@ -11,7 +11,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lcurl -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lcurl -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE

1 0

moving is_int() to pv module
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Hi Juha, you added is_int() function to utils module, which has dependencies on curl and xml2 libraries. I think a better place would be pv module since it is actually working on pvs. Since it is new in 3.2, it should be moved before the major release -- if you think is ok, feel free to move it or if time is a constraint, I can do it. Thanks, 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

2 2

Re: [sr-dev] registrar save() with multiple Contact headers
by Francesco Castellano 13 Sep '11

13 Sep '11

Hi Henning, thanks for your prompt and kind reply. I'm unsure if I'm able to upgrade our production server, but, I'll try to reproduce it on a testing environment. As soon as I can I'll report the results. Kind regards, Francesco On Fri, Sep 9, 2011 at 3:36 PM, Henning Westerholt <henning.westerholt(a)1und1.de> wrote: > On Friday 09 September 2011, Henning Westerholt wrote: >> [..] >> You can try to apply this patch locally, wait until next week for 3.1.4 or >> check out the 3.1 master branch from the repository. > > small correction, i meant of course 3.1.5, the 3.1.4 was released some month > ago. > > Henning >

1 0

git:master: textops(k): cleanup of route types for exported functions
by Daniel-Constantin Mierla 13 Sep '11

13 Sep '11

Module: sip-router Branch: master Commit: 9cc429b65b86c763bf7a56737fbb61c260030b35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cc429b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 11:02:21 2011 +0200 textops(k): cleanup of route types for exported functions - convert to ANY_ROUTE the long list of all route types - removed non-existing anymore route types --- modules_k/textops/textops.c | 62 +++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 8c0cdde..f2f89bb 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -151,64 +151,64 @@ static tr_export_t mod_trans[] = { static cmd_export_t cmds[]={ {"search", (cmd_function)search_f, 1, fixup_regexp_null, fixup_free_regexp_null, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"search_body", (cmd_function)search_body_f, 1, fixup_regexp_null, fixup_free_regexp_null, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"search_append", (cmd_function)search_append_f, 2, fixup_regexp_none,fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"search_append_body", (cmd_function)search_append_body_f, 2, fixup_regexp_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"replace", (cmd_function)replace_f, 2, fixup_regexp_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"replace_body", (cmd_function)replace_body_f, 2, fixup_regexp_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"replace_all", (cmd_function)replace_all_f, 2, fixup_regexp_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"replace_body_all", (cmd_function)replace_body_all_f,2, fixup_regexp_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"replace_body_atonce", (cmd_function)replace_body_atonce_f,2, fixup_regexpNL_none, fixup_free_regexp_none, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"append_to_reply", (cmd_function)append_to_reply_f, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ERROR_ROUTE}, + REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"append_hf", (cmd_function)append_hf_1, 1, add_header_fixup, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"append_hf", (cmd_function)append_hf_2, 2, add_header_fixup, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"insert_hf", (cmd_function)insert_hf_1, 1, add_header_fixup, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"insert_hf", (cmd_function)insert_hf_2, 2, add_header_fixup, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"append_urihf", (cmd_function)append_urihf, 2, fixup_str_str, fixup_free_str_str, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"remove_hf", (cmd_function)remove_hf_f, 1, hname_fixup, free_hname_fixup, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_present_hf", (cmd_function)is_present_hf_f, 1, hname_fixup, free_hname_fixup, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_present_hf_re", (cmd_function)is_present_hf_re_f,1, fixup_regexp_null, fixup_free_regexp_null, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"subst", (cmd_function)subst_f, 1, fixup_substre, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"subst_uri", (cmd_function)subst_uri_f, 1, fixup_substre, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, @@ -217,13 +217,13 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"subst_body", (cmd_function)subst_body_f, 1, fixup_substre, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"filter_body", (cmd_function)filter_body_f, 1, fixup_str_null, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"append_time", (cmd_function)append_time_f, 0, 0, 0, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, + REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"set_body", (cmd_function)set_body_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE }, @@ -232,31 +232,31 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"is_method", (cmd_function)is_method_f, 1, fixup_method, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"has_body", (cmd_function)has_body_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"has_body", (cmd_function)has_body_f, 1, fixup_body_type, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_privacy", (cmd_function)is_privacy_f, 1, fixup_privacy, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"cmp_str", (cmd_function)cmp_str_f, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"cmp_istr", (cmd_function)cmp_istr_f, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"append_time_to_request", (cmd_function)append_time_request_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"bind_textops", (cmd_function)bind_textops, 0, 0, 0, 0},

1 0

git:master: doxygen: fix a bunch of errors in parser, db_mysql and xmlrpc modules
by Henning Westerholt 12 Sep '11

12 Sep '11

Module: sip-router Branch: master Commit: c867df9a6212db099d23ba099e22b970b49f3a84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c867df9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 12 21:29:26 2011 +0200 doxygen: fix a bunch of errors in parser, db_mysql and xmlrpc modules --- modules/db_mysql/my_cmd.c | 5 ++--- modules/xmlrpc/xmlrpc.c | 9 ++++----- parser/parse_allow.c | 2 +- parser/parse_allow.h | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/db_mysql/my_cmd.c b/modules/db_mysql/my_cmd.c index 2e71131..f6479f9 100644 --- a/modules/db_mysql/my_cmd.c +++ b/modules/db_mysql/my_cmd.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2006-2007 iptelorg GmbH * @@ -139,8 +137,9 @@ static void my_cmd_free(db_cmd_t* cmd, struct my_cmd* payload) /** Builds a DELETE SQL statement.The function builds DELETE statement where * cmd->match specify WHERE clause. - * @param cmd SQL statement as a result of this function + * @param sql_cmd SQL statement as a result of this function * @param cmd input for statement creation + * @return -1 on error, 0 on success */ static int build_delete_cmd(str* sql_cmd, db_cmd_t* cmd) { diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index ba150ef..7528ea3 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2005 iptelorg GmbH * Written by Jan Janak <jan(a)iptel.org> * @@ -1326,9 +1324,10 @@ static int get_double(double* val, struct xmlrpc_reply* reply, * @param doc A pointer to the XML-RPC request document. * @param value A pointer to the element containing the parameter to be * converted within the document. - * @param flags : GET_X_AUTOCONV - try autoconverting - * GET_X_LFLF2CRLF - replace double '\n' with `\r\n' - * GET_X_NOREPLY - do not reply + * @param flags + * - GET_X_AUTOCONV - try autoconverting + * - GET_X_LFLF2CRLF - replace double '\\n' with `\\r\\n' + * - GET_X_NOREPLY - do not reply * @return <0 on error, 0 on success */ static int get_string(char** val, struct xmlrpc_reply* reply, diff --git a/parser/parse_allow.c b/parser/parse_allow.c index da882f8..4fb9d66 100644 --- a/parser/parse_allow.c +++ b/parser/parse_allow.c @@ -37,7 +37,7 @@ /*! \brief * This method is used to parse Allow header. * - * \param hf message header field + * \param _hf message header field * \return 0 on success, -1 on failure. */ int parse_allow_header(struct hdr_field* _hf) diff --git a/parser/parse_allow.h b/parser/parse_allow.h index 5ce78aa..e568630 100644 --- a/parser/parse_allow.h +++ b/parser/parse_allow.h @@ -56,10 +56,10 @@ int parse_allow(struct sip_msg *msg); /*! \brief * This method is used to parse Allow header. * - * \param hf message header field + * \param _hf message header field * \return 0 on success, -1 on failure. */ -int parse_allow_header(struct hdr_field* _h); +int parse_allow_header(struct hdr_field* _hf); /*! \brief

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011