ProfessionalUwU/echoip
1
0
Fork 0
mirror of https://github.com/mpolden/echoip.git synced 2025-07-21 00:06:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include IP in decimal format

Browse Source 
Fixes #19
This commit is contained in:
Martin Polden
2016-07-06 23:44:33 +02:00
parent cfb86fe124
commit 6a9202851d
4 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
api/api.go
View File

@ -6,6 +6,7 @@ import (
"html/template"
"io"
"log"
"math/big"
"net"
"net/http"
"path/filepath"
@ -29,10 +30,11 @@ type API struct {
}
type Response struct {
IP net.IP `json:"ip"`
Country string `json:"country,omitempty"`
City string `json:"city,omitempty"`
Hostname string `json:"hostname,omitempty"`
IP net.IP `json:"ip"`
IPDecimal *big.Int `json:"ip_decimal"`
Country string `json:"country,omitempty"`
City string `json:"city,omitempty"`
Hostname string `json:"hostname,omitempty"`
}
type PortResponse struct {
@ -45,6 +47,16 @@ func New(oracle Oracle) *API {
return &API{oracle: oracle}
}
func ipToDecimal(ip net.IP) *big.Int {
i := big.NewInt(0)
if to4 := ip.To4(); to4 != nil {
i.SetBytes(to4)
} else {
i.SetBytes(ip)
}
return i
}
func ipFromRequest(header string, r *http.Request) (net.IP, error) {
remoteIP := r.Header.Get(header)
if remoteIP == "" {
@ -66,6 +78,7 @@ func (a *API) newResponse(r *http.Request) (Response, error) {
if err != nil {
return Response{}, err
}
ipDecimal := ipToDecimal(ip)
country, err := a.oracle.LookupCountry(ip)
if err != nil {
log.Print(err)
@ -79,10 +92,11 @@ func (a *API) newResponse(r *http.Request) (Response, error) {
log.Print(err)
}
return Response{
IP: ip,
Country: country,
City: city,
Hostname: strings.Join(hostnames, " "),
IP: ip,
IPDecimal: ipDecimal,
Country: country,
City: city,
Hostname: strings.Join(hostnames, " "),
}, nil
}