From ba30ceeb705e9b4d40ce0d98f6a4e047d47ce919 Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Sun, 21 Sep 2008 15:54:12 +0000 Subject: moved all modules source to src subdirectory.. Moved header files into include subdirectory cleaned up makefiles. --- (limited to 'mod_log_sql_ssl.c') diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c deleted file mode 100644 index 47bba8b..0000000 --- a/mod_log_sql_ssl.c +++ /dev/null @@ -1,106 +0,0 @@ -/* $Id$ */ - -#if defined(WITH_APACHE20) -# include "apache20.h" -#elif defined(WITH_APACHE13) -# include "apache13.h" -#else -# error Unsupported Apache version -#endif - -#ifdef HAVE_CONFIG_H -/* Undefine these to prevent conflicts between Apache ap_config_auto.h and - * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. - */ -#undef PACKAGE_BUGREPORT -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME -#undef PACKAGE_VERSION - -#include "config.h" -#endif - -#include "mod_log_sql.h" - -#include "mod_ssl.h" - -#if defined(WITH_APACHE20) -static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *header_ssl_lookup = NULL; -# define TEST_SSL(r) header_ssl_lookup -#elif defined(WITH_APACHE13) -# define TEST_SSL(r) ap_ctx_get(r->connection->client->ctx, "ssl") -# define header_ssl_lookup ssl_var_lookup -#endif - -static const char *extract_ssl_keysize(request_rec *r, char *a) -{ - char *result = NULL; - if (TEST_SSL(r) != NULL) - { - result = header_ssl_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE"); - log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_KEYSIZE: %s", result); - if (result && result[0]) - return result; - else - return "0"; - } else { - return "0"; - } -} - -static const char *extract_ssl_maxkeysize(request_rec *r, char *a) -{ - char *result = NULL; - if (TEST_SSL(r) != NULL) - { - result = header_ssl_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE"); - log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_ALGKEYSIZE: %s", result); - if (result && result[0]) - return result; - else - return "0"; - } else { - return "0"; - } -} - -static const char *extract_ssl_cipher(request_rec *r, char *a) -{ - char *result = NULL; - if (TEST_SSL(r) != NULL) - { - result = header_ssl_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER"); - log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_CIPHER: %s", result); - if (result && result[0]) - return result; - else - return "0"; - } else { - return "-"; - } -} - - -LOGSQL_REGISTER(ssl) -{ - log_sql_register_function(p, "ssl_keysize", extract_ssl_keysize, LOGSQL_FUNCTION_REQ_FINAL); - log_sql_register_function(p, "ssl_maxkeysize", extract_ssl_maxkeysize, LOGSQL_FUNCTION_REQ_FINAL); - log_sql_register_function(p, "ssl_cipher", extract_ssl_cipher, LOGSQL_FUNCTION_REQ_FINAL); - - log_sql_register_alias(s,p,'q', "ssl_keysize"); - log_sql_register_alias(s,p,'Q', "ssl_maxkeysize"); - log_sql_register_alias(s,p,'z', "ssl_cipher"); - - log_sql_register_field(p, "ssl_keysize", "ssl_keysize", NULL, - "ssl_keysize", LOGSQL_DATATYPE_VARCHAR, 0); - log_sql_register_field(p, "ssl_maxkeysize", "ssl_maxkeysize", NULL, - "ssl_maxkeysize", LOGSQL_DATATYPE_VARCHAR, 0); - log_sql_register_field(p, "ssl_cipher", "ssl_cipher", NULL, - "ssl_cipher", LOGSQL_DATATYPE_VARCHAR, 0); - -#if defined(WITH_APACHE20) - header_ssl_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup); -#endif - LOGSQL_REGISTER_RETURN; -} -- cgit v0.9.2