Skip to content

Commit 873b279

Browse files
committed
Fixed infinite loop
Signed-off-by: Vishal Rana <vr@labstack.com>
1 parent 0180dec commit 873b279

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
dist
2+
.idea

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = 0.2.5
1+
VERSION = 0.2.6
22

33
publish:
44
git tag $(VERSION)

cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var (
1212
Short: "Print the version of Tunnel",
1313
// Long: ``,
1414
Run: func(cmd *cobra.Command, args []string) {
15-
fmt.Println("0.2.4")
15+
fmt.Println("0.2.6")
1616
},
1717
}
1818
)

tunnel.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,23 +114,26 @@ func Create(c *Config) {
114114
br := bufio.NewReader(r)
115115
go func() {
116116
for {
117-
line, _, _ := br.ReadLine()
117+
line, _, err := br.ReadLine()
118+
if err != nil {
119+
log.Fatalf("Failed to read: %v", err)
120+
}
118121
fmt.Printf("%s\n", line)
119122
}
120123
}()
121124

122125
// Remote listener
123126
ln, err := client.Listen("tcp", fmt.Sprintf("%s:%d", c.RemoteHost, c.RemotePort))
124127
if err != nil {
125-
log.Fatalf("Failed to listen on remote host %v", err)
128+
log.Fatalf("Failed to listen on remote host: %v", err)
126129
}
127130
defer ln.Close()
128131

129132
for {
130133
// Handle inbound connection
131134
in, err := ln.Accept()
132135
if err != nil {
133-
log.Printf("Failed to accept connection %v", err)
136+
log.Printf("Failed to accept connection: %v", err)
134137
return
135138
}
136139

@@ -140,7 +143,7 @@ func Create(c *Config) {
140143
// Target connection
141144
out, err := net.Dial("tcp", fmt.Sprintf("%s:%d", c.TargetHost, c.TargetPort))
142145
if err != nil {
143-
log.Printf("Failed to connect to target %v", err)
146+
log.Printf("Failed to connect to target: %v", err)
144147
return
145148
}
146149
defer out.Close()
@@ -157,7 +160,7 @@ func Create(c *Config) {
157160
// Handle error
158161
err = <-errCh
159162
if err != nil && err != io.EOF {
160-
log.Printf("Failed to copy %v", err)
163+
log.Printf("Failed to copy: %v", err)
161164
}
162165
}(in)
163166
}

0 commit comments

Comments
 (0)