Skip to content

Commit d140151

Browse files
author
chaehni
authored
Fix app panic in multi-AS setup (#70)
* fixed panic for multi-AS setup
1 parent 0f0a338 commit d140151

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

bwtester/bwtestserver/bwtestserver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ func main() {
115115
// Create the SCION UDP socket
116116
if len(serverCCAddrStr) == 0 {
117117
serverCCAddr, err = scionutil.GetLocalhost()
118-
serverCCAddr.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
119118
if err != nil {
120119
printUsage()
121-
LogFatal("Unable to start server", "err", err)
120+
LogFatal("Unable to start server, please provide the server address manually", "err", err)
122121
}
122+
serverCCAddr.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
123123
} else {
124124
serverCCAddr, err = snet.AddrFromString(serverCCAddrStr)
125125
if err != nil {

camerapp/imageserver/imageserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ func main() {
155155
}
156156
} else {
157157
server, err = scionutil.GetLocalhost()
158-
server.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
159158
check(err)
159+
server.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
160160
}
161161

162162
if sciondFromIA {

roughtime/timeclient/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ func main() {
4242

4343
if *clientAddress != "" {
4444
cAddr, err = scionutil.InitSCIONString(*clientAddress)
45+
checkErr("InitSCIONString", err)
4546
} else {
4647
cAddr, err = scionutil.GetLocalhost()
48+
checkErr("GetLocalhost", err)
4749
cAddr.Host.L4 = addr.NewL4UDPInfo(0)
48-
scionutil.InitSCION(cAddr)
50+
err = scionutil.InitSCION(cAddr)
51+
checkErr("InitSCION", err)
4952
}
50-
checkErr("Init SCION", err)
5153

5254
if cAddr.Host.L4.Port() != 0 {
5355
log.Panicf("Application port must be set to 0, currently its %d", cAddr.Host.L4.Port())

sensorapp/sensorserver/sensorserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ func main() {
116116
}
117117
} else {
118118
server, err = scionutil.GetLocalhost()
119-
server.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
120119
check(err)
120+
server.Host.L4 = addr.NewL4UDPInfo(uint16(serverPort))
121121
}
122122

123123
if sciondFromIA {

0 commit comments

Comments
 (0)