diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-03-27 08:38:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 08:38:44 +0100 |
| commit | 890e8644ac331215dc6541d1a4da97c0a74df2f6 (patch) | |
| tree | e1b4b2b87d9fe16be9b743cf975e41868855789a /src/lib/ndpi_main.c | |
| parent | 1b8f7ed101ae68573689cf816929185bd28594f5 (diff) | |
| parent | 1bab8a1c2238860c655ebff2ace5cf79e7873e63 (diff) | |
Merge pull request #861 from havup/dev
pull request with s7comm
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8ab7ad520..8a24e506d 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1782,6 +1782,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp ndpi_build_default_ports(ports_a, 10050, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */ ); + ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_S7COMM, + 1 /* no subprotocol */, no_master, + no_master, "s7comm", NDPI_PROTOCOL_CATEGORY_NETWORK, + ndpi_build_default_ports(ports_a, 102, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */ + ); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main.c" @@ -3525,6 +3531,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* Targus Getdata */ init_targus_getdata_dissector(ndpi_str, &a, detection_bitmask); + + /* S7 comm */ + init_s7comm_dissector(ndpi_str, &a, detection_bitmask); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" |