Skip to content

Commit c3a11a3

Browse files
committed
Fix port listen option in netcat
1 parent 1b47dbf commit c3a11a3

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

netcat/main.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func printUsage() {
2929
fmt.Println(" -local: Local SCION address (default localhost)")
3030
fmt.Println(" -b: Send or expect an extra (throw-away) byte before the actual data")
3131
fmt.Println(" -tlsKey: TLS key path, only needed when listening (default: ./key.pem)")
32-
fmt.Println(" -tlsCertificate: TLS certificate path, only needed when listening (default: ./certificate.pem)")
32+
fmt.Println(" -tlsCert: TLS certificate path, only needed when listening (default: ./certificate.pem)")
3333
}
3434

3535
func main() {
@@ -77,6 +77,10 @@ func main() {
7777
}
7878
}
7979

80+
if listen {
81+
localAddrString = fmt.Sprintf("%s:%v", localAddrString, port)
82+
}
83+
8084
localAddr, err := snet.AddrFromString(localAddrString)
8185
if err != nil {
8286
golog.Panicf("Error parsing local address: %v", err)
@@ -112,11 +116,11 @@ func main() {
112116
close := func() {
113117
err := stream.Close()
114118
if err != nil {
115-
log.Warn("Error closing stream: %v", err)
119+
log.Warn("Error closing stream", "error", err)
116120
}
117121
err = sess.Close(nil)
118122
if err != nil {
119-
log.Warn("Error closing session: %v", err)
123+
log.Warn("Error closing session", "error", err)
120124
}
121125
}
122126

@@ -127,6 +131,8 @@ func main() {
127131
}()
128132
io.Copy(stream, os.Stdin)
129133
once.Do(close)
134+
135+
log.Debug("Done, closing now")
130136
}
131137

132138
func doListen(localAddr *snet.Addr, extraByte bool) (quic.Session, quic.Stream) {

0 commit comments

Comments
 (0)