1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- bhm.cpp.orig Tue Feb 6 16:04:04 2007
+++ bhm.cpp Tue Feb 6 16:05:12 2007
@@ -3,27 +3,25 @@
#endif
#include "bhmusers.h"
-#include <errno.h>
-#include <ctype.h>
+#include <cerrno>
+#include <cctype>
#include <unistd.h>
#include <sys/wait.h>
-#include <signal.h>
-#include <stdio.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
#include <sys/poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#ifndef __FreeBSD__
#include <netinet/ip.h>
+#endif
#include "postal.h"
#include "logit.h"
#include "results.h"
#include "basictcp.h"
-#ifdef USE_GNUTLS
-#include <errno.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
int processes = 0;
int *thread_status;
@@ -47,7 +45,7 @@
int maxMsgSize = 10240;
results res;
-Logit *log;
+Logit *bhm_log;
int exitCount = 0;
@@ -261,7 +259,7 @@
void do_work(thread_data *td)
{
- base_tcp t(td->fd, log, td->debug, &res
+ base_tcp t(td->fd, bhm_log, td->debug, &res
#ifdef USE_SSL
, td->ssl
#endif
@@ -408,7 +406,7 @@
#endif
"\n");
- log = new Logit("bhm.log", allLog, false, 0);
+ bhm_log = new Logit("bhm.log", allLog, false, 0);
Logit *debug = NULL;
if(debugName)
|
