From a66c2593d635a5cf284bc7194bb7607c5bb2639b Mon Sep 17 00:00:00 2001 From: janvrska <1644599+janvrska@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:07:55 +0200 Subject: [PATCH] Rename energomonitor to energostack --- .github/workflows/bisquitt-docker.yaml | 20 +++++++++++++------- .github/workflows/bisquitt-tests.yaml | 16 ++++++++-------- Makefile | 4 ++-- README.md | 19 +++++++++++-------- client/broker_publish_qos2_transaction.go | 4 ++-- client/client.go | 14 +++++++------- client/client_test.go | 10 +++++----- client/connect_transaction.go | 8 ++++---- client/disconnect_transaction.go | 6 +++--- client/message_handlers.go | 2 +- client/net.go | 6 +++--- client/ping_transaction.go | 6 +++--- client/publish_qos1_transaction.go | 6 +++--- client/publish_qos2_transaction.go | 6 +++--- client/register_transaction.go | 6 +++--- client/sleep_transaction.go | 8 ++++---- client/subscribe_transaction.go | 6 +++--- client/transaction.go | 6 +++--- client/unsubscribe_transaction.go | 6 +++--- cmd/bisquitt-pub/actions.go | 8 ++++---- cmd/bisquitt-pub/application.go | 2 +- cmd/bisquitt-sub/actions.go | 10 +++++----- cmd/bisquitt-sub/application.go | 2 +- cmd/bisquitt/actions.go | 10 +++++----- cmd/bisquitt/application.go | 4 ++-- gateway/broker_publish_qos0_transaction.go | 4 ++-- gateway/broker_publish_qos1_transaction.go | 4 ++-- gateway/broker_publish_qos2_transaction.go | 4 ++-- gateway/broker_publish_transaction.go | 8 ++++---- gateway/client_publish_qos1_transaction.go | 6 +++--- gateway/connect_transaction.go | 8 ++++---- gateway/gateway.go | 4 ++-- gateway/gateway_test.go | 8 ++++---- gateway/handler1.go | 22 +++++++++++----------- gateway/subscribe_transaction.go | 6 +++--- go.mod | 2 +- packets1/advertise.go | 2 +- packets1/advertise_test.go | 2 +- packets1/auth.go | 2 +- packets1/auth_test.go | 2 +- packets1/connack.go | 2 +- packets1/connack_test.go | 2 +- packets1/connect.go | 2 +- packets1/connect_test.go | 2 +- packets1/disconnect.go | 2 +- packets1/disconnect_test.go | 2 +- packets1/gwinfo.go | 2 +- packets1/gwinfo_test.go | 2 +- packets1/packets1.go | 2 +- packets1/packets1_test.go | 2 +- packets1/pingreq.go | 2 +- packets1/pingresp.go | 2 +- packets1/puback.go | 2 +- packets1/puback_test.go | 2 +- packets1/pubcomp.go | 2 +- packets1/pubcomp_test.go | 2 +- packets1/publish.go | 2 +- packets1/publish_test.go | 2 +- packets1/pubrec.go | 2 +- packets1/pubrec_test.go | 2 +- packets1/pubrel.go | 2 +- packets1/pubrel_test.go | 2 +- packets1/regack.go | 2 +- packets1/regack_test.go | 2 +- packets1/register.go | 2 +- packets1/register_test.go | 2 +- packets1/searchgw.go | 2 +- packets1/searchgw_test.go | 2 +- packets1/suback.go | 2 +- packets1/suback_test.go | 2 +- packets1/subscribe.go | 2 +- packets1/subscribe_test.go | 2 +- packets1/unsuback.go | 2 +- packets1/unsuback_test.go | 2 +- packets1/unsubscribe.go | 2 +- packets1/unsubscribe_test.go | 2 +- packets1/willmsg.go | 2 +- packets1/willmsgreq.go | 2 +- packets1/willmsgreq_test.go | 2 +- packets1/willmsgresp.go | 2 +- packets1/willmsgresp_test.go | 2 +- packets1/willmsgupd.go | 2 +- packets1/willtopic.go | 2 +- packets1/willtopic_test.go | 2 +- packets1/willtopicreq.go | 2 +- packets1/willtopicreq_test.go | 2 +- packets1/willtopicresp.go | 2 +- packets1/willtopicresp_test.go | 2 +- packets1/willtopicupd.go | 2 +- packets1/willtopicupd_test.go | 2 +- transactions/transaction_store.go | 2 +- version.txt | 2 +- 92 files changed, 196 insertions(+), 187 deletions(-) diff --git a/.github/workflows/bisquitt-docker.yaml b/.github/workflows/bisquitt-docker.yaml index e1c12c5..3740dee 100644 --- a/.github/workflows/bisquitt-docker.yaml +++ b/.github/workflows/bisquitt-docker.yaml @@ -8,21 +8,27 @@ jobs: build-and-push-image: name: Build and push a Docker image runs-on: ubuntu-20.04 + permissions: + packages: write + contents: read + attestations: write + id-token: write steps: - uses: actions/checkout@v2 with: - path: "go/src/github.com/energomonitor/bisquitt" + path: "go/src/github.com/energostack/bisquitt" - - name: Login to Docker Hub - uses: docker/login-action@v2 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ghcr.io/energostack/bisquitt-psk + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build image run: "make docker/build" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" - name: Push image run: "make docker/push" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" diff --git a/.github/workflows/bisquitt-tests.yaml b/.github/workflows/bisquitt-tests.yaml index f2bb6f6..4922d3e 100644 --- a/.github/workflows/bisquitt-tests.yaml +++ b/.github/workflows/bisquitt-tests.yaml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - path: "go/src/github.com/energomonitor/bisquitt" + path: "go/src/github.com/energostack/bisquitt" - uses: actions/setup-go@v2 with: @@ -31,11 +31,11 @@ jobs: - name: Download dependencies run: "make tidy" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" - name: Run tests run: "go version && make test" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" fmt-check: name: Code format - go ${{ matrix.go_version }} @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - path: "go/src/github.com/energomonitor/bisquitt" + path: "go/src/github.com/energostack/bisquitt" - uses: actions/setup-go@v2 with: @@ -54,11 +54,11 @@ jobs: - name: Install goimports run: "go get golang.org/x/tools/cmd/goimports" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" - name: Run format check run: "./tools/ci/run_fmt_check.bash" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" integration-tests: name: Integration tests - builder ${{ matrix.builder_version }} @@ -70,10 +70,10 @@ jobs: steps: - uses: actions/checkout@v2 with: - path: "go/src/github.com/energomonitor/bisquitt" + path: "go/src/github.com/energostack/bisquitt" - name: Run test run: "make docker/test" env: DOCKER_BUILDER_VERSION: "${{ matrix.builder_version }}" - working-directory: "go/src/github.com/energomonitor/bisquitt" + working-directory: "go/src/github.com/energostack/bisquitt" diff --git a/Makefile b/Makefile index 76c9e32..1ea64a2 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ VERSION := $(shell cat version.txt) -DOCKER_REGISTRY ?= docker.io +DOCKER_REGISTRY ?= ghcr.io DOCKER_BUILDER_VERSION ?= 1.17.8-bullseye DOCKER_RUNTIME_VERSION ?= bullseye-20220228-slim -DOCKER_IMAGE = energomonitor/bisquitt +DOCKER_IMAGE = energostack/bisquitt # Enable data race detection in the compiled binaries. ifeq ($(WITH_RACE_DETECTION), 1) diff --git a/README.md b/README.md index 9b3de42..55e680d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@

