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

Adding Triconex protocol #525

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Adding Triconex protocol #525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f8b10d
Adding triconex protocol
glaslos Nov 8, 2020
59a3e68
black fixes
glaslos Nov 8, 2020
f15af52
Merge branch 'master' into triconex
glaslos Feb 20, 2022
2155b09
merge fixes
glaslos Feb 20, 2022
c0e9f0d
import fixed
glaslos Feb 20, 2022
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
Prev Previous commit
Next Next commit
merge fixes
  • Loading branch information
@glaslos
glaslos committed Feb 20, 2022
commit 2155b0917b95e14ae7c9579bbc6b2b0bdcadeb0e
1 change: 1 addition & 0 deletions conpot/protocols/kamstrup_management/kamstrup_management_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import conpot.core as conpot_core
from .command_responder import CommandResponder
from conpot.core.protocol_wrapper import conpot_protocol
from conpot.core import attack_session
from conpot.utils.networking import str_to_bytes

logger = logging.getLogger(__name__)
Expand Down
1 change: 1 addition & 0 deletions conpot/protocols/kamstrup_meter/kamstrup_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from .request_parser import KamstrupRequestParser
from .command_responder import CommandResponder
from conpot.core.protocol_wrapper import conpot_protocol
from conpot.core import attack_session

logger = logging.getLogger(__name__)

Expand Down