Merge pull request #913 from linuxmaniac/vseva/fix_82

Rename modules interface files

src/modules/auth_ephemeral/autheph_mod.c → src/modules/auth_ephemeral/auth_ephemeral_mod.c

@@ -32,7 +32,7 @@
 #include "../../core/rpc_lookup.h"
 #include "../../modules/auth/api.h"
 
-#include "autheph_mod.h"
+#include "auth_ephemeral_mod.h"
 #include "authorize.h"
 #include "checks.h"
 

src/modules/auth_ephemeral/authorize.c

@@ -37,7 +37,7 @@
 #include "../../core/parser/hf.h"
 #include "../../core/mod_fix.h"
 
-#include "autheph_mod.h"
+#include "auth_ephemeral_mod.h"
 #include "authorize.h"
 
 static inline int get_pass(str *_username, str *_secret, str *_password)

src/modules/auth_ephemeral/checks.c

@@ -34,7 +34,7 @@
 #include "../../core/parser/parse_uri.h"
 #include "../../core/mod_fix.h"
 
-#include "autheph_mod.h"
+#include "auth_ephemeral_mod.h"
 #include "authorize.h"
 #include "checks.h"
 

src/modules/cdp/mod.c → src/modules/cdp/cdp_mod.c

@@ -41,7 +41,7 @@
  *
  */
 
-#include "mod.h"
+#include "cdp_mod.h"
 
 #include "../../core/sr_module.h"
 #include "../../core/globals.h"

src/modules/cdp_avp/mod.c → src/modules/cdp_avp/cdp_avp_mod.c

@@ -43,7 +43,7 @@
 #include "../../core/sr_module.h"
 MODULE_VERSION
 
-#include "mod_export.h"
+#include "cdp_avp_mod.h"
 
 #include "../cdp/cdp_load.h"
 

src/modules/cdp_avp/macros.h

@@ -214,7 +214,7 @@
 #elif defined(CDP_AVP_EXPORT)
 
 	/*
-	 * This is the export of the functions in the module, so this needs to generate the mod_export.h lists
+	 * This is the export of the functions in the module, so this needs to generate the cdp_avp_mod.h lists
 	 */
 	
 	

src/modules/db2_ldap/ld_mod.c → src/modules/db2_ldap/db2_ldap_mod.c

@@ -30,7 +30,7 @@
  * LDAP module interface.
  */
 
-#include "ld_mod.h"
+#include "db2_ldap_mod.h"
 #include "ld_uri.h"
 #include "ld_cfg.h"
 #include "ld_con.h"

src/modules/db2_ldap/ld_cfg.c

@@ -23,7 +23,7 @@
  */
 
 #include "ld_cfg.h"
-#include "ld_mod.h"
+#include "db2_ldap_mod.h"
 #include "ld_uri.h"
 
 #include "../../core/cfg_parser.h"

src/modules/db2_ldap/ld_cmd.c

@@ -33,7 +33,7 @@
 #include "ld_cmd.h"
 #include "ld_fld.h"
 #include "ld_con.h"
-#include "ld_mod.h"
+#include "db2_ldap_mod.h"
 #include "ld_uri.h"
 #include "ld_cfg.h"
 #include "ld_res.h"

src/modules/db_berkeley/bdb_mod.c

@@ -48,7 +48,7 @@
 #include "bdb_fld.h"
 #include "bdb_res.h"
 #include "bdb_cmd.h"
-#include "km_db_berkeley.h"
+#include "db_berkeley.h"
 
 MODULE_VERSION
 

src/modules/db_berkeley/km_db_berkeley.c → src/modules/db_berkeley/db_berkeley.c

@@ -44,7 +44,7 @@
 #include "../../lib/srdb1/db_res.h"
 #include "../../lib/srdb1/db.h"
 #include "../../lib/srdb1/db_query.h"
-#include "km_db_berkeley.h"
+#include "db_berkeley.h"
 #include "km_bdb_lib.h"
 #include "km_bdb_res.h"
 #include "bdb_mod.h"

src/modules/db_berkeley/km_bdb_val.c

@@ -31,7 +31,7 @@
 
 #include "../../lib/srdb1/db_val.h"
 #include "../../lib/srdb1/db_ut.h"
-#include "km_db_berkeley.h"
+#include "db_berkeley.h"
 #include "km_bdb_res.h"
 #include "km_bdb_val.h"
 #include <string.h>

src/modules/erlang/cnode.c

@@ -32,7 +32,7 @@
 
 #include "../../core/pass_fd.h"
 
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 #include "erl_helpers.h"
 #include "cnode.h"
 #include "epmd.h"

src/modules/erlang/epmd.c

@@ -27,7 +27,7 @@
 #include "../../core/dprint.h"
 #include "../../core/ip_addr.h"
 
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 #include "erl_helpers.h"
 #include "epmd.h"
 #include "cnode.h"

src/modules/erlang/erl_api.c

@@ -21,7 +21,7 @@
  *
  */
 
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 #include "erl_helpers.h"
 #include "erl_api.h"
 #include "pv_xbuff.h"

