X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.h;h=8d8b4483c949f6604de1a2b7a22d97d2fc0199a5;hp=0dc82d4682a5c94dfca87bd7d865af0631472a84;hb=f854931ffbee9464b278c433c4fdc7c3ea5af2fb;hpb=ee7da8a9d7f64695f0111f8633d5f8ea173b77be

diff --git a/main.h b/main.h
index 0dc82d4..8d8b448 100644
--- a/main.h
+++ b/main.h
@@ -29,12 +29,9 @@
 #include <sys/file.h>
 #include <sys/mman.h>
 #include <sys/resource.h>
-#include <config.h>
 
 #define NAME		"LCR"
 
-#define DEFAULT_ENDPOINT_APP EndpointAppPBX
-
 #define VERSION_STRING	VERSION
 
 extern int memuse;
@@ -52,14 +49,14 @@ extern int fhuse;
 
 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 int mask, const char *fmt, ...);
-void _printerror(const char *function, int line, const char *fmt, ...);
+#define PDEBUG(mask, fmt, arg...) _printdebug(__FILE__, __FUNCTION__, __LINE__, mask, fmt, ## arg)
+#define PERROR(fmt, arg...) _printerror(__FILE__, __FUNCTION__, __LINE__, fmt, ## arg)
+#define PDEBUG_RUNTIME(mask, fmt, arg...) _printdebug(NULL, NULL, 0, mask, fmt, ## arg)
+#define PERROR_RUNTIME(fmt, arg...) _printerror(NULL, NULL, 0, fmt, ## arg)
+void _printdebug(const char *file, const char *function, int line, unsigned int mask, const char *fmt, ...);
+void _printerror(const char *file, const char *function, int line, const char *fmt, ...);
 #define DEBUG_FUNC
-void debug(const char *function, int line, const char *prefix, char *buffer);
+void debug(const char *file, const char *function, int line, const char *prefix, char *buffer);
 
 #define DEBUG_CONFIG	0x0001
 #define DEBUG_MSG 	0x0002
@@ -70,13 +67,13 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
 #define DEBUG_GSM 	0x0120
 #define DEBUG_SS5 	0x0140
 #define DEBUG_VBOX	0x0180
+#define DEBUG_SIP	0x10100
 #define DEBUG_EPOINT 	0x0200
 #define DEBUG_JOIN 	0x0400
 #define DEBUG_VERSATEL 	0x0800
 #define DEBUG_CRYPT	0x1000
 #define DEBUG_ROUTE	0x2000
 #define DEBUG_IDLETIME	0x4000
-#define DEBUG_LOG	0x7fff
 
 // check any faulty malloc
 #define MALLOC_CHECK_	1
@@ -84,7 +81,7 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
 /*
  * one of the bits must be enabled in order to write log files
  */
-#define DEBUG_LOG	0x7fff
+#define DEBUG_LOG	0xfffff
 
 /*
  * load transmit buffer to avoid gaps at the beginning due to jitter
@@ -121,6 +118,8 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
  */
 //#define BUDETECT_DEF
 
+/* internal limit of payload type in a message */
+
 #ifdef BUDETECT_DEF
  #define BUDETECT	budetect(__FILE__, __LINE__, __FUNCTION__);
  void budetect(const char *file, int line, const char *function);
@@ -128,14 +127,17 @@ void debug(const char *function, int line, const char *prefix, char *buffer);
  #define BUDETECT	;
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <mbuffer.h>
-#ifdef __cplusplus
-}
+#ifdef WITH_MISDN
+ #ifdef __cplusplus
+  extern "C" {
+ #endif
+ #include <mISDN/mbuffer.h>
+ #ifdef __cplusplus
+  }
+ #endif
 #endif
 #include "macro.h"
+#include "select.h"
 #include "options.h"
 #include "interface.h"
 #include "extension.h"
@@ -143,19 +145,33 @@ extern "C" {
 #include "endpoint.h"
 #include "endpointapp.h"
 #include "apppbx.h"
+#include "appbridge.h"
 #include "callerid.h"
 #include "route.h"
 #include "port.h"
+#ifdef WITH_MISDN
 #include "mISDN.h"
 #include "dss1.h"
-#ifdef WITH_GSM
+#include "loop.h"
+#include "remote.h"
+#endif
+#if defined WITH_GSM_BS || defined WITH_GSM_MS
 #include "gsm.h"
 #endif
+#ifdef WITH_GSM_BS
+#include "gsm_bs.h"
+#endif
+#ifdef WITH_GSM_MS
+#include "gsm_ms.h"
+#endif
 #ifdef WITH_SS5
 #include "ss5_encode.h"
 #include "ss5_decode.h"
 #include "ss5.h"
 #endif
+#ifdef WITH_SIP
+#include "sip.h"
+#endif
 #include "vbox.h"
 #include "join.h"
 #include "joinpbx.h"
@@ -168,11 +184,6 @@ extern "C" {
 #include "trace.h"
 
 extern int quit;
-extern double now_d;
-extern time_t now;
-extern struct tm *now_tm;
-extern struct timeval now_tv;
-extern struct timezone now_tz;
 
 #define DIRECTION_NONE	0
 #define DIRECTION_OUT	1