瀏覽代碼

- renaming: openser -> kamailio

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4585 689a6050-402a-0410-94f2-e92a70836424
Klaus Darilion 17 年之前
父節點
當前提交
9b64b9f378
共有 100 個文件被更改,包括 261 次插入261 次删除
  1. 5 5
      modules_k/acc/README
  2. 1 1
      modules_k/acc/acc_extra.c
  3. 1 1
      modules_k/acc/acc_extra.h
  4. 1 1
      modules_k/acc/acc_mod.c
  5. 6 6
      modules_k/acc/doc/acc_admin.xml
  6. 1 1
      modules_k/acc/etc/radiusclient.conf
  7. 1 1
      modules_k/alias_db/alias_db.c
  8. 1 1
      modules_k/alias_db/alias_db.h
  9. 1 1
      modules_k/alias_db/alookup.c
  10. 1 1
      modules_k/alias_db/alookup.h
  11. 2 2
      modules_k/auth/README
  12. 2 2
      modules_k/auth/doc/auth_admin.xml
  13. 1 1
      modules_k/auth_radius/sterman.c
  14. 1 1
      modules_k/avp_radius/avp_radius.c
  15. 1 1
      modules_k/avpops/README
  16. 2 2
      modules_k/avpops/avpops.c
  17. 2 2
      modules_k/avpops/avpops_db.c
  18. 2 2
      modules_k/avpops/avpops_db.h
  19. 2 2
      modules_k/avpops/avpops_impl.c
  20. 2 2
      modules_k/avpops/avpops_impl.h
  21. 2 2
      modules_k/avpops/avpops_parse.c
  22. 2 2
      modules_k/avpops/avpops_parse.h
  23. 2 2
      modules_k/avpops/doc/avpops_admin.xml
  24. 1 1
      modules_k/benchmark/README
  25. 2 2
      modules_k/benchmark/benchmark.c
  26. 1 1
      modules_k/benchmark/benchmark.h
  27. 1 1
      modules_k/benchmark/benchmark_api.h
  28. 1 1
      modules_k/benchmark/doc/benchmark_admin.xml
  29. 4 4
      modules_k/carrierroute/README
  30. 1 1
      modules_k/carrierroute/doc/carrierroute.xml
  31. 4 4
      modules_k/carrierroute/doc/carrierroute_admin.xml
  32. 1 1
      modules_k/cfgutils/README
  33. 1 1
      modules_k/cfgutils/doc/cfgutils_admin.xml
  34. 3 3
      modules_k/cpl-c/README
  35. 3 3
      modules_k/cpl-c/doc/cpl-c_admin.xml
  36. 14 14
      modules_k/db_berkeley/README
  37. 1 1
      modules_k/db_berkeley/bdb_lib.c
  38. 14 14
      modules_k/db_berkeley/doc/db_berkeley_admin.xml
  39. 2 2
      modules_k/db_mysql/README
  40. 2 2
      modules_k/db_mysql/db_mysql.c
  41. 2 2
      modules_k/db_mysql/doc/db_mysql_admin.xml
  42. 2 2
      modules_k/db_oracle/README
  43. 3 3
      modules_k/db_oracle/doc/db_oracle_admin.xml
  44. 1 1
      modules_k/db_postgres/dbase.c
  45. 1 1
      modules_k/db_text/README
  46. 1 1
      modules_k/db_text/doc/db_text_admin.xml
  47. 3 3
      modules_k/db_unixodbc/README
  48. 3 3
      modules_k/db_unixodbc/doc/db_unixodbc_admin.xml
  49. 2 2
      modules_k/dialplan/README
  50. 2 2
      modules_k/dialplan/doc/dialplan_admin.xml
  51. 1 1
      modules_k/dialplan/trex.h
  52. 4 4
      modules_k/dispatcher/README
  53. 1 1
      modules_k/dispatcher/doc/dispatcher.cfg
  54. 3 3
      modules_k/dispatcher/doc/dispatcher_admin.xml
  55. 1 1
      modules_k/domain/api.c
  56. 1 1
      modules_k/domain/api.h
  57. 12 12
      modules_k/h350/README
  58. 9 9
      modules_k/h350/doc/h350_admin.xml
  59. 1 1
      modules_k/h350/h350_exp_fn.c
  60. 1 1
      modules_k/h350/h350_exp_fn.h
  61. 1 1
      modules_k/h350/h350_mod.c
  62. 1 1
      modules_k/h350/h350_mod.h
  63. 10 10
      modules_k/imc/README
  64. 10 10
      modules_k/imc/doc/imc_admin.xml
  65. 20 20
      modules_k/ldap/README
  66. 1 1
      modules_k/ldap/api.h
  67. 15 15
      modules_k/ldap/doc/ldap_admin.xml
  68. 2 2
      modules_k/ldap/doc/ldap_devel.xml
  69. 1 1
      modules_k/ldap/etc/ldap.cfg
  70. 1 1
      modules_k/ldap/iniparser.c
  71. 1 1
      modules_k/ldap/iniparser.h
  72. 1 1
      modules_k/ldap/ld_session.c
  73. 1 1
      modules_k/ldap/ld_session.h
  74. 1 1
      modules_k/ldap/ldap_api_fn.c
  75. 1 1
      modules_k/ldap/ldap_api_fn.h
  76. 1 1
      modules_k/ldap/ldap_connect.c
  77. 1 1
      modules_k/ldap/ldap_connect.h
  78. 1 1
      modules_k/ldap/ldap_escape.c
  79. 1 1
      modules_k/ldap/ldap_escape.h
  80. 1 1
      modules_k/ldap/ldap_exp_fn.c
  81. 1 1
      modules_k/ldap/ldap_exp_fn.h
  82. 2 2
      modules_k/ldap/ldap_mod.c
  83. 1 1
      modules_k/mi_datagram/README
  84. 1 1
      modules_k/mi_datagram/doc/mi_datagram_faq.xml
  85. 1 1
      modules_k/mi_fifo/README
  86. 1 1
      modules_k/mi_fifo/doc/mi_fifo_admin.xml
  87. 1 1
      modules_k/mi_fifo/fifo_fnc.h
  88. 2 2
      modules_k/mi_xmlrpc/mi_xmlrpc.c
  89. 2 2
      modules_k/mi_xmlrpc/mi_xmlrpc.h
  90. 2 2
      modules_k/mi_xmlrpc/xr_parser.c
  91. 2 2
      modules_k/mi_xmlrpc/xr_parser.h
  92. 2 2
      modules_k/mi_xmlrpc/xr_server.c
  93. 2 2
      modules_k/mi_xmlrpc/xr_server.h
  94. 2 2
      modules_k/mi_xmlrpc/xr_writer.c
  95. 2 2
      modules_k/mi_xmlrpc/xr_writer.h
  96. 5 5
      modules_k/msilo/README
  97. 2 2
      modules_k/msilo/doc/msilo.cfg
  98. 3 3
      modules_k/msilo/doc/msilo_admin.xml
  99. 1 1
      modules_k/nat_traversal/README
  100. 2 2
      modules_k/nat_traversal/doc/nat_traversal_admin.xml

+ 5 - 5
modules_k/acc/README

@@ -210,10 +210,10 @@ Chapter 1. Admin Guide
    particular, accounting secret must match that one configured in
    server and proper dictionary is used (one is available at
    etc/sip_dictionary). Also note that Debian radiusclient-ng uses
