merge modbus2023 to main branch #159
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LongConnection問題とログ回収問題を修正
Update modbus2023 to main with modbus function enabled
Update Dockerfile to use a former version of modbus
デフォルトはFalseでOK
takuma0121
reviewed
Dec 22, 2023
There was a problem hiding this comment.
zkg refreshは消して良いんだっけ？- パッケージのインストールは各行にまとめているので、元の165目を以下のようにしてほしい。
icsnpp-modbus --version 03de54df8b0a8c1e6264876167f80dccae74902a
There was a problem hiding this comment.
zkg refreshは消して良いんだっけ？
消したら良くないと思います。
消したら、https://github.com/zeek/packages/blob/master/nttcom/zkg.index にあるパッケージは何か修正があれば、反映できなくなります。
There was a problem hiding this comment.
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の最後に移動できます。
There was a problem hiding this comment.
OK
ではzkg refreshを戻しておいて。
There was a problem hiding this comment.
では
zkg refreshを戻しておいて。
戻しました。
takuma0121
approved these changes
Dec 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
テスト：
OsecT20でsensorをdeployしました。
modbus_detailed.logの生成とログの送信を確認しました。
(comtest01はstep2.5総合検証した時に、いったん削除されたので、sensorの送信機能は問題ないですが、送信先と接続できない状態です)