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 &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; 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 &lt;bastian.friedrich(a)collax.com&gt;) * - * 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 &lt;bastian.friedrich(a)collax.com&gt;) @@ -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 &lt;bastian.friedrich(a)collax.com&gt;) @@ -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 &lt;bastian.friedrich(a)collax.com&gt;) @@ -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 &lt;bastian.friedrich(a)collax.com&gt;) 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);