ser modules ported to sip-router

- added -DSER_MOD_INTERFACE to each module Makefile
- db:
     - linked with srdb2 when needed
     - fixed db includes path (../../lib/srdb2/*.h)
     - fixed db constants
- fixed tm include path (../../modules/tm/*.h)

modules_s/acc_db/Makefile

@@ -11,4 +11,8 @@ auto_gen=
 NAME=acc_db.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/acc_db/acc_db.c

@@ -36,16 +36,16 @@
 #include "../../sr_module.h"
 #include "../../dprint.h"
 #include "../../mem/mem.h"
-#include "../tm/t_hooks.h"
-#include "../tm/tm_load.h"
-#include "../tm/h_table.h"
+#include "../../modules/tm/t_hooks.h"
+#include "../../modules/tm/tm_load.h"
+#include "../../modules/tm/h_table.h"
 #include "../../parser/msg_parser.h"
 #include "../../parser/parse_from.h"
 #include "../../parser/digest/digest.h"
 #include "../../usr_avp.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 #include "../../usr_avp.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../trim.h"
 #include "../../id.h"
 #include "../acc_syslog/attrs.h"

modules_s/acc_radius/Makefile

@@ -11,4 +11,6 @@ include ../../Makefile.radius
 auto_gen=
 NAME=acc_radius.so
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/acc_radius/acc_radius.c

@@ -38,15 +38,15 @@
 #include "../../sr_module.h"
 #include "../../dprint.h"
 #include "../../mem/mem.h"
-#include "../tm/t_hooks.h"
-#include "../tm/tm_load.h"
-#include "../tm/h_table.h"
+#include "../../modules/tm/t_hooks.h"
+#include "../../modules/tm/tm_load.h"
+#include "../../modules/tm/h_table.h"
 #include "../../parser/msg_parser.h"
 #include "../../parser/parse_from.h"
 #include "../../parser/digest/digest.h"
 #include "../../usr_avp.h"
 #include "../../id.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 #include "../../parser/parse_rr.h"
 #include "../../trim.h"

modules_s/acc_syslog/Makefile

@@ -11,4 +11,6 @@ auto_gen=
 NAME=acc_syslog.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/acc_syslog/acc_syslog.c

@@ -36,16 +36,16 @@
 #include "../../sr_module.h"
 #include "../../dprint.h"
 #include "../../mem/mem.h"
-#include "../tm/t_hooks.h"
-#include "../tm/tm_load.h"
-#include "../tm/h_table.h"
+#include "../../modules/tm/t_hooks.h"
+#include "../../modules/tm/tm_load.h"
+#include "../../modules/tm/h_table.h"
 #include "../../parser/msg_parser.h"
 #include "../../parser/parse_from.h"
 #include "../../parser/digest/digest.h"
 #include "../../usr_avp.h"
 #include "../../id.h"
 #include "attrs.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 /*
  * TODO:

modules_s/auth/Makefile

@@ -14,4 +14,6 @@ LIBS=
 #       -DUSE_OT_NONCE - compile with one-time nonces support
 DEFS+=-DUSE_NC -DUSE_OT_NONCE
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/auth_db/Makefile

@@ -10,4 +10,8 @@ auto_gen=
 NAME=auth_db.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/auth_db/authdb_mod.c

@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../sr_module.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../dprint.h"
 #include "../../error.h"
 #include "../../mem/mem.h"

modules_s/auth_db/authdb_mod.h

@@ -32,7 +32,7 @@
 #define AUTHDB_MOD_H
 
 #include "../../str.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../auth/api.h"
 #include "../sl/sl.h"
 #include "../../parser/msg_parser.h"

modules_s/auth_db/authorize.c

@@ -40,7 +40,7 @@
 #include <string.h>
 #include "../../ut.h"
 #include "../../str.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../dprint.h"
 #include "../../parser/digest/digest.h"
 #include "../../parser/hf.h"
@@ -91,10 +91,10 @@ static inline int get_ha1(struct username* username, str* did, str* realm,
 			LOG(L_ERR, "auth_db:get_ha1: Credentials for '%.*s'@'%.*s' contain NULL value, skipping\n",
 				username->user.len, ZSW(username->user.s), realm->len, ZSW(realm->s));
 		} else {
-			if ((*row)->fld[1].v.int4 & DB_DISABLED) {
+			if ((*row)->fld[1].v.int4 & SRDB_DISABLED) {
 				/* disabled rows ignored */
 			} else {
-				if ((*row)->fld[1].v.int4 & DB_LOAD_SER) {
+				if ((*row)->fld[1].v.int4 & SRDB_LOAD_SER) {
 					/* *row = i; */
 					break;
 				}
@@ -269,11 +269,11 @@ static inline int check_all_ha1(struct sip_msg* msg, struct hdr_field* hdr,
 			    dig->username.user.len, ZSW(dig->username.user.s), realm->len, ZSW(realm->s));
 		}
 		else {
-			if (row->fld[1].v.int4 & DB_DISABLED) {
+			if (row->fld[1].v.int4 & SRDB_DISABLED) {
 				/* disabled rows ignored */
 			}
 			else {
-				if (row->fld[1].v.int4 & DB_LOAD_SER) {
+				if (row->fld[1].v.int4 & SRDB_LOAD_SER) {
 					result.s = row->fld[0].v.cstr;
 					result.len = strlen(result.s);
 					if (calc_ha1) {

modules_s/auth_identity/Makefile

@@ -15,4 +15,6 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto -lcurl
 #
 #LIBS+= /usr/lib/libcurl.a /usr/lib/libssl.a /usr/lib/libcrypto.a -lkrb5 -lidn -lz -lgssapi_krb5
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/auth_identity/auth_hdrs.c

@@ -35,7 +35,7 @@
 #include "../../parser/keys.h"
 #include "../../parser/contact/parse_contact.h"
 
-#include "../tm/ut.h"
+#include "../../modules/tm/ut.h"
 #include "../../data_lump.h"
 #include "../../msg_translator.h"
 #include "auth_identity.h"

modules_s/auth_radius/Makefile

@@ -12,4 +12,6 @@ auto_gen=
 NAME=auth_radius.so
 
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/avp/Makefile

@@ -9,5 +9,7 @@ include ../../Makefile.defs
 auto_gen=
 NAME=avp.so
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/avp_db/Makefile

@@ -11,4 +11,8 @@ NAME=avp_db.so
 LIBS=
 DEFS += -Wall
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/avp_db/avp_db.c

@@ -40,7 +40,7 @@
 #include "../../parser/parse_to.h"
 #include "../../parser/parse_uri.h"
 #include "../../str.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../config.h"
 #include "../../usr_avp.h"
 #include "../../ut.h"
@@ -210,7 +210,7 @@ static void read_attrs(db_res_t *res, unsigned long flags)
 			continue;
 		}
 
-		if ((row->fld[3].v.int4 & DB_LOAD_SER) == 0) {
+		if ((row->fld[3].v.int4 & SRDB_LOAD_SER) == 0) {
 			row = db_next(res);
 			continue;
 		}

modules_s/avp_db/avp_db.h

@@ -25,7 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 
 extern db_ctx_t* ctx;
 extern int auto_unlock;

modules_s/avp_db/extra_attrs.c

@@ -299,7 +299,7 @@ static int read_avps(db_res_t *res, avp_flags_t flag) /* id must not be NULL */
 		get_str_val(row->fld[2], value);
 		get_int_val(row->fld[3], flags);
 
-		if (flags & DB_LOAD_SER) {
+		if (flags & SRDB_LOAD_SER) {
 			if (type == AVP_VAL_STR) val.s = value;
 			else str2int(&value, (unsigned int *)&val.n); /* FIXME */
 

modules_s/avp_db/extra_attrs.h

@@ -3,7 +3,7 @@
 
 
 #include "../../parser/msg_parser.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../sr_module.h"
 
 int declare_attr_group(modparam_t type, char* param);

modules_s/avp_radius/Makefile

@@ -13,4 +13,6 @@ NAME=avp_radius.so
 
 
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/avpops/Makefile

@@ -10,4 +10,8 @@ auto_gen=
 NAME=avpops.so
 LIBS= 
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/avpops/avpops_db.c

@@ -36,7 +36,7 @@
 
 #include "../../mem/mem.h"
 #include "../../mem/shm_mem.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../dprint.h"
 #include "avpops_parse.h"
 #include "avpops_db.h"

modules_s/avpops/avpops_db.h

@@ -35,7 +35,7 @@
 #ifndef _AVP_OPS_DB_H_
 #define _AVP_OPS_DB_H_
 
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../str.h"
 #include "../../sr_module.h"
 

modules_s/bdb/Makefile

@@ -19,4 +19,8 @@ DEFS += -I$(LOCALBASE)/include/db44
 LIBS  = -L$(LOCALBASE)/lib -ldb-4.4
 
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/bdb/bdb.h

@@ -41,8 +41,8 @@
 #include "../../mem/mem.h"
 #include "../../str.h"
 #include "../../timer.h"
-#include "../../db/db_con.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_res.h"
 #include "../../db/db_key.h"
 #include "../../db/db_op.h"
 #include "../../db/db_val.h"

modules_s/blst/Makefile

@@ -6,5 +6,7 @@ auto_gen=
 NAME=blst.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/cfg_db/Makefile

@@ -9,4 +9,8 @@ auto_gen=
 NAME=cfg_db.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/cfg_db/cfg_db.c

@@ -32,7 +32,7 @@
 #include "../../sr_module.h"
 #include "../../cfg/cfg.h"
 #include "../../cfg/cfg_ctx.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../error.h"
 #include "../../ut.h"
 #include <unistd.h>

modules_s/cfg_rpc/Makefile

@@ -9,4 +9,6 @@ auto_gen=
 NAME=cfg_rpc.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/cpl-c/Makefile

@@ -14,4 +14,8 @@ DEFS +=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
 
 LIBS= -L$(LOCALBASE)/lib -lxml2
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/cpl-c/cpl.c

@@ -59,7 +59,7 @@
 #include "../../parser/parse_from.h"
 #include "../../parser/parse_content.h"
 #include "../../parser/parse_disposition.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../cfg/cfg_struct.h"
 #include "cpl_run.h"
 #include "cpl_env.h"

modules_s/cpl-c/cpl_db.c

@@ -31,7 +31,7 @@
   */
 
 #include "../../mem/shm_mem.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../dprint.h"
 #include "cpl_db.h"
 

modules_s/cpl-c/cpl_db.h

@@ -28,7 +28,7 @@
 #ifndef _CPL_DB_H
 #define _CPL_DB_H
 
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 
 
 int cpl_db_bind(char* db_url);

modules_s/cpl-c/cpl_env.h

@@ -35,7 +35,7 @@
 #include "../../usr_avp.h"
 #include "../sl/sl.h"
 #include "../usrloc/usrloc.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 struct cpl_enviroment {
 	char  *log_dir;         /* dir where the user log should be dumped */

modules_s/cpl-c/cpl_proxy.h

@@ -31,7 +31,7 @@
  *             transaction is created (bogdan)
  */
 
-#include "../tm/h_table.h"
+#include "../../modules/tm/h_table.h"
 #include "../../parser/contact/parse_contact.h"
 
 

modules_s/cpl-c/cpl_run.c

@@ -45,7 +45,7 @@
 #include "../../dprint.h"
 #include "../../parser/msg_parser.h"
 #include "../../data_lump_rpl.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 #include "../usrloc/usrloc.h"
 #include "CPL_tree.h"
 #include "loc_set.h"

modules_s/cpl-c/cpl_sig.c

@@ -29,7 +29,7 @@
 #include "../../action.h"
 #include "../../dset.h"
 #include "../../route.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 #include "loc_set.h"
 #include "cpl_sig.h"
 #include "cpl_env.h"

modules_s/ctl/Makefile

@@ -10,5 +10,7 @@ LIBS=
 # fifo support
 DEFS+=-DUSE_FIFO
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/db_ops/Makefile

@@ -12,6 +12,10 @@ NAME=db_ops.so
 LIBS=
 
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules
 
 

modules_s/db_ops/db_ops.c

@@ -35,7 +35,7 @@
 #include "../../error.h"
 #include "../../config.h"
 #include "../../trim.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../select.h"
 #include "../../script_cb.h"
 #include "../xlog/xl_lib.h"

modules_s/dbg/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=dbg.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/dbtext/Makefile

@@ -13,4 +13,8 @@ auto_gen=
 NAME=dbtext.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/dbtext/dbt_api.h

@@ -39,8 +39,8 @@
 #define _DBT_API_H_
 
 #include "../../db/db_op.h"
-#include "../../db/db_res.h"
-#include "../../db/db_con.h"
+#include "../../lib/srdb2/db_res.h"
+#include "../../lib/srdb2/db_con.h"
 #include "../../db/db_row.h"
 
 int dbt_free_columns(db_res_t* _r);

modules_s/dbtext/dbt_res.h

@@ -39,7 +39,7 @@
 #define _DBT_RES_H_
 
 #include "../../db/db_op.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_res.h"
 
 #include "dbt_lib.h"
 

modules_s/dbtext/dbtext.h

@@ -38,8 +38,8 @@
 #ifndef _DBTEXT_H_
 #define _DBTEXT_H_
 
-#include "../../db/db_con.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_res.h"
 #include "../../db/db_key.h"
 #include "../../db/db_op.h"
 #include "../../db/db_val.h"

modules_s/dialog/Makefile

@@ -18,4 +18,7 @@ LIBS =
 SERLIBPATH=../../lib
 SER_LIBS=$(SERLIBPATH)/cds/ser_cds
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/dialog/db_dlg.h

@@ -26,8 +26,8 @@
 #ifndef __DB_DLG_H
 #define __DB_DLG_H
 
-#include "../tm/dlg.h"
-#include "../../db/db.h"
+#include "../../modules/tm/dlg.h"
+#include "../../lib/srdb2/db.h"
 #include <cds/sstr.h>
 
 int db_store_dlg(db_con_t* conn, dlg_t *dlg, str *dst_id);

modules_s/dialog/dlg_mod.c

@@ -27,7 +27,7 @@
 #include "db_dlg.h"
 #include "serialize_dlg.h"
 #include "../../sr_module.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 #include <cds/sstr.h>
 #include "dlg_utils.h"
 #include "dlg_request.h"

modules_s/dialog/dlg_mod.h

@@ -26,9 +26,9 @@
 #ifndef __DLG_MOD_H
 #define __DLG_MOD_H
 
-#include "../tm/dlg.h"
-#include "../../db/db.h"
-#include "../tm/t_hooks.h"
+#include "../../modules/tm/dlg.h"
+#include "../../lib/srdb2/db.h"
+#include "../../modules/tm/t_hooks.h"
 #include <cds/serialize.h>
 
 /* Prototype of function for storing dialog into database.

modules_s/dialog/dlg_mod_internal.h

@@ -26,7 +26,7 @@
 #ifndef __DLG_MOD_INTERNAL_H
 #define __DLG_MOD_INTERNAL_H
 
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 #include "dlg_mod.h"
 
 extern struct tm_binds tmb;

modules_s/dialog/dlg_request.h

@@ -2,7 +2,7 @@
 #define __DIALOG_REQUEST_H
 
 #include "dlg_mod.h"
-#include "../tm/t_hooks.h"
+#include "../../modules/tm/t_hooks.h"
 
 int request_outside(str* method, str* headers, str* body, dlg_t* dialog, transaction_cb cb, void* cbp);
 int request_inside(str* method, str* headers, str* body, dlg_t* dialog, transaction_cb completion_cb, void* cbp);

modules_s/dialog/serialize_dlg.h

@@ -26,7 +26,7 @@
 #ifndef __SERIALIZE_DLG_H
 #define __SERIALIZE_DLG_H
 
-#include "../tm/dlg.h"
+#include "../../modules/tm/dlg.h"
 #include <cds/serialize.h>
 
 int serialize_dlg(sstream_t *ss, dlg_t *dlg);

modules_s/dispatcher/Makefile

@@ -12,4 +12,6 @@ NAME=dispatcher.so
 
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/diversion/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=diversion.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/domain/Makefile

@@ -10,4 +10,8 @@ auto_gen=
 NAME=domain.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/domain/domain.c

@@ -31,7 +31,7 @@
 #include "domain_mod.h"
 #include "../../dprint.h"
 #include "../../mem/shm_mem.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../ut.h"
 
 
@@ -199,7 +199,7 @@ int db_load_domain_attrs(domain_t* d)
 			goto skip;
 		}
 		
-		if ((rec->fld[3].v.int4 & DB_LOAD_SER) == 0) goto skip;
+		if ((rec->fld[3].v.int4 & SRDB_LOAD_SER) == 0) goto skip;
 	
 		/* Get AVP name */
 		name.s = rec->fld[0].v.lstr;
@@ -270,9 +270,9 @@ int load_domains(domain_t** dest)
 		flags = rec->fld[2].v.int4;
 		
 		/* Skip entries that are disabled/scheduled for removal */
-		if (flags & DB_DISABLED) goto skip;
+		if (flags & SRDB_DISABLED) goto skip;
 		     /* Skip entries that are for serweb/ser-ctl only */
-		if (!(flags & DB_LOAD_SER)) goto skip;
+		if (!(flags & SRDB_LOAD_SER)) goto skip;
 		
 		DBG("domain:load_domains: Processing entry (%.*s, %.*s, %u)\n",
 		    rec->fld[0].v.lstr.len, ZSW(rec->fld[0].v.lstr.s),

modules_s/domain/domain_mod.c

@@ -413,7 +413,7 @@ static int db_get_did(str* did, str* domain)
 		/* Test flags first, we are only interested in rows
 		 * that are not disabled
 		 */
-		if (rec->fld[1].flags & DB_NULL || (rec->fld[1].v.bitmap & DB_DISABLED)) {
+		if (rec->fld[1].flags & DB_NULL || (rec->fld[1].v.bitmap & SRDB_DISABLED)) {
 			db_res_free(res);
 			return 0;
 		}

modules_s/domain/domain_mod.h

@@ -31,7 +31,7 @@
 #ifndef _DOMAIN_MOD_H
 #define _DOMAIN_MOD_H
 
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../str.h"
 #include "../../usr_avp.h"
 #include "../../parser/msg_parser.h"

modules_s/domain/domain_rpc.c

@@ -28,7 +28,7 @@
  */
 
 #include "../../dprint.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../ut.h"
 #include "../../mem/mem.h"
 #include "hash.h"

modules_s/enum/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=enum.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/eval/Makefile

@@ -10,5 +10,7 @@ include ../../Makefile.defs
 auto_gen=
 NAME=eval.so
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/exec/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=exec.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/fifo/Makefile

@@ -8,5 +8,7 @@ auto_gen=
 NAME=fifo.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/flatstore/Makefile

@@ -7,4 +7,8 @@ auto_gen=
 NAME=flatstore.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/flatstore/flat_cmd.h

@@ -33,8 +33,8 @@
  * Inmplementation of flatstore commands.
  */
 
-#include "../../db/db_drv.h"
-#include "../../db/db_cmd.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_cmd.h"
 
 
 /** Extension structure of db_cmd adding flatstore specific data.

modules_s/flatstore/flat_con.h

@@ -33,9 +33,9 @@
  * Inmplementation of flatstore "connections".
  */
 
-#include "../../db/db_pool.h"
-#include "../../db/db_con.h"
-#include "../../db/db_uri.h"
+#include "../../lib/srdb2/db_pool.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_uri.h"
 
 #include <stdio.h>
 

modules_s/flatstore/flat_uri.h

@@ -32,8 +32,8 @@
  * The functions parsing and interpreting flatstore: URIs.
  */
 
-#include "../../db/db_uri.h"
-#include "../../db/db_drv.h"
+#include "../../lib/srdb2/db_uri.h"
+#include "../../lib/srdb2/db_drv.h"
 
 /** Flatstore driver specific payload to attach to db_uri structures.  
  * This is the flatstore specific structure that will be attached to generic

modules_s/gflags/Makefile

@@ -10,5 +10,9 @@ auto_gen=
 NAME=gflags.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules
 

modules_s/gflags/gflags.c

@@ -50,7 +50,7 @@
 #include "../../sr_module.h"
 #include "../../error.h"
 #include "../../ut.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../mem/mem.h"
 #include "../../mem/shm_mem.h"
 #include "../../usr_avp.h"
@@ -231,7 +231,7 @@ static int load_attrs(avp_list_t* global_avps)
 			goto skip;
 		}
 
-		if ((rec->fld[3].v.int4 & DB_LOAD_SER) == 0) goto skip;
+		if ((rec->fld[3].v.int4 & SRDB_LOAD_SER) == 0) goto skip;
 
 		name.s = rec->fld[0].v.lstr;
 
@@ -365,7 +365,7 @@ int save_gflags(unsigned int flags)
 	save_gflags_cmd->vals[0].v.cstr = AVP_GFLAGS;
 	save_gflags_cmd->vals[1].v.int4 = 0;
 	save_gflags_cmd->vals[2].v.lstr = fl;
-	save_gflags_cmd->vals[3].v.bitmap = DB_LOAD_SER;
+	save_gflags_cmd->vals[3].v.bitmap = SRDB_LOAD_SER;
 
 	if (db_exec(NULL, save_gflags_cmd) < 0) {
 		LOG(L_ERR, "gflags:save_gflag: Unable to store new value\n");

modules_s/iptrtpproxy/Makefile

@@ -14,5 +14,7 @@ NAME=iptrtpproxy.so
 LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc -L $(iptdir)/extensions -lext
 DEFS += -I $(iptdir)/include
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/jabber/Makefile

@@ -17,4 +17,8 @@ DEFS+=-DXJ_EXTRA_DEBUG
 DEFS+=-I$(LOCALBASE)/include
 LIBS=-L$(LOCALBASE)/lib -lexpat
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/jabber/jabber.c

@@ -63,10 +63,10 @@
 #include "../../parser/parse_uri.h"
 #include "../../parser/parse_content.h"
 #include "../../parser/parse_from.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../cfg/cfg_struct.h"
 
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 #ifdef HAVE_IHTTP
 #include "../ihttp/ih_load.h"

modules_s/jabber/xjab_worker.c

@@ -62,7 +62,7 @@
 #include "../../mem/mem.h"
 #include "../../mem/shm_mem.h"
 #include "../../cfg/cfg_struct.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 #include "xjab_worker.h"
 #include "xjab_util.h"

modules_s/jabber/xjab_worker.h

@@ -40,9 +40,9 @@
 #define _XJAB_WORKER_H_
 
 #include "../../str.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../locking.h"
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 #include "xjab_util.h"
 #include "tree234.h"

modules_s/lcr/Makefile

@@ -9,5 +9,9 @@ auto_gen=
 NAME=lcr.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules
 

modules_s/lcr/lcr_mod.c

@@ -44,7 +44,7 @@
 #include "../../error.h"
 #include "../../mem/mem.h"
 #include "../../mem/shm_mem.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../usr_avp.h"
 #include "../../parser/parse_uri.h"
 #include "../../parser/parse_from.h"

modules_s/ldap/Makefile

@@ -16,4 +16,8 @@ DEFS += -Wall -DOPENLDAP23
 
 LIBS=-L$(LOCALBASE)/lib -L /usr/lib -lldap
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/ldap/ld_cmd.h

@@ -34,9 +34,9 @@
  * stored in db_cmd structures and related functions.
  */
 
-#include "../../db/db_drv.h"
-#include "../../db/db_cmd.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_cmd.h"
+#include "../../lib/srdb2/db_res.h"
 #include "../../str.h"
 
 #include <stdarg.h>

modules_s/ldap/ld_con.h

@@ -33,9 +33,9 @@
  * Implementation of LDAP per-connection related data structures and functions.
  */
 
-#include "../../db/db_pool.h"
-#include "../../db/db_con.h"
-#include "../../db/db_uri.h"
+#include "../../lib/srdb2/db_pool.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_uri.h"
 
 #include <time.h>
 #include <ldap.h>

modules_s/ldap/ld_fld.c

@@ -38,7 +38,7 @@
 
 #include "ld_fld.h"
 
-#include "../../db/db_drv.h"
+#include "../../lib/srdb2/db_drv.h"
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../ut.h"

modules_s/ldap/ld_fld.h

@@ -38,9 +38,9 @@
 
 struct ld_cfg;
 
-#include "../../db/db_gen.h"
-#include "../../db/db_fld.h"
-#include "../../db/db_cmd.h"
+#include "../../lib/srdb2/db_gen.h"
+#include "../../lib/srdb2/db_fld.h"
+#include "../../lib/srdb2/db_cmd.h"
 
 #include <ldap.h>
 

modules_s/ldap/ld_mod.c

@@ -41,7 +41,7 @@
 #include "../../sr_module.h"
 
 #ifdef LD_TEST
-#include "../../db/db_cmd.h"
+#include "../../lib/srdb2/db_cmd.h"
 #include <limits.h>
 #include <float.h>
 #endif

modules_s/ldap/ld_res.c

@@ -37,7 +37,7 @@
 
 #include "../../mem/mem.h"
 #include "../../dprint.h"
-#include "../../db/db_gen.h"
+#include "../../lib/srdb2/db_gen.h"
 
 
 static void ld_res_free(db_res_t* res, struct ld_res* payload)

modules_s/ldap/ld_res.h

@@ -34,8 +34,8 @@
  * servers.
  */
 
-#include "../../db/db_drv.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_res.h"
 
 #include <ldap.h>
 

modules_s/ldap/ld_uri.h

@@ -33,8 +33,8 @@
  * The functions parsing and interpreting ldap: URIs.
  */
 
-#include "../../db/db_uri.h"
-#include "../../db/db_drv.h"
+#include "../../lib/srdb2/db_uri.h"
+#include "../../lib/srdb2/db_drv.h"
 
 #include <ldap.h>
 

modules_s/mangler/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=mangler.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/mangler/mangler.c

@@ -52,9 +52,9 @@
 
 #ifdef DEMO
 
-#include "../tm/t_hooks.h"
-#include "../tm/tm_load.h"
-#include "../tm/h_table.h"
+#include "../../modules/tm/t_hooks.h"
+#include "../../modules/tm/tm_load.h"
+#include "../../modules/tm/h_table.h"
 struct tm_binds tmb;
 
 #endif

modules_s/maxfwd/Makefile

@@ -10,4 +10,6 @@ auto_gen=
 NAME=maxfwd.so
 LIBS= 
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules

modules_s/mediaproxy/Makefile

@@ -10,5 +10,7 @@ auto_gen=
 NAME=mediaproxy.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
 include ../../Makefile.modules
 

modules_s/msilo/Makefile

@@ -10,4 +10,8 @@ auto_gen=
 NAME=msilo.so
 LIBS=
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/msilo/msilo.c

@@ -59,14 +59,14 @@
 #include "../../ut.h"
 #include "../../timer.h"
 #include "../../mem/shm_mem.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db.h"
 #include "../../parser/parse_from.h"
 #include "../../parser/parse_content.h"
 #include "../../parser/contact/parse_contact.h"
 #include "../../resolve.h"
 #include "../../id.h"
 
-#include "../tm/tm_load.h"
+#include "../../modules/tm/tm_load.h"
 
 #define CONTACT_PREFIX "Content-Type: text/plain"CRLF"Contact: <"
 #define CONTACT_SUFFIX  ">;msilo=yes"CRLF

modules_s/mysql/Makefile

@@ -19,4 +19,8 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \
 		-L/usr/lib64/mysql \
 		-lmysqlclient -lz
 
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2
 include ../../Makefile.modules

modules_s/mysql/my_cmd.c

@@ -42,7 +42,7 @@
 
 #include "../../mem/mem.h"
 #include "../../str.h"
-#include "../../db/db_cmd.h"
+#include "../../lib/srdb2/db_cmd.h"
 #include "../../ut.h"
 
 #include <stdlib.h>

modules_s/mysql/my_cmd.h

@@ -29,8 +29,8 @@
 #ifndef _MY_CMD_H
 #define _MY_CMD_H  1
 
-#include "../../db/db_drv.h"
-#include "../../db/db_cmd.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_cmd.h"
 #include <mysql/mysql.h>
 #include <stdarg.h>
 

modules_s/mysql/my_con.h

@@ -29,9 +29,9 @@
 #ifndef _MY_CON_H
 #define _MY_CON_H  1
 
-#include "../../db/db_pool.h"
-#include "../../db/db_con.h"
-#include "../../db/db_uri.h"
+#include "../../lib/srdb2/db_pool.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_uri.h"
 
 #include <time.h>
 #include <mysql/mysql.h>

modules_s/mysql/my_fld.c

@@ -30,7 +30,7 @@
 
 #include "../../mem/mem.h"
 #include "../../dprint.h"
-#include "../../db/db_gen.h"
+#include "../../lib/srdb2/db_gen.h"
 
 #include <string.h>
 

modules_s/mysql/my_fld.h

@@ -33,8 +33,8 @@
  *  @{
  */
 
-#include "../../db/db_drv.h"
-#include "../../db/db_fld.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_fld.h"
 #include <mysql/mysql.h>
 
 struct my_fld {

modules_s/mysql/my_res.c

@@ -32,7 +32,7 @@
 
 #include "../../mem/mem.h"
 #include "../../dprint.h"
-#include "../../db/db_gen.h"
+#include "../../lib/srdb2/db_gen.h"
 
 #include <mysql/mysql.h>
 

modules_s/mysql/my_res.h

@@ -29,8 +29,8 @@
 #ifndef _MY_RES_H
 #define _MY_RES_H  1
 
-#include "../../db/db_drv.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_res.h"
 
 struct my_res {
 	db_drv_t gen;