- Build status - Go Reference - License + Build status + Go Reference + License

Bisquitt is a transparent MQTT-SN gateway. It provides a simple, secure, and @@ -23,8 +23,11 @@ command-line MQTT-SN clients and can be used as a Go MQTT-SN library. The easiest way to install Bisquitt is to use its Docker image: +### Deprecation warning +Dockerhub registry images is now deprecated. Please use GitHub Container Registry (ghcr.io) instead. +Also, we renamed from **energomonitor** to **energostack**. ```console -$ docker pull energomonitor/bisquitt +$ docker pull ghcr.io/energostack/bisquitt ``` The image contains the gateway itself (`bisquitt`), which is started by default, @@ -33,9 +36,9 @@ and the command-line MQTT-SN clients (`bisquitt-sub` and `bisquitt-pub`). Alternatively, you can install the gateway and clients using `go install`: ```console -$ go install github.com/energomonitor/bisquitt/cmd/bisquitt@latest -$ go install github.com/energomonitor/bisquitt/cmd/bisquitt-pub@latest -$ go install github.com/energomonitor/bisquitt/cmd/bisquitt-sub@latest +$ go install github.com/energostack/bisquitt/cmd/bisquitt@latest +$ go install github.com/energostack/bisquitt/cmd/bisquitt-pub@latest +$ go install github.com/energostack/bisquitt/cmd/bisquitt-sub@latest ``` Note that Bisquitt requires Go 1.16 or higher. @@ -61,7 +64,7 @@ open-source MQTT server) using Docker Compose: services: bisquitt: - image: energomonitor/bisquitt + image: energostack/bisquitt environment: MQTT_HOST: mosquitto BISQUITT_USER: bisquitt diff --git a/client/broker_publish_qos2_transaction.go b/client/broker_publish_qos2_transaction.go index 4134513..bc9d24c 100644 --- a/client/broker_publish_qos2_transaction.go +++ b/client/broker_publish_qos2_transaction.go @@ -12,8 +12,8 @@ package client import ( "fmt" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type brokerPublishQOS2Transaction struct { diff --git a/client/client.go b/client/client.go index fff5f2d..12dcda9 100644 --- a/client/client.go +++ b/client/client.go @@ -9,8 +9,8 @@ // "fmt" // "time" // -// "github.com/energomonitor/bisquitt/client" -// "github.com/energomonitor/bisquitt/util" +// "github.com/energostack/bisquitt/client" +// "github.com/energostack/bisquitt/util" // ) // // func main() { @@ -70,11 +70,11 @@ import ( "github.com/pion/dtls/v2/pkg/crypto/selfsign" "golang.org/x/sync/errgroup" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) type ClientConfig struct { diff --git a/client/client_test.go b/client/client_test.go index 099d6a6..2d07cd2 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) const ( diff --git a/client/connect_transaction.go b/client/connect_transaction.go index cf934bb..83d94c6 100644 --- a/client/connect_transaction.go +++ b/client/connect_transaction.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) type connectTransaction struct { diff --git a/client/disconnect_transaction.go b/client/disconnect_transaction.go index 0b2e648..768c91a 100644 --- a/client/disconnect_transaction.go +++ b/client/disconnect_transaction.go @@ -1,9 +1,9 @@ package client import ( - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type disconnectTransaction struct { diff --git a/client/message_handlers.go b/client/message_handlers.go index d34a06d..4c954f5 100644 --- a/client/message_handlers.go +++ b/client/message_handlers.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - pkts1 "github.com/energomonitor/bisquitt/packets1" + pkts1 "github.com/energostack/bisquitt/packets1" ) // Subscribed message handler callback type. diff --git a/client/net.go b/client/net.go index 0463534..de1b973 100644 --- a/client/net.go +++ b/client/net.go @@ -8,9 +8,9 @@ import ( dtlsProtocol "github.com/pion/dtls/v2/pkg/protocol" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/util" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/util" ) func (c *Client) send(pkt pkts.Packet) error { diff --git a/client/ping_transaction.go b/client/ping_transaction.go index 87a0935..a4b1bd5 100644 --- a/client/ping_transaction.go +++ b/client/ping_transaction.go @@ -1,9 +1,9 @@ package client import ( - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type pingTransaction struct { diff --git a/client/publish_qos1_transaction.go b/client/publish_qos1_transaction.go index 06696b8..a5e292f 100644 --- a/client/publish_qos1_transaction.go +++ b/client/publish_qos1_transaction.go @@ -3,9 +3,9 @@ package client import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type publishQOS1Transaction struct { diff --git a/client/publish_qos2_transaction.go b/client/publish_qos2_transaction.go index 9eb1744..8eeac2c 100644 --- a/client/publish_qos2_transaction.go +++ b/client/publish_qos2_transaction.go @@ -3,9 +3,9 @@ package client import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type publishQOS2Transaction struct { diff --git a/client/register_transaction.go b/client/register_transaction.go index a474bda..4c3b89d 100644 --- a/client/register_transaction.go +++ b/client/register_transaction.go @@ -3,9 +3,9 @@ package client import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type registerTransaction struct { diff --git a/client/sleep_transaction.go b/client/sleep_transaction.go index 0c32555..9ea8871 100644 --- a/client/sleep_transaction.go +++ b/client/sleep_transaction.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) const maxPingrespWait = time.Minute diff --git a/client/subscribe_transaction.go b/client/subscribe_transaction.go index 6ae2263..6177fc7 100644 --- a/client/subscribe_transaction.go +++ b/client/subscribe_transaction.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type subscribeTransaction struct { diff --git a/client/transaction.go b/client/transaction.go index 540f98d..f782578 100644 --- a/client/transaction.go +++ b/client/transaction.go @@ -1,9 +1,9 @@ package client import ( - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) // Transactions states constants type. diff --git a/client/unsubscribe_transaction.go b/client/unsubscribe_transaction.go index 954448c..8dae95f 100644 --- a/client/unsubscribe_transaction.go +++ b/client/unsubscribe_transaction.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - pkts "github.com/energomonitor/bisquitt/packets" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + pkts "github.com/energostack/bisquitt/packets" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type unsubscribeTransaction struct { diff --git a/cmd/bisquitt-pub/actions.go b/cmd/bisquitt-pub/actions.go index c1bce58..a72cc77 100644 --- a/cmd/bisquitt-pub/actions.go +++ b/cmd/bisquitt-pub/actions.go @@ -16,10 +16,10 @@ import ( "github.com/patrickmn/go-cache" "github.com/urfave/cli/v2" - snClient "github.com/energomonitor/bisquitt/client" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/util" - cryptoutils "github.com/energomonitor/bisquitt/util/crypto" + snClient "github.com/energostack/bisquitt/client" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/util" + cryptoutils "github.com/energostack/bisquitt/util/crypto" ) func handleAction() cli.ActionFunc { diff --git a/cmd/bisquitt-pub/application.go b/cmd/bisquitt-pub/application.go index e86c129..c3b9355 100644 --- a/cmd/bisquitt-pub/application.go +++ b/cmd/bisquitt-pub/application.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/energomonitor/bisquitt" + "github.com/energostack/bisquitt" ) const ( diff --git a/cmd/bisquitt-sub/actions.go b/cmd/bisquitt-sub/actions.go index 6961389..9a892d6 100644 --- a/cmd/bisquitt-sub/actions.go +++ b/cmd/bisquitt-sub/actions.go @@ -18,11 +18,11 @@ import ( "github.com/patrickmn/go-cache" "github.com/urfave/cli/v2" - snClient "github.com/energomonitor/bisquitt/client" - pkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/util" - cryptoutils "github.com/energomonitor/bisquitt/util/crypto" + snClient "github.com/energostack/bisquitt/client" + pkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/util" + cryptoutils "github.com/energostack/bisquitt/util/crypto" ) func handleAction() cli.ActionFunc { diff --git a/cmd/bisquitt-sub/application.go b/cmd/bisquitt-sub/application.go index 02ce643..6474478 100644 --- a/cmd/bisquitt-sub/application.go +++ b/cmd/bisquitt-sub/application.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/energomonitor/bisquitt" + "github.com/energostack/bisquitt" ) const ( diff --git a/cmd/bisquitt/actions.go b/cmd/bisquitt/actions.go index 2303a6b..be5e932 100644 --- a/cmd/bisquitt/actions.go +++ b/cmd/bisquitt/actions.go @@ -15,11 +15,11 @@ import ( "github.com/patrickmn/go-cache" "github.com/urfave/cli/v2" - "github.com/energomonitor/bisquitt/gateway" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/util" - cryptoutils "github.com/energomonitor/bisquitt/util/crypto" - "github.com/energomonitor/bisquitt/util/platform" + "github.com/energostack/bisquitt/gateway" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/util" + cryptoutils "github.com/energostack/bisquitt/util/crypto" + "github.com/energostack/bisquitt/util/platform" ) func handleAction() cli.ActionFunc { diff --git a/cmd/bisquitt/application.go b/cmd/bisquitt/application.go index 1e9efa4..0d0c343 100644 --- a/cmd/bisquitt/application.go +++ b/cmd/bisquitt/application.go @@ -6,8 +6,8 @@ import ( "github.com/urfave/cli/v2" - "github.com/energomonitor/bisquitt" - "github.com/energomonitor/bisquitt/util/platform" + "github.com/energostack/bisquitt" + "github.com/energostack/bisquitt/util/platform" ) const ( diff --git a/gateway/broker_publish_qos0_transaction.go b/gateway/broker_publish_qos0_transaction.go index 6fcf9ff..2621719 100644 --- a/gateway/broker_publish_qos0_transaction.go +++ b/gateway/broker_publish_qos0_transaction.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type brokerPublishQOS0Transaction struct { diff --git a/gateway/broker_publish_qos1_transaction.go b/gateway/broker_publish_qos1_transaction.go index 3883ec1..d3df4ae 100644 --- a/gateway/broker_publish_qos1_transaction.go +++ b/gateway/broker_publish_qos1_transaction.go @@ -6,8 +6,8 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type brokerPublishQOS1Transaction struct { diff --git a/gateway/broker_publish_qos2_transaction.go b/gateway/broker_publish_qos2_transaction.go index c3dae69..807ec3f 100644 --- a/gateway/broker_publish_qos2_transaction.go +++ b/gateway/broker_publish_qos2_transaction.go @@ -6,8 +6,8 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" ) type brokerPublishQOS2Transaction struct { diff --git a/gateway/broker_publish_transaction.go b/gateway/broker_publish_transaction.go index 9b19d22..6b99155 100644 --- a/gateway/broker_publish_transaction.go +++ b/gateway/broker_publish_transaction.go @@ -5,10 +5,10 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts "github.com/energomonitor/bisquitt/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + snPkts "github.com/energostack/bisquitt/packets" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) // Transactions states constants diff --git a/gateway/client_publish_qos1_transaction.go b/gateway/client_publish_qos1_transaction.go index 1f5b8a4..f08a993 100644 --- a/gateway/client_publish_qos1_transaction.go +++ b/gateway/client_publish_qos1_transaction.go @@ -23,9 +23,9 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) type clientPublishQOS1Transaction struct { diff --git a/gateway/connect_transaction.go b/gateway/connect_transaction.go index 192e7f4..21a7a94 100644 --- a/gateway/connect_transaction.go +++ b/gateway/connect_transaction.go @@ -14,10 +14,10 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts "github.com/energomonitor/bisquitt/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + snPkts "github.com/energostack/bisquitt/packets" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) var Cancelled = errors.New("transaction cancelled") diff --git a/gateway/gateway.go b/gateway/gateway.go index e182055..b649cc4 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -16,8 +16,8 @@ import ( "github.com/pion/dtls/v2/pkg/crypto/selfsign" "github.com/pion/udp" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/util" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/util" ) type GatewayConfig struct { diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go index bf7115c..4245944 100644 --- a/gateway/gateway_test.go +++ b/gateway/gateway_test.go @@ -14,10 +14,10 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" "github.com/stretchr/testify/assert" - snPkts "github.com/energomonitor/bisquitt/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/util" + snPkts "github.com/energostack/bisquitt/packets" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/util" ) const ( diff --git a/gateway/handler1.go b/gateway/handler1.go index 741dc33..3fa20e5 100644 --- a/gateway/handler1.go +++ b/gateway/handler1.go @@ -30,11 +30,11 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" "golang.org/x/sync/errgroup" - snPkts "github.com/energomonitor/bisquitt/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/topics" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + snPkts "github.com/energostack/bisquitt/packets" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/topics" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) type handler1 struct { @@ -650,12 +650,12 @@ func (h *handler1) handleUnsubscribe(snUnsubscribe *snPkts1.Unsubscribe) error { // Check whether the given packet is legal in the current Handler's state. // // We check only packets received in the "disconnected" state because: -// 1. It is the only state before authentication, hence illegal packets could -// potentially be used to attack the gateway by an unauthenticated user. -// 2. Packets in other states are correctly handled by their respective -// transactions. Also unexpected packets can be caused by delayed UDP -// packets etc. therefore we do not want to close the connection -// when such packet appears. +// 1. It is the only state before authentication, hence illegal packets could +// potentially be used to attack the gateway by an unauthenticated user. +// 2. Packets in other states are correctly handled by their respective +// transactions. Also unexpected packets can be caused by delayed UDP +// packets etc. therefore we do not want to close the connection +// when such packet appears. func (h *handler1) checkPacketLegal(pkt snPkts.Packet) error { state := h.state.Get() if state != util.StateDisconnected { diff --git a/gateway/subscribe_transaction.go b/gateway/subscribe_transaction.go index 5dafa8e..b08acf5 100644 --- a/gateway/subscribe_transaction.go +++ b/gateway/subscribe_transaction.go @@ -9,9 +9,9 @@ import ( mqPkts "github.com/eclipse/paho.mqtt.golang/packets" - snPkts1 "github.com/energomonitor/bisquitt/packets1" - "github.com/energomonitor/bisquitt/transactions" - "github.com/energomonitor/bisquitt/util" + snPkts1 "github.com/energostack/bisquitt/packets1" + "github.com/energostack/bisquitt/transactions" + "github.com/energostack/bisquitt/util" ) type subscribeTransaction struct { diff --git a/go.mod b/go.mod index 12c213e..b5ce7b7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/energomonitor/bisquitt +module github.com/energostack/bisquitt go 1.16 diff --git a/packets1/advertise.go b/packets1/advertise.go index 4e80b5f..29c4e22 100644 --- a/packets1/advertise.go +++ b/packets1/advertise.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const advertiseVarPartLength uint16 = 3 diff --git a/packets1/advertise_test.go b/packets1/advertise_test.go index bcb0a42..6e12e08 100644 --- a/packets1/advertise_test.go +++ b/packets1/advertise_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestAdvertiseConstructor(t *testing.T) { diff --git a/packets1/auth.go b/packets1/auth.go index 5ed2da9..3d8c872 100644 --- a/packets1/auth.go +++ b/packets1/auth.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) // Authentication reason constants. diff --git a/packets1/auth_test.go b/packets1/auth_test.go index d2cc51d..c69b59b 100644 --- a/packets1/auth_test.go +++ b/packets1/auth_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestAuthPlainConstructor(t *testing.T) { diff --git a/packets1/connack.go b/packets1/connack.go index d0521a5..636df3f 100644 --- a/packets1/connack.go +++ b/packets1/connack.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const connackVarPartLength uint16 = 1 diff --git a/packets1/connack_test.go b/packets1/connack_test.go index fa1ae00..052c715 100644 --- a/packets1/connack_test.go +++ b/packets1/connack_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestConnackConstructor(t *testing.T) { diff --git a/packets1/connect.go b/packets1/connect.go index 383c97a..f343135 100644 --- a/packets1/connect.go +++ b/packets1/connect.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const connectHeaderLength uint16 = 4 diff --git a/packets1/connect_test.go b/packets1/connect_test.go index 5494c41..6d49c90 100644 --- a/packets1/connect_test.go +++ b/packets1/connect_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestConnectConstructor(t *testing.T) { diff --git a/packets1/disconnect.go b/packets1/disconnect.go index 9701ec8..18239e1 100644 --- a/packets1/disconnect.go +++ b/packets1/disconnect.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const disconnectDurationLength uint16 = 2 diff --git a/packets1/disconnect_test.go b/packets1/disconnect_test.go index 97ae7c6..7b7d64e 100644 --- a/packets1/disconnect_test.go +++ b/packets1/disconnect_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestDisconnectConstructor(t *testing.T) { diff --git a/packets1/gwinfo.go b/packets1/gwinfo.go index 0a0fc19..0ab27f3 100644 --- a/packets1/gwinfo.go +++ b/packets1/gwinfo.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const gwInfoHeaderLength uint16 = 1 diff --git a/packets1/gwinfo_test.go b/packets1/gwinfo_test.go index 51361ce..3dcdd58 100644 --- a/packets1/gwinfo_test.go +++ b/packets1/gwinfo_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestGwInfoConstructor(t *testing.T) { diff --git a/packets1/packets1.go b/packets1/packets1.go index 2b8d90d..7657c54 100644 --- a/packets1/packets1.go +++ b/packets1/packets1.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) // MQTT-SN specification version 1.2, section 5.2.1 defines maximal packet size diff --git a/packets1/packets1_test.go b/packets1/packets1_test.go index 909bda8..4f6b432 100644 --- a/packets1/packets1_test.go +++ b/packets1/packets1_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func testPacketMarshal(t *testing.T, pkt1 pkts.Packet) pkts.Packet { diff --git a/packets1/pingreq.go b/packets1/pingreq.go index 620f1da..bbe5215 100644 --- a/packets1/pingreq.go +++ b/packets1/pingreq.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) type Pingreq struct { diff --git a/packets1/pingresp.go b/packets1/pingresp.go index 545bf23..884ab74 100644 --- a/packets1/pingresp.go +++ b/packets1/pingresp.go @@ -1,7 +1,7 @@ package packets1 import ( - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const pingrespVarPartLength uint16 = 0 diff --git a/packets1/puback.go b/packets1/puback.go index d1a5073..8597673 100644 --- a/packets1/puback.go +++ b/packets1/puback.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const pubackVarPartLength uint16 = 5 diff --git a/packets1/puback_test.go b/packets1/puback_test.go index 127d925..2e6c1ef 100644 --- a/packets1/puback_test.go +++ b/packets1/puback_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestPubackConstructor(t *testing.T) { diff --git a/packets1/pubcomp.go b/packets1/pubcomp.go index f6f98b8..9fc74b2 100644 --- a/packets1/pubcomp.go +++ b/packets1/pubcomp.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const pubcompVarPartLength uint16 = 2 diff --git a/packets1/pubcomp_test.go b/packets1/pubcomp_test.go index 6f71e9f..43a8d42 100644 --- a/packets1/pubcomp_test.go +++ b/packets1/pubcomp_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestPubcompConstructor(t *testing.T) { diff --git a/packets1/publish.go b/packets1/publish.go index 6f54aee..76c6944 100644 --- a/packets1/publish.go +++ b/packets1/publish.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const publishHeaderLength uint16 = 5 diff --git a/packets1/publish_test.go b/packets1/publish_test.go index e969c5b..b0c109d 100644 --- a/packets1/publish_test.go +++ b/packets1/publish_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestPublishConstructor(t *testing.T) { diff --git a/packets1/pubrec.go b/packets1/pubrec.go index 4f5c07b..2dcdd5b 100644 --- a/packets1/pubrec.go +++ b/packets1/pubrec.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const pubrecVarPartLength uint16 = 2 diff --git a/packets1/pubrec_test.go b/packets1/pubrec_test.go index 6c79297..26aad5e 100644 --- a/packets1/pubrec_test.go +++ b/packets1/pubrec_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestPubrecConstructor(t *testing.T) { diff --git a/packets1/pubrel.go b/packets1/pubrel.go index 228e760..8ef06a4 100644 --- a/packets1/pubrel.go +++ b/packets1/pubrel.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const pubrelVarPartLength uint16 = 2 diff --git a/packets1/pubrel_test.go b/packets1/pubrel_test.go index c1e74fa..cfd5d75 100644 --- a/packets1/pubrel_test.go +++ b/packets1/pubrel_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestPubrelConstructor(t *testing.T) { diff --git a/packets1/regack.go b/packets1/regack.go index 8476eb4..728575d 100644 --- a/packets1/regack.go +++ b/packets1/regack.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const regackVarPartLength uint16 = 5 diff --git a/packets1/regack_test.go b/packets1/regack_test.go index c345928..d097a09 100644 --- a/packets1/regack_test.go +++ b/packets1/regack_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestRegackConstructor(t *testing.T) { diff --git a/packets1/register.go b/packets1/register.go index 6b20ff2..23c3869 100644 --- a/packets1/register.go +++ b/packets1/register.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const registerHeaderLength uint16 = 4 diff --git a/packets1/register_test.go b/packets1/register_test.go index 85210c5..3fe25d6 100644 --- a/packets1/register_test.go +++ b/packets1/register_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestRegisterConstructor(t *testing.T) { diff --git a/packets1/searchgw.go b/packets1/searchgw.go index a836900..53dc3e8 100644 --- a/packets1/searchgw.go +++ b/packets1/searchgw.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const searchGwVarPartLength uint16 = 1 diff --git a/packets1/searchgw_test.go b/packets1/searchgw_test.go index b8192ef..a20e978 100644 --- a/packets1/searchgw_test.go +++ b/packets1/searchgw_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestSearchGwConstructor(t *testing.T) { diff --git a/packets1/suback.go b/packets1/suback.go index cb75f86..df1ac56 100644 --- a/packets1/suback.go +++ b/packets1/suback.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const subackVarPartLength uint16 = 6 diff --git a/packets1/suback_test.go b/packets1/suback_test.go index c0a11ae..7140f68 100644 --- a/packets1/suback_test.go +++ b/packets1/suback_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestSubackConstructor(t *testing.T) { diff --git a/packets1/subscribe.go b/packets1/subscribe.go index 2fb192e..d1b9f03 100644 --- a/packets1/subscribe.go +++ b/packets1/subscribe.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const subscribeHeaderLength uint16 = 3 diff --git a/packets1/subscribe_test.go b/packets1/subscribe_test.go index dc5ecb9..bb033e3 100644 --- a/packets1/subscribe_test.go +++ b/packets1/subscribe_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestSubscribeConstructor(t *testing.T) { diff --git a/packets1/unsuback.go b/packets1/unsuback.go index 7979652..5f391b3 100644 --- a/packets1/unsuback.go +++ b/packets1/unsuback.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const unsubackVarPartLength uint16 = 2 diff --git a/packets1/unsuback_test.go b/packets1/unsuback_test.go index dc471b5..3ffa289 100644 --- a/packets1/unsuback_test.go +++ b/packets1/unsuback_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestUnsubackConstructor(t *testing.T) { diff --git a/packets1/unsubscribe.go b/packets1/unsubscribe.go index 0db7fde..4b5d476 100644 --- a/packets1/unsubscribe.go +++ b/packets1/unsubscribe.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const unsubscribeHeaderLength uint16 = 3 diff --git a/packets1/unsubscribe_test.go b/packets1/unsubscribe_test.go index 2388282..0cd597e 100644 --- a/packets1/unsubscribe_test.go +++ b/packets1/unsubscribe_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestUnsubscribeConstructor(t *testing.T) { diff --git a/packets1/willmsg.go b/packets1/willmsg.go index 5225189..19038ef 100644 --- a/packets1/willmsg.go +++ b/packets1/willmsg.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) type WillMsg struct { diff --git a/packets1/willmsgreq.go b/packets1/willmsgreq.go index d990414..56d1129 100644 --- a/packets1/willmsgreq.go +++ b/packets1/willmsgreq.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willMsgReqVarPartLength uint16 = 0 diff --git a/packets1/willmsgreq_test.go b/packets1/willmsgreq_test.go index 4449bbf..6dbe20a 100644 --- a/packets1/willmsgreq_test.go +++ b/packets1/willmsgreq_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillMsgReqConstructor(t *testing.T) { diff --git a/packets1/willmsgresp.go b/packets1/willmsgresp.go index 7b9d4ff..3d36aad 100644 --- a/packets1/willmsgresp.go +++ b/packets1/willmsgresp.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willMsgRespVarPartLength uint16 = 1 diff --git a/packets1/willmsgresp_test.go b/packets1/willmsgresp_test.go index 16aa43a..3c49763 100644 --- a/packets1/willmsgresp_test.go +++ b/packets1/willmsgresp_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillMsgRespConstructor(t *testing.T) { diff --git a/packets1/willmsgupd.go b/packets1/willmsgupd.go index d7b85f4..1ec40a4 100644 --- a/packets1/willmsgupd.go +++ b/packets1/willmsgupd.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) type WillMsgUpd struct { diff --git a/packets1/willtopic.go b/packets1/willtopic.go index 312606d..171b811 100644 --- a/packets1/willtopic.go +++ b/packets1/willtopic.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willTopicFlagsLength uint16 = 1 diff --git a/packets1/willtopic_test.go b/packets1/willtopic_test.go index 81aea17..49ba0c7 100644 --- a/packets1/willtopic_test.go +++ b/packets1/willtopic_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillTopicConstructor(t *testing.T) { diff --git a/packets1/willtopicreq.go b/packets1/willtopicreq.go index 53f6075..577fe9f 100644 --- a/packets1/willtopicreq.go +++ b/packets1/willtopicreq.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willTopicReqVarPartLength uint16 = 0 diff --git a/packets1/willtopicreq_test.go b/packets1/willtopicreq_test.go index bdb33d0..db30633 100644 --- a/packets1/willtopicreq_test.go +++ b/packets1/willtopicreq_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillTopicReqConstructor(t *testing.T) { diff --git a/packets1/willtopicresp.go b/packets1/willtopicresp.go index 97a13e5..3751eae 100644 --- a/packets1/willtopicresp.go +++ b/packets1/willtopicresp.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willTopicRespVarPartLength uint16 = 1 diff --git a/packets1/willtopicresp_test.go b/packets1/willtopicresp_test.go index 7f184d0..cd79d86 100644 --- a/packets1/willtopicresp_test.go +++ b/packets1/willtopicresp_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillTopicRespConstructor(t *testing.T) { diff --git a/packets1/willtopicupd.go b/packets1/willtopicupd.go index b1e3cb6..4e7c2aa 100644 --- a/packets1/willtopicupd.go +++ b/packets1/willtopicupd.go @@ -3,7 +3,7 @@ package packets1 import ( "fmt" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) const willTopicUpdFlagsLength uint16 = 1 diff --git a/packets1/willtopicupd_test.go b/packets1/willtopicupd_test.go index 350d9dc..cc76fde 100644 --- a/packets1/willtopicupd_test.go +++ b/packets1/willtopicupd_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) func TestWillTopicUpdConstructor(t *testing.T) { diff --git a/transactions/transaction_store.go b/transactions/transaction_store.go index c956e7f..b7920dc 100644 --- a/transactions/transaction_store.go +++ b/transactions/transaction_store.go @@ -3,7 +3,7 @@ package transactions import ( "sync" - pkts "github.com/energomonitor/bisquitt/packets" + pkts "github.com/energostack/bisquitt/packets" ) // TransactionStore stores transactions by MessageID or PacketType diff --git a/version.txt b/version.txt index faef31a..a3df0a6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.7.0 +0.8.0