entrouvert
/
lasso
16
0
Fork 0
Code Issues Pull Requests Releases Activity

move debug functions with other tools functions in tools.c

This commit is contained in:
Frédéric Péters 2004-11-03 20:59:08 +00:00
parent 6ad55ada1f
commit 506a1e11b5
5 changed files with 70 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lasso/xml/Makefile.am
View File

@ -11,7 +11,6 @@ noinst_LTLIBRARIES = liblasso-xml.la
liblasso_xml_la_SOURCES = \
tools.c \
debug.c \
errors.c \
xml.c \
lib_assertion.c \
@ -59,7 +58,6 @@ liblasso_xml_la_SOURCES = \
liblassoinclude_HEADERS = \
strings.h \
tools.h \
debug.h \
errors.h \
xml.h \
lib_assertion.h \

90
lasso/xml/debug.c
View File

@ -1,90 +0,0 @@
/* $Id$
*
* Lasso - A free implementation of the Liberty Alliance specifications.
*
* Copyright (C) 2004 Entr'ouvert
* http://lasso.entrouvert.org
*
* Authors: Nicolas Clapies <nclapies@entrouvert.com>
* Valery Febvre <vfebvre@easter-eggs.com>
*
* 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.
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <time.h>
#include <lasso/xml/debug.h>
/* #define normal "\033[m" */
/* #define red "\033[31m" */
/* #define green "\033[32m" */
/* #define yellow "\033[33m" */
/* #define blue "\033[34m" */
int debug_type;
int debug_line;
char debug_filename[512];
char debug_function[512];
void
set_debug_info(int line,
char *filename,
char *function,
int type)
{
debug_type = type;
debug_line = line;
debug_filename[511] = 0;
debug_function[511] = 0;
strncpy(debug_filename, filename, 511);
strncpy(debug_function, function, 511);
}
void
_debug(GLogLevelFlags level,
const char *format, ...)
{
char debug_string[1024];
time_t ts;
char date[20];
va_list args;
if (level == G_LOG_LEVEL_DEBUG && debug_type == 0) {
g_warning("message() function should not be used with G_LOG_LEVEL_DEBUG level. Use debug() function rather.");
}
debug_type = 0;
va_start(args, format);
vsnprintf(debug_string, sizeof(debug_string), format, args);
va_end(args);
time(&ts);
strftime(date, 20, "%d-%m-%Y %H:%M:%S", localtime(&ts));
if (level == G_LOG_LEVEL_DEBUG || level == G_LOG_LEVEL_CRITICAL) {
g_log("Lasso", level,
"%s (%s/%s:%d)\n======> %s",
date, debug_filename, debug_function, debug_line,
debug_string);
}
else {
g_log("Lasso", level,
"%s\t%s",
date, debug_string);
}
}

50
lasso/xml/debug.h
View File

@ -1,50 +0,0 @@
/* $Id$
*
* Lasso - A free implementation of the Liberty Alliance specifications.
*
* Copyright (C) 2004 Entr'ouvert
* http://lasso.entrouvert.org
*
* Authors: Nicolas Clapies <nclapies@entrouvert.com>
* Valery Febvre <vfebvre@easter-eggs.com>
*
* 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.
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __LASSO_DEBUG_H__
#define __LASSO_DEBUG_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <glib.h>
void set_debug_info(int line, char *filename, char *function, int type);
void _debug(GLogLevelFlags level, const char *format, ...);
#if defined LASSO_DEBUG
#define debug(format, args...) set_debug_info(__LINE__, __FILE__, __FUNCTION__, 1); _debug(G_LOG_LEVEL_DEBUG, format, ##args);
#else
#define debug(format, ...);
#endif
#define message(level, format, args...) set_debug_info(__LINE__, __FILE__, __FUNCTION__, 0); _debug(level, format, ##args);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LASSO_DEBUG_H__ */

52
lasso/xml/tools.c
View File

