Debian Codegraph @

misc/ditg-ignore-client-log.patch

raw
1 diff -Z -u -r D-ITG-2.8.1-r1023.orig/src/ITGRecv/ITGRecv.cpp D-ITG-2.8.1-r1023/src/ITGRecv/ITGRecv.cpp
2 --- D-ITG-2.8.1-r1023.orig/src/ITGRecv/ITGRecv.cpp 2013-07-02 16:35:10.000000000 +0200
3 +++ D-ITG-2.8.1-r1023/src/ITGRecv/ITGRecv.cpp 2014-03-31 13:48:35.043462511 +0200
4 @@ -83,6 +83,8 @@
5
6 int logRemote = 0;
7
8 +int ignoreClientLog = 0;
9 +
10 uint16_t logbuffer_size = 50;
11
12
13 @@ -587,7 +589,7 @@
14
15 if (type == TSP_SEND_NAME_LOG) {
16 recvNameLog(nameFileLog, newSockSignaling);
17 - if (logCheck != 1) {
18 + if (logCheck != 1 && !ignoreClientLog) {
19 fileDescriptor = allowedLogFile(nameFileLog);
20 if (fileDescriptor == NULL) {
21 if (sendAck(newSockSignaling, TSP_ERR_MSG_4) < 0)
22 @@ -609,13 +611,15 @@
23 }
24 } else if (type == TSP_SEND_FLOW_LOG) {
25 recvFlowLog(newSockSignaling, logHost, protocolLog, nameFileLog);
26 - if (logRemote != 1) {
27 - createRemoteLogFile(logHost, nameFileLog,protocolLog, logSockSignaling, logSock);
28 - logRemote = 2;
29 - } else {
30 - logSockSignaling = globaleLogSockSignaling;
31 - logSock = globaleLogSock;
32 - copia(globaleLogHost, logHost);
33 + if (!ignoreClientLog) {
34 + if (logRemote != 1) {
35 + createRemoteLogFile(logHost, nameFileLog,protocolLog, logSockSignaling, logSock);
36 + logRemote = 2;
37 + } else {
38 + logSockSignaling = globaleLogSockSignaling;
39 + logSock = globaleLogSock;
40 + copia(globaleLogHost, logHost);
41 + }
42 }
43 if (sendAck(newSockSignaling, TSP_ACK_SEND_FLOW_LOG) < 0)
44 reportErrorAndExit("sendFlowLog","sendAck - type = TSP_ACK_SEND_FLOW_LOG(12)","Cannot send Ack on newSockSignaling");
45 @@ -827,7 +831,9 @@
46
47 " -H <ITGSend_address> Enable \"Passive Mode\" toward the specified ITGSend instance.\n\n"
48
49 - " -n <num_pkt> Number of outgoing packets used for UDP NAT traversal.\n";
50 + " -n <num_pkt> Number of outgoing packets used for UDP NAT traversal.\n"
51 +
52 + " -I Ignore client logging options and use command line settings exclusively.\n";
53
54 cout << "\nFor more information please refer to the manual.\n";
55 exit(1);
56 @@ -2136,6 +2142,11 @@
57 NEXT_OPT;
58 break;
59
60 + case 'I':
61 + PRINTD(1,"parserRecv: Ignoring logging data from clients.\n");
62 + ignoreClientLog = 1;
63 + break;
64 +
65 default:
66 printf("parserRecv: Unknow option : %s\n\n", argv[0]);
67 printHelpAndExit();