Skip to content

Commit 07b45c6

Browse files
committed
don't use internal ports, fixes #202
1 parent c830716 commit 07b45c6

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

build/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
const (
1313
logLevel = logging.InfoLevel
1414
appName = "ccu-jack"
15-
appVersion = "2.11.1"
15+
appVersion = "2.11.2"
1616
appPkg = "github.com/mdzio/ccu-jack"
1717
ldFlags = "-s -w -X main.appVersion=" + appVersion
1818
buildDir = ".."

dist/ccu/addon/ccu-jack-default.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"HmIPRF",
77
"VirtualDevices"
88
],
9-
"UseInternalPorts": true,
109
"InitID": "CCU-Jack"
1110
},
1211
"Host": {

go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/mdzio/go-hmccu v1.4.0
88
github.com/mdzio/go-lib v0.2.2
99
github.com/mdzio/go-logging v1.0.0
10-
github.com/mdzio/go-mqtt v1.0.2
10+
github.com/mdzio/go-mqtt v1.0.3
1111
github.com/mdzio/go-veap v0.5.0
12-
golang.org/x/crypto v0.34.0
12+
golang.org/x/crypto v0.36.0
1313
)
1414

1515
require (
1616
github.com/felixge/httpsnoop v1.0.4 // indirect
1717
github.com/gorilla/websocket v1.5.3 // indirect
18-
golang.org/x/net v0.35.0 // indirect
19-
golang.org/x/text v0.22.0 // indirect
18+
golang.org/x/net v0.36.0 // indirect
19+
golang.org/x/text v0.23.0 // indirect
2020
)

go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/mdzio/go-lib v0.2.2 h1:3/59L//wOTDLQnbdt/rYPIXsXsoBFM/eC2tffWV7gto=
1616
github.com/mdzio/go-lib v0.2.2/go.mod h1:iT5EGniJ9KN32ynSFImmjSTOxscncRL6h6OagK/G1PY=
1717
github.com/mdzio/go-logging v1.0.0 h1:5ykv9QZfEEn3G8Xt2Kcq7FIXDUpXyvp9PUiqWtLDaP0=
1818
github.com/mdzio/go-logging v1.0.0/go.mod h1:PAR0NsQwdZiUSy/yykXTWm+kZsbYCLTkBnKgJ6O50rw=
19-
github.com/mdzio/go-mqtt v1.0.2 h1:MHleWm5GFkBVUwp2ikYU3fXE3A70zRKqUspr9IIj/UM=
20-
github.com/mdzio/go-mqtt v1.0.2/go.mod h1:t50yUg5iAtGdYcyXKf8++fTOQ6wnUuROs3aZM7Gcu+I=
19+
github.com/mdzio/go-mqtt v1.0.3 h1:vHEjpThS7okr26Qa/vaOh0+iLoBfqDp8hH0/mnXU6zw=
20+
github.com/mdzio/go-mqtt v1.0.3/go.mod h1:t50yUg5iAtGdYcyXKf8++fTOQ6wnUuROs3aZM7Gcu+I=
2121
github.com/mdzio/go-veap v0.5.0 h1:tkMReXc9jvl05dcoyp7WL/PLZ0cUVFgJF6hHt6+9qyU=
2222
github.com/mdzio/go-veap v0.5.0/go.mod h1:i3h5W4bhxYYgT6WUfBLzAfr8VymSfOV6NMW5y1SiWi4=
2323
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -36,8 +36,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
3636
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
3737
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
3838
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
39-
golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA=
40-
golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
39+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
40+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
4141
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
4242
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
4343
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -52,8 +52,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
5252
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
5353
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
5454
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
55-
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
56-
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
55+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
56+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
5757
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5858
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5959
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -90,8 +90,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
9090
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
9191
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
9292
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
93-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
94-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
93+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
94+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
9595
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
9696
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
9797
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ func runApp() error {
430430
intercon = &itf.Interconnector{
431431
CCUAddr: cfg.CCU.Address,
432432
Types: cfg.CCU.Interfaces,
433-
UseInternalPorts: cfg.CCU.UseInternalPorts,
433+
UseInternalPorts: false, // don't use, this feature causes problems
434434
IDPrefix: cfg.CCU.InitID + "-",
435435
LogicLayer: mqttReceiver,
436436
ServeErr: serveErr,

rtcfg/model.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ func (c *Config) AddUser(u *User) {
7373

7474
// CCU configuration
7575
type CCU struct {
76-
Address string
77-
Interfaces itf.Types
78-
UseInternalPorts bool
79-
InitID string
76+
Address string
77+
Interfaces itf.Types
78+
InitID string
8079
}
8180

8281
// Host configuration

0 commit comments

Comments
 (0)