sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
326 discussions

git:master: modules/*: updated include paths
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: 63a09d8562a1ac3679dc34c409a37f1d6617e430 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63a09d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 13:26:01 2013 +0100 modules/*: updated include paths --- modules/acc_radius/acc_radius_mod.c | 2 +- modules/app_lua/app_lua_exp.c | 34 +++++++++++++++++----------------- modules/dialog_ng/dialog.c | 2 +- modules/dialog_ng/dlg_handlers.c | 2 +- modules/mediaproxy/mediaproxy.c | 4 ++-- modules/osp/orig_transaction.c | 2 +- modules/osp/osp_mod.c | 2 +- modules/pua_reginfo/notify.c | 2 +- modules/registrar/lookup.h | 2 +- modules/registrar/reg_mod.c | 2 +- modules/registrar/regpv.h | 2 +- modules/registrar/save.h | 2 +- modules/utils/xcap_auth.c | 8 ++++---- modules/xcap_server/xcap_misc.c | 2 +- modules/xcap_server/xcap_server.c | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index abfb69f..07f39ff 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -47,7 +47,7 @@ #include "../../mem/mem.h" #include "../../parser/parse_to.h" #include "../../lib/kcore/radius.h" -#include "../../modules_k/acc/acc_api.h" +#include "../../modules/acc/acc_api.h" #include "acc_radius_mod.h" MODULE_VERSION diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index fad9864..cb25c9a 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -33,27 +33,27 @@ #include "../../modules/sl/sl.h" #include "../../modules/tm/tm_load.h" -#include "../../modules_k/sqlops/sql_api.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/sqlops/sql_api.h" +#include "../../modules/rr/api.h" #include "../../modules/auth/api.h" -#include "../../modules_k/auth_db/api.h" -#include "../../modules_k/maxfwd/api.h" -#include "../../modules_k/registrar/api.h" -#include "../../modules_k/dispatcher/api.h" +#include "../../modules/auth_db/api.h" +#include "../../modules/maxfwd/api.h" +#include "../../modules/registrar/api.h" +#include "../../modules/dispatcher/api.h" #include "../../modules/xhttp/api.h" #include "../../modules/sdpops/api.h" -#include "../../modules_k/presence/bind_presence.h" -#include "../../modules_k/presence_xml/api.h" -#include "../../modules_k/textops/api.h" -#include "../../modules_k/pua_usrloc/api.h" -#include "../../modules_k/siputils/siputils.h" -#include "../../modules_k/rls/api.h" -#include "../../modules_k/alias_db/api.h" -#include "../../modules_k/msilo/api.h" -#include "../../modules_k/uac/api.h" +#include "../../modules/presence/bind_presence.h" +#include "../../modules/presence_xml/api.h" +#include "../../modules/textops/api.h" +#include "../../modules/pua_usrloc/api.h" +#include "../../modules/siputils/siputils.h" +#include "../../modules/rls/api.h" +#include "../../modules/alias_db/api.h" +#include "../../modules/msilo/api.h" +#include "../../modules/uac/api.h" #include "../../modules/sanity/api.h" -#include "../../modules_k/cfgutils/api.h" -#include "../../modules_k/tmx/api.h" +#include "../../modules/cfgutils/api.h" +#include "../../modules/tmx/api.h" #include "../../modules/mqueue/api.h" #include "app_lua_api.h" diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 4c0bc6b..748515d 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -21,7 +21,7 @@ #include "../../parser/parse_to.h" #include "../../modules/tm/tm_load.h" #include "../../rpc_lookup.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index f05c7eb..7536725 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -21,7 +21,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_rr.h" #include "../../modules/tm/tm_load.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" #include "dlg_cb.h" diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 4cb16c9..9b994bf 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -46,8 +46,8 @@ #include "../../parser/parse_to.h" #include "../../parser/parse_param.h" #include "../../msg_translator.h" -#include "../../modules_k/dialog/dlg_load.h" -#include "../../modules_k/dialog/dlg_hash.h" +#include "../../modules/dialog/dlg_load.h" +#include "../../modules/dialog/dlg_hash.h" MODULE_VERSION diff --git a/modules/osp/orig_transaction.c b/modules/osp/orig_transaction.c index 34fd482..6bc3937 100644 --- a/modules/osp/orig_transaction.c +++ b/modules/osp/orig_transaction.c @@ -33,7 +33,7 @@ #include "../../dset.h" #include "../../usr_avp.h" #include "../../mem/mem.h" -#include "../../modules_k/siputils/siputils.h" +#include "../../modules/siputils/siputils.h" #include "orig_transaction.h" #include "destination.h" #include "osptoolkit.h" diff --git a/modules/osp/osp_mod.c b/modules/osp/osp_mod.c index 33af6d7..e5b14cd 100644 --- a/modules/osp/osp_mod.c +++ b/modules/osp/osp_mod.c @@ -34,7 +34,7 @@ #include <osp/osp.h> #include "../rr/api.h" -#include "../../modules_k/siputils/siputils.h" +#include "../../modules/siputils/siputils.h" #include "osp_mod.h" #include "orig_transaction.h" #include "term_transaction.h" diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index 3b20e4e..499cccb 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -25,7 +25,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" #include <libxml/parser.h> #include "pua_reginfo.h" diff --git a/modules/registrar/lookup.h b/modules/registrar/lookup.h index 93780ae..9c10240 100644 --- a/modules/registrar/lookup.h +++ b/modules/registrar/lookup.h @@ -33,7 +33,7 @@ #define LOOKUP_H #include "../../parser/msg_parser.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" /*! \brief diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index a493e79..a5c427d 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -66,7 +66,7 @@ #include "../../error.h" #include "../../socket_info.h" #include "../../pvar.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" #include "../../lib/kcore/statistics.h" #include "../../lib/srutils/sruid.h" #include "../../modules/sl/sl.h" diff --git a/modules/registrar/regpv.h b/modules/registrar/regpv.h index 3af7154..5b291cb 100644 --- a/modules/registrar/regpv.h +++ b/modules/registrar/regpv.h @@ -33,7 +33,7 @@ #define _REGPV_H_ #include "../../pvar.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); diff --git a/modules/registrar/save.h b/modules/registrar/save.h index fbb668e..69e1352 100644 --- a/modules/registrar/save.h +++ b/modules/registrar/save.h @@ -40,7 +40,7 @@ #include "../../parser/msg_parser.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" /*! \brief diff --git a/modules/utils/xcap_auth.c b/modules/utils/xcap_auth.c index eb87e7e..ec67c5b 100644 --- a/modules/utils/xcap_auth.c +++ b/modules/utils/xcap_auth.c @@ -44,10 +44,10 @@ #include "../../dprint.h" #include "../../pvar.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/presence/subscribe.h" -#include "../../modules_k/presence/utils_func.h" -#include "../../modules_k/presence/hash.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/presence/subscribe.h" +#include "../../modules/presence/utils_func.h" +#include "../../modules/presence/hash.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "utils.h" #include "pidf.h" diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index 540e190..d947e7c 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -32,7 +32,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../parser/parse_param.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "xcap_misc.h" diff --git a/modules/xcap_server/xcap_server.c b/modules/xcap_server/xcap_server.c index 2287f26..24e3269 100644 --- a/modules/xcap_server/xcap_server.c +++ b/modules/xcap_server/xcap_server.c @@ -42,7 +42,7 @@ #include "../../data_lump_rpl.h" #include "../../mod_fix.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "../../modules/sl/sl.h" #include "../../lib/kcore/cmpapi.h" #include "../../ip_addr.h"

1 0

git:master: modules_k/: added placeholder for an empty directory
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: dbe58f4cff868f069bc417b3002c7ac75ce484a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbe58f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 12:51:29 2013 +0100 modules_k/: added placeholder for an empty directory --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/.gitkeep b/modules_k/.gitkeep new file mode 100644 index 0000000..e69de29

1 0

git:master: app_perl: perl module moved and renamed to modules/app_perl
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: ba3fa594f3ade8f8afd69606f92d1e4fa4685ede URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba3fa59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 12:47:08 2013 +0100 app_perl: perl module moved and renamed to modules/app_perl - same naming pattern as for the other embedded interpreters --- {modules_k/perl => modules/app_perl}/Makefile | 8 ++++---- {modules_k/perl => modules/app_perl}/README | 0 .../perl/perl.c => modules/app_perl/app_perl_mod.c | 6 +++--- .../perl/perl.h => modules/app_perl/app_perl_mod.h | 0 {modules_k/perl => modules/app_perl}/doc/Makefile | 2 +- .../perl.xml => modules/app_perl/doc/app_perl.xml | 8 ++++---- .../app_perl/doc/app_perl_admin.xml | 0 .../app_perl/doc/app_perl_faq.xml | 0 .../app_perl/doc/app_perl_pod.xml | 0 .../app_perl/doc/app_perl_samples.xml | 0 .../app_perl}/doc/samples/branches.pl | 0 .../app_perl}/doc/samples/firstline.pl | 0 .../perl => modules/app_perl}/doc/samples/flags.pl | 0 .../app_perl}/doc/samples/functions.pl | 0 .../app_perl}/doc/samples/headers.pl | 0 .../app_perl}/doc/samples/logging.pl | 0 .../app_perl}/doc/samples/messagedump.pl | 0 .../app_perl}/doc/samples/persistence.pl | 0 .../app_perl}/doc/samples/phonenumbers.pl | 0 .../app_perl}/doc/samples/pseudovars.pl | 0 {modules_k/perl => modules/app_perl}/kamailioxs.xs | 0 .../perl => modules/app_perl}/lib/perl/Kamailio.pm | 0 .../app_perl}/lib/perl/Kamailio/Constants.pm | 0 .../lib/perl/Kamailio/LDAPUtils/LDAPConf.pm | 0 .../lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm | 0 .../app_perl}/lib/perl/Kamailio/Message.pm | 0 .../app_perl}/lib/perl/Kamailio/Utils/Debug.pm | 0 .../lib/perl/Kamailio/Utils/PhoneNumbers.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB.pm | 0 .../Kamailio/VDB/Adapter/AccountingSIPtrace.pm | 0 .../lib/perl/Kamailio/VDB/Adapter/Alias.pm | 0 .../lib/perl/Kamailio/VDB/Adapter/Auth.pm | 0 .../lib/perl/Kamailio/VDB/Adapter/Describe.pm | 0 .../lib/perl/Kamailio/VDB/Adapter/Speeddial.pm | 0 .../lib/perl/Kamailio/VDB/Adapter/TableVersions.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/Column.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/Pair.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/ReqCond.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/Result.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/VTab.pm | 0 .../app_perl}/lib/perl/Kamailio/VDB/Value.pm | 0 {modules_k/perl => modules/app_perl}/perlfunc.c | 2 +- {modules_k/perl => modules/app_perl}/perlfunc.h | 0 {modules_k/perl => modules/app_perl}/typemap | 0 44 files changed, 13 insertions(+), 13 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ba3…

1 0

git:master: perl: samples and documentation updated to use package Kamailio
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: 0533e3f86bb605d4ce68ae60b80013dcf8540903 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0533e3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 12:14:41 2013 +0100 perl: samples and documentation updated to use package Kamailio --- modules_k/perl/README | 304 ++++++++++++++-------------- modules_k/perl/doc/perl_admin.xml | 4 +- modules_k/perl/doc/perl_faq.xml | 4 +- modules_k/perl/doc/perl_pod.xml | 152 +++++++------- modules_k/perl/doc/perl_samples.xml | 26 ++-- modules_k/perl/doc/samples/firstline.pl | 10 +- modules_k/perl/doc/samples/flags.pl | 4 +- modules_k/perl/doc/samples/functions.pl | 8 +- modules_k/perl/doc/samples/headers.pl | 4 +- modules_k/perl/doc/samples/logging.pl | 8 +- modules_k/perl/doc/samples/messagedump.pl | 6 +- modules_k/perl/doc/samples/persistence.pl | 6 +- modules_k/perl/doc/samples/phonenumbers.pl | 16 +- modules_k/perl/doc/samples/pseudovars.pl | 4 +- modules_k/perl/kamailioxs.xs | 4 +- 15 files changed, 281 insertions(+), 279 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=053…

1 0

git:master: perl: Perl packages renamed from OpenSER::* to Kamailio::*
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: 1be653e243b02094a93ef20509fc98326f160284 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1be653e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 11:53:36 2013 +0100 perl: Perl packages renamed from OpenSER::* to Kamailio::* - part of patch from Stoyan Mihaylov --- modules_k/perl/lib/perl/Kamailio.pm | 16 +++--- modules_k/perl/lib/perl/Kamailio/Constants.pm | 10 ++-- .../perl/lib/perl/Kamailio/LDAPUtils/LDAPConf.pm | 14 +++--- .../lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm | 34 +++++++------- modules_k/perl/lib/perl/Kamailio/Message.pm | 14 +++--- modules_k/perl/lib/perl/Kamailio/Utils/Debug.pm | 10 ++-- .../perl/lib/perl/Kamailio/Utils/PhoneNumbers.pm | 14 +++--- modules_k/perl/lib/perl/Kamailio/VDB.pm | 48 ++++++++++---------- .../Kamailio/VDB/Adapter/AccountingSIPtrace.pm | 16 +++--- .../perl/lib/perl/Kamailio/VDB/Adapter/Alias.pm | 30 ++++++------ .../perl/lib/perl/Kamailio/VDB/Adapter/Auth.pm | 30 ++++++------ .../perl/lib/perl/Kamailio/VDB/Adapter/Describe.pm | 22 +++++----- .../lib/perl/Kamailio/VDB/Adapter/Speeddial.pm | 26 +++++----- .../lib/perl/Kamailio/VDB/Adapter/TableVersions.pm | 14 +++--- modules_k/perl/lib/perl/Kamailio/VDB/Column.pm | 16 +++--- modules_k/perl/lib/perl/Kamailio/VDB/Pair.pm | 14 +++--- modules_k/perl/lib/perl/Kamailio/VDB/ReqCond.pm | 16 +++--- modules_k/perl/lib/perl/Kamailio/VDB/Result.pm | 14 +++--- modules_k/perl/lib/perl/Kamailio/VDB/VTab.pm | 12 +++--- modules_k/perl/lib/perl/Kamailio/VDB/Value.pm | 16 +++--- 20 files changed, 193 insertions(+), 193 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1be…

1 0

git:master: perl: xs file updated to use Kamailio instead of OpenSER
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: e3f78196b345ab22eaba8f4ade7492e660782485 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3f7819… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 11:59:00 2013 +0100 perl: xs file updated to use Kamailio instead of OpenSER --- modules_k/perl/kamailioxs.xs | 60 +++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules_k/perl/kamailioxs.xs b/modules_k/perl/kamailioxs.xs index a7f536b..7f6ffdb 100644 --- a/modules_k/perl/kamailioxs.xs +++ b/modules_k/perl/kamailioxs.xs @@ -429,19 +429,19 @@ inline int sv2int_str(SV *val, int_str *is, /* ************************************************************************ */ /* Object methods begin here */ -=head1 OpenSER +=head1 Kamailio -This module provides access to a limited number of OpenSER core functions. +This module provides access to a limited number of Kamailio core functions. As the most interesting functions deal with SIP messages, they are located -in the OpenSER::Message class below. +in the Kamailio::Message class below. =cut -MODULE = OpenSER PACKAGE = OpenSER +MODULE = Kamailio PACKAGE = Kamailio =head2 log(level,message) -Logs the message with OpenSER's logging facility. The logging level +Logs the message with Kamailio's logging facility. The logging level is one of the following: * L_ALERT @@ -454,10 +454,10 @@ is one of the following: Please note that this method is I<NOT> automatically exported, as it collides with the perl function log (which calculates the logarithm). Either explicitly -import the function (via C<use OpenSER qw ( log );>), or call it with its full +import the function (via C<use Kamailio qw ( log );>), or call it with its full name: - OpenSER::log(L_INFO, "foobar"); + Kamailio::log(L_INFO, "foobar"); =cut @@ -481,13 +481,13 @@ log(level, log) -MODULE = OpenSER PACKAGE = OpenSER::Message +MODULE = Kamailio PACKAGE = Kamailio::Message PROTOTYPES: ENABLE -=head1 OpenSER::Message +=head1 Kamailio::Message -This package provides access functions for an OpenSER C<sip_msg> structure and +This package provides access functions for an Kamailio C<sip_msg> structure and its sub-components. Through its means it is possible to fully configure alternative routing decisions. @@ -845,7 +845,7 @@ parameters self, string1, string2. C<string1> and/or C<string2> may be omitted. As this function provides access to the functions that are exported to the -OpenSER configuration file, it is autoloaded for unknown functions. Instead of +Kamailio configuration file, it is autoloaded for unknown functions. Instead of writing $m->moduleFunction("sl_send_reply", "500", "Internal Error"); @@ -858,7 +858,7 @@ you may as well write WARNING -In OpenSER 1.2, only a limited subset of module functions is available. This +In Kamailio 1.2, only a limited subset of module functions is available. This restriction will be removed in a later version. Here is a list of functions that are expected to be working (not claiming @@ -991,7 +991,7 @@ moduleFunction (self, func, string1 = NULL, string2 = NULL) =head2 log(level,message) (deprecated type) -Logs the message with OpenSER's logging facility. The logging level +Logs the message with Kamailio's logging facility. The logging level is one of the following: * L_ALERT @@ -1002,8 +1002,8 @@ is one of the following: * L_INFO * L_DBG -The logging function should be accessed via the OpenSER module variant. This -one, located in OpenSER::Message, is deprecated. +The logging function should be accessed via the Kamailio module variant. This +one, located in Kamailio::Message, is deprecated. =cut @@ -1211,7 +1211,7 @@ append_branch(self, branch = NULL, qval = NULL) =head2 getParsedRURI() -Returns the current destination URI as an OpenSER::URI object. +Returns the current destination URI as an Kamailio::URI object. =cut @@ -1233,7 +1233,7 @@ getParsedRURI(self) uri = &(msg->parsed_uri); ret = sv_newmortal(); - sv_setref_pv(ret, "OpenSER::URI", (void *)uri); + sv_setref_pv(ret, "Kamailio::URI", (void *)uri); SvREADONLY_on(SvRV(ret)); ST(0) = ret; @@ -1241,9 +1241,9 @@ getParsedRURI(self) -MODULE = OpenSER PACKAGE = OpenSER::URI +MODULE = Kamailio PACKAGE = Kamailio::URI -=head1 OpenSER::URI +=head1 Kamailio::URI This package provides functions for access to sip_uri structures. @@ -1513,9 +1513,9 @@ r2_val(self) -=head1 OpenSER::AVP +=head1 Kamailio::AVP -This package provides access functions for OpenSER's AVPs. +This package provides access functions for Kamailio's AVPs. These variables can be created, evaluated, modified and removed through this package. @@ -1526,20 +1526,20 @@ documentation of add method below. =cut -MODULE = OpenSER PACKAGE = OpenSER::AVP +MODULE = Kamailio PACKAGE = Kamailio::AVP =head2 add(name,val) Add an AVP. -Add an OpenSER AVP to its environment. name and val may both be integers or +Add an Kamailio AVP to its environment. name and val may both be integers or strings; this function will try to guess what is correct. Please note that - OpenSER::AVP::add("10", "10") + Kamailio::AVP::add("10", "10") is something different than - OpenSER::AVP::add(10, 10) + Kamailio::AVP::add(10, 10) due to this evaluation: The first will create _string_ AVPs with the name 10, while the latter will create a numerical AVP. @@ -1579,10 +1579,10 @@ add(p_name, p_val) =head2 get(name) -get an OpenSER AVP: +get an Kamailio AVP: - my $numavp = OpenSER::AVP::get(5); - my $stravp = OpenSER::AVP::get("foo"); + my $numavp = Kamailio::AVP::get(5); + my $stravp = Kamailio::AVP::get("foo"); =cut @@ -1632,8 +1632,8 @@ get(p_name) Destroy an AVP. - OpenSER::AVP::destroy(5); - OpenSER::AVP::destroy("foo"); + Kamailio::AVP::destroy(5); + Kamailio::AVP::destroy("foo"); =cut

1 0

git:master: perl: renamed files and directory from openser to kamailio
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: 9d5cc7085e916bf348ba52828d5c9519652c61ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d5cc70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 11:34:20 2013 +0100 perl: renamed files and directory from openser to kamailio - part of patch from Stoyan Mihaylov --- modules_k/perl/Makefile | 50 ++++++++++---------- modules_k/perl/{openserxs.xs => kamailioxs.xs} | 0 .../perl/lib/perl/{OpenSER.pm => Kamailio.pm} | 0 .../lib/perl/{OpenSER => Kamailio}/Constants.pm | 0 .../{OpenSER => Kamailio}/LDAPUtils/LDAPConf.pm | 0 .../LDAPUtils/LDAPConnection.pm | 0 .../perl/lib/perl/{OpenSER => Kamailio}/Message.pm | 0 .../lib/perl/{OpenSER => Kamailio}/Utils/Debug.pm | 0 .../{OpenSER => Kamailio}/Utils/PhoneNumbers.pm | 0 .../perl/lib/perl/{OpenSER => Kamailio}/VDB.pm | 0 .../VDB/Adapter/AccountingSIPtrace.pm | 0 .../{OpenSER => Kamailio}/VDB/Adapter/Alias.pm | 0 .../perl/{OpenSER => Kamailio}/VDB/Adapter/Auth.pm | 0 .../{OpenSER => Kamailio}/VDB/Adapter/Describe.pm | 0 .../{OpenSER => Kamailio}/VDB/Adapter/Speeddial.pm | 0 .../VDB/Adapter/TableVersions.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/Column.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/Pair.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/ReqCond.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/Result.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/VTab.pm | 0 .../lib/perl/{OpenSER => Kamailio}/VDB/Value.pm | 0 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules_k/perl/Makefile b/modules_k/perl/Makefile index 190aa85..67e953d 100644 --- a/modules_k/perl/Makefile +++ b/modules_k/perl/Makefile @@ -6,7 +6,7 @@ # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs -auto_gen=openserxs.c +auto_gen=kamailioxs.c NAME=perl.so LIBS= @@ -27,7 +27,7 @@ DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi -PODFILES=openserxs.xs `find lib/perl -name *.pm` +PODFILES=kamailioxs.xs `find lib/perl -name *.pm` ifeq ($(TYPEMAP),) ifeq ($(PERLLIBPATH),) @@ -38,39 +38,39 @@ endif include ../../Makefile.modules -perl.d: openserxs.o -perl.o: perl.c openserxs.o +perl.d: kamailioxs.o +perl.o: perl.c kamailioxs.o -openserxs.o: CFLAGS+=-Wno-unused +kamailioxs.o: CFLAGS+=-Wno-unused -openserxs.c: openserxs.xs typemap - xsubpp -typemap $(TYPEMAP) -typemap typemap openserxs.xs > openserxs.c +kamailioxs.c: kamailioxs.xs typemap + xsubpp -typemap $(TYPEMAP) -typemap typemap kamailioxs.xs > kamailioxs.c .PHONY: perlpod perlpod: doc/perl_pod.sgml -doc/perl_pod.sgml: openserxs.xs - cat $(PODFILES) | pod2docbook --doctype=chapter --title='OpenSER Perl API' --no-header - doc/perl_pod.sgml +doc/perl_pod.sgml: kamailioxs.xs + cat $(PODFILES) | pod2docbook --doctype=chapter --title='Kamailio Perl API' --no-header - doc/perl_pod.sgml install-perl-scripts: - echo "installing Perl Kamailio (OpenSER) packages ..." + echo "installing Perl Kamailio packages ..." mkdir -p $(modules_prefix)/$(lib_dir)/perl $(INSTALL_CFG) lib/perl/*.pm $(modules_prefix)/$(lib_dir)/perl - mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER - $(INSTALL_CFG) lib/perl/OpenSER/*.pm \ - $(modules_prefix)/$(lib_dir)/perl/OpenSER - mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/LDAPUtils - $(INSTALL_CFG) lib/perl/OpenSER/LDAPUtils/*.pm \ - $(modules_prefix)/$(lib_dir)/perl/OpenSER/LDAPUtils - mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/Utils - $(INSTALL_CFG) lib/perl/OpenSER/Utils/*.pm \ - $(modules_prefix)/$(lib_dir)/perl/OpenSER/Utils - mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB - $(INSTALL_CFG) lib/perl/OpenSER/VDB/*.pm \ - $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB - mkdir -p $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB/Adapter - $(INSTALL_CFG) lib/perl/OpenSER/VDB/Adapter/*.pm \ - $(modules_prefix)/$(lib_dir)/perl/OpenSER/VDB/Adapter + mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio + $(INSTALL_CFG) lib/perl/Kamailio/*.pm \ + $(modules_prefix)/$(lib_dir)/perl/Kamailio + mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/LDAPUtils + $(INSTALL_CFG) lib/perl/Kamailio/LDAPUtils/*.pm \ + $(modules_prefix)/$(lib_dir)/perl/Kamailio/LDAPUtils + mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/Utils + $(INSTALL_CFG) lib/perl/Kamailio/Utils/*.pm \ + $(modules_prefix)/$(lib_dir)/perl/Kamailio/Utils + mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB + $(INSTALL_CFG) lib/perl/Kamailio/VDB/*.pm \ + $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB + mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB/Adapter + $(INSTALL_CFG) lib/perl/Kamailio/VDB/Adapter/*.pm \ + $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB/Adapter install-scripts: install-perl-scripts diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/kamailioxs.xs similarity index 100% rename from modules_k/perl/openserxs.xs rename to modules_k/perl/kamailioxs.xs diff --git a/modules_k/perl/lib/perl/OpenSER.pm b/modules_k/perl/lib/perl/Kamailio.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER.pm rename to modules_k/perl/lib/perl/Kamailio.pm diff --git a/modules_k/perl/lib/perl/OpenSER/Constants.pm b/modules_k/perl/lib/perl/Kamailio/Constants.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/Constants.pm rename to modules_k/perl/lib/perl/Kamailio/Constants.pm diff --git a/modules_k/perl/lib/perl/OpenSER/LDAPUtils/LDAPConf.pm b/modules_k/perl/lib/perl/Kamailio/LDAPUtils/LDAPConf.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/LDAPUtils/LDAPConf.pm rename to modules_k/perl/lib/perl/Kamailio/LDAPUtils/LDAPConf.pm diff --git a/modules_k/perl/lib/perl/OpenSER/LDAPUtils/LDAPConnection.pm b/modules_k/perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/LDAPUtils/LDAPConnection.pm rename to modules_k/perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm diff --git a/modules_k/perl/lib/perl/OpenSER/Message.pm b/modules_k/perl/lib/perl/Kamailio/Message.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/Message.pm rename to modules_k/perl/lib/perl/Kamailio/Message.pm diff --git a/modules_k/perl/lib/perl/OpenSER/Utils/Debug.pm b/modules_k/perl/lib/perl/Kamailio/Utils/Debug.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/Utils/Debug.pm rename to modules_k/perl/lib/perl/Kamailio/Utils/Debug.pm diff --git a/modules_k/perl/lib/perl/OpenSER/Utils/PhoneNumbers.pm b/modules_k/perl/lib/perl/Kamailio/Utils/PhoneNumbers.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/Utils/PhoneNumbers.pm rename to modules_k/perl/lib/perl/Kamailio/Utils/PhoneNumbers.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB.pm b/modules_k/perl/lib/perl/Kamailio/VDB.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB.pm rename to modules_k/perl/lib/perl/Kamailio/VDB.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/AccountingSIPtrace.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/AccountingSIPtrace.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/AccountingSIPtrace.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/AccountingSIPtrace.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Alias.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Alias.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Alias.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Alias.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Auth.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Auth.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Auth.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Auth.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Describe.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Describe.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Describe.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Describe.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Speeddial.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Speeddial.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/Speeddial.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/Speeddial.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Adapter/TableVersions.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Adapter/TableVersions.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Adapter/TableVersions.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Adapter/TableVersions.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Column.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Column.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Column.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Column.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Pair.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Pair.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Pair.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Pair.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/ReqCond.pm b/modules_k/perl/lib/perl/Kamailio/VDB/ReqCond.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/ReqCond.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/ReqCond.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Result.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Result.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Result.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Result.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/VTab.pm b/modules_k/perl/lib/perl/Kamailio/VDB/VTab.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/VTab.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/VTab.pm diff --git a/modules_k/perl/lib/perl/OpenSER/VDB/Value.pm b/modules_k/perl/lib/perl/Kamailio/VDB/Value.pm similarity index 100% rename from modules_k/perl/lib/perl/OpenSER/VDB/Value.pm rename to modules_k/perl/lib/perl/Kamailio/VDB/Value.pm

1 0

git:master: perl: renaming openser to kamailio in C source files
by Daniel-Constantin Mierla 20 Jan '13

20 Jan '13

Module: sip-router Branch: master Commit: f448282ec6775857f4bef733f4785dd571bfe081 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f448282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 11:47:48 2013 +0100 perl: renaming openser to kamailio in C source files --- modules_k/perl/kamailioxs.xs | 4 ++-- modules_k/perl/perl.c | 18 +++++++++--------- modules_k/perl/perl.h | 6 +++--- modules_k/perl/perlfunc.c | 4 ++-- modules_k/perl/perlfunc.h | 2 +- modules_k/perlvdb/perlvdb.h | 2 +- modules_k/perlvdb/perlvdb_conv.c | 6 +++--- modules_k/perlvdb/perlvdb_conv.h | 6 +++--- modules_k/perlvdb/perlvdbfunc.c | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules_k/perl/kamailioxs.xs b/modules_k/perl/kamailioxs.xs index 5c25f06..a7f536b 100644 --- a/modules_k/perl/kamailioxs.xs +++ b/modules_k/perl/kamailioxs.xs @@ -1,12 +1,12 @@ /* * $Id$ * - * Perl module for OpenSER + * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH * (Bastian Friedrich <bastian.friedrich(a)collax.com>) * - * This file is part of openser, a free SIP server. + * This file is part of kamailio, a free SIP server. * * openser is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/modules_k/perl/perl.c b/modules_k/perl/perl.c index 5e603ac..e527e1e 100644 --- a/modules_k/perl/perl.c +++ b/modules_k/perl/perl.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Perl module for OpenSER + * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH * (Bastian Friedrich <bastian.friedrich(a)collax.com>) @@ -24,7 +24,7 @@ * */ -#define DEFAULTMODULE "OpenSER" +#define DEFAULTMODULE "Kamailio" #define MAX_LIB_PATHS 10 #include <stdio.h> @@ -53,7 +53,7 @@ MODULE_VERSION /* Full path to the script including executed functions */ char *filename = NULL; -/* Path to an arbitrary directory where the OpenSER Perl modules are +/* Path to an arbitrary directory where the Kamailio Perl modules are * installed */ char *modpath = NULL; @@ -165,18 +165,18 @@ struct module_exports exports = { EXTERN_C void boot_DynaLoader (pTHX_ CV* cv); -EXTERN_C void boot_OpenSER(pTHX_ CV* cv); +EXTERN_C void boot_Kamailio(pTHX_ CV* cv); /* * This is output by perl -MExtUtils::Embed -e xsinit - * and complemented by the OpenSER bootstrapping + * and complemented by the Kamailio bootstrapping */ EXTERN_C void xs_init(pTHX) { char *file = __FILE__; dXSUB_SYS; - newXS("OpenSER::bootstrap", boot_OpenSER, file); + newXS("Kamailio::bootstrap", boot_Kamailio, file); newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file); } @@ -229,7 +229,7 @@ PerlInterpreter *parser_init(void) { } } - argv[argc] = "-M"DEFAULTMODULE; argc++; /* Always "use" Openser.pm */ + argv[argc] = "-M"DEFAULTMODULE; argc++; /* Always "use" Kamailio.pm */ argv[argc] = filename; /* The script itself */ argc++; @@ -314,7 +314,7 @@ struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param) /* * mod_init - * Called by openser at init time + * Called by kamailio at init time */ static int mod_init(void) { @@ -356,7 +356,7 @@ static int mod_init(void) { /* * destroy - * called by openser at exit time + * called by kamailio at exit time */ static void destroy(void) { diff --git a/modules_k/perl/perl.h b/modules_k/perl/perl.h index 8905ca1..4f7d2ac 100644 --- a/modules_k/perl/perl.h +++ b/modules_k/perl/perl.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Perl module for OpenSER + * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH * (Bastian Friedrich <bastian.friedrich(a)collax.com>) @@ -44,7 +44,7 @@ extern PerlInterpreter *my_perl; extern sl_api_t slb; -#define PERLCLASS_MESSAGE "OpenSER::Message" -#define PERLCLASS_URI "OpenSER::URI" +#define PERLCLASS_MESSAGE "Kamailio::Message" +#define PERLCLASS_URI "Kamailio::URI" #endif /* PERL_MOD_H */ diff --git a/modules_k/perl/perlfunc.c b/modules_k/perl/perlfunc.c index f65b9c0..f4b592b 100644 --- a/modules_k/perl/perlfunc.c +++ b/modules_k/perl/perlfunc.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Perl module for OpenSER + * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH * (Bastian Friedrich <bastian.friedrich(a)collax.com>) @@ -128,7 +128,7 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { } m = sv_newmortal(); - sv_setref_pv(m, "OpenSER::Message", (void *)_msg); + sv_setref_pv(m, "Kamailio::Message", (void *)_msg); SvREADONLY_on(SvRV(m)); diff --git a/modules_k/perl/perlfunc.h b/modules_k/perl/perlfunc.h index 95f9502..2d380b9 100644 --- a/modules_k/perl/perlfunc.h +++ b/modules_k/perl/perlfunc.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Perl module for OpenSER + * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH * (Bastian Friedrich <bastian.friedrich(a)collax.com>) diff --git a/modules_k/perlvdb/perlvdb.h b/modules_k/perlvdb/perlvdb.h index a356b5e..bf2d100 100644 --- a/modules_k/perlvdb/perlvdb.h +++ b/modules_k/perlvdb/perlvdb.h @@ -52,7 +52,7 @@ #include "perlvdb_oohelpers.h" #include "perlvdbfunc.h" -#define PERL_VDB_BASECLASS "OpenSER::VDB" +#define PERL_VDB_BASECLASS "Kamailio::VDB" #define PERL_VDB_USETABLEMETHOD "use_table" #define PERL_VDB_INSERTMETHOD "_insert" diff --git a/modules_k/perlvdb/perlvdb_conv.c b/modules_k/perlvdb/perlvdb_conv.c index c041c42..99dd752 100644 --- a/modules_k/perlvdb/perlvdb_conv.c +++ b/modules_k/perlvdb/perlvdb_conv.c @@ -62,7 +62,7 @@ AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) { element = cond2perlcond(*(keys + i), *(ops + i), vals + i); } else { -/* OP_EQ is defined in OpenSER _and_ perl. Includes collide :( */ +/* OP_EQ is defined in Kamailio _and_ perl. Includes collide :( */ #ifdef OP_EQ element = cond2perlcond(*(keys + i), OP_EQ, vals + i); #else @@ -246,7 +246,7 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { modified db result value. */ if (!(SvROK(perlres) && - (sv_derived_from(perlres, "OpenSER::VDB::Result")))) { + (sv_derived_from(perlres, "Kamailio::VDB::Result")))) { goto error; } /* Memory allocation for C side result structure */ @@ -406,7 +406,7 @@ end: av_undef(rowarray); return retval; error: - LM_CRIT("broken result set. Exiting, leaving OpenSER in unknown state.\n"); + LM_CRIT("broken result set. Exiting, leaving Kamailio in unknown state.\n"); return -1; } diff --git a/modules_k/perlvdb/perlvdb_conv.h b/modules_k/perlvdb/perlvdb_conv.h index 2eb3235..a27f27c 100644 --- a/modules_k/perlvdb/perlvdb_conv.h +++ b/modules_k/perlvdb/perlvdb_conv.h @@ -35,9 +35,9 @@ #include <XSUB.h> -#define PERL_CLASS_VALUE "OpenSER::VDB::Value" -#define PERL_CLASS_PAIR "OpenSER::VDB::Pair" -#define PERL_CLASS_REQCOND "OpenSER::VDB::ReqCond" +#define PERL_CLASS_VALUE "Kamailio::VDB::Value" +#define PERL_CLASS_PAIR "Kamailio::VDB::Pair" +#define PERL_CLASS_REQCOND "Kamailio::VDB::ReqCond" #define PERL_CONSTRUCTOR_NAME "new" diff --git a/modules_k/perlvdb/perlvdbfunc.c b/modules_k/perlvdb/perlvdbfunc.c index f7f162c..006e463 100644 --- a/modules_k/perlvdb/perlvdbfunc.c +++ b/modules_k/perlvdb/perlvdbfunc.c @@ -85,7 +85,7 @@ SV *getobj(db1_con_t *con) { * - not null * - not undef * - an object - * - derived from OpenSER::VDB + * - derived from Kamailio::VDB */ int checkobj(SV* obj) { if (obj != NULL) { @@ -314,13 +314,13 @@ int perlvdb_db_query(db1_con_t* h, db_key_t* k, db_op_t* op, db_val_t* v, av_undef(condarr); av_undef(retkeysarr); - /* Transform perl result set to OpenSER result set */ + /* Transform perl result set to Kamailio result set */ if (!resultset) { /* No results. */ LM_ERR("no perl result set.\n"); retval = -1; } else { - if (sv_isa(resultset, "OpenSER::VDB::Result")) { + if (sv_isa(resultset, "Kamailio::VDB::Result")) { retval = perlresult2dbres(resultset, r); /* Nested refs are decreased/deleted inside the routine */ SvREFCNT_dec(resultset);

1 0

git:master: xmlops Updating xml formats
by Olle E. Johansson 19 Jan '13

19 Jan '13

Module: sip-router Branch: master Commit: 396de50105c29c102da1afb9fabe8ea1324a7282 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=396de50… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Jan 19 19:57:50 2013 +0100 xmlops Updating xml formats --- modules/xmlops/README | 7 +-- modules/xmlops/doc/xmlops.xml | 3 +- modules/xmlops/doc/xmlops_admin.xml | 64 +++++++++++++++++++++++++++++++ modules/xmlops/doc/xmlops_functions.xml | 29 -------------- modules/xmlops/doc/xmlops_params.xml | 41 -------------------- 5 files changed, 68 insertions(+), 76 deletions(-) diff --git a/modules/xmlops/README b/modules/xmlops/README index 0e1a1f4..b8353b4 100644 --- a/modules/xmlops/README +++ b/modules/xmlops/README @@ -40,6 +40,7 @@ Daniel-Constantin Mierla 3.1. buf_size (integer) 3.2. xml_ns (str) + 3.3. Pseudo-Variables 3.1. buf_size (integer) @@ -62,11 +63,9 @@ modparam("xmlops", "buf_size", 8192) modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") ... -4. Pseudo-Variables +3.3. Pseudo-Variables - 4.1. $xml(name=>spec) - -4.1. $xml(name=>spec) +3.3. Pseudo-Variables Pseudo-variable for XML document operations using xpath syntax. For more see the Pseudo-Variables Cookbook. diff --git a/modules/xmlops/doc/xmlops.xml b/modules/xmlops/doc/xmlops.xml index 1917a8e..211eca9 100644 --- a/modules/xmlops/doc/xmlops.xml +++ b/modules/xmlops/doc/xmlops.xml @@ -59,8 +59,7 @@ </section> </section> - <xi:include href="xmlops_params.xml"/> - <xi:include href="xmlops_functions.xml"/> + <xi:include href="xmlops_admin.xml"/> </book> diff --git a/modules/xmlops/doc/xmlops_admin.xml b/modules/xmlops/doc/xmlops_admin.xml new file mode 100644 index 0000000..e076a52 --- /dev/null +++ b/modules/xmlops/doc/xmlops_admin.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="xmlops.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>Parameters</title> + + <section id="buf_size"> + <title><varname>buf_size</varname> (integer)</title> + <para> + Maximum size of the XML buffer. + </para> + <para> + Default value is 4096. + </para> + <example> + <title>Set <varname>buf_size</varname> parameter</title> + <programlisting> +... +modparam("xmlops", "buf_size", 8192) +... + </programlisting> + </example> + </section> + + <section id="xml_ns"> + <title><varname>xml_ns</varname> (str)</title> + <para> + Register xml namespace prefix. Parameter value must have the format: + 'prefix=uri'.</para> + <example> + <title>Set <varname>xml_ns</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +... +</programlisting> + </example> + </section> + + + <section id="pv-xml"> + <title>Pseudo-Variables</title> + <title> + <function moreinfo="none">$xml(name=>spec)</function> + </title> + <para> + Pseudo-variable for XML document operations using xpath syntax. For + more see the Pseudo-Variables Cookbook. + </para> + <example> + <title><function>xml</function> usage</title> + <programlisting format="linespecific"> +... +$xml(x=>doc) + = '<?xml version="1.0" encoding="UTF-8"?><a><b>test</b></a>'; +xlog("content of node b: $xml(x=>xpath:/a/b/text())\n"); +$xml(x=>xpath:/a/b) = "1234"; +... +</programlisting> + </example> + </section> + +</section> diff --git a/modules/xmlops/doc/xmlops_functions.xml b/modules/xmlops/doc/xmlops_functions.xml deleted file mode 100644 index 36daac0..0000000 --- a/modules/xmlops/doc/xmlops_functions.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - -<section id="textopsx.pvs" xmlns:xi="http://www.w3.org/2001/XInclude"> - <title>Pseudo-Variables</title> - - <section id="pv-xml"> - <title> - <function moreinfo="none">$xml(name=>spec)</function> - </title> - <para> - Pseudo-variable for XML document operations using xpath syntax. For - more see the Pseudo-Variables Cookbook. - </para> - <example> - <title><function>xml</function> usage</title> - <programlisting format="linespecific"> -... -$xml(x=>doc) - = '<?xml version="1.0" encoding="UTF-8"?><a><b>test</b></a>'; -xlog("content of node b: $xml(x=>xpath:/a/b/text())\n"); -$xml(x=>xpath:/a/b) = "1234"; -... -</programlisting> - </example> - </section> - -</section> diff --git a/modules/xmlops/doc/xmlops_params.xml b/modules/xmlops/doc/xmlops_params.xml deleted file mode 100644 index 2fc947e..0000000 --- a/modules/xmlops/doc/xmlops_params.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - -<section id="xmlops.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> - <title>Parameters</title> - - <section id="buf_size"> - <title><varname>buf_size</varname> (integer)</title> - <para> - Maximum size of the XML buffer. - </para> - <para> - Default value is 4096. - </para> - <example> - <title>Set <varname>buf_size</varname> parameter</title> - <programlisting> -... -modparam("xmlops", "buf_size", 8192) -... - </programlisting> - </example> - </section> - - <section id="xml_ns"> - <title><varname>xml_ns</varname> (str)</title> - <para> - Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'.</para> - <example> - <title>Set <varname>xml_ns</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") -... -</programlisting> - </example> - </section> - -</section>

