Lines 1-57
Link Here
|
1 |
--- src/Cedar/Cedar.h.orig 2014-06-08 06:19:15 UTC |
1 |
--- src/Cedar/Cedar.h.orig 2016-04-21 11:35:52.896232000 +0200 |
2 |
+++ src/Cedar/Cedar.h |
2 |
+++ src/Cedar/Cedar.h 2016-04-21 11:35:17.696745000 +0200 |
3 |
@@ -477,22 +477,22 @@ |
3 |
@@ -510,22 +510,22 @@ |
4 |
#define LOG_ENGINE_BUFFER_CACHE_SIZE_MAX (10 * 1024 * 1024) // Write cache size |
4 |
#define LOG_ENGINE_BUFFER_CACHE_SIZE_MAX (10 * 1024 * 1024) // Write cache size |
5 |
|
5 |
|
6 |
// Constant such as a file name |
6 |
// Constant such as a file name |
7 |
-#define SERVER_LOG_DIR_NAME "@server_log" |
7 |
-#define SERVER_LOG_DIR_NAME "@server_log" |
8 |
+#define SERVER_LOG_DIR_NAME "/var/db/softether/server_log" |
8 |
+#define SERVER_LOG_DIR_NAME "/var/log/softether/server" |
9 |
#define BRIDGE_LOG_DIR_NAME SERVER_LOG_DIR_NAME |
9 |
#define BRIDGE_LOG_DIR_NAME SERVER_LOG_DIR_NAME |
10 |
#define SERVER_LOG_PERFIX "vpn" |
10 |
#define SERVER_LOG_PERFIX "vpn" |
11 |
|
11 |
|
12 |
-#define HUB_SECURITY_LOG_DIR_NAME "@security_log" |
12 |
-#define HUB_SECURITY_LOG_DIR_NAME "@security_log" |
13 |
-#define HUB_SECURITY_LOG_FILE_NAME "@security_log/%s" |
13 |
-#define HUB_SECURITY_LOG_FILE_NAME "@security_log/%s" |
14 |
+#define HUB_SECURITY_LOG_DIR_NAME "/var/db/softether/security_log" |
14 |
+#define HUB_SECURITY_LOG_DIR_NAME "/var/log/softether/security" |
15 |
+#define HUB_SECURITY_LOG_FILE_NAME "/var/db/softether/security_log/%s" |
15 |
+#define HUB_SECURITY_LOG_FILE_NAME "/var/log/softether/security/%s" |
16 |
#define HUB_SECURITY_LOG_PREFIX "sec" |
16 |
#define HUB_SECURITY_LOG_PREFIX "sec" |
17 |
-#define HUB_PACKET_LOG_DIR_NAME "@packet_log" |
17 |
-#define HUB_PACKET_LOG_DIR_NAME "@packet_log" |
18 |
-#define HUB_PACKET_LOG_FILE_NAME "@packet_log/%s" |
18 |
-#define HUB_PACKET_LOG_FILE_NAME "@packet_log/%s" |
19 |
+#define HUB_PACKET_LOG_DIR_NAME "/var/db/softether/packet_log" |
19 |
+#define HUB_PACKET_LOG_DIR_NAME "/var/log/softether/packet" |
20 |
+#define HUB_PACKET_LOG_FILE_NAME "/var/db/softether/packet_log/%s" |
20 |
+#define HUB_PACKET_LOG_FILE_NAME "/var/log/softether/packet/%s" |
21 |
#define HUB_PACKET_LOG_PREFIX "pkt" |
21 |
#define HUB_PACKET_LOG_PREFIX "pkt" |
22 |
|
22 |
|
23 |
-#define NAT_LOG_DIR_NAME "@secure_nat_log" |
23 |
-#define NAT_LOG_DIR_NAME "@secure_nat_log" |
24 |
-#define NAT_LOG_FILE_NAME "@secure_nat_log/%s" |
24 |
-#define NAT_LOG_FILE_NAME "@secure_nat_log/%s" |
25 |
+#define NAT_LOG_DIR_NAME "/var/db/softether/secure_nat_log" |
25 |
+#define NAT_LOG_DIR_NAME "/var/log/softether/secure_nat" |
26 |
+#define NAT_LOG_FILE_NAME "/var/db/softether/secure_nat_log/%s" |
26 |
+#define NAT_LOG_FILE_NAME "/var/log/softether/secure_nat/%s" |
27 |
#define NAT_LOG_PREFIX "snat" |
27 |
#define NAT_LOG_PREFIX "snat" |
28 |
|
28 |
|
29 |
-#define CLIENT_LOG_DIR_NAME "@client_log" |
29 |
-#define CLIENT_LOG_DIR_NAME "@client_log" |
30 |
+#define CLIENT_LOG_DIR_NAME "/var/db/softether/client_log" |
30 |
+#define CLIENT_LOG_DIR_NAME "/var/log/softether/client" |
31 |
#define CLIENT_LOG_PREFIX "client" |
31 |
#define CLIENT_LOG_PREFIX "client" |
32 |
|
32 |
|
33 |
// Packet log settings |
33 |
// Packet log settings |
34 |
@@ -527,8 +527,8 @@ |
34 |
@@ -560,8 +560,8 @@ |
35 |
#define DISK_FREE_CHECK_INTERVAL (5 * 60 * 1000) |
35 |
#define DISK_FREE_CHECK_INTERVAL_DEFAULT (5 * 60 * 1000) |
36 |
|
36 |
|
37 |
// Simple log |
37 |
// Simple log |
38 |
-#define TINY_LOG_DIRNAME "@tiny_log" |
38 |
-#define TINY_LOG_DIRNAME "@tiny_log" |
39 |
-#define TINY_LOG_FILENAME "@tiny_log/%04u%02u%02u_%02u%02u%02u.log" |
39 |
-#define TINY_LOG_FILENAME "@tiny_log/%04u%02u%02u_%02u%02u%02u.log" |
40 |
+#define TINY_LOG_DIRNAME "/var/db/softether/tiny_log" |
40 |
+#define TINY_LOG_DIRNAME "/var/log/softether/tiny" |
41 |
+#define TINY_LOG_FILENAME "/var/db/softether/tiny_log/%04u%02u%02u_%02u%02u%02u.log" |
41 |
+#define TINY_LOG_FILENAME "/var/log/softether/tiny/%04u%02u%02u_%02u%02u%02u.log" |
42 |
|
42 |
|
43 |
|
43 |
|
44 |
////////////////////////////////////////////////////////////////////// |
44 |
////////////////////////////////////////////////////////////////////// |
45 |
@@ -541,7 +541,7 @@ |
45 |
@@ -574,7 +574,7 @@ |
46 |
//#define CE_SNAPSHOT_INTERVAL ((UINT64)(3000)) |
46 |
//#define CE_SNAPSHOT_INTERVAL ((UINT64)(3000)) |
47 |
#define CE_SNAPSHOT_POLLING_INTERVAL (1 * 1000) |
47 |
#define CE_SNAPSHOT_POLLING_INTERVAL (1 * 1000) |
48 |
#define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE (30 * 1000) |
48 |
#define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE (30 * 1000) |
49 |
-#define CE_SNAPSHOT_DIR_NAME "@carrier_log" |
49 |
-#define CE_SNAPSHOT_DIR_NAME "@carrier_log" |
50 |
+#define CE_SNAPSHOT_DIR_NAME "/var/db/softether/carrier_log" |
50 |
+#define CE_SNAPSHOT_DIR_NAME "/var/log/softether/carrier" |
51 |
#define CE_SNAPSHOT_PREFIX "carrier" |
51 |
#define CE_SNAPSHOT_PREFIX "carrier" |
52 |
|
52 |
|
53 |
|
53 |
|
54 |
@@ -558,7 +558,7 @@ |
54 |
@@ -591,7 +591,7 @@ |
55 |
// Expiration date of random size cache |
55 |
// Expiration date of random size cache |
56 |
#define RAND_SIZE_CACHE_EXPIRE (24 * 60 * 60 * 1000) |
56 |
#define RAND_SIZE_CACHE_EXPIRE (24 * 60 * 60 * 1000) |
57 |
// Management allowed IP address list file name |
57 |
// Management allowed IP address list file name |
Lines 60-66
Link Here
|
60 |
|
60 |
|
61 |
#define NON_SSL_MIN_COUNT 60 |
61 |
#define NON_SSL_MIN_COUNT 60 |
62 |
#define NON_SSL_ENTRY_EXPIRES (10 * 60 * 1000) |
62 |
#define NON_SSL_ENTRY_EXPIRES (10 * 60 * 1000) |
63 |
@@ -609,9 +609,9 @@ |
63 |
@@ -642,9 +642,9 @@ |
64 |
////////////////////////////////////////////////////////////////////// |
64 |
////////////////////////////////////////////////////////////////////// |
65 |
|
65 |
|
66 |
#define EL_ADMIN_PORT 22888 |
66 |
#define EL_ADMIN_PORT 22888 |
Lines 68-75
Link Here
|
68 |
-#define EL_PACKET_LOG_DIR_NAME "@etherlogger_log" |
68 |
-#define EL_PACKET_LOG_DIR_NAME "@etherlogger_log" |
69 |
-#define EL_PACKET_LOG_FILE_NAME "@etherlogger_log/%s" |
69 |
-#define EL_PACKET_LOG_FILE_NAME "@etherlogger_log/%s" |
70 |
+#define EL_CONFIG_FILENAME "/var/db/softether/etherlogger.config" |
70 |
+#define EL_CONFIG_FILENAME "/var/db/softether/etherlogger.config" |
71 |
+#define EL_PACKET_LOG_DIR_NAME "/var/db/softether/etherlogger_log" |
71 |
+#define EL_PACKET_LOG_DIR_NAME "/var/log/softether/etherlogger" |
72 |
+#define EL_PACKET_LOG_FILE_NAME "/var/db/softether/etherlogger_log/%s" |
72 |
+#define EL_PACKET_LOG_FILE_NAME "/var/log/softether/etherlogger/%s" |
73 |
#define EL_PACKET_LOG_PREFIX "pkt" |
73 |
#define EL_PACKET_LOG_PREFIX "pkt" |
74 |
#define EL_LICENSE_CHECK_SPAN (10 * 1000) |
74 |
#define EL_LICENSE_CHECK_SPAN (10 * 1000) |
75 |
|
75 |
|