-   /var/run/radius.seq as seqfile but OpenSER Debian init script
-   expects /var/run/openser/openser_radius.seq, so is needed to
-   change it in radiusclient-ng configuration or in OpenSER Debian
-   init script (if not, OpenSER can't create the seq file when not
+   /var/run/radius.seq as seqfile but Kamailio Debian init script
+   expects /var/run/kamailio/kamailio_radius.seq, so is needed to
+   change it in radiusclient-ng configuration or in Kamailio Debian
+   init script (if not, Kamailio can't create the seq file when not
    running as root). Uses along with FreeRadius (
    http://www.freeradius.org/) and Radiator (
    http://www.open.com.au/radiator/) servers have been reported to
@@ -270,7 +270,7 @@ if (uri=~"sip:+40") /* calls to Romania */ {
 
    The full list of supported pseudo-variables in Kamailio is
    availabe at:
-   http://openser.org/dokuwiki/doku.php/pseudovariables:devel
+   http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel
 
    Via log_name you define how/where the data will be logged. Its
    meaning depends of the accounting support which is used:

+ 1 - 1
modules_k/acc/acc_extra.c

@@ -5,7 +5,7 @@
  *
  * This file is part of Kamailio, a free SIP server.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 1 - 1
modules_k/acc/acc_extra.h

@@ -5,7 +5,7 @@
  *
  * This file is part of Kamailio, a free SIP server.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 1 - 1
modules_k/acc/acc_mod.c

@@ -51,7 +51,7 @@
  * - Module: \ref acc
  */
 
-/*! \defgroup acc ACC :: The OpenSER accounting Module
+/*! \defgroup acc ACC :: The Kamailio accounting Module
  *            
  * The ACC module is used to account transactions information to
  *  different backends like syslog, SQL, RADIUS and DIAMETER (beta

+ 6 - 6
modules_k/acc/doc/acc_admin.xml

@@ -109,10 +109,10 @@
 		In particular, accounting secret must match that one configured in
 		server and proper dictionary is used (one is available at 
 		etc/sip_dictionary). Also note that Debian radiusclient-ng uses
-		/var/run/radius.seq as seqfile but OpenSER Debian init script expects
-		/var/run/openser/openser_radius.seq, so is needed to change it in
-		radiusclient-ng configuration or in OpenSER Debian init script (if not,
-		OpenSER can't create the seq file when not running as root). Uses along
+		/var/run/radius.seq as seqfile but Kamailio Debian init script expects
+		/var/run/kamailio/kamailio_radius.seq, so is needed to change it in
+		radiusclient-ng configuration or in Kamailio Debian init script (if not,
+		Kamailio can't create the seq file when not running as root). Uses along
 		with FreeRadius (<ulink url='http://www.freeradius.org/'>
 		http://www.freeradius.org/</ulink>) and Radiator 
 		(<ulink url='http://www.open.com.au/radiator/'>
@@ -183,8 +183,8 @@ if (uri=~"sip:+40") /* calls to Romania */ {
 			<para>
 			The full list of supported pseudo-variables in &openser; is
 			availabe at: 
-			<ulink url="http://openser.org/dokuwiki/doku.php/pseudovariables:devel">
-			http://openser.org/dokuwiki/doku.php/pseudovariables:devel</ulink>
+			<ulink url="http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel">
+			http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel</ulink>
 			</para>
 			<para>
 			Via <emphasis>log_name</emphasis> you define how/where the 

+ 1 - 1
modules_k/acc/etc/radiusclient.conf

@@ -61,7 +61,7 @@ login_radius	/usr/local/sbin/login.radius
 #
 # if openser don't run as root, this directory should be used
 # the debian init script for example use this location
-seqfile		/var/run/openser/openser_radius.seq
+seqfile		/var/run/kamailio/kamailio_radius.seq
 
 # file which specifies mapping between ttyname and NAS-Port attribute
 mapfile		/usr/local/etc/radiusclient/port-id-map

+ 1 - 1
modules_k/alias_db/alias_db.c

@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 Voice Sistem SRL
  *
- * This file is part of a module for openser, a free SIP server.
+ * This file is part of a module for Kamailio, a free SIP server.
  *
  * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

+ 1 - 1
modules_k/alias_db/alias_db.h

@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 Voice Sistem
  *
- * This file is part of a module for openser, a free SIP server.
+ * This file is part of a module for Kamailio, a free SIP server.
  *
  * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

+ 1 - 1
modules_k/alias_db/alookup.c

@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 Voice Sistem SRL
  *
- * This file is part of a module for openser, a free SIP server.
+ * This file is part of a module for Kamailio, a free SIP server.
  *
  * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

+ 1 - 1
modules_k/alias_db/alookup.h

@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 Voice Sistem SRL
  *
- * This file is part of a module for openser, a free SIP server.
+ * This file is part of a module for Kamailio, a free SIP server.
  *
  * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

+ 2 - 2
modules_k/auth/README

@@ -453,8 +453,8 @@ append_rpid_hf("", ";party=calling;id-type=subscriber;screen=yes");
 ...
 $var(username)="abc";
 $avp(s:password)="xyz";
-if (pv_www_authorize("openser.org")) {
-        www_challenge("openser.org", "1");
+if (pv_www_authorize("kamailio.org")) {
+        www_challenge("kamailio.org", "1");
 };
 ...
 

+ 2 - 2
modules_k/auth/doc/auth_admin.xml

@@ -549,8 +549,8 @@ append_rpid_hf("", ";party=calling;id-type=subscriber;screen=yes");
 ...
 $var(username)="abc";
 $avp(s:password)="xyz";
-if (pv_www_authorize("openser.org")) {
-	www_challenge("openser.org", "1");
+if (pv_www_authorize("kamailio.org")) {
+	www_challenge("kamailio.org", "1");
 };
 ...
 </programlisting>

+ 1 - 1
modules_k/auth_radius/sterman.c

@@ -24,7 +24,7 @@
  * History:
  * -------
  * 2003-03-09: Based on digest.c from radius_auth module (janakj)
- * 2005-07-08: Radius AVP may contain any kind of OpenSER AVP - ID/name or
+ * 2005-07-08: Radius AVP may contain any kind of Kamailio AVP - ID/name or
  *             int/str value (bogdan)
  * 2005-07-08: old RPID RADIUS AVP compatibility droped (bogdan)
  */

+ 1 - 1
modules_k/avp_radius/avp_radius.c

@@ -22,7 +22,7 @@
  *
  * History:
  * -------
- * 2005-07-08: Radius AVP may contain any kind of OpenSER AVP - ID/name or
+ * 2005-07-08: Radius AVP may contain any kind of Kamailio AVP - ID/name or
  *             int/str value (bogdan)
  */
 

+ 1 - 1
modules_k/avpops/README

@@ -521,7 +521,7 @@ avp_copy("$avp(old)","$avp(new)/gd");
    Prints the formatted string 'format' in the AVP 'dest'. The
    'format' parameter can include any pseudo-variable defined in
    Kamailio. The list with all pseudo-variables in Kamailio can be
-   found at: http://openser.org/dokuwiki/.
+   found at: http://kamailio.org/dokuwiki/.
 
    Meaning of the parameters is as follows:
      * dest - in which AVP should be stored the result. Parameter

+ 2 - 2
modules_k/avpops/avpops.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_db.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_db.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_impl.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_impl.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_parse.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/avpops_parse.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2004-2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/avpops/doc/avpops_admin.xml

@@ -799,8 +799,8 @@ avp_copy("$avp(old)","$avp(new)/gd");
 			'format' parameter can include any pseudo-variable defined in
 			&openser;. The list with all pseudo-variables in &openser; can
 			be found at:	
-			<ulink url="http://openser.org/dokuwiki/">
-			http://openser.org/dokuwiki/</ulink>.
+			<ulink url="http://kamailio.org/dokuwiki/">
+			http://kamailio.org/dokuwiki/</ulink>.
 			</para>
 			<para>Meaning of the parameters is as follows:</para>
 			<itemizedlist>

+ 1 - 1
modules_k/benchmark/README

@@ -84,7 +84,7 @@ Chapter 1. Admin Guide
 
    This module helps developers to benchmark their module
    functions. By adding this module's functions via the
-   configuration file or through its API, OpenSER can log
+   configuration file or through its API, Kamailio can log
    profiling information for every function.
 
    The duration between calls to start_timer and log_timer is

+ 2 - 2
modules_k/benchmark/benchmark.c

@@ -1,7 +1,7 @@
 /*
  * $Id: benchmark.c 941 2007-04-11 12:37:21Z bastian $
  *
- * Benchmarking module for OpenSER
+ * Benchmarking module for Kamailio
  *
  * Copyright (C) 2007 Collax GmbH
  *                    (Bastian Friedrich <[email protected]>)
@@ -34,7 +34,7 @@
 
 /*! \defgroup benchmark Benchmark :: Developer benchmarking module
  *
- * This module is for OpenSER developers, as well as admins. It gives
+ * This module is for Kamailio developers, as well as admins. It gives
  * a possibility to clock certain critical paths in module code or 
  * configuration sections.
  * 

+ 1 - 1
modules_k/benchmark/benchmark.h

@@ -1,7 +1,7 @@
 /*
  * $Id: benchmark.h 825 2007-02-16 13:04:16Z bastian $
  *
- * Benchmarking module for OpenSER
+ * Benchmarking module for Kamailio
  *
  * Copyright (C) 2007 Collax GmbH
  *                    (Bastian Friedrich <[email protected]>)

+ 1 - 1
modules_k/benchmark/benchmark_api.h

@@ -1,7 +1,7 @@
 /*
  * $Id: benchmark_api.h 944 2007-04-11 12:43:49Z bastian $
  *
- * Benchmarking module for OpenSER
+ * Benchmarking module for Kamailio
  *
  * Copyright (C) 2007 Collax GmbH
  *                    (Bastian Friedrich <[email protected]>)

+ 1 - 1
modules_k/benchmark/doc/benchmark_admin.xml

@@ -8,7 +8,7 @@
 	<title>Overview</title>
 	<para>
 		This module helps developers to benchmark their module functions. By adding
-		this module's functions via the configuration file or through its API, OpenSER
+		this module's functions via the configuration file or through its API, Kamailio
 		can log profiling information for every function.
 	</para>
 	<para>

+ 4 - 4
modules_k/carrierroute/README

@@ -162,7 +162,7 @@ Chapter 1. Admin Guide
 
    The module provides routing, balancing and blacklisting
    capabilities. It reads routing entries from a database source
-   or from a config file at OpenSER startup. It can uses one
+   or from a config file at Kamailio startup. It can uses one
    routing tree (for one carrier), or if needed for every user a
    different routing tree (unique for each carrier) for number
    prefix based routing. It supports several route tree domains,
@@ -514,11 +514,11 @@ modparam("carrierroute", "config_source", "file")
 
    Specifies the path to the config file.
 
-   Default value is "/etc/openser/carrierroute.conf".
+   Default value is "/etc/kamailio/carrierroute.conf".
 
    Example 1.23. Set config_file parameter
 ...
-modparam("carrierroute", "config_file", "/etc/openser/carrierroute.conf"
+modparam("carrierroute", "config_file", "/etc/kamailio/carrierroute.conf"
 )
 ...
 
@@ -1098,7 +1098,7 @@ domain register {
    data. For that, if the table was not created by the
    installation script or you choose to install everything by
    yourself you can use the carrierroute-create.sql SQL script in
-   the database directories in the openser/scripts folder as
+   the database directories in the kamailio/scripts folder as
    template. Database and table name can be set with module
    parameters so they can be changed, but the name of the columns
    must be as they are in the SQL script. You can also find the

+ 1 - 1
modules_k/carrierroute/doc/carrierroute.xml

@@ -6,7 +6,7 @@
 <!ENTITY admin SYSTEM "carrierroute_admin.xml">
 <!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
 
-<!-- Include general OpenSER documentation entities -->
+<!-- Include general Kamailio documentation entities -->
 <!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
 %docentities;
 

+ 4 - 4
modules_k/carrierroute/doc/carrierroute_admin.xml

@@ -8,7 +8,7 @@
 	<para>A module which provides routing, balancing and blacklisting capabilities.</para>
 	<para>
 		The module provides routing, balancing and blacklisting capabilities.
-		It reads routing entries from a database source or from a config file at OpenSER
+		It reads routing entries from a database source or from a config file at Kamailio
 		startup. It can uses one routing tree (for one carrier), or if needed for every user
 		a different routing tree (unique for each carrier) for number prefix based routing.
 		It supports several route tree domains,	e.g. for failback routes or different routing
@@ -571,14 +571,14 @@ modparam("carrierroute", "config_source", "file")
 	    </para>
 	    <para>
 		    <emphasis>
-			    Default value is <quote>/etc/openser/carrierroute.conf</quote>.
+			    Default value is <quote>/etc/kamailio/carrierroute.conf</quote>.
 		    </emphasis>
 	    </para>
 	    <example>
 		    <title>Set <varname>config_file</varname> parameter</title>
 		    <programlisting format="linespecific">
 ...
-modparam("carrierroute", "config_file", "/etc/openser/carrierroute.conf")
+modparam("carrierroute", "config_file", "/etc/kamailio/carrierroute.conf")
 ...
 		    </programlisting>
 	    </example>
@@ -1479,7 +1479,7 @@ domain register {
 			the table was not created by the installation script or you choose
 			to install everything by yourself you can use the carrierroute-create.sql
 			<acronym>SQL</acronym> script in the database directories in the 
-			openser/scripts folder as template. 
+			kamailio/scripts folder as template. 
 			Database and table name can be set with module parameters so they 
 			can be changed, but the name of the columns must be as they are 
 			in the <acronym>SQL</acronym> script.

+ 1 - 1
modules_k/cfgutils/README

@@ -156,7 +156,7 @@ modparam("cfgutils", "initial_probability", 15)
 
    Example 1.2. hash_file parameter usage
 
-modparam("cfgutils", "hash_file", "/etc/openser/kamailio.cfg")
+modparam("cfgutils", "hash_file", "/etc/kamailio/kamailio.cfg")
 
 
 1.3.3. shvset (string)

+ 1 - 1
modules_k/cfgutils/doc/cfgutils_admin.xml

@@ -91,7 +91,7 @@ modparam("cfgutils", "initial_probability", 15)
 		<title><varname>hash_file</varname> parameter usage</title>
 		<programlisting format="linespecific">
    
-modparam("cfgutils", "hash_file", "/etc/openser/kamailio.cfg")
+modparam("cfgutils", "hash_file", "/etc/kamailio/kamailio.cfg")
    
 </programlisting>
 	    </example>

+ 3 - 3
modules_k/cpl-c/README

@@ -199,7 +199,7 @@ modparam("cpl-c","cpl_bin_column","cpl_bin")
 
    Example 1.7. Set cpl_dtd_file parameter
 ...
-modparam("cpl-c","cpl_dtd_file","/etc/openser/cpl-06.dtd")
+modparam("cpl-c","cpl_dtd_file","/etc/kamailio/cpl-06.dtd")
 ...
 
 1.3.8. log_dir (string)
@@ -213,7 +213,7 @@ modparam("cpl-c","cpl_dtd_file","/etc/openser/cpl-06.dtd")
 
    Example 1.8. Set log_dir parameter
 ...
-modparam("cpl-c","log_dir","/var/log/openser/cpl")
+modparam("cpl-c","log_dir","/var/log/kamailio/cpl")
 ...
 
 1.3.9. proxy_recurse (int)
@@ -496,7 +496,7 @@ if (method=="REGISTER") {
    that, if the table was not created by the installation script
    or you choose to install everything by yourself you can use the
    cpc-create.sql SQL script in the database directories in the
-   openser/scripts folder as template. Database and table name can
+   kamailio/scripts folder as template. Database and table name can
    be set with module parameters so they can be changed, but the
    name of the columns must be as they are in the SQL script. You
    can also find the complete database documentation on the

+ 3 - 3
modules_k/cpl-c/doc/cpl-c_admin.xml

@@ -214,7 +214,7 @@ modparam("cpl-c","cpl_bin_column","cpl_bin")
 				<title>Set <varname>cpl_dtd_file</varname> parameter</title>
 				<programlisting format="linespecific">
 ...
-modparam("cpl-c","cpl_dtd_file","/etc/openser/cpl-06.dtd")
+modparam("cpl-c","cpl_dtd_file","/etc/kamailio/cpl-06.dtd")
 ...
 </programlisting>
 			</example>
@@ -236,7 +236,7 @@ modparam("cpl-c","cpl_dtd_file","/etc/openser/cpl-06.dtd")
 				<title>Set <varname>log_dir</varname> parameter</title>
 				<programlisting format="linespecific">
 ...
-modparam("cpl-c","log_dir","/var/log/openser/cpl")
+modparam("cpl-c","log_dir","/var/log/kamailio/cpl")
 ...
 </programlisting>
 			</example>
@@ -681,7 +681,7 @@ if (method=="REGISTER") {
 			the table was not created by the installation script or you choose
 			to install everything by yourself you can use the cpc-create.sql
 			<acronym>SQL</acronym> script in the database directories in the 
-			openser/scripts folder as template. 
+			kamailio/scripts folder as template. 
 			Database and table name can be set with module parameters so they 
 			can be changed, but the name of the columns must be as they are 
 			in the <acronym>SQL</acronym> script.

+ 14 - 14
modules_k/db_berkeley/README

@@ -62,8 +62,8 @@ Chapter 1. Admin Guide
 
 1.1. Overview
 
-   This is a module which integrates the Berkeley DB into OpenSER.
-   It implements the DB API defined in OpenSER.
+   This is a module which integrates the Berkeley DB into Kamailio.
+   It implements the DB API defined in Kamailio.
 
 1.2. Dependencies
 
@@ -155,7 +155,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
    outside the scope of this document. Documentation for this
    procedure is available on the Internet.
 
-   Next, prepare to compile OpenSER with the db_berkeley module.
+   Next, prepare to compile Kamailio with the db_berkeley module.
    In the directory /modules/db_berkeley, modify the Makefile to
    point to your distribution of Berkeley DB. You may also define
    'BDB_EXTRA_DEBUG' to compile in extra debug logs. However, it
@@ -171,7 +171,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
        include_modules="db_berkeley"; make install
        include_modules="db_berkeley"'.
 
-   Installation of OpenSER is performed by simply running make
+   Installation of Kamailio is performed by simply running make
    install as root user of the main directory. This will install
    the binaries in /usr/local/sbin/. If this was successful,
    openser control engine files should now be installed as
@@ -179,27 +179,27 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 
    Decide where (on the filesystem) you want to install the
    Berkeley DB files. For instance,
-   '/usr/local/etc/openser/db_berkeley' directory. Make note of
+   '/usr/local/etc/kamailio/db_berkeley' directory. Make note of
    this directory as we need to add this path to the kamctlrc
-   file. Note: OpenSER will not startup without these DB files.
+   file. Note: Kamailio will not startup without these DB files.
 
    Edit kamctlrc - There are two parameters in this file that
    should be configured before openserctrdb script can work
    properly: DBENGINE and DB_PATH. Edit file:
-   '/usr/local/etc/openser/kamctlrc'
+   '/usr/local/etc/kamailio/kamctlrc'
                 ## database type: MYSQL, PGSQL, DB_BERKELEY, or DBTEXT,
 by default none is loaded
                 # DBENGINE=DB_BERKELEY
 
                 ## database path used by dbtext or db_berkeley
-                # DB_PATH="/usr/local/etc/openser/db_berkeley"
+                # DB_PATH="/usr/local/etc/kamailio/db_berkeley"
 
    (Optional) Pre creation step- Customize your meta-data. The DB
    files are initially seeded with necessary meta-data. This is a
    good time to review the meta-data section details, before
    making modifications to your tables dbschema. By default, the
    files are installed in
-   '/usr/local/share/openser/db_berkeley/openser' By default these
+   '/usr/local/share/kamailio/db_berkeley/openser' By default these
    tables are created Read/Write and without any journalling as
    shown. These settings can be modified on a per table basis.
    Note: If you plan to use bdb_recover, you must change the
@@ -215,11 +215,11 @@ by default none is loaded
                 kamdbctl presence           (optional)
                 kamdbctl extra              (optional)
 
-   Modify the OpenSER configuration file to use db_berkeley
+   Modify the Kamailio configuration file to use db_berkeley
    module. The database URL for modules must be the path to the
    directory where the Berkeley DB table-files are located,
    prefixed by "berkeley://", e.g.,
-   "berkeley:///usr/local/etc/openser/db_berkeley".
+   "berkeley:///usr/local/etc/kamailio/db_berkeley".
 
    A couple other IMPORTANT things to consider are the 'db_mode'
    and the 'use_domain' modparams. The description of these
@@ -398,7 +398,7 @@ r) last_name(str) email_address(str) datetime_created(datetime) timezone
 
 1.12. DB Maintaince Script : kamdbctl
 
-   Use the kamdbctl script for maintaining OpenSER Berkeley DB
+   Use the kamdbctl script for maintaining Kamailio Berkeley DB
    tables. This script assumes you have DBENGINE and DB_PATH setup
    correctly in kamctlrc. Note Unsupported commands are-
    backup, restore, migrate, copy, serweb.
@@ -425,14 +425,14 @@ tance of db; output DB_PATH/db.new)
    The db_berkeley module uses the Concurrent Data Store (CDS)
    architecture. As such, no transaction or journaling is provided
    by the DB natively. The application bdb_recover is specifically
-   written to recover data from journal files that OpenSER
+   written to recover data from journal files that Kamailio
    creates. The bdb_recover application requires an additional
    text file that contains the table schema.
 
    The schema is loaded with the '-s' option and is required for
    all operations. Provide the path to the db_berkeley plain-text
    schema files. By default, these install to
-   '/usr/local/share/openser/db_berkeley/openser/'.
+   '/usr/local/share/kamailio/db_berkeley/kamailio/'.
 
    The '-h' home option is the DB_PATH path. Unlike the Berkeley
    utilities, this application does not look for the DB_PATH

+ 1 - 1
modules_k/db_berkeley/bdb_lib.c

@@ -726,7 +726,7 @@ int bdblib_create_journal(table_p _tp)
 	
 	if(! _db_p || ! _tp) return -1;
 	if(! _db_parms->log_enable) return 0;
-	/* journal filename ; e.g. '/var/openser/db/location-YYYYMMDDhhmmss.jnl' */
+	/* journal filename ; e.g. '/var/kamailio/db/location-YYYYMMDDhhmmss.jnl' */
 	s=fn;
 	strncpy(s, _db_p->name.s, _db_p->name.len);
 	s+=_db_p->name.len;

+ 14 - 14
modules_k/db_berkeley/doc/db_berkeley_admin.xml

@@ -7,8 +7,8 @@
 	<section>
 	<title>Overview</title>
 	<para>
-		This is a module which integrates the Berkeley DB into OpenSER.
-		It implements the DB API defined in OpenSER.
+		This is a module which integrates the Berkeley DB into Kamailio.
+		It implements the DB API defined in Kamailio.
 	</para>
 	</section>
 
@@ -159,7 +159,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 		</para>
 		
 		<para>
-		Next, prepare to compile OpenSER with the db_berkeley module. 
+		Next, prepare to compile Kamailio with the db_berkeley module. 
 		In the directory /modules/db_berkeley, modify the Makefile to point 
 		to your distribution of Berkeley DB. You may also define 'BDB_EXTRA_DEBUG' 
 		to compile in extra debug logs. However, it is not a recommended 
@@ -188,7 +188,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 		</itemizedlist>
 		
 		<para>
-		Installation of OpenSER is performed by simply running make install
+		Installation of Kamailio is performed by simply running make install
 		as root user of the main directory. This will install the binaries 
 		in /usr/local/sbin/.
 		If this was successful, openser control engine files should now 
@@ -197,22 +197,22 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 		
 		<para>
 		Decide where (on the filesystem) you want to install the Berkeley DB files.
-		For instance, '/usr/local/etc/openser/db_berkeley' directory.
+		For instance, '/usr/local/etc/kamailio/db_berkeley' directory.
 		Make note of this directory as we need to add this path to the kamctlrc file.
-		Note: OpenSER will not startup without these DB files.
+		Note: Kamailio will not startup without these DB files.
 		</para>
 		
 		<para>
 		Edit kamctlrc - There are two parameters in this file that should be 
 		configured before openserctrdb script can work properly: DBENGINE and DB_PATH.
-		Edit file: '/usr/local/etc/openser/kamctlrc'
+		Edit file: '/usr/local/etc/kamailio/kamctlrc'
 		</para>
 	        <programlisting  format="linespecific">
 		## database type: MYSQL, PGSQL, DB_BERKELEY, or DBTEXT, by default none is loaded
 		# DBENGINE=DB_BERKELEY
 		
 		## database path used by dbtext or db_berkeley
-		# DB_PATH="/usr/local/etc/openser/db_berkeley"
+		# DB_PATH="/usr/local/etc/kamailio/db_berkeley"
 		</programlisting>
 		
 		<para>
@@ -220,7 +220,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 		The DB files are initially seeded with necessary meta-data. 
 		This is a good time to review the meta-data section details,
 		before making modifications to your tables dbschema.
-		By default, the files are installed in '/usr/local/share/openser/db_berkeley/openser'
+		By default, the files are installed in '/usr/local/share/kamailio/db_berkeley/openser'
 		By default these tables are created Read/Write and without any journalling as 
 		shown. These settings can be modified on a per table basis.
 		Note: If you plan to use bdb_recover, you must change the LOGFLAGS.
@@ -244,10 +244,10 @@ modparam("db_berkeley", "journal_roll_interval", 3600)
 		</programlisting>
 		
 		<para>
-		Modify the OpenSER configuration file to use db_berkeley module. 
+		Modify the Kamailio configuration file to use db_berkeley module. 
 		The database URL for modules must be the path to the directory where 
 		the Berkeley DB table-files are located, prefixed by "berkeley://", 
-		e.g., "berkeley:///usr/local/etc/openser/db_berkeley". 
+		e.g., "berkeley:///usr/local/etc/kamailio/db_berkeley". 
 		</para>
 		
 		<para>
@@ -491,7 +491,7 @@ username(str) domain(str) password(str) ha1(str) ha1b(str) first_name(str) last_
 	<title>DB Maintaince Script : kamdbctl </title>
 	
 	<para>
-	Use the kamdbctl script for maintaining OpenSER Berkeley DB tables.
+	Use the kamdbctl script for maintaining Kamailio Berkeley DB tables.
 	This script assumes you have DBENGINE and DB_PATH setup correctly in kamctlrc.
 	Note Unsupported commands are- backup, restore, migrate, copy, serweb.
 	<example>
@@ -518,7 +518,7 @@ usage: kamdbctl create
 	The db_berkeley module uses the Concurrent Data Store (CDS) architecture. 
 	As such, no transaction or journaling is provided by the DB natively. 
 	The application bdb_recover is specifically written to recover data from 
-	journal files that OpenSER creates.  
+	journal files that Kamailio creates.  
 	The bdb_recover application requires an additional text file that contains 
 	the table schema.
 	</para>
@@ -526,7 +526,7 @@ usage: kamdbctl create
 	<para>
 	The schema is loaded with the '-s' option and is required for all operations.
 	Provide the path to the db_berkeley plain-text schema files. By default, these
-	install to '/usr/local/share/openser/db_berkeley/openser/'.
+	install to '/usr/local/share/kamailio/db_berkeley/kamailio/'.
 	</para>
 	
 	<para>

+ 2 - 2
modules_k/db_mysql/README

@@ -45,8 +45,8 @@ Chapter 1. Admin Guide
 
 1.1. Overview
 
-   This is a module which provides MySQL connectivity for OpenSER.
-   It implements the DB API defined in OpenSER.
+   This is a module which provides MySQL connectivity for Kamailio.
+   It implements the DB API defined in Kamailio.
 
 1.2. Dependencies
 

+ 2 - 2
modules_k/db_mysql/db_mysql.c

@@ -35,8 +35,8 @@
  *  Module: \ref db_mysql
  */
 
-/*! \defgroup db_mysql DB_MYSQL :: the MySQL driver for OpenSER
- *  \brief The OpenSER database interface to the MySQL database
+/*! \defgroup db_mysql DB_MYSQL :: the MySQL driver for Kamailio
+ *  \brief The Kamailio database interface to the MySQL database
  *  - http://www.mysql.org
  *
  */

+ 2 - 2
modules_k/db_mysql/doc/db_mysql_admin.xml

@@ -7,8 +7,8 @@
 	<section>
 	<title>Overview</title>
 	<para>
-		This is a module which provides MySQL connectivity for OpenSER.
-		It implements the DB API defined in OpenSER.
+		This is a module which provides MySQL connectivity for Kamailio.
+		It implements the DB API defined in Kamailio.
 	</para>
 	</section>
 

+ 2 - 2
modules_k/db_oracle/README

@@ -54,7 +54,7 @@ Chapter 1. User's Guide
 1.1. Overview
 
    This is a module which provides Oracle connectivity for
-   OpenSER. It implements the DB API defined in OpenSER. If you
+   Kamailio. It implements the DB API defined in Kamailio. If you
    want to use the nathelper module, or any other modules that
    calls the get_all_ucontacts API export from usrloc, then you
    need to set the DORACLE_USRLOC define in the Makefile.defs file
@@ -137,5 +137,5 @@ modparam("db_oracle", "reconnect", 0.5)
    the utility openser_orasel, which formats printing
    approximately in the same way as the 'mysql' client utility. In
    addition, this utility known about the "agreements and types"
-   in DB that are used in OpenSER for the work with Oracle and
+   in DB that are used in Kamailio for the work with Oracle and
    formats printing taking these into account.

+ 3 - 3
modules_k/db_oracle/doc/db_oracle_admin.xml

@@ -7,8 +7,8 @@
 	<section>
 	<title>Overview</title>
 	<para>
-		This is a module which provides Oracle connectivity for OpenSER.
-		It implements the DB API defined in OpenSER. If you want to use
+		This is a module which provides Oracle connectivity for Kamailio.
+		It implements the DB API defined in Kamailio. If you want to use
 		the nathelper module, or any other modules that calls the
 		get_all_ucontacts API export from usrloc, then you need to set
 		the <emphasis>DORACLE_USRLOC</emphasis> define in the Makefile.defs
@@ -143,7 +143,7 @@ modparam("db_oracle", "reconnect", 0.5)
 		described in the db scheme). This problem has been solved by inclusion the 
 		utility openser_orasel, which formats printing approximately in the same 
 		way as the 'mysql' client utility. In addition, this utility known about 
-		the "agreements and types" in DB that are used in OpenSER for the work 
+		the "agreements and types" in DB that are used in Kamailio for the work 
 		with Oracle and formats printing taking these into account.
 		</para>
 	</section>

+ 1 - 1
modules_k/db_postgres/dbase.c

@@ -42,7 +42,7 @@
  *            a call (or multiple calls) to PQgetResult.
  *            Removed transaction processing calls (BEGIN/COMMIT/ROLLBACK) as 
  *            they added uneeded overhead.  Klaus' testing showed in excess of 
- *            1ms gain by removing each command.  In addition, OpenSER only 
+ *            1ms gain by removing each command.  In addition, Kamailio only 
  *            issues single queries and is not, at this time transaction aware.
  *            The transaction processing routines have been left in place 
  *            should this support be needed in the future.

+ 1 - 1
modules_k/db_text/README

@@ -200,7 +200,7 @@ modparam("db_text", "db_mode", 1)
 
    Example 1.5. Load the dbtext module
 ...
-loadmodule "/path/to/openser/modules/db_text.so"
+loadmodule "/path/to/kamailio/modules/db_text.so"
 ...
 modparam("module_name", "database_URL", "text:///path/to/dbtext/database
 ")

+ 1 - 1
modules_k/db_text/doc/db_text_admin.xml

@@ -283,7 +283,7 @@ modparam("db_text", "db_mode", 1)
 		<title>Load the dbtext module</title>
 <programlisting format="linespecific">
 ...
-loadmodule "/path/to/openser/modules/db_text.so"
+loadmodule "/path/to/kamailio/modules/db_text.so"
 ...
 modparam("module_name", "database_URL", "text:///path/to/dbtext/database")
 ...

+ 3 - 3
modules_k/db_unixodbc/README

@@ -130,13 +130,13 @@ modparam("db_unixodbc", "use_escape_common", 1)
 
    In the openser.conf file, add the line:
 ....
-loadmodule "/usr/local/lib/openser/modules/db_unixodbc.so"
+loadmodule "/usr/local/lib/kamailio/modules/db_unixodbc.so"
 ....
 
    You should also uncomment this:
 ....
-loadmodule "/usr/local/lib/openser/modules/auth.so"
-loadmodule "/usr/local/lib/openser/modules/auth_db.so"
+loadmodule "/usr/local/lib/kamailio/modules/auth.so"
+loadmodule "/usr/local/lib/kamailio/modules/auth_db.so"
 modparam("usrloc", "db_mode", 2)
 modparam("auth_db", "calculate_ha1", yes)
 modparam("auth_db", "password_column", "password")

+ 3 - 3
modules_k/db_unixodbc/doc/db_unixodbc_admin.xml

@@ -151,7 +151,7 @@ modparam("db_unixodbc", "use_escape_common", 1)
 	</para>
 	<programlisting format="linespecific">
 ....
-loadmodule "/usr/local/lib/openser/modules/db_unixodbc.so"
+loadmodule "/usr/local/lib/kamailio/modules/db_unixodbc.so"
 ....
 </programlisting>
 	<para>
@@ -159,8 +159,8 @@ loadmodule "/usr/local/lib/openser/modules/db_unixodbc.so"
 	</para>
 	<programlisting format="linespecific">
 ....
-loadmodule "/usr/local/lib/openser/modules/auth.so"
-loadmodule "/usr/local/lib/openser/modules/auth_db.so"
+loadmodule "/usr/local/lib/kamailio/modules/auth.so"
+loadmodule "/usr/local/lib/kamailio/modules/auth_db.so"
 modparam("usrloc", "db_mode", 2)
 modparam("auth_db", "calculate_ha1", yes)
 modparam("auth_db", "password_column", "password")

+ 2 - 2
modules_k/dialplan/README

@@ -347,10 +347,10 @@ xlog("translated to var $var(y) \n");
 
 1.8. Installation
 
-   The modules requires one table in OpenSER database:
+   The modules requires one table in Kamailio database:
    dialplan.The SQL syntax to create them can be found in
    dialplan-create.sql script in the database directories in the
-   openser/scripts folder. You can also find the complete database
+   kamailio/scripts folder. You can also find the complete database
    documentation on the project webpage,
    http://www.kamailio.org/docs/db-tables/openser-db-devel.html.
 

+ 2 - 2
modules_k/dialplan/doc/dialplan_admin.xml

@@ -496,9 +496,9 @@ xlog("translated to var $var(y) \n");
     <section>
 	    <title>Installation</title>
 	    <para>
-        The modules requires one table in OpenSER database: dialplan.The SQL 
+        The modules requires one table in Kamailio database: dialplan.The SQL 
         syntax to create them can be found in dialplan-create.sql     
-        script in the database directories in the openser/scripts folder.
+        script in the database directories in the kamailio/scripts folder.
         You can also find the complete database documentation on the
         project webpage, &openserdbdocslink;.
         </para>

+ 1 - 1
modules_k/dialplan/trex.h

@@ -30,7 +30,7 @@
 /****************************************************************
  * NOTE:
  * The code below is no longer the original T-Rex code as it was 
- * modified to meet the needs of integration into the OpenSER
+ * modified to meet the needs of integration into the Kamailio
  * code.
  *****************************************************************/
 

+ 4 - 4
modules_k/dispatcher/README

@@ -137,12 +137,12 @@ Chapter 1. Admin Guide
 
    Path to the file with destination sets.
 
-   Default value is "/etc/openser/dispatcher.list" or
-   "/usr/local/etc/openser/dispatcher.list".
+   Default value is "/etc/kamailio/dispatcher.list" or
+   "/usr/local/etc/kamailio/dispatcher.list".
 
    Example 1.1. Set the "list_file" parameter
 ...
-modparam("dispatcher", "list_file", "/var/run/openser/dispatcher.list")
+modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list")
 ...
 
 1.3.2. db_url (string)
@@ -625,7 +625,7 @@ port=5060
 # for more info: sip_router -h
 
 # ------------------ module loading ----------------------------------
-mpath="/usr/local/lib/openser/modules/"
+mpath="/usr/local/lib/kamailio/modules/"
 loadmodule "maxfwd.so"
 loadmodule "sl.so"
 loadmodule "dispatcher.so"

+ 1 - 1
modules_k/dispatcher/doc/dispatcher.cfg

@@ -15,7 +15,7 @@ port=5060
 # for more info: sip_router -h
 
 # ------------------ module loading ----------------------------------
-mpath="/usr/local/lib/openser/modules/"
+mpath="/usr/local/lib/kamailio/modules/"
 loadmodule "maxfwd.so"
 loadmodule "sl.so"
 loadmodule "dispatcher.so"

+ 3 - 3
modules_k/dispatcher/doc/dispatcher_admin.xml

@@ -57,15 +57,15 @@
 		</para>
 		<para>
 		<emphasis>
-			Default value is <quote>/etc/openser/dispatcher.list</quote> or
-			<quote>/usr/local/etc/openser/dispatcher.list</quote>.
+			Default value is <quote>/etc/kamailio/dispatcher.list</quote> or
+			<quote>/usr/local/etc/kamailio/dispatcher.list</quote>.
 		</emphasis>
 		</para>
 		<example>
 		<title>Set the <quote>list_file</quote> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("dispatcher", "list_file", "/var/run/openser/dispatcher.list")
+modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list")
 ...
 </programlisting>
 		</example>

+ 1 - 1
modules_k/domain/api.c

@@ -3,7 +3,7 @@
  *
  * This file is part of Kamailio, a free SIP server.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 1 - 1
modules_k/domain/api.h

@@ -3,7 +3,7 @@
  *
  * This file is part of Kamailio, a free SIP server.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 12 - 12
modules_k/h350/README

@@ -20,7 +20,7 @@ Christian Schlatter
 
         1.2. Dependencies
 
-              1.2.1. OpenSER Modules
+              1.2.1. Kamailio Modules
               1.2.2. External Libraries or Applications
 
         1.3. Exported Parameters
@@ -59,7 +59,7 @@ Chapter 1. Admin Guide
 
 1.1. Overview
 
-   The OpenSER H350 module enables an OpenSER SIP proxy server to
+   The Kamailio H350 module enables an Kamailio SIP proxy server to
    access SIP account data stored in an LDAP [RFC4510] directory
    containing H.350 [H.350] commObjects. ITU-T Recommendation
    H.350 standardizes LDAP object classes to store Real-Time
@@ -77,10 +77,10 @@ Chapter 1. Admin Guide
    to set up an H.350/LDAP directory and discusses different
    deployment scenarios.
 
-   The H350 module uses the OpenSER LDAP module to import H.350
-   attribute values into the OpenSER routing script variable
+   The H350 module uses the Kamailio LDAP module to import H.350
+   attribute values into the Kamailio routing script variable
    space. The module exports functions to parse and store the
-   H.350 attribute values from the OpenSER routing script. It
+   H.350 attribute values from the Kamailio routing script. It
    allows a script writer to implement H.350 based SIP digest
    authentication, call forwarding, SIP URI alias to AOR
    rewriting, and service level parsing.
@@ -139,7 +139,7 @@ objectClass                   top
 
 1.2. Dependencies
 
-1.2.1. OpenSER Modules
+1.2.1. Kamailio Modules
 
    The module depends on the following modules (the listed modules
    must be loaded before this module):
@@ -148,7 +148,7 @@ objectClass                   top
 1.2.2. External Libraries or Applications
 
    The following libraries or applications must be installed
-   before running OpenSER with this module loaded:
+   before running Kamailio with this module loaded:
      * OpenLDAP library (libldap), libldap header files
        (libldap-dev) are needed for compilation
 
@@ -195,7 +195,7 @@ modparam("h350", "search_scope", "sub");
    filter strings. The result of the LDAP search is stored
    internally and can be accessed either by one of the
    h350_result* or one of the ldap_result* functions from the
-   OpenSER LDAP module.
+   Kamailio LDAP module.
 
    The function returns -1 (FALSE) for internal errors, and -2
    (FALSE) if no H.350 commObject was found with a matching
@@ -209,7 +209,7 @@ modparam("h350", "search_scope", "sub");
 
    sip_uri
           H.350 SIPIdentitySIPURI to search for in directory.
-          Included OpenSER variables do get expanded.
+          Included Kamailio variables do get expanded.
 
    Return Values:
 
@@ -272,7 +272,7 @@ if (!h350_sipuri_lookup("sip:$rU@$rd"))
 
    auth_username
           H.350 SIPIdentityUserName to search for in directory.
-          Included OpenSER variables do get expanded.
+          Included Kamailio variables do get expanded.
 
    username_avp_spec
           Specification for authentication username AVP, e.g.
@@ -456,7 +456,7 @@ AVP value = argument / 1000
    $avp("s:prefix_f[2]]") = "sip:[email protected]".
 
    These AVPs can then be used to implement the desired behavior
-   in the OpenSER routing script.
+   in the Kamailio routing script.
 
    This function returns the number of successfully parsed simple
    call forwarding rules (TRUE), in case the H.350
@@ -544,7 +544,7 @@ if (is_avp_set("$avp(s:callee_pref_u)"))
    which can be used to store SIP account service level values in
    an LDAP directory. This function parses the
    SIPIdentityServiceLevel attribute and stores all service level
-   values as AVPs for later retrieval in the OpenSER routing
+   values as AVPs for later retrieval in the Kamailio routing
    script. The function accesses the H.350 commObject fetched by a
    call to h350_*_lookup or ldap_search.
 

+ 9 - 9
modules_k/h350/doc/h350_admin.xml

@@ -5,7 +5,7 @@
         <title>Overview</title>
 
         <para>
-			The OpenSER H350 module enables an OpenSER SIP proxy server to access SIP account data stored in an LDAP <xref linkend="RFC4510"/> directory containing H.350 <xref linkend="H350"/> <emphasis>commObjects</emphasis>. ITU-T Recommendation H.350 standardizes LDAP object classes to store Real-Time Communication (RTC) account data. In particular, <emphasis>H.350.4</emphasis> <xref linkend="H350-4"/> defines an object class called <emphasis>sipIdentity</emphasis> that includes attribute specifications for SIP account data like SIP URI, SIP digest username/password, or service level. This allows to store SIP account data in a vendor neutral way and lets different entities, like SIP proxies, provisioning, or billing applications, access the data in a standardized format.  
+			The Kamailio H350 module enables an Kamailio SIP proxy server to access SIP account data stored in an LDAP <xref linkend="RFC4510"/> directory containing H.350 <xref linkend="H350"/> <emphasis>commObjects</emphasis>. ITU-T Recommendation H.350 standardizes LDAP object classes to store Real-Time Communication (RTC) account data. In particular, <emphasis>H.350.4</emphasis> <xref linkend="H350-4"/> defines an object class called <emphasis>sipIdentity</emphasis> that includes attribute specifications for SIP account data like SIP URI, SIP digest username/password, or service level. This allows to store SIP account data in a vendor neutral way and lets different entities, like SIP proxies, provisioning, or billing applications, access the data in a standardized format.  
         </para>
         
         <para>
@@ -13,7 +13,7 @@
         </para>
         
         <para>
-            The H350 module uses the OpenSER LDAP module to import H.350 attribute values into the OpenSER routing script variable space. The module exports functions to parse and store the H.350 attribute values from the OpenSER routing script. It allows a script writer to implement H.350 based SIP digest authentication, call forwarding, SIP URI alias to AOR rewriting, and service level parsing. 
+            The H350 module uses the Kamailio LDAP module to import H.350 attribute values into the Kamailio routing script variable space. The module exports functions to parse and store the H.350 attribute values from the Kamailio routing script. It allows a script writer to implement H.350 based SIP digest authentication, call forwarding, SIP URI alias to AOR rewriting, and service level parsing. 
         </para>
 
     <section>
@@ -81,7 +81,7 @@ objectClass                   top
       <title>Dependencies</title>
 
       <section>
-        <title>OpenSER Modules</title>
+        <title>Kamailio Modules</title>
 
         <para>The module depends on the following modules (the listed modules
         must be loaded before this module):</para>
@@ -97,7 +97,7 @@ objectClass                   top
         <title>External Libraries or Applications</title>
 
         <para>The following libraries or applications must be installed before
-        running OpenSER with this module loaded:</para>
+        running Kamailio with this module loaded:</para>
 
         <itemizedlist>
           <listitem>
@@ -179,7 +179,7 @@ modparam("h350", "search_scope", "sub");
         <title>h350_sipuri_lookup(sip_uri)</title>
         
         <para>
-            This function performs an LDAP search query for an H.350 commObject with a SIPIdentitySIPURI of <varname>sip_uri</varname>. The <varname>sip_uri</varname> parameter first gets escaped according the rules for LDAP filter strings. The result of the LDAP search is stored internally and can be accessed either by one of the <emphasis>h350_result*</emphasis> or one of the <emphasis>ldap_result*</emphasis> functions from the OpenSER LDAP module.
+            This function performs an LDAP search query for an H.350 commObject with a SIPIdentitySIPURI of <varname>sip_uri</varname>. The <varname>sip_uri</varname> parameter first gets escaped according the rules for LDAP filter strings. The result of the LDAP search is stored internally and can be accessed either by one of the <emphasis>h350_result*</emphasis> or one of the <emphasis>ldap_result*</emphasis> functions from the Kamailio LDAP module.
         </para>
         
         <para>
@@ -198,7 +198,7 @@ modparam("h350", "search_scope", "sub");
 
                 <listitem>
                     <para>
-                        H.350 SIPIdentitySIPURI to search for in directory. Included OpenSER variables do get expanded.
+                        H.350 SIPIdentitySIPURI to search for in directory. Included Kamailio variables do get expanded.
                     </para>
                 </listitem>
             </varlistentry>
@@ -305,7 +305,7 @@ if (!h350_sipuri_lookup("sip:$rU@$rd"))
 
                 <listitem>
                     <para>
-                        H.350 SIPIdentityUserName to search for in directory. Included OpenSER variables do get expanded.
+                        H.350 SIPIdentityUserName to search for in directory. Included Kamailio variables do get expanded.
                     </para>
                 </listitem>
             </varlistentry>
@@ -549,7 +549,7 @@ AVP value = argument / 1000
         </para>
         
         <para>
-            These AVPs can then be used to implement the desired behavior in the OpenSER routing script.
+            These AVPs can then be used to implement the desired behavior in the Kamailio routing script.
         </para>
         
         <para>
@@ -679,7 +679,7 @@ if (is_avp_set("$avp(s:callee_pref_u)"))
         <title>h350_result_service_level(avp_name_prefix)</title>
         
         <para>
-			<emphasis>Directory services architecture for SIP</emphasis> <xref linkend="H350-4"/> defines a multi-valued LDAP attribute named SIPIdentityServiceLevel, which can be used to store SIP account service level values in an LDAP directory. This function parses the SIPIdentityServiceLevel attribute and stores all service level values as AVPs for later retrieval in the OpenSER routing script. The function accesses the H.350 commObject fetched by a call to <emphasis>h350_*_lookup</emphasis> or <emphasis>ldap_search</emphasis>. 
+			<emphasis>Directory services architecture for SIP</emphasis> <xref linkend="H350-4"/> defines a multi-valued LDAP attribute named SIPIdentityServiceLevel, which can be used to store SIP account service level values in an LDAP directory. This function parses the SIPIdentityServiceLevel attribute and stores all service level values as AVPs for later retrieval in the Kamailio routing script. The function accesses the H.350 commObject fetched by a call to <emphasis>h350_*_lookup</emphasis> or <emphasis>ldap_search</emphasis>. 
         </para>
         
         <para>

+ 1 - 1
modules_k/h350/h350_exp_fn.c

@@ -1,7 +1,7 @@
 /*
  * $Id: $
  *
- * OpenSER H.350 Module
+ * Kamailio H.350 Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/h350/h350_exp_fn.h

@@ -1,7 +1,7 @@
 /*
  * $Id: $
  *
- * OpenSER H.350 Module
+ * Kamailio H.350 Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/h350/h350_mod.c

@@ -1,7 +1,7 @@
 /* 
  * $Id: $
  *
- * OpenSER H.350 Module
+ * Kamailio H.350 Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/h350/h350_mod.h

@@ -1,7 +1,7 @@
 /*
  * $Id: $
  *
- * OpenSER H.350 Module
+ * Kamailio H.350 Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 10 - 10
modules_k/imc/README

@@ -162,8 +162,8 @@ modparam("imc", "imc_cmd_start_char", "#")
 1.3.6. outbound_proxy (str)
 
    The SIP address used as next hop when sending the message. Very
-   useful when using OpenSER with a domain name not in DNS, or
-   when using a separate OpenSER instance for imc processing. If
+   useful when using Kamailio with a domain name not in DNS, or
+   when using a separate Kamailio instance for imc processing. If
    not set, the message will be sent to the address in destination
    URI.
 
@@ -171,7 +171,7 @@ modparam("imc", "imc_cmd_start_char", "#")
 
    Example 1.6. Set outbound_proxy parameter
 ...
-modparam("imc", "outbound_proxy", "sip:openser.org;transport=tcp")
+modparam("imc", "outbound_proxy", "sip:kamailio.org;transport=tcp")
 ...
 
 1.4. Exported Functions
@@ -254,8 +254,8 @@ if(is_method("MESSAGE)
     present it will be considered to be the address in the To
     header of the message
   -if the room does not exist the command is treated as create
-  -eg:join sip:chat-000@openser.org,
-      or just, #join, sent to sip:chat-000@openser.org
+  -eg:join sip:chat-000@kamailio.org,
+      or just, #join, sent to sip:chat-000@kamailio.org
 
 3.invite
   -invites a user to become a member of a room
@@ -265,15 +265,15 @@ if(is_method("MESSAGE)
            to be the address in the To header of the message
   -only certain users have the right to invite other user: the owner
     and the administrators
-  -eg: #invite sip:john@openser.org sip:chat-000@openser.org
-    or  #invite john@openser.org sent to sip:chat-000@openser.org
+  -eg: #invite sip:john@kamailio.org sip:chat-000@kamailio.org
+    or  #invite john@kamailio.org sent to sip:chat-000@kamailio.org
 
 4.accept
   -accepting an invitation
   -takes one optional parameter - the address of the room - if not
     present it will be considered to be the address in the To header
     of the message
-  -eg: #accept sip:john@openser.org
+  -eg: #accept sip:john@kamailio.org
 
 5.deny
   -rejects an invitation
@@ -286,7 +286,7 @@ if(is_method("MESSAGE)
     2)the address of the room -if not present it will be considered
           to be the address in the To header of the message
   -only certain members have the right to remove other members
-  -eg: #remove sip:john@openser.org, sent to sip:chat-000@openser.org
+  -eg: #remove sip:john@kamailio.org, sent to sip:chat-000@kamailio.org
 
 7.exit
   -leaving a room
@@ -312,6 +312,6 @@ if(is_method("MESSAGE)
    if the tables were not created by the installation script or
    you choose to install everything by yourself you can use the
    imc-create.sql SQL script in the database directories in the
-   openser/scripts folder as template. You can also find the
+   kamailio/scripts folder as template. You can also find the
    complete database documentation on the project webpage,
    http://www.kamailio.org/docs/db-tables/openser-db-devel.html.

+ 10 - 10
modules_k/imc/doc/imc_admin.xml

@@ -162,8 +162,8 @@ modparam("imc", "imc_cmd_start_char", "#")
 		<title><varname>outbound_proxy</varname> (str)</title>
 		<para>
 	   The SIP address used as next hop when sending the message. Very
-   useful when using OpenSER with a domain name not in DNS, or
-   when using a separate OpenSER instance for imc processing. If
+   useful when using Kamailio with a domain name not in DNS, or
+   when using a separate Kamailio instance for imc processing. If
    not set, the message will be sent to the address in destination
    URI.
 		</para>
@@ -176,7 +176,7 @@ modparam("imc", "imc_cmd_start_char", "#")
 		<title>Set <varname>outbound_proxy</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("imc", "outbound_proxy", "sip:openser.org;transport=tcp")
+modparam("imc", "outbound_proxy", "sip:kamailio.org;transport=tcp")
 ...
 </programlisting>
 		</example>
@@ -307,8 +307,8 @@ if(is_method("MESSAGE)
     present it will be considered to be the address in the To
     header of the message
   -if the room does not exist the command is treated as create
-  -eg:join sip:chat-000@openser.org,
-      or just, #join, sent to sip:chat-000@openser.org
+  -eg:join sip:chat-000@kamailio.org,
+      or just, #join, sent to sip:chat-000@kamailio.org
 
 3.invite
   -invites a user to become a member of a room
@@ -318,15 +318,15 @@ if(is_method("MESSAGE)
 	   to be the address in the To header of the message
   -only certain users have the right to invite other user: the owner
     and the administrators
-  -eg: #invite sip:john@openser.org sip:chat-000@openser.org
-    or  #invite john@openser.org sent to sip:chat-000@openser.org
+  -eg: #invite sip:john@kamailio.org sip:chat-000@kamailio.org
+    or  #invite john@kamailio.org sent to sip:chat-000@kamailio.org
 
 4.accept
   -accepting an invitation
   -takes one optional parameter - the address of the room - if not
     present it will be considered to be the address in the To header
     of the message
-  -eg: #accept sip:john@openser.org
+  -eg: #accept sip:john@kamailio.org
 
 5.deny
   -rejects an invitation
@@ -339,7 +339,7 @@ if(is_method("MESSAGE)
     2)the address of the room -if not present it will be considered
 	  to be the address in the To header of the message
   -only certain members have the right to remove other members
-  -eg: #remove sip:john@openser.org, sent to sip:chat-000@openser.org
+  -eg: #remove sip:john@kamailio.org, sent to sip:chat-000@kamailio.org
 
 7.exit
   -leaving a room
@@ -368,7 +368,7 @@ if(is_method("MESSAGE)
 		tables were not created by the installation script or you choose
 		to install everything by yourself you can use the imc-create.sql
 		<acronym>SQL</acronym> script in the database directories in the 
-		openser/scripts folder as template. 
+		kamailio/scripts folder as template. 
 		You can also find the complete database documentation on the
 		project webpage, &openserdbdocslink;.
 		</para>

+ 20 - 20
modules_k/ldap/README

@@ -21,7 +21,7 @@ Christian Schlatter
 
         1.2. Dependencies
 
-              1.2.1. OpenSER Modules
+              1.2.1. Kamailio Modules
               1.2.2. External Libraries or Applications
 
         1.3. LDAP Configuration File
@@ -100,9 +100,9 @@ Chapter 1. Admin Guide
 1.1. Overview
 
    The LDAP module implements an LDAP search interface for
-   OpenSER. It exports script functions to perform an LDAP search
-   operation and to store the search results as OpenSER AVPs. This
-   allows for using LDAP directory data in the OpenSER SIP message
+   Kamailio. It exports script functions to perform an LDAP search
+   operation and to store the search results as Kamailio AVPs. This
+   allows for using LDAP directory data in the Kamailio SIP message
    routing script.
 
    The following features are offered by the LDAP module:
@@ -113,19 +113,19 @@ Chapter 1. Admin Guide
      * LDAP server failover and automatic reconnect
      * Configurable LDAP connection and bind timeouts
      * Module API for LDAP search operations that can be used by
-       other OpenSER modules
+       other Kamailio modules
 
    The module implementation makes use of the open source OpenLDAP
    library available on most UNIX/Linux platforms. Besides LDAP
    server failover and automatic reconnect, this module can handle
    multiple LDAP sessions concurrently allowing to access data
-   stored on different LDAP servers. Each OpenSER worker process
+   stored on different LDAP servers. Each Kamailio worker process
    maintains one LDAP TCP connection per configured LDAP server.
    This enables parallel execution of LDAP requests and offloads
    LDAP concurrency control to the LDAP server(s).
 
    An LDAP search module API is provided that can be used by other
-   OpenSER modules. A module using this API does not have to
+   Kamailio modules. A module using this API does not have to
    implement LDAP connection management and configuration, while
    still having access to the full OpenLDAP API for searching and
    result handling.
@@ -134,7 +134,7 @@ Chapter 1. Admin Guide
    access they are a good choice to store SIP provisioning data.
    Performance tests have shown that this module achieves lower
    data access times and higher call rates than other database
-   modules like e.g. the OpenSER MYSQL module.
+   modules like e.g. the Kamailio MYSQL module.
 
 1.1.1. Usage Basics
 
@@ -144,7 +144,7 @@ Chapter 1. Admin Guide
    access parameters like server hostname or connection timeouts.
    Normally only a single LDAP session will be used unless there
    is a need to access more than one LDAP server. The LDAP session
-   name will then be used in the OpenSER configuration script to
+   name will then be used in the Kamailio configuration script to
    refer to a specific LDAP session.
 
    The ldap_search function (Section 1.5.1,
@@ -168,7 +168,7 @@ Chapter 1. Admin Guide
 
    All ldap_result* functions do always access the LDAP result set
    from the last ldap_search call. This should be kept in mind
-   when calling ldap_search more than once in the OpenSER
+   when calling ldap_search more than once in the Kamailio
    configuration script.
 
 1.1.2. LDAP URLs
@@ -231,16 +231,16 @@ Note
 
 1.2. Dependencies
 
-1.2.1. OpenSER Modules
+1.2.1. Kamailio Modules
 
    The module depends on the following modules (the listed modules
    must be loaded before this module):
-     * No dependencies on other OpenSER modules.
+     * No dependencies on other Kamailio modules.
 
 1.2.2. External Libraries or Applications
 
    The following libraries or applications must be installed
-   before running OpenSER with this module loaded:
+   before running Kamailio with this module loaded:
      * OpenLDAP library (libldap) v2.1 or greater, libldap header
        files (libldap-dev) are needed for compilation
 
@@ -266,7 +266,7 @@ key = value ; comment
    comments.
 
    Each section describes one LDAP session that can be referred to
-   in the OpenSER configuration script. Using the section name as
+   in the Kamailio configuration script. Using the section name as
    the host part of an LDAP URL tells the module to use the LDAP
    session specified in the respective section. An example LDAP
    session specification looks like:
@@ -391,10 +391,10 @@ ldap_client_bind_timeout = 500
 
    Full path to LDAP configuration file.
 
-   Default value: /usr/local/etc/openser/ldap.cfg
+   Default value: /usr/local/etc/kamailio/ldap.cfg
 
    Example 1.8. config_file parameter usage
-modparam("ldap", "config_file", "/etc/openser/ldap.ini")
+modparam("ldap", "config_file", "/etc/kamailio/ldap.ini")
 
 1.5. Exported Functions
 
@@ -404,7 +404,7 @@ modparam("ldap", "config_file", "/etc/openser/ldap.ini")
    stores result internally for later retrieval by ldap_result*
    functions. If one ore more LDAP entries are found the function
    returns the number of found entries which evaluates to TRUE in
-   the OpenSER configuration script. It returns -1 (FALSE) in case
+   the Kamailio configuration script. It returns -1 (FALSE) in case
    no LDAP entry was found, and -2 (FALSE) if an internal error
    like e.g. an LDAP error occurred.
 
@@ -416,7 +416,7 @@ modparam("ldap", "config_file", "/etc/openser/ldap.ini")
           URL format). The hostport part must be one of the LDAP
           session names declared in the LDAP configuration script.
 
-          OpenSER pseudo variables and AVPs included in ldap_url
+          Kamailio pseudo variables and AVPs included in ldap_url
           do get substituted with their value.
 
           Example 1.9. Example Usage of ldap_url
@@ -756,7 +756,7 @@ Chapter 2. Developer Guide
 
 2.1. Overview
 
-   The LDAP module API can be used by other OpenSER modules to
+   The LDAP module API can be used by other Kamailio modules to
    implement LDAP search functionality. This frees the module
    implementer from having to care about LDAP connection
    management and configuration.
@@ -1021,7 +1021,7 @@ typedef int (*ldap_rfc4515_escape_t)(str *sin, str *sout, int url_encode
    Returns the OpenLDAP LDAP handle for a specific LDAP session.
    This allows a module implementor to use the OpenLDAP API
    functions directly, instead of using the API functions exported
-   by the OpenSER LDAP module. The LDAP structure is defined in
+   by the Kamailio LDAP module. The LDAP structure is defined in
    OpenLDAP's ldap.h, which has to be included.
 typedef int (*get_ldap_handle_t)(char* _lds_name, LDAP** _ldap_handle);
 

+ 1 - 1
modules_k/ldap/api.h

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 15 - 15
modules_k/ldap/doc/ldap_admin.xml

@@ -4,7 +4,7 @@
     <section>
       <title>Overview</title>
 
-      <para>The LDAP module implements an LDAP search interface for OpenSER. It exports script functions to perform an LDAP search operation and to store the search results as OpenSER AVPs. This allows for using LDAP directory data in the OpenSER SIP message routing script.</para>
+      <para>The LDAP module implements an LDAP search interface for Kamailio. It exports script functions to perform an LDAP search operation and to store the search results as Kamailio AVPs. This allows for using LDAP directory data in the Kamailio SIP message routing script.</para>
       
       <para>The following features are offered by the LDAP module:</para>
       <itemizedlist>
@@ -27,21 +27,21 @@
             <para>Configurable LDAP connection and bind timeouts</para>
         </listitem>
 		<listitem>
-            <para>Module API for LDAP search operations that can be used by other OpenSER modules</para>
+            <para>Module API for LDAP search operations that can be used by other Kamailio modules</para>
         </listitem>
       </itemizedlist> 
       
-      <para>The module implementation makes use of the open source OpenLDAP library available on most UNIX/Linux platforms. Besides LDAP server failover and automatic reconnect, this module can handle multiple LDAP sessions concurrently allowing to access data stored on different LDAP servers. Each OpenSER worker process maintains one LDAP TCP connection per configured LDAP server. This enables parallel execution of LDAP requests and offloads LDAP concurrency control to the LDAP server(s).</para>
+      <para>The module implementation makes use of the open source OpenLDAP library available on most UNIX/Linux platforms. Besides LDAP server failover and automatic reconnect, this module can handle multiple LDAP sessions concurrently allowing to access data stored on different LDAP servers. Each Kamailio worker process maintains one LDAP TCP connection per configured LDAP server. This enables parallel execution of LDAP requests and offloads LDAP concurrency control to the LDAP server(s).</para>
       
-      <para>An LDAP search module API is provided that can be used by other OpenSER modules. A module using this API does not have to implement LDAP connection management and configuration, while still having access to the full OpenLDAP API for searching and result handling.</para> 
+      <para>An LDAP search module API is provided that can be used by other Kamailio modules. A module using this API does not have to implement LDAP connection management and configuration, while still having access to the full OpenLDAP API for searching and result handling.</para> 
       
-      <para>Since LDAP server implementations are optimized for fast read access they are a good choice to store SIP provisioning data. Performance tests have shown that this module achieves lower data access times and higher call rates than other database modules like e.g. the OpenSER MYSQL module.</para>
+      <para>Since LDAP server implementations are optimized for fast read access they are a good choice to store SIP provisioning data. Performance tests have shown that this module achieves lower data access times and higher call rates than other database modules like e.g. the Kamailio MYSQL module.</para>
 
       <section>
         <title>Usage Basics</title>
 
         <para>
-			First so called LDAP sessions have to be specified in an external configuration file (as described in <xref linkend="ldap-config" xreflabel="LDAP Configuration File"/>). Each LDAP session includes LDAP server access parameters like server hostname or connection timeouts. Normally only a single LDAP session will be used unless there is a need to access more than one LDAP server. The LDAP session name will then be used in the OpenSER configuration script to refer to a specific LDAP session.
+			First so called LDAP sessions have to be specified in an external configuration file (as described in <xref linkend="ldap-config" xreflabel="LDAP Configuration File"/>). Each LDAP session includes LDAP server access parameters like server hostname or connection timeouts. Normally only a single LDAP session will be used unless there is a need to access more than one LDAP server. The LDAP session name will then be used in the Kamailio configuration script to refer to a specific LDAP session.
         </para>
 
         <para>
@@ -53,7 +53,7 @@
         </para>
         
         <para>
-        All <varname>ldap_result*</varname> functions do always access the LDAP result set from the last <varname>ldap_search</varname> call. This should be kept in mind when calling <varname>ldap_search</varname> more than once in the OpenSER configuration script.
+        All <varname>ldap_result*</varname> functions do always access the LDAP result set from the last <varname>ldap_search</varname> call. This should be kept in mind when calling <varname>ldap_search</varname> more than once in the Kamailio configuration script.
         </para>
       </section>
 
@@ -174,14 +174,14 @@
       <title>Dependencies</title>
 
       <section>
-        <title>OpenSER Modules</title>
+        <title>Kamailio Modules</title>
 
         <para>The module depends on the following modules (the listed modules
         must be loaded before this module):</para>
 
         <itemizedlist>
           <listitem>
-            <para><emphasis>No dependencies on other OpenSER modules.</emphasis></para>
+            <para><emphasis>No dependencies on other Kamailio modules.</emphasis></para>
           </listitem>
         </itemizedlist>
       </section>
@@ -190,7 +190,7 @@
         <title>External Libraries or Applications</title>
 
         <para>The following libraries or applications must be installed before
-        running OpenSER with this module loaded:</para>
+        running Kamailio with this module loaded:</para>
 
         <itemizedlist>
           <listitem>
@@ -220,7 +220,7 @@
         are treated as comments.</para>
 
         <para>Each section describes one LDAP session that can be referred to
-        in the OpenSER configuration script. Using the section name as the
+        in the Kamailio configuration script. Using the section name as the
         host part of an LDAP URL tells the module to use the LDAP session
         specified in the respective section. An example LDAP session
         specification looks like:
@@ -404,13 +404,13 @@ ldap_client_bind_timeout = 500
         <para>Full path to LDAP configuration file.</para>
 
         <para>Default value:
-        <varname>/usr/local/etc/openser/ldap.cfg</varname></para>
+        <varname>/usr/local/etc/kamailio/ldap.cfg</varname></para>
 
         <example>
           <title><varname>config_file</varname> parameter usage</title>
 
           <programlisting format="linespecific">
-modparam("ldap", "config_file", "/etc/openser/ldap.ini")
+modparam("ldap", "config_file", "/etc/kamailio/ldap.ini")
 		  </programlisting>
         </example>
       </section>
@@ -425,7 +425,7 @@ modparam("ldap", "config_file", "/etc/openser/ldap.ini")
         <para>Performs an LDAP search operation using given LDAP URL and stores result
         internally for later retrieval by <varname>ldap_result*</varname> functions. If one ore
         more LDAP entries are found the function returns the number of found
-        entries which evaluates to TRUE in the OpenSER configuration script.
+        entries which evaluates to TRUE in the Kamailio configuration script.
         It returns <varname>-1</varname> (<varname>FALSE</varname>) in case no
         LDAP entry was found, and <varname>-2</varname>
         (<varname>FALSE</varname>) if an internal error like e.g. an LDAP
@@ -443,7 +443,7 @@ modparam("ldap", "config_file", "/etc/openser/ldap.ini")
               format). The hostport part must be one of the LDAP session names
               declared in the LDAP configuration script.</para>
 
-              <para>OpenSER pseudo variables and AVPs included in
+              <para>Kamailio pseudo variables and AVPs included in
               <varname>ldap_url</varname> do get substituted with their
               value.</para>
 

+ 2 - 2
modules_k/ldap/doc/ldap_devel.xml

@@ -5,7 +5,7 @@
 	<section>
 		<title>Overview</title>
 		<para>
-			The LDAP module API can be used by other OpenSER modules to implement LDAP search functionality. This frees the module implementer from having to care about LDAP connection management and configuration. 
+			The LDAP module API can be used by other Kamailio modules to implement LDAP search functionality. This frees the module implementer from having to care about LDAP connection management and configuration. 
 		</para>
 		<para>
 			In order to use this API, a module has to load the API using the <varname>load_ldap_api</varname> function which returns a pointer to a <varname>ldap_api</varname> structure. This structure includes pointers to the API functions described below. The LDAP module source file <varname>api.h</varname> includes all declarations needed to load the API, it has to be included in the file that loads the API. Loading the API is typically done inside a module's <varname>mod_init</varname> call as the following example shows:			
@@ -431,7 +431,7 @@ typedef int (*ldap_rfc4515_escape_t)(str *sin, str *sout, int url_encode);
 		<section>
 			<title>get_ldap_handle</title>
 			<para>
-				Returns the OpenLDAP LDAP handle for a specific LDAP session. This allows a module implementor to use the OpenLDAP API functions directly, instead of using the API functions exported by the OpenSER LDAP module. The <varname>LDAP</varname> structure is defined in OpenLDAP's <varname>ldap.h</varname>, which has to be included.
+				Returns the OpenLDAP LDAP handle for a specific LDAP session. This allows a module implementor to use the OpenLDAP API functions directly, instead of using the API functions exported by the Kamailio LDAP module. The <varname>LDAP</varname> structure is defined in OpenLDAP's <varname>ldap.h</varname>, which has to be included.
 			</para>
 			<programlisting><![CDATA[
 typedef int (*get_ldap_handle_t)(char* _lds_name, LDAP** _ldap_handle);

+ 1 - 1
modules_k/ldap/etc/ldap.cfg

@@ -1,5 +1,5 @@
 # 
-# OpenSER LDAP module example configuration
+# Kamailio LDAP module example configuration
 #
 
 # LDAP session "sipaccounts":

+ 1 - 1
modules_k/ldap/iniparser.c

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 1 - 1
modules_k/ldap/iniparser.h

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 1 - 1
modules_k/ldap/ld_session.c

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 1 - 1
modules_k/ldap/ld_session.h

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 1 - 1
modules_k/ldap/ldap_api_fn.c

@@ -1,7 +1,7 @@
 /*
 * $Id$
 *
-* OpenSER LDAP Module
+* Kamailio LDAP Module
 *
 * Copyright (C) 2007 University of North Carolina
 *

+ 1 - 1
modules_k/ldap/ldap_api_fn.h

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_connect.c

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_connect.h

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_escape.c

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_escape.h

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_exp_fn.c

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 1 - 1
modules_k/ldap/ldap_exp_fn.h

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *

+ 2 - 2
modules_k/ldap/ldap_mod.c

@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * OpenSER LDAP Module
+ * Kamailio LDAP Module
  *
  * Copyright (C) 2007 University of North Carolina
  *
@@ -83,7 +83,7 @@ static int w_ldap_result_check_2(struct sip_msg* msg,
 /* 
 * Default module parameter values 
 */
-#define DEF_LDAP_CONFIG "/usr/local/etc/openser/ldap.cfg"
+#define DEF_LDAP_CONFIG "/usr/local/etc/kamailio/ldap.cfg"
 
 /*
 * Module parameter variables

+ 1 - 1
modules_k/mi_datagram/README

@@ -212,7 +212,7 @@ Chapter 2. Frequently Asked Questions
 
    2.3.
 
-       Where can I find more about OpenSER?
+       Where can I find more about Kamailio?
 
        Take a look at http://www.kamailio.org/.
 

+ 1 - 1
modules_k/mi_datagram/doc/mi_datagram_faq.xml

@@ -29,7 +29,7 @@
 	</qandaentry>
 	<qandaentry>
 		<question>
-		<para>Where can I find more about OpenSER?</para>
+		<para>Where can I find more about Kamailio?</para>
 		</question>
 		<answer>
 		<para>

+ 1 - 1
modules_k/mi_fifo/README

@@ -136,7 +136,7 @@ modparam("mi_fifo", "fifo_user", "root")
 
    Example 1.5. Set reply_dir parameter
 ...
-modparam("mi_fifo", "reply_dir", "/home/openser/tmp/")
+modparam("mi_fifo", "reply_dir", "/home/kamailio/tmp/")
 ...
 
 1.4.6. reply_indent (string)

+ 1 - 1
modules_k/mi_fifo/doc/mi_fifo_admin.xml

@@ -173,7 +173,7 @@ modparam("mi_fifo", "fifo_user", "root")
 		<title>Set <varname>reply_dir</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("mi_fifo", "reply_dir", "/home/openser/tmp/")
+modparam("mi_fifo", "reply_dir", "/home/kamailio/tmp/")
 ...
 </programlisting>
 		</example>

+ 1 - 1
modules_k/mi_fifo/fifo_fnc.h

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of a module for openser, a free SIP server.
+ * This file is part of a module for Kamailio, a free SIP server.
  *
  * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

+ 2 - 2
modules_k/mi_xmlrpc/mi_xmlrpc.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/mi_xmlrpc.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_parser.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_parser.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_server.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_server.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_writer.c

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 2 - 2
modules_k/mi_xmlrpc/xr_writer.h

@@ -3,9 +3,9 @@
  *
  * Copyright (C) 2006 Voice Sistem SRL
  *
- * This file is part of Open SIP Express Router (openser).
+ * This file is part of Kamailio.
  *
- * openser is free software; you can redistribute it and/or
+ * Kamailio is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.

+ 5 - 5
modules_k/msilo/README

@@ -251,8 +251,8 @@ modparam("msilo", "reminder", "sip:[email protected]")
 1.3.8. outbound_proxy (string)
 
    The SIP address used as next hop when sending the message. Very
-   useful when using OpenSER with a domain name not in DNS, or
-   when using a separate OpenSER instance for msilo processing. If
+   useful when using Kamailio with a domain name not in DNS, or
+   when using a separate Kamailio instance for msilo processing. If
    not set, the message will be sent to the address in destination
    URI.
 
@@ -260,7 +260,7 @@ modparam("msilo", "reminder", "sip:[email protected]")
 
    Example 1.8. Set the "outbound_proxy" parameter
 ...
-modparam("msilo", "outbound_proxy", "sip:openser.org;transport=tcp")
+modparam("msilo", "outbound_proxy", "sip:kamailio.org;transport=tcp")
 ...
 
 1.3.9. expire_time (int)
@@ -580,7 +580,7 @@ port=5060
 listen=10.0.0.2   # listen address
 
 # ------------------ module loading ----------------------------------
-mpath="/usr/local/lib/openser/modules/"
+mpath="/usr/local/lib/kamailio/modules/"
 
 loadmodule "textops.so"
 
@@ -605,7 +605,7 @@ modparam("usrloc", "db_mode", 0)
 # -- msilo params --
 
 modparam("msilo","db_url","mysql://openser:openserrw@localhost/openser")
-modparam("msilo","from_address","sip:registrar@openser.org")
+modparam("msilo","from_address","sip:registrar@kamailio.org")
 modparam("msilo","contact_hdr","Contact: [email protected]:5060;msil
 o=yes\r\n")
 modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n")

+ 2 - 2
modules_k/msilo/doc/msilo.cfg

@@ -19,7 +19,7 @@ port=5060
 listen=10.0.0.2   # listen address
 
 # ------------------ module loading ----------------------------------
-mpath="/usr/local/lib/openser/modules/"
+mpath="/usr/local/lib/kamailio/modules/"
 
 loadmodule "textops.so"
 
@@ -44,7 +44,7 @@ modparam("usrloc", "db_mode", 0)
 # -- msilo params --
 
 modparam("msilo","db_url","mysql://openser:openserrw@localhost/openser")
-modparam("msilo","from_address","sip:registrar@openser.org")
+modparam("msilo","from_address","sip:registrar@kamailio.org")
 modparam("msilo","contact_hdr","Contact: [email protected]:5060;msilo=yes\r\n")
 modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n")
 modparam("msilo","offline_message","*** User $rU is offline!")

+ 3 - 3
modules_k/msilo/doc/msilo_admin.xml

@@ -235,8 +235,8 @@ modparam("msilo", "reminder", "sip:[email protected]")
 		<title><varname>outbound_proxy</varname> (string)</title>
 		<para>
 		The &sip; address used as next hop when sending the message. Very
-		useful when using OpenSER with a domain name not in DNS, or when
-		using a separate OpenSER instance for msilo processing. If not set,
+		useful when using Kamailio with a domain name not in DNS, or when
+		using a separate Kamailio instance for msilo processing. If not set,
 		the message will be sent to the address in destination URI.
 		</para>
 		<para>
@@ -248,7 +248,7 @@ modparam("msilo", "reminder", "sip:[email protected]")
 		<title>Set the <quote>outbound_proxy</quote> parameter</title>
 <programlisting format="linespecific">
 ...
-modparam("msilo", "outbound_proxy", "sip:openser.org;transport=tcp")
+modparam("msilo", "outbound_proxy", "sip:kamailio.org;transport=tcp")
 ...
 </programlisting>
 		</example>

+ 1 - 1
modules_k/nat_traversal/README

@@ -471,7 +471,7 @@ R\r\nX-MyHeader: some_value\r\n")
 
    Example 1.5. Setting the keepalive_state_file parameter
 ...
-modparam("nat_traversal", "keepalive_state_file", "/var/run/openser/keep
+modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keep
 alive_state")
 ...
 

+ 2 - 2
modules_k/nat_traversal/doc/nat_traversal_admin.xml

@@ -448,7 +448,7 @@ modparam("nat_traversal", "keepalive_from", "sip:[email protected]")
       <title>Setting the <varname>keepalive_extra_headers</varname> parameter</title>
         <programlisting format="linespecific">
 ...
-modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: OpenSER\r\nX-MyHeader: some_value\r\n")
+modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: Kamailio\r\nX-MyHeader: some_value\r\n")
 ...
         </programlisting>
       </example>
@@ -481,7 +481,7 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: OpenSER\r\nX-M
       <title>Setting the <varname>keepalive_state_file</varname> parameter</title>
         <programlisting format="linespecific">
 ...
-modparam("nat_traversal", "keepalive_state_file", "/var/run/openser/keepalive_state")
+modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_state")
 ...
         </programlisting>
       </example>

部分文件因文件數量過多而無法顯示