app_python: declaration of global vars moved in c files

- declared as extern in h files
- prefixed the names to avoid eventual conflicts when using common words
  for var names

modules/app_python/apy_kemi.c

@@ -24,6 +24,7 @@
 
 #include "../../dprint.h"
 #include "../../route.h"
+#include "../../kemi.h"
 
 #include "python_exec.h"
 #include "apy_kemi.h"
@@ -82,3 +83,11 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname)
 
 	return 1;
 }
+
+/**
+ *
+ */
+int sr_apy_init_ksr(void)
+{
+	return 0;
+}

modules/app_python/mod_Core.c

@@ -41,16 +41,18 @@
 #include "mod_Router.h"
 #include "mod_Core.h"
 
+PyObject *_sr_apy_core_module = NULL;
+
 PyMethodDef CoreMethods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
 void init_mod_Core(void)
 {
-	core_module = Py_InitModule("Router.Core", CoreMethods);
-	PyDict_SetItemString(main_module_dict, "Core", core_module);
+	_sr_apy_core_module = Py_InitModule("Router.Core", CoreMethods);
+	PyDict_SetItemString(_sr_apy_main_module_dict, "Core", _sr_apy_core_module);
 
-	Py_INCREF(core_module);
+	Py_INCREF(_sr_apy_core_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Core' has been initialized\n");
@@ -60,7 +62,7 @@ void init_mod_Core(void)
 
 void destroy_mod_Core(void)
 {
-	Py_XDECREF(core_module);
+	Py_XDECREF(_sr_apy_core_module);
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Core' has been destroyed\n");
 #endif

modules/app_python/mod_Core.h

@@ -26,7 +26,7 @@
 #include <Python.h>
 #include <libgen.h>
 
-PyObject *core_module;
+extern PyObject *_sr_apy_core_module;
 
 extern PyMethodDef CoreMethods[];
 

modules/app_python/mod_Logger.c

@@ -41,6 +41,8 @@
 #include "mod_Router.h"
 #include "mod_Logger.h"
 
+PyObject *_sr_apy_logger_module = NULL;
+
 /*
  * Python method: LM_GEN1(self, int log_level, str msg)
  */
@@ -204,30 +206,40 @@ PyMethodDef LoggerMethods[] = {
 
 void init_mod_Logger(void)
 {
-	logger_module = Py_InitModule("Router.Logger", LoggerMethods);
-	PyDict_SetItemString(main_module_dict, "Logger", logger_module);
+	_sr_apy_logger_module = Py_InitModule("Router.Logger", LoggerMethods);
+	PyDict_SetItemString(_sr_apy_main_module_dict, "Logger", _sr_apy_logger_module);
 
 	/*
 	 * Log levels
 	 * Reference: dprint.h
 	 */
-	PyModule_AddObject(logger_module, "L_ALERT",  PyInt_FromLong((long)L_ALERT));
-	PyModule_AddObject(logger_module, "L_BUG",    PyInt_FromLong((long)L_BUG));
-	PyModule_AddObject(logger_module, "L_CRIT2",  PyInt_FromLong((long)L_CRIT2)); /* like L_CRIT, but adds prefix */
-	PyModule_AddObject(logger_module, "L_CRIT",   PyInt_FromLong((long)L_CRIT));  /* no prefix added */
-	PyModule_AddObject(logger_module, "L_ERR",    PyInt_FromLong((long)L_ERR));
-	PyModule_AddObject(logger_module, "L_WARN",   PyInt_FromLong((long)L_WARN));
-	PyModule_AddObject(logger_module, "L_NOTICE", PyInt_FromLong((long)L_NOTICE));
-	PyModule_AddObject(logger_module, "L_INFO",   PyInt_FromLong((long)L_INFO));
-	PyModule_AddObject(logger_module, "L_DBG",    PyInt_FromLong((long)L_DBG));
+	PyModule_AddObject(_sr_apy_logger_module, "L_ALERT",
+			PyInt_FromLong((long)L_ALERT));
+	PyModule_AddObject(_sr_apy_logger_module, "L_BUG",
+			PyInt_FromLong((long)L_BUG));
+	PyModule_AddObject(_sr_apy_logger_module, "L_CRIT2",
+			PyInt_FromLong((long)L_CRIT2)); /* like L_CRIT, but adds prefix */
+	PyModule_AddObject(_sr_apy_logger_module, "L_CRIT",
+			PyInt_FromLong((long)L_CRIT));  /* no prefix added */
+	PyModule_AddObject(_sr_apy_logger_module, "L_ERR",
+			PyInt_FromLong((long)L_ERR));
+	PyModule_AddObject(_sr_apy_logger_module, "L_WARN",
+			PyInt_FromLong((long)L_WARN));
+	PyModule_AddObject(_sr_apy_logger_module, "L_NOTICE",
+			PyInt_FromLong((long)L_NOTICE));
+	PyModule_AddObject(_sr_apy_logger_module, "L_INFO",
+			PyInt_FromLong((long)L_INFO));
+	PyModule_AddObject(_sr_apy_logger_module, "L_DBG",
+			PyInt_FromLong((long)L_DBG));
 
 	/*
 	 * Facility
 	 * Reference: dprint.h
 	 */
-	PyModule_AddObject(logger_module, "DEFAULT_FACILITY", PyInt_FromLong((long)DEFAULT_FACILITY));
+	PyModule_AddObject(_sr_apy_logger_module, "DEFAULT_FACILITY",
+			PyInt_FromLong((long)DEFAULT_FACILITY));
 
-	Py_INCREF(logger_module);
+	Py_INCREF(_sr_apy_logger_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Logger' has been initialized\n");
@@ -237,7 +249,7 @@ void init_mod_Logger(void)
 
 void destroy_mod_Logger(void)
 {
-	Py_XDECREF(logger_module);
+	Py_XDECREF(_sr_apy_logger_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Logger' has been destroyed\n");

modules/app_python/mod_Logger.h

@@ -26,7 +26,7 @@
 #include <Python.h>
 #include <libgen.h>
 
-PyObject *logger_module;
+extern PyObject *_sr_apy_logger_module;
 
 extern PyMethodDef LoggerMethods[];
 

modules/app_python/mod_Ranks.c

@@ -41,29 +41,43 @@
 #include "mod_Router.h"
 #include "mod_Ranks.h"
 
+PyObject *_sr_apy_ranks_module = NULL;
+
 PyMethodDef RanksMethods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
 void init_mod_Ranks(void)
 {
-	ranks_module = Py_InitModule("Router.Ranks", RanksMethods);
-	PyDict_SetItemString(main_module_dict, "Ranks", ranks_module);
-
-	PyModule_AddObject(ranks_module, "PROC_MAIN",		PyInt_FromLong((long)PROC_MAIN));
-	PyModule_AddObject(ranks_module, "PROC_TIMER",		PyInt_FromLong((long)PROC_TIMER));
-	PyModule_AddObject(ranks_module, "PROC_RPC",		PyInt_FromLong((long)PROC_RPC));
-	PyModule_AddObject(ranks_module, "PROC_FIFO",		PyInt_FromLong((long)PROC_FIFO));
-	PyModule_AddObject(ranks_module, "PROC_TCP_MAIN",		PyInt_FromLong((long)PROC_TCP_MAIN));
-	PyModule_AddObject(ranks_module, "PROC_UNIXSOCK",		PyInt_FromLong((long)PROC_UNIXSOCK));
-	PyModule_AddObject(ranks_module, "PROC_ATTENDANT",		PyInt_FromLong((long)PROC_ATTENDANT));
-	PyModule_AddObject(ranks_module, "PROC_INIT",		PyInt_FromLong((long)PROC_INIT));
-	PyModule_AddObject(ranks_module, "PROC_NOCHLDINIT",		PyInt_FromLong((long)PROC_NOCHLDINIT));
-	PyModule_AddObject(ranks_module, "PROC_SIPINIT",		PyInt_FromLong((long)PROC_SIPINIT));
-	PyModule_AddObject(ranks_module, "PROC_SIPRPC",		PyInt_FromLong((long)PROC_SIPRPC));
-	PyModule_AddObject(ranks_module, "PROC_MIN",		PyInt_FromLong((long)PROC_MIN));
-
-	Py_INCREF(ranks_module);
+	_sr_apy_ranks_module = Py_InitModule("Router.Ranks", RanksMethods);
+	PyDict_SetItemString(_sr_apy_main_module_dict, "Ranks", _sr_apy_ranks_module);
+
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_MAIN",
+			PyInt_FromLong((long)PROC_MAIN));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_TIMER",
+			PyInt_FromLong((long)PROC_TIMER));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_RPC",
+			PyInt_FromLong((long)PROC_RPC));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_FIFO",
+			PyInt_FromLong((long)PROC_FIFO));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_TCP_MAIN",
+			PyInt_FromLong((long)PROC_TCP_MAIN));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_UNIXSOCK",
+			PyInt_FromLong((long)PROC_UNIXSOCK));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_ATTENDANT",
+			PyInt_FromLong((long)PROC_ATTENDANT));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_INIT",
+			PyInt_FromLong((long)PROC_INIT));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_NOCHLDINIT",
+			PyInt_FromLong((long)PROC_NOCHLDINIT));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_SIPINIT",
+			PyInt_FromLong((long)PROC_SIPINIT));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_SIPRPC",
+			PyInt_FromLong((long)PROC_SIPRPC));
+	PyModule_AddObject(_sr_apy_ranks_module, "PROC_MIN",
+			PyInt_FromLong((long)PROC_MIN));
+
+	Py_INCREF(_sr_apy_ranks_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Ranks' has been initialized\n");
@@ -73,7 +87,7 @@ void init_mod_Ranks(void)
 
 void destroy_mod_Ranks(void)
 {
-	Py_XDECREF(ranks_module);
+	Py_XDECREF(_sr_apy_ranks_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router.Ranks' has been destroyed\n");

modules/app_python/mod_Ranks.h

@@ -25,7 +25,7 @@
 #include <Python.h>
 #include <libgen.h>
 
-PyObject *ranks_module;
+extern PyObject *_sr_apy_ranks_module;
 
 extern PyMethodDef RanksMethods[];
 

modules/app_python/mod_Router.c

@@ -39,6 +39,8 @@
 
 #include "mod_Router.h"
 
+PyObject *_sr_apy_main_module = NULL;
+PyObject *_sr_apy_main_module_dict = NULL;
 
 PyMethodDef RouterMethods[] = {
 	{NULL, NULL, 0, NULL}
@@ -46,10 +48,10 @@ PyMethodDef RouterMethods[] = {
 
 void init_mod_Router(void)
 {
-	main_module = Py_InitModule("Router", RouterMethods);
-	main_module_dict = PyModule_GetDict(main_module);
+	_sr_apy_main_module = Py_InitModule("Router", RouterMethods);
+	_sr_apy_main_module_dict = PyModule_GetDict(_sr_apy_main_module);
 
-	Py_INCREF(main_module);
+	Py_INCREF(_sr_apy_main_module);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router' has been initialized\n");
@@ -59,8 +61,8 @@ void init_mod_Router(void)
 
 void destroy_mod_Router(void)
 {
-	Py_XDECREF(main_module);
-	Py_XDECREF(main_module_dict);
+	Py_XDECREF(_sr_apy_main_module);
+	Py_XDECREF(_sr_apy_main_module_dict);
 
 #ifdef WITH_EXTRA_DEBUG
 	LM_ERR("Module 'Router' has been destroyed\n");

modules/app_python/mod_Router.h

@@ -25,8 +25,8 @@
 #include <Python.h>
 #include <libgen.h>
 
-PyObject *main_module;
-PyObject *main_module_dict;
+extern PyObject *_sr_apy_main_module;
+extern PyObject *_sr_apy_main_module_dict;
 
 extern PyMethodDef RouterMethods[];