solving problem of bacnet function not loaded

nttcom · Sep 15, 2023 · db42a5f · db42a5f
1 parent d9abef6
commit db42a5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/osect_sensor/Infrastructure/edge_cron/Dockerfile b/osect_sensor/Infrastructure/edge_cron/Dockerfile
@@ -133,6 +133,7 @@ RUN apt-get update \
     liblua5.1-dev \
     libhiredis-dev \
     libevent-dev \
+    vim \
     # python-yaml \
     rustc \
  && apt-get -y clean \

diff --git a/osect_sensor/Infrastructure/edge_cron/work/ot_tools/bro.sh b/osect_sensor/Infrastructure/edge_cron/work/ot_tools/bro.sh
@@ -32,15 +32,16 @@ merge_log "nbns.*.log" "netbios-ns.log"
 reformat_log "netbios-ns.log"
 merge_log "ssdp.*.log" "ssdp.log"
 reformat_log "ssdp.log"
+merge_log "bacnet.*.log" "bacnet.log"
 # OTプロトコル: CC-Link
 merge_log "cclink-ief-basic.*.log" "cclink-ief-basic.log"
 merge_log "cclink-ie.*.log" "cclink-ie.log"
 
 if [ $4 = "True" ]; then
     # tsharkでの出力と同じにするため
-    merge_log "bacnet_service.*.log" "bacnet_service.log"
-    sed -i '/^#/d' bacnet_service.log
-    sed -i '1i #' bacnet_service.log
+    merge_log "bacnet.*.log" "bacnet.log"
+    sed -i '/^#/d' bacnet.log
+    sed -i '1i #' bacnet.log
 fi
 
 if [ $5 = "True" ]; then

diff --git a/osect_sensor/conf/local.zeek b/osect_sensor/conf/local.zeek
@@ -119,6 +119,7 @@ redef LogAscii::enable_utf_8 = F;
 #@load zeek-plugin-s7comm
 #@load icsnpp-ethercat
 #@load icsnpp-modbus
+@load icsnpp-bacnet
 @load zeek-long-connections
 @load zeek-af_packet-plugin
 @load CIFS_B