session_policy: Remove dummy plugin

The default configuration will be created by the core if no
plugin is used. Therefore there is no need for this plugin.

diff --git a/Makefile.plugins b/Makefile.plugins
index 48dec7a..9f31d63 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -235,18 +235,6 @@ plugins_tist_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if SESSION_POLICY
-if SESSION_POLICY_BUILTIN
-builtin_modules += session_policy
-builtin_sources += plugins/session_policy.c
-else
-plugin_LTLIBRARIES += plugins/session_policy.la
-plugin_objects += $(plugins_session_policy_la_OBJECTS)
-plugins_session_policy_la_CFLAGS = $(plugin_cflags)
-plugins_session_policy_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if SESSION_POLICY_LOCAL
 if SESSION_POLICY_LOCAL_BUILTIN
 builtin_modules += session_policy_local

diff --git a/configure.ac b/configure.ac
index 4d71f9c..e0cac94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -252,12 +252,6 @@ AC_ARG_ENABLE(tist,
 AM_CONDITIONAL(TIST, test "${enable_tist}" != "no")
 AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin")
 
-AC_ARG_ENABLE(session-policy,
-       AC_HELP_STRING([--enable-session-policy], [enable default Session policy configuration support]),
-                       [enable_session_policy=${enableval}], [enable_session_policy="no"])
-AM_CONDITIONAL(SESSION_POLICY, test "${enable_session_policy}" != "no")
-AM_CONDITIONAL(SESSION_POLICY_BUILTIN, test "${enable_session_policy}" = "builtin")
-
 AC_ARG_ENABLE(session-policy-local,
        AC_HELP_STRING([--enable-session-policy-local], [enable local file Session policy configuration support]),
                        [enable_session_policy_local=${enableval}], [enable_session_policy_local="no"])

diff --git a/plugins/session_policy.c b/plugins/session_policy.c
deleted file mode 100644 (file)
index 4f27525..0000000
--- a/plugins/session_policy.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2012  BMW Car IT GbmH. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <string.h>
-
-#include <glib.h>
-
-#define CONNMAN_API_SUBJECT_TO_CHANGE
-#include <connman/plugin.h>
-#include <connman/log.h>
-#include <connman/session.h>
-
-static GHashTable *config_hash;
-
-static int policy_create(struct connman_session *session,
-                               connman_session_config_cb callback,
-                               void *user_data)
-{
-       struct connman_session_config *config;
-
-       DBG("session %p", session);
-
-       if (callback == NULL)
-               return -EINVAL;
-
-       config = connman_session_create_default_config();
-       if (config == NULL)
-               return -ENOMEM;
-
-       g_hash_table_replace(config_hash, session, config);
-
-       (*callback)(session, config, user_data, 0);
-
-       return 0;
-}
-
-static void policy_destroy(struct connman_session *session)
-{
-       DBG("session %p", session);
-
-       g_hash_table_remove(config_hash, session);
-}
-
-static struct connman_session_policy session_policy = {
-       .name = "session policy configuration",
-       .priority = CONNMAN_SESSION_POLICY_PRIORITY_LOW,
-       .create = policy_create,
-       .destroy = policy_destroy,
-};
-
-static int session_policy_init(void)
-{
-       int err;
-
-       err = connman_session_policy_register(&session_policy);
-       if (err < 0)
-               return err;
-
-       config_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL,
-                                               g_free);
-       if (config_hash == NULL) {
-               connman_session_policy_unregister(&session_policy);
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-static void session_policy_exit(void)
-{
-       g_hash_table_destroy(config_hash);
-
-       connman_session_policy_unregister(&session_policy);
-}
-
-CONNMAN_PLUGIN_DEFINE(session_policy, "Session policy configuration plugin",
-               VERSION, CONNMAN_PLUGIN_PRIORITY_DEFAULT,
-               session_policy_init, session_policy_exit)