From 2b340fc2ec941b3d021079fe7c4c212468e004e8 Mon Sep 17 00:00:00 2001
From: Ian Bishop <ianbishop@pace7.com>
Date: Sun, 6 Mar 2016 16:10:58 +1000
Subject: [PATCH 1/2] Link to IPv4 page from IPv6 page

---
 api/api.go | 9 ++++++++-
 index.html | 9 +++++++++
 main.go    | 6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/api/api.go b/api/api.go
index 32670a1..a96b43c 100644
--- a/api/api.go
+++ b/api/api.go
@@ -141,12 +141,19 @@ func (a *API) DefaultHandler(w http.ResponseWriter, r *http.Request) *appError {
 		return internalServerError(err)
 	}
 
+	IsV6 := true
+	ip := net.ParseIP(r.Header.Get(IP_HEADER))
+	if ip.To4() != nil {
+		IsV6 = false
+	}
+
 	var data = struct {
 		IP     string
+		IsV6   bool
 		JSON   string
 		Header http.Header
 		Cmd
-	}{r.Header.Get(IP_HEADER), string(b), r.Header, cmd}
+	}{ip.String(), IsV6, string(b), r.Header, cmd}
 
 	if err := t.Execute(w, &data); err != nil {
 		return internalServerError(err)
diff --git a/index.html b/index.html
index 82f71d1..0d9e0ff 100644
--- a/index.html
+++ b/index.html
@@ -24,6 +24,10 @@
         margin-bottom: 10px;
         text-align: center;
       }
+      #footer {
+        margin-top: 10px;
+        text-align: center;
+      }
       .ip {
         border: 1px solid #cbcbcb;
         background: #f2f2f2;
@@ -66,6 +70,11 @@
         </tbody>
       </table>
     </div>
+    <div id="footer">
+    {{ if .IsV6 }}
+      <a href="http://v4.ifconfig.co">IPv4 page</a>
+    {{end}}
+    </div>
     <a href="https://github.com/martinp/ifconfigd"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
   </body>
 </html>
diff --git a/main.go b/main.go
index 218e5d4..0f14d9c 100644
--- a/main.go
+++ b/main.go
@@ -13,13 +13,13 @@ func main() {
 	var opts struct {
 		DBPath        string `short:"f" long:"file" description:"Path to GeoIP database" value-name:"FILE" default:""`
 		Listen        string `short:"l" long:"listen" description:"Listening address" value-name:"ADDR" default:":8080"`
-		CORS          bool   `short:"x" long:"cors" description:"Allow requests from other domains" default:"false"`
-		ReverseLookup bool   `short:"r" long:"reverselookup" description:"Perform reverse hostname lookups" default:"false"`
+		CORS          bool   `short:"x" long:"cors" description:"Allow requests from other domains"`
+		ReverseLookup bool   `short:"r" long:"reverselookup" description:"Perform reverse hostname lookups"`
 		Template      string `short:"t" long:"template" description:"Path to template" default:"index.html"`
 	}
 	_, err := flags.ParseArgs(&opts, os.Args)
 	if err != nil {
-		os.Exit(1)
+		log.Fatal(err)
 	}
 
 	var a *api.API

From 4cfccfdcaf008240f5e5e46a37a73f1c0e5d50bd Mon Sep 17 00:00:00 2001
From: Ian Bishop <ianbishop@pace7.com>
Date: Wed, 9 Mar 2016 08:55:41 +1000
Subject: [PATCH 2/2] Include both IPv4 and IPv6 links

---
 api/api.go | 9 +--------
 index.html | 6 ++++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/api/api.go b/api/api.go
index a96b43c..32670a1 100644
--- a/api/api.go
+++ b/api/api.go
@@ -141,19 +141,12 @@ func (a *API) DefaultHandler(w http.ResponseWriter, r *http.Request) *appError {
 		return internalServerError(err)
 	}
 
-	IsV6 := true
-	ip := net.ParseIP(r.Header.Get(IP_HEADER))
-	if ip.To4() != nil {
-		IsV6 = false
-	}
-
 	var data = struct {
 		IP     string
-		IsV6   bool
 		JSON   string
 		Header http.Header
 		Cmd
-	}{ip.String(), IsV6, string(b), r.Header, cmd}
+	}{r.Header.Get(IP_HEADER), string(b), r.Header, cmd}
 
 	if err := t.Execute(w, &data); err != nil {
 		return internalServerError(err)
diff --git a/index.html b/index.html
index 0d9e0ff..3d5ac7e 100644
--- a/index.html
+++ b/index.html
@@ -28,6 +28,9 @@
         margin-top: 10px;
         text-align: center;
       }
+      #footer a {
+	margin: 0 10px;
+      }
       .ip {
         border: 1px solid #cbcbcb;
         background: #f2f2f2;
@@ -71,9 +74,8 @@
       </table>
     </div>
     <div id="footer">
-    {{ if .IsV6 }}
       <a href="http://v4.ifconfig.co">IPv4 page</a>
-    {{end}}
+      <a href="http://v6.ifconfig.co">IPv6 page</a>
     </div>
     <a href="https://github.com/martinp/ifconfigd"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
   </body>