1 0

git:master: sanity Sanitize XML file names and formats
by Olle E. Johansson 19 Jan '13

19 Jan '13

Module: sip-router Branch: master Commit: 80dc9107c5cd47cab24786a12d2612c25f714ff3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80dc910… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Jan 19 20:07:08 2013 +0100 sanity Sanitize XML file names and formats --- modules/sanity/README | 80 +++++++++++++------ modules/sanity/doc/sanity.xml | 3 +- .../doc/{sanity_params.xml => sanity_admin.xml} | 0 modules/sanity/doc/sanity_functions.xml | 81 -------------------- 4 files changed, 55 insertions(+), 109 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index 90e7ca3..d57b8c0 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -7,15 +7,30 @@ Nils Ohlmeier Copyright � 2006 iptelorg GmbH __________________________________________________________________ + Table of Contents + + 1. + + 1. Parameters + + 1.1. default_checks (integer) + 1.2. uri_checks (integer) + 1.3. proxy_require (string) + 1.4. autodrop (integer) + + 2. Functions + + 2.1. sanity_check([msg_checks [, uri_checks]]) + List of Examples - 1. Set default_checks parameter - 2. Set uri_checks parameter - 3. Set proxy_require parameter - 4. Set autodrop parameter - 5. sanity_check usage - 6. sanity_check usage with parameter - 7. sanity_check usage with two parameters + 1.1. Set default_checks parameter + 1.2. Set uri_checks parameter + 1.3. Set proxy_require parameter + 1.4. Set autodrop parameter + 1.5. sanity_check usage + 1.6. sanity_check usage with parameter + 1.7. sanity_check usage with two parameters 1. Overview @@ -64,14 +79,27 @@ Nils Ohlmeier The following modules must be loaded before this module: * sl - Stateless replies. -3. Parameters + Table of Contents + + 1. Parameters + + 1.1. default_checks (integer) + 1.2. uri_checks (integer) + 1.3. proxy_require (string) + 1.4. autodrop (integer) + + 2. Functions + + 2.1. sanity_check([msg_checks [, uri_checks]]) + +1. Parameters - 3.1. default_checks (integer) - 3.2. uri_checks (integer) - 3.3. proxy_require (string) - 3.4. autodrop (integer) + 1.1. default_checks (integer) + 1.2. uri_checks (integer) + 1.3. proxy_require (string) + 1.4. autodrop (integer) -3.1. default_checks (integer) +1.1. default_checks (integer) This parameter determines which of the checks from the sanity module are executed if no parameter was given to the sanity_check function @@ -84,12 +112,12 @@ Nils Ohlmeier cseq_method (32), cseq_value (64), cotent_length (128), expires_value (256), proxy_require (512). - Example 1. Set default_checks parameter + Example 1.1. Set default_checks parameter ... modparam("sanity", "default_checks", 1) ... -3.2. uri_checks (integer) +1.2. uri_checks (integer) This parameter determines which URIs are going to be checked if the 'parse uri' will be executed. @@ -97,24 +125,24 @@ modparam("sanity", "default_checks", 1) Default value is 7. This resolves to the following list of parsed URIs: Request RUI (1), From URI (2) and To URI (4). - Example 2. Set uri_checks parameter + Example 1.2. Set uri_checks parameter ... modparam("sanity", "uri_checks", 3) ... -3.3. proxy_require (string) +1.3. proxy_require (string) This parameter sets the list of supported extensions for this Kamailio. The value is expected as a comma separated list of extensions. This list is separated into single tokens. Each token from a proxy require header will be compared to the tokens from this list. - Example 3. Set proxy_require parameter + Example 1.3. Set proxy_require parameter ... modparam("sanity", "proxy_require", "foo, bar") ... -3.4. autodrop (integer) +1.4. autodrop (integer) This parameter controls whether the module drops automatically or not the SIP message if the sanity checks fail. Default value is 1 (auto @@ -123,16 +151,16 @@ modparam("sanity", "proxy_require", "foo, bar") sure you exit execution of config without sending a SIP reply because it is sent by module itself. - Example 4. Set autodrop parameter + Example 1.4. Set autodrop parameter ... modparam("sanity", "autodrop", 1) ... -4. Functions +2. Functions - 4.1. sanity_check([msg_checks [, uri_checks]]) + 2.1. sanity_check([msg_checks [, uri_checks]]) -4.1. sanity_check([msg_checks [, uri_checks]]) +2.1. sanity_check([msg_checks [, uri_checks]]) This function makes a row of sanity checks over the given SIP request. The behavior of the function is also controlled by 'autodrop' @@ -142,7 +170,7 @@ modparam("sanity", "autodrop", 1) module sends a precise error reply via SL send_reply(). Thus there is no need to reply with a generic error message. - Example 5. sanity_check usage + Example 1.5. sanity_check usage ... if (!sanity_check()) { exit; @@ -155,7 +183,7 @@ if (!sanity_check()) { checks (like for the module parameter) which should be executed at this function call. - Example 6. sanity_check usage with parameter + Example 1.6. sanity_check usage with parameter ... if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a @@ -168,7 +196,7 @@ if (method=="REGISTER" && !sanity_check("256")) { overwrites the global module parameter uri_checks and thus determines which URIs will be checked if the parse uri test will be executed. - Example 7. sanity_check usage with two parameters + Example 1.7. sanity_check usage with two parameters ... if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with diff --git a/modules/sanity/doc/sanity.xml b/modules/sanity/doc/sanity.xml index 8ba8e32..7415abd 100644 --- a/modules/sanity/doc/sanity.xml +++ b/modules/sanity/doc/sanity.xml @@ -139,6 +139,5 @@ </para> </section> - <xi:include href="sanity_params.xml"/> - <xi:include href="sanity_functions.xml"/> + <xi:include href="sanity_admin.xml"/> </book> diff --git a/modules/sanity/doc/sanity_params.xml b/modules/sanity/doc/sanity_admin.xml similarity index 100% rename from modules/sanity/doc/sanity_params.xml rename to modules/sanity/doc/sanity_admin.xml diff --git a/modules/sanity/doc/sanity_functions.xml b/modules/sanity/doc/sanity_functions.xml deleted file mode 100644 index 62d28e6..0000000 --- a/modules/sanity/doc/sanity_functions.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" -"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - - -<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> -%docentities; - -]> - -<section id="options.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> - <sectioninfo> - </sectioninfo> - - <title>Functions</title> - - <section id="sanity_check"> - <title> - <function>sanity_check([msg_checks [, uri_checks]])</function> - </title> - <para> - This function makes a row of sanity checks over the given SIP request. The - behavior of the function is also controlled by 'autodrop' parameter. - If autodrop=0, the function returns false (-1) if one of the checks failed. - When autodrop=1, the function stops the execution of configuration file. - In both cases, if one of the checks fails the module sends a precise error - reply via SL send_reply(). Thus there is no need to reply with a generic - error message. - </para> - <example> - <title><function>sanity_check</function> usage</title> - <programlisting> -<![CDATA[ -... -if (!sanity_check()) { - exit; -} -... -]]> - </programlisting> - </example> - <para> - Optionally the function takes an integer argument which overwrites - the global module parameter default_checks. This allows to make - certain test from script regions. The integer value is again the sum - of the checks (like for the module parameter) which should be executed - at this function call. - </para> - <example> - <title><function>sanity_check</function> usage with parameter</title> - <programlisting> -<![CDATA[ -... -if (method=="REGISTER" && !sanity_check("256")) { - /* the register contains an invalid expires value and is replied with a 400 */ - exit; -} -... -]]> - </programlisting> - </example> - <para> - Optionally the function takes a second integer argument which - overwrites the global module parameter uri_checks and thus determines - which URIs will be checked if the parse uri test will be executed. - </para> - <example> - <title><function>sanity_check</function> usage with two parameters</title> - <programlisting> -<![CDATA[ -... -if (method=="INVITE" && !sanity_check("1024", "6")) { - /* the INVITE contains an invalid From or To header and is replied with a 400 */ - exit; -} -... -]]> - </programlisting> - </example> - </section> -</section>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013