X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.h;h=d6aee787b6c4dc38e8fcce46f2b92bc86b408cc8;hp=0eac1ab07e6ce5f619bb2a7d74e7cd441c48e331;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=b1e604969443a400168c98c0a032d3df80307326 diff --git a/main.h b/main.h index 0eac1ab..d6aee78 100644 --- a/main.h +++ b/main.h @@ -9,11 +9,32 @@ ** ** \*****************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #define NAME "LCR" #define DEFAULT_ENDPOINT_APP EndpointAppPBX -#define VERSION_STRING "0.4 (Spring 2007)" +#define VERSION_STRING "1.1 (Summer 2008)" extern int memuse; extern int mmemuse; @@ -26,16 +47,18 @@ extern int classuse; extern int fduse; extern int fhuse; -extern int global_debug; +//extern pthread_mutex_t mutex_lcr; // lcr process mutex + +extern FILE *debug_fp; #define PDEBUG(mask, fmt, arg...) _printdebug(__FUNCTION__, __LINE__, mask, fmt, ## arg) #define PERROR(fmt, arg...) _printerror(__FUNCTION__, __LINE__, fmt, ## arg) #define PDEBUG_RUNTIME(mask, fmt, arg...) _printdebug(NULL, 0, mask, fmt, ## arg) #define PERROR_RUNTIME(fmt, arg...) _printerror(NULL, 0, fmt, ## arg) -void _printdebug(const char *function, int line, unsigned long mask, const char *fmt, ...); +void _printdebug(const char *function, int line, unsigned int mask, const char *fmt, ...); void _printerror(const char *function, int line, const char *fmt, ...); #define DEBUG_FUNC -void debug(const char *function, int line, char *prefix, char *buffer); +void debug(const char *function, int line, const char *prefix, char *buffer); #define DEBUG_CONFIG 0x0001 #define DEBUG_MSG 0x0002 @@ -98,25 +121,15 @@ void debug(const char *function, int line, char *prefix, char *buffer); #ifdef BUDETECT_DEF #define BUDETECT budetect(__FILE__, __LINE__, __FUNCTION__); - void budetect(const char *file, int line, char *function); + void budetect(const char *file, int line, const char *function); #else #define BUDETECT ; #endif -#include -#include -#include -#include -#include -#include -//#include #ifdef __cplusplus extern "C" { #endif -#ifndef SOCKET_MISDN -#include -#include -#endif +#include #ifdef __cplusplus } #endif @@ -128,6 +141,7 @@ extern "C" { #include "endpoint.h" #include "endpointapp.h" #include "apppbx.h" +#include "callerid.h" #include "route.h" #include "port.h" #include "mISDN.h" @@ -140,7 +154,7 @@ extern "C" { #include "alawulaw.h" #include "tones.h" #include "crypt.h" -#include "admin_server.h" +#include "socket_server.h" #include "trace.h" extern double now_d;