[asterisk-commits] tilghman: branch tilghman/auto_preload r275813 - in /team/tilghman/auto_prelo...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jul 12 17:42:56 CDT 2010
Author: tilghman
Date: Mon Jul 12 17:42:49 2010
New Revision: 275813
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275813
Log:
Assign more priorities to modules and make the default 128
Modified:
team/tilghman/auto_preload/addons/chan_mobile.c
team/tilghman/auto_preload/addons/res_config_mysql.c
team/tilghman/auto_preload/apps/app_confbridge.c
team/tilghman/auto_preload/apps/app_meetme.c
team/tilghman/auto_preload/apps/app_queue.c
team/tilghman/auto_preload/cdr/cdr_adaptive_odbc.c
team/tilghman/auto_preload/cdr/cdr_csv.c
team/tilghman/auto_preload/cdr/cdr_custom.c
team/tilghman/auto_preload/cdr/cdr_manager.c
team/tilghman/auto_preload/cdr/cdr_odbc.c
team/tilghman/auto_preload/cdr/cdr_pgsql.c
team/tilghman/auto_preload/cdr/cdr_radius.c
team/tilghman/auto_preload/cdr/cdr_sqlite.c
team/tilghman/auto_preload/cdr/cdr_sqlite3_custom.c
team/tilghman/auto_preload/cdr/cdr_syslog.c
team/tilghman/auto_preload/cdr/cdr_tds.c
team/tilghman/auto_preload/cel/cel_adaptive_odbc.c
team/tilghman/auto_preload/cel/cel_custom.c
team/tilghman/auto_preload/cel/cel_manager.c
team/tilghman/auto_preload/cel/cel_pgsql.c
team/tilghman/auto_preload/cel/cel_radius.c
team/tilghman/auto_preload/cel/cel_sqlite3_custom.c
team/tilghman/auto_preload/cel/cel_tds.c
team/tilghman/auto_preload/channels/chan_agent.c
team/tilghman/auto_preload/channels/chan_alsa.c
team/tilghman/auto_preload/channels/chan_bridge.c
team/tilghman/auto_preload/channels/chan_console.c
team/tilghman/auto_preload/channels/chan_dahdi.c
team/tilghman/auto_preload/channels/chan_gtalk.c
team/tilghman/auto_preload/channels/chan_h323.c
team/tilghman/auto_preload/channels/chan_iax2.c
team/tilghman/auto_preload/channels/chan_jingle.c
team/tilghman/auto_preload/channels/chan_local.c
team/tilghman/auto_preload/channels/chan_mgcp.c
team/tilghman/auto_preload/channels/chan_misdn.c
team/tilghman/auto_preload/channels/chan_multicast_rtp.c
team/tilghman/auto_preload/channels/chan_sip.c
team/tilghman/auto_preload/channels/chan_skinny.c
team/tilghman/auto_preload/funcs/func_curl.c
team/tilghman/auto_preload/funcs/func_devstate.c
team/tilghman/auto_preload/include/asterisk/module.h
team/tilghman/auto_preload/main/config.c
team/tilghman/auto_preload/main/loader.c
team/tilghman/auto_preload/res/res_calendar.c
team/tilghman/auto_preload/res/res_calendar_caldav.c
team/tilghman/auto_preload/res/res_calendar_ews.c
team/tilghman/auto_preload/res/res_calendar_exchange.c
team/tilghman/auto_preload/res/res_calendar_icalendar.c
team/tilghman/auto_preload/res/res_config_curl.c
team/tilghman/auto_preload/res/res_config_odbc.c
team/tilghman/auto_preload/res/res_jabber.c
team/tilghman/auto_preload/res/res_odbc.c
Modified: team/tilghman/auto_preload/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/addons/chan_mobile.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/addons/chan_mobile.c (original)
+++ team/tilghman/auto_preload/addons/chan_mobile.c Mon Jul 12 17:42:49 2010
@@ -4584,7 +4584,8 @@
return AST_MODULE_LOAD_FAILURE;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Bluetooth Mobile Device Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bluetooth Mobile Device Channel Driver",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/addons/res_config_mysql.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/addons/res_config_mysql.c (original)
+++ team/tilghman/auto_preload/addons/res_config_mysql.c Mon Jul 12 17:42:49 2010
@@ -1755,9 +1755,10 @@
return CLI_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL RealTime Configuration Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MySQL RealTime Configuration Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_REALTIME_DRIVER,
);
Modified: team/tilghman/auto_preload/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/apps/app_confbridge.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/apps/app_confbridge.c (original)
+++ team/tilghman/auto_preload/apps/app_confbridge.c Mon Jul 12 17:42:49 2010
@@ -819,4 +819,8 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Conference Bridge Application");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Conference Bridge Application",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
Modified: team/tilghman/auto_preload/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/apps/app_meetme.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/apps/app_meetme.c (original)
+++ team/tilghman/auto_preload/apps/app_meetme.c Mon Jul 12 17:42:49 2010
@@ -6975,9 +6975,10 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MeetMe conference bridge",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
);
Modified: team/tilghman/auto_preload/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/apps/app_queue.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/apps/app_queue.c (original)
+++ team/tilghman/auto_preload/apps/app_queue.c Mon Jul 12 17:42:49 2010
@@ -8132,9 +8132,10 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "True Call Queueing",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_adaptive_odbc.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_adaptive_odbc.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_adaptive_odbc.c Mon Jul 12 17:42:49 2010
@@ -754,9 +754,10 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CDR backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_csv.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_csv.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_csv.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_csv.c Mon Jul 12 17:42:49 2010
@@ -357,8 +357,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_custom.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_custom.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_custom.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_custom.c Mon Jul 12 17:42:49 2010
@@ -211,9 +211,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_manager.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_manager.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_manager.c Mon Jul 12 17:42:49 2010
@@ -218,8 +218,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_odbc.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_odbc.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_odbc.c Mon Jul 12 17:42:49 2010
@@ -279,8 +279,9 @@
return odbc_load_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_pgsql.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_pgsql.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_pgsql.c Mon Jul 12 17:42:49 2010
@@ -587,8 +587,9 @@
return config_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_radius.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_radius.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_radius.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_radius.c Mon Jul 12 17:42:49 2010
@@ -263,4 +263,8 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CDR Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+ );
Modified: team/tilghman/auto_preload/cdr/cdr_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_sqlite.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_sqlite.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_sqlite.c Mon Jul 12 17:42:49 2010
@@ -238,4 +238,8 @@
return AST_MODULE_LOAD_DECLINE;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SQLite CDR Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+);
Modified: team/tilghman/auto_preload/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_sqlite3_custom.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_sqlite3_custom.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_sqlite3_custom.c Mon Jul 12 17:42:49 2010
@@ -354,8 +354,9 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CDR Module",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CDR Module",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_syslog.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_syslog.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_syslog.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_syslog.c Mon Jul 12 17:42:49 2010
@@ -271,8 +271,9 @@
return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable syslog CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cdr/cdr_tds.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cdr/cdr_tds.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cdr/cdr_tds.c (original)
+++ team/tilghman/auto_preload/cdr/cdr_tds.c Mon Jul 12 17:42:49 2010
@@ -628,8 +628,9 @@
return tds_unload_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_adaptive_odbc.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_adaptive_odbc.c (original)
+++ team/tilghman/auto_preload/cel/cel_adaptive_odbc.c Mon Jul 12 17:42:49 2010
@@ -783,9 +783,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CEL backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CEL backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_custom.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_custom.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_custom.c (original)
+++ team/tilghman/auto_preload/cel/cel_custom.c Mon Jul 12 17:42:49 2010
@@ -208,9 +208,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_manager.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_manager.c (original)
+++ team/tilghman/auto_preload/cel/cel_manager.c Mon Jul 12 17:42:49 2010
@@ -168,8 +168,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_pgsql.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_pgsql.c (original)
+++ team/tilghman/auto_preload/cel/cel_pgsql.c Mon Jul 12 17:42:49 2010
@@ -558,8 +558,9 @@
return my_load_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_radius.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_radius.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_radius.c (original)
+++ team/tilghman/auto_preload/cel/cel_radius.c Mon Jul 12 17:42:49 2010
@@ -251,4 +251,8 @@
}
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CEL Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CEL Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+);
Modified: team/tilghman/auto_preload/cel/cel_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_sqlite3_custom.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_sqlite3_custom.c (original)
+++ team/tilghman/auto_preload/cel/cel_sqlite3_custom.c Mon Jul 12 17:42:49 2010
@@ -357,8 +357,9 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CEL Module",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CEL Module",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/cel/cel_tds.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/cel/cel_tds.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/cel/cel_tds.c (original)
+++ team/tilghman/auto_preload/cel/cel_tds.c Mon Jul 12 17:42:49 2010
@@ -576,8 +576,9 @@
return tds_unload_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_agent.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_agent.c (original)
+++ team/tilghman/auto_preload/channels/chan_agent.c Mon Jul 12 17:42:49 2010
@@ -2476,8 +2476,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Agent Proxy Channel",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Agent Proxy Channel",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_alsa.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_alsa.c (original)
+++ team/tilghman/auto_preload/channels/chan_alsa.c Mon Jul 12 17:42:49 2010
@@ -1009,4 +1009,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ALSA Console Channel Driver");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+ );
Modified: team/tilghman/auto_preload/channels/chan_bridge.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_bridge.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_bridge.c (original)
+++ team/tilghman/auto_preload/channels/chan_bridge.c Mon Jul 12 17:42:49 2010
@@ -242,4 +242,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Bridge Interaction Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bridge Interaction Channel",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
Modified: team/tilghman/auto_preload/channels/chan_console.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_console.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_console.c (original)
+++ team/tilghman/auto_preload/channels/chan_console.c Mon Jul 12 17:42:49 2010
@@ -1519,8 +1519,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Console Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Console Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_dahdi.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_dahdi.c (original)
+++ team/tilghman/auto_preload/channels/chan_dahdi.c Mon Jul 12 17:42:49 2010
@@ -17829,8 +17829,9 @@
* AST_MODULE_INFO(, , "DAHDI Telephony"
*/
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc,
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_gtalk.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_gtalk.c (original)
+++ team/tilghman/auto_preload/channels/chan_gtalk.c Mon Jul 12 17:42:49 2010
@@ -2152,8 +2152,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Gtalk Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gtalk Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_h323.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_h323.c (original)
+++ team/tilghman/auto_preload/channels/chan_h323.c Mon Jul 12 17:42:49 2010
@@ -3426,8 +3426,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "The NuFone Network's OpenH323 Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_iax2.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_iax2.c (original)
+++ team/tilghman/auto_preload/channels/chan_iax2.c Mon Jul 12 17:42:49 2010
@@ -14506,8 +14506,9 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Inter Asterisk eXchange (Ver 2)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchange (Ver 2)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_jingle.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_jingle.c (original)
+++ team/tilghman/auto_preload/channels/chan_jingle.c Mon Jul 12 17:42:49 2010
@@ -1961,8 +1961,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Jingle Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Jingle Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_local.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_local.c (original)
+++ team/tilghman/auto_preload/channels/chan_local.c Mon Jul 12 17:42:49 2010
@@ -1038,4 +1038,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Local Proxy Channel (Note: used internally by other modules)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Local Proxy Channel (Note: used internally by other modules)",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+ );
Modified: team/tilghman/auto_preload/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_mgcp.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_mgcp.c (original)
+++ team/tilghman/auto_preload/channels/chan_mgcp.c Mon Jul 12 17:42:49 2010
@@ -4895,8 +4895,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Media Gateway Control Protocol (MGCP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_misdn.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_misdn.c (original)
+++ team/tilghman/auto_preload/channels/chan_misdn.c Mon Jul 12 17:42:49 2010
@@ -12297,8 +12297,9 @@
}
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for mISDN Support (BRI/PRI)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Channel driver for mISDN Support (BRI/PRI)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_multicast_rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_multicast_rtp.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_multicast_rtp.c (original)
+++ team/tilghman/auto_preload/channels/chan_multicast_rtp.c Mon Jul 12 17:42:49 2010
@@ -184,4 +184,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Multicast RTP Paging Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Paging Channel",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
Modified: team/tilghman/auto_preload/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_sip.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_sip.c (original)
+++ team/tilghman/auto_preload/channels/chan_sip.c Mon Jul 12 17:42:49 2010
@@ -28153,8 +28153,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Session Initiation Protocol (SIP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Protocol (SIP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/channels/chan_skinny.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/channels/chan_skinny.c (original)
+++ team/tilghman/auto_preload/channels/chan_skinny.c Mon Jul 12 17:42:49 2010
@@ -7443,8 +7443,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: team/tilghman/auto_preload/funcs/func_curl.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/funcs/func_curl.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/funcs/func_curl.c (original)
+++ team/tilghman/auto_preload/funcs/func_curl.c Mon Jul 12 17:42:49 2010
@@ -641,7 +641,6 @@
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Load external URL",
.load = load_module,
.unload = unload_module,
- .reload = reload,
- .load_pri = AST_MODPRI_REALTIME_DEPEND + 1, /* After res_curl.so */
+ .load_pri = AST_MODPRI_REALTIME_DEPEND2,
);
Modified: team/tilghman/auto_preload/funcs/func_devstate.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/funcs/func_devstate.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/funcs/func_devstate.c (original)
+++ team/tilghman/auto_preload/funcs/func_devstate.c Mon Jul 12 17:42:49 2010
@@ -349,4 +349,8 @@
return res;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Gets or sets a device state in the dialplan");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gets or sets a device state in the dialplan",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
Modified: team/tilghman/auto_preload/include/asterisk/module.h
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/include/asterisk/module.h?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/include/asterisk/module.h (original)
+++ team/tilghman/auto_preload/include/asterisk/module.h Mon Jul 12 17:42:49 2010
@@ -194,10 +194,18 @@
};
enum ast_module_load_priority {
- AST_MODPRI_TIMING = 10, /*!< Provides a timing interface */
- AST_MODPRI_REALTIME_DEPEND = 20, /*!< Dependency for a realtime driver */
- AST_MODPRI_REALTIME_DRIVER = 30, /*!< A realtime driver, which provides configuration services for other modules */
- AST_MODPRI_APP_DEPEND = 80, /*!< Dependency for an application */
+ AST_MODPRI_TIMING = 10, /*!< Provides a timing interface */
+ AST_MODPRI_REALTIME_DEPEND = 20, /*!< Dependency for a realtime driver */
+ AST_MODPRI_REALTIME_DEPEND2 = 25, /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */
+ AST_MODPRI_REALTIME_DRIVER = 30, /*!< A realtime driver, which provides configuration services for other modules */
+ AST_MODPRI_CHANNEL_DEPEND = 50, /*!< Channel drivers (provide devicestate) */
+ AST_MODPRI_CHANNEL_DRIVER = 60, /*!< Channel drivers (provide devicestate) */
+ AST_MODPRI_APP_DEPEND = 70, /*!< Dependency for an application */
+ AST_MODPRI_DEVSTATE_PROVIDER = 80, /*!< Applications and other modules that _provide_ devicestate (e.g. meetme) */
+ AST_MODPRI_DEVSTATE_PLUGIN = 90, /*!< Plugin for a module that provides devstate (e.g. res_calendar_*) */
+ AST_MODPRI_CDR_DRIVER = 100, /*!< CDR or CEL backend */
+ AST_MODPRI_DEFAULT = 128, /*!< Modules not otherwise defined (such as most apps) will load here */
+ AST_MODPRI_DEVSTATE_CONSUMER = 150, /*!< Certain modules, which consume devstate, need to load after all others (e.g. app_queue) */
};
struct ast_module_info {
@@ -252,7 +260,7 @@
void ast_module_unref(struct ast_module *);
#if defined(__cplusplus) || defined(c_plusplus)
-#define AST_MODULE_INFO(keystr, flags_to_set, desc, load_func, unload_func, reload_func) \
+#define AST_MODULE_INFO(keystr, flags_to_set, desc, load_func, unload_func, reload_func, load_pri) \
static struct ast_module_info __mod_info = { \
NULL, \
load_func, \
@@ -265,6 +273,7 @@
keystr, \
flags_to_set, \
AST_BUILDOPT_SUM, \
+ load_pri, \
}; \
static void __attribute__((constructor)) __reg_module(void) \
{ \
@@ -277,10 +286,11 @@
static const __attribute__((unused)) struct ast_module_info *ast_module_info = &__mod_info
#define AST_MODULE_INFO_STANDARD(keystr, desc) \
- AST_MODULE_INFO(keystr, AST_MODFLAG_DEFAULT, desc, \
+ AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc, \
load_module, \
unload_module, \
- NULL \
+ NULL, \
+ AST_MODPRI_DEFAULT \
)
#else /* plain C */
@@ -371,9 +381,10 @@
static const struct ast_module_info *ast_module_info = &__mod_info
#define AST_MODULE_INFO_STANDARD(keystr, desc) \
- AST_MODULE_INFO(keystr, AST_MODFLAG_DEFAULT, desc, \
+ AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc, \
.load = load_module, \
.unload = unload_module, \
+ .load_pri = AST_MODPRI_DEFAULT, \
)
#endif /* plain C */
Modified: team/tilghman/auto_preload/main/config.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/main/config.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/main/config.c (original)
+++ team/tilghman/auto_preload/main/config.c Mon Jul 12 17:42:49 2010
@@ -2060,7 +2060,7 @@
cfg->include_level++;
- if (!ast_test_flags(flags, CONFIG_FLAG_NOREALTIME) && config_engine_list) {
+ if (!ast_test_flag(&flags, CONFIG_FLAG_NOREALTIME) && config_engine_list) {
struct ast_config_engine *eng;
eng = find_engine(filename, db, sizeof(db), table, sizeof(table));
Modified: team/tilghman/auto_preload/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/main/loader.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/main/loader.c (original)
+++ team/tilghman/auto_preload/main/loader.c Mon Jul 12 17:42:49 2010
@@ -899,9 +899,9 @@
struct ast_module *a_mod = (struct ast_module *) a;
struct ast_module *b_mod = (struct ast_module *) b;
int res = -1;
- /* if load_pri is not set, default is 255. Lower is better*/
- unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 255;
- unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 255;
+ /* if load_pri is not set, default is 128. Lower is better*/
+ unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 128;
+ unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 128;
if (a_pri == b_pri) {
res = 0;
} else if (a_pri < b_pri) {
Modified: team/tilghman/auto_preload/res/res_calendar.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_calendar.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/res/res_calendar.c (original)
+++ team/tilghman/auto_preload/res/res_calendar.c Mon Jul 12 17:42:49 2010
@@ -1693,8 +1693,9 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Asterisk Calendar integration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Calendar integration",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
);
Modified: team/tilghman/auto_preload/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_calendar_caldav.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/res/res_calendar_caldav.c (original)
+++ team/tilghman/auto_preload/res/res_calendar_caldav.c Mon Jul 12 17:42:49 2010
@@ -690,7 +690,8 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk CalDAV Calendar Integration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk CalDAV Calendar Integration",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
);
Modified: team/tilghman/auto_preload/res/res_calendar_ews.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_calendar_ews.c?view=diff&rev=275813&r1=275812&r2=275813
==============================================================================
--- team/tilghman/auto_preload/res/res_calendar_ews.c (original)
[... 112 lines stripped ...]
More information about the asterisk-commits
mailing list