wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Close connection when testing port

This commit is contained in:
Martin Polden 2016-04-16 09:48:39 +02:00
parent 55d72fd053
commit 4664693b0a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/api.go
View File

@ -98,9 +98,12 @@ func ipFromRequest(r *http.Request) (net.IP, error) {
func testPort(ip net.IP, port uint64) error {
address := fmt.Sprintf("%s:%d", ip, port)
if _, err := net.DialTimeout("tcp", address, 2*time.Second); err != nil {
conn, err := net.DialTimeout("tcp", address, 2*time.Second)
if err != nil {
return err
}
defer conn.Close()
return nil
}
@ -173,7 +176,7 @@ func (a *API) JSONHandler(w http.ResponseWriter, r *http.Request) *appError {
return nil
}
func (a *API) TestPortHandler(w http.ResponseWriter, r *http.Request) *appError {
func (a *API) PortHandler(w http.ResponseWriter, r *http.Request) *appError {
vars := mux.Vars(r)
port, err := strconv.ParseUint(vars["port"], 10, 16)
if err != nil {
@ -286,7 +289,7 @@ func (a *API) Handlers() http.Handler {
r.Handle("/", appHandler(a.DefaultHandler)).Methods("GET")
// Port testing
r.Handle("/port/{port:[0-9]+}", appHandler(a.TestPortHandler)).Methods("GET")
r.Handle("/port/{port:[0-9]+}", appHandler(a.PortHandler)).Methods("GET")
// Not found handler which returns JSON when appropriate
r.NotFoundHandler = appHandler(a.NotFoundHandler)