logging, binkp TRF

source/include/bforce.h

@@ -14,22 +14,6 @@
 #ifndef _BFORCE_H_
 #define _BFORCE_H_
 
-#ifndef DAEMON_LOGFILE
-#define DAEMON_LOGFILE "/var/log/bforce/bf-daemon"
-#endif
-
-#ifndef BFORCE_LOGFILE
-#define BFORCE_LOGFILE "/var/log/bforce/bf-log"
-#endif
-
-#ifndef BFORCE_DEBFILE
-#define BFORCE_DEBFILE "/var/log/bforce/bf-debug"
-#endif
-
-#ifndef BFORCE_CFGFILE
-#define BFORCE_CFGFILE "/etc/bforce/bforce.conf"
-#endif
-
 /*
  * BinkleyForce limits
  */
@@ -39,9 +23,6 @@
 #define BF_MAXDOMAIN		40
 #define BF_MAXADDRSTR		80
 
-/* IP-only nodes phone */
-#define NO_PSTN_PHONE "00-00-000000"
-
 /*
  * Maximum length of file name (without path)
  */

source/include/confread.h

@@ -319,7 +319,7 @@ typedef struct conf_entry {
 		CT_STRING,
 		CT_TRANSLATE,
 		CT_TRIES,
-		CT_DEBLEVEL,
+//		CT_DEBLEVEL,
 		CT_FILEBOX
 	} type;
 	s_cval_entry *data;

source/include/logger.h

@@ -46,6 +46,8 @@ enum { LOG_FILE_DAEMON, LOG_FILE_SESSION, LOG_FILE_DEBUG, LOG_FILE_HISTORY };
 # define D_FREQ		0x0000400L
 # define D_STATEM	0x0000800L
 # define D_DAEMON	0x0001000L
+# define D_24554	0x0002000L
+# define D_FREE 	0x0004000L
 # define D_FULL		0xfffffffL
 #endif
 
@@ -67,13 +69,14 @@ int  log(const char *s, ...);
 int  logerr(const char *s, ...);
 
 #ifdef DEBUG
-void debug_setlevel(long newlevel, bool logit);
+//void debug_setlevel(long newlevel, bool logit);
 bool debug_isopened(void);
-void debug_setfilename(const char *debugname);
-int  debug_parsestring(char *str, unsigned long *deblevel);
-int  debug_open(const char *debugname);
-int  debug_close(void);
-int  debug(unsigned long what, const char *str, ...);
+//void debug_setfilename(const char *debugname);
+//int  debug_parsestring(char *str, unsigned long *deblevel);
+int debug_open();
+int debug_close();
+int debug(unsigned long what, const char *str, ...);
+void debug_configure();
 #endif
 
 #endif

source/include/prot_binkp.h

@@ -82,6 +82,9 @@ typedef struct {
 	int        options;
 	char       challenge[BINKP_MAXCHALLENGE+1];
 	int        challenge_length;
+	bool    has_TRF;
+	int     TRF_PKT;
+	int     TRF_other;
 } s_binkp_sysinfo;
 
 
@@ -172,6 +175,7 @@ void binkp_log_sysinfo(s_binkp_sysinfo *binkp);
 //void binkp_queue_sysinfo(s_bpinfo *bpi, s_binkp_sysinfo *binkp);
 void binkp_set_sysinfo(s_binkp_sysinfo *binkp, s_faddr *remote_addr, bool caller);
 void binkp_parse_options(s_binkp_sysinfo *binkp, char *options);
+int binkp_remote_traffic(s_handshake_protocol *THIS, s_traffic *dest);
 
 /* prot_binkp_api.c */
 extern s_handshake_protocol handshake_protocol_binkp;