|
0 |
Description: rename enum
|
|
1 |
Apparently something else now #defines (or in some other way influences
|
|
2 |
the value of) SOCKET so using that as an enum identifier leads to this
|
|
3 |
problem.
|
|
4 |
Author: Sascha Steinbiss <satta@debian.org>
|
|
5 |
Forwarded: https://github.com/KIT-Telematics/pktanon/pull/1
|
|
6 |
Last-Update: 2019-07-22
|
|
7 |
--- a/src/RuntimeConfig.cpp
|
|
8 |
+++ b/src/RuntimeConfig.cpp
|
|
9 |
@@ -47,7 +47,7 @@
|
|
10 |
|
|
11 |
void RuntimeConfig::addOutputSockConfig ( std::string sock_addr, uint16_t sock_port, bool use_ipv6, bool use_udp )
|
|
12 |
{
|
|
13 |
- output_type = OutputType::SOCKET;
|
|
14 |
+ output_type = OutputType::OSOCKET;
|
|
15 |
output_config = new OutputSocketConfig ( sock_addr, sock_port, use_ipv6, use_udp );
|
|
16 |
}
|
|
17 |
|
|
18 |
--- a/src/RuntimeConfig.h
|
|
19 |
+++ b/src/RuntimeConfig.h
|
|
20 |
@@ -19,7 +19,7 @@
|
|
21 |
};
|
|
22 |
enum class OutputType
|
|
23 |
{
|
|
24 |
- UNDEFINED, OSTREAM, LIBPCAP_DUMP, SOCKET, LIBPCAP_INJECT //, RAW_SOCKETS
|
|
25 |
+ UNDEFINED, OSTREAM, LIBPCAP_DUMP, OSOCKET, LIBPCAP_INJECT //, RAW_SOCKETS
|
|
26 |
};
|
|
27 |
|
|
28 |
struct default_values
|
|
29 |
--- a/src/RuntimeFactory.cpp
|
|
30 |
+++ b/src/RuntimeFactory.cpp
|
|
31 |
@@ -46,7 +46,7 @@
|
|
32 |
case OutputType::OSTREAM:
|
|
33 |
return new OstreamOutput();
|
|
34 |
|
|
35 |
- case OutputType::SOCKET:
|
|
36 |
+ case OutputType::OSOCKET:
|
|
37 |
return new SocketOutput();
|
|
38 |
|
|
39 |
default:
|