Forráskód Böngészése

- sql:// changed to mysql:// in all modules

Jan Janak 22 éve
szülő
commit
3ee348996f

+ 2 - 2
config.h

@@ -180,8 +180,8 @@
 /* maximum path length */
 /* maximum path length */
 #define PATH_MAX_GUESS	1024
 #define PATH_MAX_GUESS	1024
 
 
-#define DEFAULT_DB_URL "sql://ser:heslo@localhost/ser"
-#define DEFAULT_RODB_URL "sql://serro:47serro11@localhost/ser"
+#define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"
+#define DEFAULT_RODB_URL "mysql://serro:47serro11@localhost/ser"
 
 
 
 
 #endif
 #endif

+ 1 - 1
db/doc/db-api.txt

@@ -360,7 +360,7 @@ function is called.
 
 
 The function takes one parameter, the parameter must contain database 
 The function takes one parameter, the parameter must contain database 
 connection URL. The URL is of the form 
 connection URL. The URL is of the form 
-sql://username:password@host:port/database where:
+mysql://username:password@host:port/database where:
 
 
 username: Username to use when logging into database (optional).
 username: Username to use when logging into database (optional).
 password: password if it was set (optional)
 password: password if it was set (optional)

+ 2 - 2
db/example/dbexample.c

@@ -31,7 +31,7 @@
 #include "../../db/db.h"
 #include "../../db/db.h"
 
 
 
 
-#define DB_URL   "sql://root@localhost/ser"
+#define DB_URL   "mysql://root@localhost/ser"
 #define DB_TABLE "location"
 #define DB_TABLE "location"
 
 
 #define TRUE 1
 #define TRUE 1
@@ -188,7 +188,7 @@ struct module_exports* mod_register()
 	     /*
 	     /*
 	      * Create a database connection
 	      * Create a database connection
 	      * DB_URL is database URL of form
 	      * DB_URL is database URL of form
-	      * sql://user:password@host:port/database
+	      * mysql://user:password@host:port/database
 	      * The function returns handle, that
 	      * The function returns handle, that
 	      * represents a database connection
 	      * represents a database connection
 	      */
 	      */

+ 4 - 4
doc/serdev/serdev.sgml

@@ -4634,7 +4634,7 @@ int n = RES_ROW_N(res);
 		<para>
 		<para>
 		    The function takes one parameter, the parameter must contain database 
 		    The function takes one parameter, the parameter must contain database 
 		    connection <acronym>URL</acronym>. The <acronym>URL</acronym> is of the form 
 		    connection <acronym>URL</acronym>. The <acronym>URL</acronym> is of the form 
-		    sql://username:password@host:port/database where:
+		    mysql://username:password@host:port/database where:
 		    <itemizedlist>
 		    <itemizedlist>
 			<listitem>
 			<listitem>
 			    <para>
 			    <para>
@@ -5048,13 +5048,13 @@ int n = RES_ROW_N(res);
 		    <listitem>
 		    <listitem>
 			<para>
 			<para>
 			    <varname>db_url</varname> - Database url string in form
 			    <varname>db_url</varname> - Database url string in form
-			    <quote>sql://&lt;user&gt;:&lt;pass&gt;@host/database</quote>.
+			    <quote>mysql://&lt;user&gt;:&lt;pass&gt;@host/database</quote>.
 			</para>
 			</para>
 			<para>
 			<para>
 			    Type: <type>string</type>
 			    Type: <type>string</type>
 			</para>
 			</para>
 			<para>
 			<para>
-			    Default: <quote>sql://serro:47serro11@localhost/ser</quote>
+			    Default: <quote>mysql://serro:47serro11@localhost/ser</quote>
 			</para>
 			</para>
 		    </listitem>
 		    </listitem>
 
 
