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

Remove unnecessary imports

This commit is contained in:
Martin Polden 2018-02-10 18:10:16 +01:00
parent da3502d429
commit 8b1d263e58
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
http/http.go
View File

@ -10,10 +10,8 @@ import (
"github.com/mpolden/ipd/useragent" "github.com/mpolden/ipd/useragent"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"math/big"
"net" "net"
"net/http" "net/http"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -38,12 +36,12 @@ type Server struct {
} }
type Response struct { type Response struct {
IP net.IP `json:"ip"` IP net.IP `json:"ip"`
IPDecimal *big.Int `json:"ip_decimal"` IPDecimal uint64 `json:"ip_decimal"`
Country string `json:"country,omitempty"` Country string `json:"country,omitempty"`
CountryISO string `json:"country_iso,omitempty"` CountryISO string `json:"country_iso,omitempty"`
City string `json:"city,omitempty"` City string `json:"city,omitempty"`
Hostname string `json:"hostname,omitempty"` Hostname string `json:"hostname,omitempty"`
} }
type PortResponse struct { type PortResponse struct {
@ -194,7 +192,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
if err != nil { if err != nil {
return internalServerError(err) return internalServerError(err)
} }
t, err := template.New(filepath.Base(s.Template)).ParseFiles(s.Template) t, err := template.ParseFiles(s.Template)
if err != nil { if err != nil {
return internalServerError(err) return internalServerError(err)
} }

4
iputil/iputil.go
View File

@ -26,12 +26,12 @@ func LookupPort(ip net.IP, port uint64) error {
return nil return nil
} }
func ToDecimal(ip net.IP) *big.Int { func ToDecimal(ip net.IP) uint64 {
i := big.NewInt(0) i := big.NewInt(0)
if to4 := ip.To4(); to4 != nil { if to4 := ip.To4(); to4 != nil {
i.SetBytes(to4) i.SetBytes(to4)
} else { } else {
i.SetBytes(ip) i.SetBytes(ip)
} }
return i return i.Uint64()
} }

9
iputil/iputil_test.go
View File

@ -1,7 +1,6 @@
package iputil package iputil
import ( import (
"math/big"
"net" "net"
"testing" "testing"
) )
@ -9,14 +8,14 @@ import (
func TestToDecimal(t *testing.T) { func TestToDecimal(t *testing.T) {
var tests = []struct { var tests = []struct {
in string in string
out *big.Int out uint64
}{ }{
{"127.0.0.1", big.NewInt(2130706433)}, {"127.0.0.1", 2130706433},
{"::1", big.NewInt(1)}, {"::1", 1},
} }
for _, tt := range tests { for _, tt := range tests {
i := ToDecimal(net.ParseIP(tt.in)) i := ToDecimal(net.ParseIP(tt.in))
if i.Cmp(tt.out) != 0 { if tt.out != i {
t.Errorf("Expected %d, got %d for IP %s", tt.out, i, tt.in) t.Errorf("Expected %d, got %d for IP %s", tt.out, i, tt.in)
} }
} }