From e3edd7e75e63b13375c890a8df202b61440c76b4 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 19 May 2011 17:21:31 +0200 Subject: [PATCH] Add enum names for database drivers --- src/libstrongswan/Android.mk | 4 ++-- src/libstrongswan/Makefile.am | 4 ++-- src/libstrongswan/database/database.c | 22 ++++++++++++++++++++++ src/libstrongswan/database/database.h | 7 +++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 src/libstrongswan/database/database.c diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 4788c48e2..dbaa1cbe5 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -47,8 +47,8 @@ credentials/sets/cert_cache.c credentials/sets/cert_cache.h \ credentials/sets/mem_cred.c credentials/sets/mem_cred.h \ credentials/sets/callback_cred.c credentials/sets/callback_cred.h \ credentials/auth_cfg.c credentials/auth_cfg.h credentials/credential_set.h \ -credentials/cert_validator.h \ -database/database.h database/database_factory.h database/database_factory.c \ +credentials/cert_validator.h database/database.h database/database.c \ +database/database_factory.h database/database_factory.c \ fetcher/fetcher.h fetcher/fetcher.c fetcher/fetcher_manager.h fetcher/fetcher_manager.c \ eap/eap.h eap/eap.c \ pen/pen.h pen/pen.c \ diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 3f75fbe9b..5739d152d 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -45,8 +45,8 @@ credentials/sets/cert_cache.c credentials/sets/cert_cache.h \ credentials/sets/mem_cred.c credentials/sets/mem_cred.h \ credentials/sets/callback_cred.c credentials/sets/callback_cred.h \ credentials/auth_cfg.c credentials/auth_cfg.h credentials/credential_set.h \ -credentials/cert_validator.h \ -database/database.h database/database_factory.h database/database_factory.c \ +credentials/cert_validator.h database/database.h database/database.c \ +database/database_factory.h database/database_factory.c \ fetcher/fetcher.h fetcher/fetcher.c fetcher/fetcher_manager.h fetcher/fetcher_manager.c \ eap/eap.h eap/eap.c \ pen/pen.h pen/pen.c \ diff --git a/src/libstrongswan/database/database.c b/src/libstrongswan/database/database.c new file mode 100644 index 000000000..60ef6cd7c --- /dev/null +++ b/src/libstrongswan/database/database.c @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2011 Martin Willi + * Copyright (C) 2011 revosec AG + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. See . + * + * 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. + */ + +#include "database.h" + +ENUM(db_driver_names, DB_ANY, DB_MYSQL, + "any", + "SQLite", + "MySQL", +); diff --git a/src/libstrongswan/database/database.h b/src/libstrongswan/database/database.h index 8df1c6f7f..dda29b5fb 100644 --- a/src/libstrongswan/database/database.h +++ b/src/libstrongswan/database/database.h @@ -49,12 +49,19 @@ enum db_type_t { * Database implementation type. */ enum db_driver_t { + /** matches to other databases */ + DB_ANY = 0, /** SQLite database */ DB_SQLITE, /** MySQL database */ DB_MYSQL, }; +/** + * Names for db_driver_t + */ +extern enum_name_t *db_driver_names; + /** * Interface for a database implementation. *