[sr-dev] git:master: modules_s/uri_db: renamed to uid_uri_db

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: b79303dbfd781de9218f73b98ca72f25cf1d1054
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b79303dbfd781de9218f73b98ca72f25cf1d1054

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Dec 21 19:51:19 2012 +0100

modules_s/uri_db: renamed to uid_uri_db

---

 modules_s/{uri_db => uid_uri_db}/Makefile          |    2 +-
 modules_s/{uri_db => uid_uri_db}/README            |   10 +++++-----
 modules_s/{uri_db => uid_uri_db}/checks.c          |    0
 modules_s/{uri_db => uid_uri_db}/checks.h          |    0
 modules_s/{uri_db => uid_uri_db}/doc/Makefile      |    2 +-
 modules_s/{uri_db => uid_uri_db}/doc/functions.xml |    0
 modules_s/{uri_db => uid_uri_db}/doc/params.xml    |    0
 .../uri_db.xml => uid_uri_db/doc/uid_uri_db.xml}   |    6 +++---
 .../uridb_mod.c => uid_uri_db/uid_uri_db_mod.c}    |    8 ++++----
 .../uridb_mod.h => uid_uri_db/uid_uri_db_mod.h}    |    0
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules_s/uri_db/Makefile b/modules_s/uid_uri_db/Makefile
similarity index 93%
rename from modules_s/uri_db/Makefile
rename to modules_s/uid_uri_db/Makefile
index f68aa82..36f9659 100644
--- a/modules_s/uri_db/Makefile
+++ b/modules_s/uid_uri_db/Makefile
@@ -7,7 +7,7 @@
 
 include ../../Makefile.defs
 auto_gen=
-NAME=uri_db.so
+NAME=uid_uri_db.so
 LIBS=
 
 DEFS+=-DSER_MOD_INTERFACE
diff --git a/modules_s/uri_db/README b/modules_s/uid_uri_db/README
similarity index 96%
rename from modules_s/uri_db/README
rename to modules_s/uid_uri_db/README
index 9737f95..2a3b301 100644
--- a/modules_s/uri_db/README
+++ b/modules_s/uid_uri_db/README
@@ -1,10 +1,10 @@
-1. Uri_db Module
+1. UID Uri_db Module
 
 Jan Janak
 
    FhG FOKUS
 
-   Copyright © 2003 FhG FOKUS
+   Copyright © 2003 FhG FOKUS
      __________________________________________________________________
 
    1.1. Overview
@@ -127,7 +127,7 @@ modparam("module", "subscriber_domain_column", "domain")
 
 1.4. Functions
 
-1.4.1.  check_to()
+1.4.1. check_to()
 
    Check To username against URI table or digest credentials.
 
@@ -138,7 +138,7 @@ if (check_to()) {
 };
 ...
 
-1.4.2.  check_from()
+1.4.2. check_from()
 
    Check From username against URI table or digest credentials.
 
@@ -149,7 +149,7 @@ if (check_from()) {
 };
 ...
 
-1.4.3.  does_uri_exist()
+1.4.3. does_uri_exist()
 
    Check if username in the request URI belongs to an existing user.
 
diff --git a/modules_s/uri_db/checks.c b/modules_s/uid_uri_db/checks.c
similarity index 100%
rename from modules_s/uri_db/checks.c
rename to modules_s/uid_uri_db/checks.c
diff --git a/modules_s/uri_db/checks.h b/modules_s/uid_uri_db/checks.h
similarity index 100%
rename from modules_s/uri_db/checks.h
rename to modules_s/uid_uri_db/checks.h
diff --git a/modules_s/uri_db/doc/Makefile b/modules_s/uid_uri_db/doc/Makefile
similarity index 75%
rename from modules_s/uri_db/doc/Makefile
rename to modules_s/uid_uri_db/doc/Makefile
index 62d82f4..cd440ef 100644
--- a/modules_s/uri_db/doc/Makefile
+++ b/modules_s/uid_uri_db/doc/Makefile
@@ -1,4 +1,4 @@
-docs = uri_db.xml
+docs = uid_uri_db.xml
 
 docbook_dir=../../../docbook
 include $(docbook_dir)/Makefile.module
diff --git a/modules_s/uri_db/doc/functions.xml b/modules_s/uid_uri_db/doc/functions.xml
similarity index 100%
rename from modules_s/uri_db/doc/functions.xml
rename to modules_s/uid_uri_db/doc/functions.xml
diff --git a/modules_s/uri_db/doc/params.xml b/modules_s/uid_uri_db/doc/params.xml
similarity index 100%
rename from modules_s/uri_db/doc/params.xml
rename to modules_s/uid_uri_db/doc/params.xml
diff --git a/modules_s/uri_db/doc/uri_db.xml b/modules_s/uid_uri_db/doc/uid_uri_db.xml
similarity index 90%
rename from modules_s/uri_db/doc/uri_db.xml
rename to modules_s/uid_uri_db/doc/uid_uri_db.xml
index b0bb9b7..3f79db9 100644
--- a/modules_s/uri_db/doc/uri_db.xml
+++ b/modules_s/uid_uri_db/doc/uid_uri_db.xml
@@ -20,14 +20,14 @@
 	</copyright>
     </sectioninfo>
 
-    <title>Uri_db Module</title>
+    <title>UID Uri_db Module</title>
 
-    <section id="uri_db.overview">
+    <section id="uid_uri_db.overview">
 	<title>Overview</title>
 	<para>Various checks related to SIP URI.</para>
     </section>
 
-    <section id="uri_db.dep">
+    <section id="uid_uri_db.dep">
 	<title>Dependencies</title>
 	<para>
 	    The following modules must be loaded before this module:
diff --git a/modules_s/uri_db/uridb_mod.c b/modules_s/uid_uri_db/uid_uri_db_mod.c
similarity index 99%
rename from modules_s/uri_db/uridb_mod.c
rename to modules_s/uid_uri_db/uid_uri_db_mod.c
index 28f413f..1b664ab 100644
--- a/modules_s/uri_db/uridb_mod.c
+++ b/modules_s/uid_uri_db/uid_uri_db_mod.c
@@ -49,9 +49,9 @@
 #include "../../parser/parse_from.h"
 #include "../../parser/parse_uri.h"
 #include "../../lib/srdb2/db.h"
-#include "uridb_mod.h"
+#include "uid_uri_db_mod.h"
 #include "../../usr_avp.h"
-#include "../domain/domain.h"
+#include "../uid_domain/domain.h"
 
 MODULE_VERSION
 
@@ -75,7 +75,7 @@ static int check_uri(struct sip_msg* msg, char* s1, char* s2);
 static int header_fixup(void** param, int param_no);
 static int lookup_user_fixup(void** param, int param_no);
 
-#define URI_TABLE    "uri"
+#define URI_TABLE    "uid_uri"
 #define UID_COL      "uid"
 #define DID_COL      "did"
 #define USERNAME_COL "username"
@@ -136,7 +136,7 @@ static param_export_t params[] = {
  * Module interface
  */
 struct module_exports exports = {
-	"uri_db",
+	"uid_uri_db",
 	cmds,      /* Exported functions */
 	0,         /* RPC methods */
 	params,    /* Exported parameters */
diff --git a/modules_s/uri_db/uridb_mod.h b/modules_s/uid_uri_db/uid_uri_db_mod.h
similarity index 100%
rename from modules_s/uri_db/uridb_mod.h
rename to modules_s/uid_uri_db/uid_uri_db_mod.h