Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge modbus2023 to main branch #159

Merged
merged 10 commits into from
Dec 22, 2023
Merged

merge modbus2023 to main branch #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ec862e
Merge pull request #107 from nttcom/fix_long_time_connection
Mar 8, 2023
65804fd
keep modbus function loaded
helenwangjia Nov 9, 2023
1fe48ab
enable modbus in common_config.py
helenwangjia Nov 9, 2023
8e59659
Merge pull request #150 from nttcom/update-modbus2023-to-main
takuma0121 Nov 10, 2023
3c8b281
use a former version of modbus
helenwangjia Nov 15, 2023
a0c1af2
Merge pull request #151 from nttcom/modify-dockerfile-in-modbus2023
nbhgytzheng Nov 15, 2023
cde7eb8
update to the latest version of main
helenwangjia Dec 21, 2023
5a7d21c
Update common_config.py
takuma0121 Dec 22, 2023
b5f0cbe
add package refresh command
helenwangjia Dec 22, 2023
b89a850
Merge branch 'modbus2023' of https://github.com/nttcom/OsecT into mod…
helenwangjia Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osect_sensor/Application/edge_cron/common/common_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
YAF_ENABLE = True
""" yaf use flag """

BACNET_ENABLE = True
BACNET_ENABLE = False
""" Bacnetトラフィックを取り込むか否か """

MODBUS_ENABLE = False
Expand Down
8 changes: 4 additions & 4 deletions osect_sensor/Infrastructure/edge_cron/Dockerfile
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • zkg refresh は消して良いんだっけ？
  • パッケージのインストールは各行にまとめているので、元の165目を以下のようにしてほしい。
icsnpp-modbus --version 03de54df8b0a8c1e6264876167f80dccae74902a

Copy link
Contributor Author

@helenwangjia helenwangjia Dec 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • zkg refresh は消して良いんだっけ？

消したら良くないと思います。
消したら、https://github.com/zeek/packages/blob/master/nttcom/zkg.index にあるパッケージは何か修正があれば、反映できなくなります。

Copy link
Contributor Author

@helenwangjia helenwangjia Dec 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

zkg install icsnpp-modbus --version 03de54df8b0a8c1e6264876167f80dccae74902a --force --skiptest \

と

  && zkg install --force --skiptest \
  icsnpp-modbus \
  zeek/corelight/zeek-long-connections \
  zeek-af_packet-plugin \
  zeek-parser-CCLinkFieldBasic \
  zeek-parser-CCLinkField-CCLinkControl \
  zeek-parser-CIFS-COM \
  zeek-parser-CIFS-NBNS-COM \
  zeek-parser-DHCPv4-COM \
  zeek-parser-DHCPv6-COM \
  zeek-parser-SSDP-COM

は二つ部分です。
&&がありますね。versionが指定されたものと指定されていないものを一緒にすることはできません。そのため、165行目に移動できないです。
移動したい場合、このstepの最後に移動できます。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

ではzkg refreshを戻しておいて。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ではzkg refreshを戻しておいて。

戻しました。

Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,16 @@ ENV PATH $PATH:/root/.cargo/bin
# zkgパッケージ（必要なものだけ入れる）
ENV PATH $PATH:/usr/local/zeek/bin
# RUN zkg autoconfig
RUN zkg refresh && \
zkg install --force --skiptest \
RUN zkg install icsnpp-modbus --version 03de54df8b0a8c1e6264876167f80dccae74902a --force --skiptest \
&& zkg refresh \
&& zkg install --force --skiptest \
# zeek-plugin-bacnet \
# zeek-plugin-enip \
# zeek-plugin-profinet \
# zeek-plugin-s7comm \
# icsnpp-ethercat \
# icsnpp-opcua-binary \
icsnpp-modbus \
# icsnpp-bacnet \
# icsnpp-bacnet \
zeek/corelight/zeek-long-connections \
zeek-af_packet-plugin \
zeek-parser-CCLinkFieldBasic \
Expand Down
2 changes: 1 addition & 1 deletion osect_sensor/conf/local.zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ redef LogAscii::enable_utf_8 = F;
#@load zeek-plugin-profinet
#@load zeek-plugin-s7comm
#@load icsnpp-ethercat
#@load icsnpp-modbus
@load icsnpp-modbus
@load zeek-long-connections
@load zeek-af_packet-plugin
@load zeek-parser-CCLinkFieldBasic
Expand Down
Loading