@@ -6561,7 +6561,7 @@ if (t_newtran()) {
 			    Type: <type>string</type>
 			    Type: <type>string</type>
 			</para>
 			</para>
 			<para>
 			<para>
-			    Default: <quote>sql://ser:heslo@localhost/ser</quote>
+			    Default: <quote>mysql://ser:heslo@localhost/ser</quote>
 			</para>
 			</para>
 		    </listitem>				
 		    </listitem>				
 
 

+ 1 - 1
doc/seruser/intro.sgml

@@ -1088,7 +1088,7 @@ loadmodule "modules/auth/auth.so"
 # ------------------ module parameters -------------------------------
 # ------------------ module parameters -------------------------------
 # tell the auth module the access data for SQL database:
 # tell the auth module the access data for SQL database:
 # username, password, hostname and database name
 # username, password, hostname and database name
-modparam("auth", "db_url","sql://ser:secret@dbhost/ser")
+modparam("auth", "db_url","mysql://ser:secret@dbhost/ser")
 
 
 
 
 # -------------------------  request routing logic -------------------
 # -------------------------  request routing logic -------------------

+ 1 - 1
doc/seruser/operation.sgml

@@ -679,7 +679,7 @@ loadmodule "modules/usrloc/usrloc.so"
 # flushed to mysql
 # flushed to mysql
 modparam("usrloc", "db_mode",   1)
 modparam("usrloc", "db_mode",   1)
 # the SQL address:
 # the SQL address:
-modparam("usrloc", "db_url","sql://ser:secret@dbhost/ser")
+modparam("usrloc", "db_url","mysql://ser:secret@dbhost/ser")
 			    </programlisting>
 			    </programlisting>
 			</para>
 			</para>
 	    </section> <!-- user aliases -->
 	    </section> <!-- user aliases -->

+ 1 - 1
etc/im_gw.cfg

@@ -52,7 +52,7 @@ modparam("pike","reqs_density_per_unit",5)
 modparam("pike","removel_latency",30)
 modparam("pike","removel_latency",30)
 
 
 # -- jabber params --
 # -- jabber params --
-modparam("jabber","db_url","sql://s2jgw:[email protected]/sip_jab")
+modparam("jabber","db_url","mysql://s2jgw:[email protected]/sip_jab")
 modparam("jabber","jaddress","bat.iptel.org")
 modparam("jabber","jaddress","bat.iptel.org")
 modparam("jabber","jport",5222)
 modparam("jabber","jport",5222)
 modparam("jabber","workers",2)
 modparam("jabber","workers",2)

+ 1 - 1
examples/msilo.cfg

@@ -37,7 +37,7 @@ modparam("usrloc", "db_mode", 0)
 
 
 # -- msilo params --
 # -- msilo params --
 
 
-modparam("msilo","db_url","sql://user:[email protected]/msilo")
+modparam("msilo","db_url","mysql://user:[email protected]/msilo")
 modparam("msilo","registrar","sip:[email protected]")
 modparam("msilo","registrar","sip:[email protected]")
 
 
 # -- tm params --
 # -- tm params --

+ 1 - 1
examples/pstn.cfg

@@ -20,7 +20,7 @@ loadmodule "modules/uri/uri.so"
 
 
 # ----------------- setting module-specific parameters ---------------
 # ----------------- setting module-specific parameters ---------------
 
 
-modparam("auth_db", "db_url","sql://ser:heslo@localhost/ser")
+modparam("auth_db", "db_url","mysql://ser:heslo@localhost/ser")
 modparam("auth_db", "calculate_ha1", yes)
 modparam("auth_db", "calculate_ha1", yes)
 modparam("auth_db", "password_column", "password")
 modparam("auth_db", "password_column", "password")
 
 

+ 1 - 1
examples/vm_proxy.cfg

@@ -19,7 +19,7 @@ loadmodule "modules/registrar/registrar.so"
 modparam("tm", "fr_inv_timer", 90)
 modparam("tm", "fr_inv_timer", 90)
 
 
 # database with user group membership
 # database with user group membership
-modparam("group", "db_url", "sql://ser:heslo@localhost/ser")
+modparam("group", "db_url", "mysql://ser:heslo@localhost/ser")
 
 
 
 
 # ---------------------  request routing logic -------------------
 # ---------------------  request routing logic -------------------

+ 1 - 1
examples/voicemail.cfg

@@ -31,7 +31,7 @@ loadmodule "/home/srouter/sip_router/modules/vm/vm.so"
 	    
 	    
 # ----------------- setting module-specific parameters ---------------
 # ----------------- setting module-specific parameters ---------------
 
 
-modparam("voicemail", "db_url","sql://ser:heslo@dbhost/ser")
+modparam("voicemail", "db_url","mysql://ser:heslo@dbhost/ser")
 
 
 # -------------------------  request routing logic -------------------
 # -------------------------  request routing logic -------------------
 
 

+ 1 - 1
examples/welcome.cfg

@@ -38,7 +38,7 @@ loadmodule "modules/exec/exec.so"
 # -- usrloc params --
 # -- usrloc params --
 
 
 modparam("usrloc", "db_mode",   2)
 modparam("usrloc", "db_mode",   2)
-modparam("usrloc", "db_url", "sql://ser:[email protected]/ser" )
+modparam("usrloc", "db_url", "mysql://ser:[email protected]/ser" )
 # -------------------------  request routing logic -------------------
 # -------------------------  request routing logic -------------------
 
 
 # main routing logic
 # main routing logic

+ 1 - 1
scripts/serconf.sh

@@ -19,7 +19,7 @@
 # SER_GWIP -- IP address of PSTN gateway, e.g. 10.0.0.1
 # SER_GWIP -- IP address of PSTN gateway, e.g. 10.0.0.1
 
 
 # parameters that are typically not changed
 # parameters that are typically not changed
-SER_SQL_URI="sql://ser:heslo@localhost/ser"
+SER_SQL_URI="mysql://ser:heslo@localhost/ser"
 # set LIB_PATH if all modules are installed in a single
 # set LIB_PATH if all modules are installed in a single
 # directory; otherwise, modules are sought in 'modules'
 # directory; otherwise, modules are sought in 'modules'
 # subdirectories
 # subdirectories