src/modules/erlang/erl_helpers.c

@@ -22,7 +22,7 @@
  */
 
 #include "erl_helpers.h"
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 
 #include "../../core/resolve.h"
 #include "../../core/ip_addr.h"

src/modules/erlang/mod_erlang.c → src/modules/erlang/erlang_mod.c

@@ -40,7 +40,7 @@
 
 #include "../../core/pass_fd.h"
 
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 #include "erl_helpers.h"
 #include "cnode.h"
 #include "handle_rpc.h"

src/modules/erlang/handle_emsg.c

@@ -32,7 +32,7 @@
 #include "erl_helpers.h"
 #include "cnode.h"
 #include "pv_xbuff.h"
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 
 #include "../../core/dprint.h"
 #include "../../core/sr_module.h"

src/modules/erlang/handle_rpc.c

@@ -28,7 +28,7 @@
 #include "../../core/dprint.h"
 
 #include "handle_rpc.h"
-#include "mod_erlang.h"
+#include "erlang_mod.h"
 
 /* create empty recycle bin */
 static struct erl_rpc_garbage *recycle_bin = 0;

src/modules/ims_charging/ccr.c

@@ -1,4 +1,4 @@
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 
 #include "ccr.h"
 #include "Ro_data.h"

src/modules/ims_charging/diameter_ro.h

@@ -2,7 +2,7 @@
 #define __CLIENT_RF_DIAMETER_RO_H
 
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 
 int AAASendCCR(AAASession * session);
 

src/modules/ims_charging/mod.c

@@ -10,7 +10,7 @@
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../../modules/ims_dialog/dlg_hash.h"
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "../../core/parser/parse_to.h"
 #include "ro_timer.h"
 #include "ro_session_hash.h"

src/modules/ims_icscf/mod.h

@@ -70,7 +70,7 @@
 #include "../../core/sr_module.h"
 #include "../../modules/tm/tm_load.h"
 #include "../../modules/ims_dialog/dlg_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 
 #define MOD_NAME "ims_icscf"
 

src/modules/ims_ocs/mod.c

@@ -22,7 +22,7 @@
 #include "../../core/sr_module.h"
 #include "../../core/route.h"
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "../../core/parser/msg_parser.h"
 #include "mod.h"
 #include "msg_faker.h"

src/modules/ims_ocs/msg_faker.c

@@ -23,7 +23,7 @@
 #include "../../core/parser/msg_parser.h"
 #include "../../core/globals.h"
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "ocs_avp_helper.h"
 
 #include "msg_faker.h"

src/modules/ims_ocs/ocs_avp_helper.c

@@ -21,7 +21,7 @@
  */
 
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "ocs_avp_helper.h"
 #include "mod.h"
 

src/modules/ims_qos/mod.c

@@ -60,7 +60,7 @@
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../../modules/ims_dialog/dlg_hash.h"
 #include "../cdp/cdp_load.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "../../core/cfg/cfg_struct.h"
 #include "cdpeventprocessor.h"
 #include "rx_authdata.h"

src/modules/ims_qos/rx_aar.c

@@ -50,7 +50,7 @@
 
 #include "../../core/mem/shm_mem.h"
 #include "../../core/parser/sdp/sdp.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../../modules/tm/tm_load.h"

src/modules/ims_qos/rx_asr.c

@@ -51,7 +51,7 @@
 
 
 
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../ims_usrloc_pcscf/usrloc.h"

src/modules/ims_qos/rx_avp.c

@@ -49,7 +49,7 @@
 
 
 #include <arpa/inet.h>
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../ims_usrloc_pcscf/usrloc.h"
 #include "rx_authdata.h"

src/modules/ims_qos/rx_str.c

@@ -50,7 +50,7 @@
 
 
 
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../ims_usrloc_pcscf/usrloc.h"
 #include "rx_authdata.h"

src/modules/ims_registrar_scscf/reg_mod.c

@@ -71,7 +71,7 @@
 #include "cxdx_sar.h"
 #include "cxdx_callbacks.h"
 #include "registrar_notify.h"
-#include "../cdp_avp/mod_export.h"
+#include "../cdp_avp/cdp_avp_mod.h"
 #include "pvt_message.h"
 #include "reg_rpc.h"
 

src/modules/mohqueue/mohq_db.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "mohq.h"
+#include "mohqueue_mod.h"
 #include "mohq_db.h"
 #include "mohq_funcs.h"
 

src/modules/mohqueue/mohq_funcs.c

@@ -21,7 +21,7 @@
 
 #include <stdarg.h>
 
-#include "mohq.h"
+#include "mohqueue_mod.h"
 #include "mohq_db.h"
 #include "mohq_funcs.h"
 

src/modules/mohqueue/mohq_locks.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "mohq.h"
+#include "mohqueue_mod.h"
 #include "mohq_locks.h"
 
 /**********

src/modules/mohqueue/mohq.c → src/modules/mohqueue/mohqueue_mod.c

@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "mohq.h"
+#include "mohqueue_mod.h"
 #include "mohq_db.h"
 #include "mohq_funcs.h"