@ -39,6 +39,13 @@
#include <lasso/xml/errors.h>
#include <lasso/xml/strings.h>
static int debug_type;
static int debug_line;
static char debug_filename[512];
static char debug_function[512];
/**
* lasso_build_random_sequence:
* @buffer: buffer to fill with random sequence
@ -424,7 +431,7 @@ lasso_query_sign(xmlChar *query,
**/
int
lasso_query_verify_signature(const char *query,
const xmlChar *sender_public_key_file)
const char *sender_public_key_file)
{
BIO *bio = NULL;
RSA *rsa = NULL;
@ -530,8 +537,8 @@ lasso_query_verify_signature(const char *query,
*
* Return value: 20-bytes buffer allocated with xmlMalloc
**/
xmlChar*
lasso_sha1(xmlChar *str)
char*
lasso_sha1(const char *str)
{
xmlChar *md;
@ -567,3 +574,42 @@ char** urlencoded_to_strings(const char *str)
return result;
}
void
set_debug_info(int line, char *filename, char *function, int type)
{
debug_type = type;
debug_line = line;
debug_filename[511] = 0;
debug_function[511] = 0;
strncpy(debug_filename, filename, 511);
strncpy(debug_function, function, 511);
}
void
_debug(GLogLevelFlags level, const char *format, ...)
{
char debug_string[1024];
time_t ts;
char date[20];
va_list args;
if (level == G_LOG_LEVEL_DEBUG && debug_type == 0) {
g_warning("message() function should not be used with G_LOG_LEVEL_DEBUG level. Use debug() function rather.");
}
debug_type = 0;
va_start(args, format);
vsnprintf(debug_string, sizeof(debug_string), format, args);
va_end(args);
time(&ts);
strftime(date, 20, "%d-%m-%Y %H:%M:%S", localtime(&ts));
if (level == G_LOG_LEVEL_DEBUG || level == G_LOG_LEVEL_CRITICAL) {
g_log("Lasso", level, "%s (%s/%s:%d)\n======> %s",
date, debug_filename, debug_function, debug_line, debug_string);
} else {
g_log("Lasso", level, "%s\t%s", date, debug_string);
}
}

29
lasso/xml/tools.h
View File

@ -38,7 +38,6 @@ extern "C" {
#include <string.h>
#include <lasso/export.h>
#include <lasso/xml/debug.h>
typedef enum {
LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,
@ -55,22 +54,36 @@ typedef enum {
LASSO_EXPORT void lasso_build_random_sequence(char *buffer, unsigned int size);
LASSO_EXPORT char* lasso_build_unique_id(unsigned int size);
LASSO_EXPORT char* lasso_get_current_time(void);
LASSO_EXPORT lassoPemFileType lasso_get_pem_file_type(const char *pem_file);
LASSO_EXPORT lassoPemFileType lasso_get_pem_file_type(const char *file);
LASSO_EXPORT xmlSecKeyPtr lasso_get_public_key_from_pem_cert_file (const char *pem_cert_file);
LASSO_EXPORT xmlSecKeysMngrPtr lasso_load_certs_from_pem_certs_chain_file (const char* pem_certs_chain_file);
LASSO_EXPORT xmlSecKey* lasso_get_public_key_from_pem_cert_file(const char *file);
LASSO_EXPORT xmlSecKeysMngr* lasso_load_certs_from_pem_certs_chain_file (const char *file);
LASSO_EXPORT xmlChar* lasso_query_sign(xmlChar *query,
lassoSignatureMethod sign_method, const char *private_key_file);
LASSO_EXPORT int lasso_query_verify_signature (const char *query,
const xmlChar *sender_public_key_file);
LASSO_EXPORT int lasso_query_verify_signature(const char *query, const char *sender_public_key_file);
LASSO_EXPORT xmlChar* lasso_sha1 (xmlChar *str);
LASSO_EXPORT char* lasso_sha1(const char *str);
char** urlencoded_to_strings(const char *str);
void set_debug_info(int line, char *filename, char *function, int type);
void _debug(GLogLevelFlags level, const char *format, ...);
#if defined LASSO_DEBUG
# define debug(format, args...) \
set_debug_info(__LINE__, __FILE__, __FUNCTION__, 1); \
_debug(G_LOG_LEVEL_DEBUG, format, ##args);
#else
# define debug(format, ...);
#endif
#define message(level, format, args...) \
set_debug_info(__LINE__, __FILE__, __FUNCTION__, 0); _debug(level, format, ##args);
#ifdef __cplusplus
}
#endif /* __cplusplus */