From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 26 Oct 2015 14:08:51 +0000 (+0100)
Subject: modules/tinyweb: feed exports country code as well
X-Git-Tag: v1.0.0-beta2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f456e0c08be650b2bb43cc00876e5d3784fa00fb;p=thirdparty%2Fknot-resolver.git

modules/tinyweb: feed exports country code as well
---

diff --git a/modules/tinyweb/tinyweb.go b/modules/tinyweb/tinyweb.go
index cbcd2bbcf..df16197d9 100644
--- a/modules/tinyweb/tinyweb.go
+++ b/modules/tinyweb/tinyweb.go
@@ -36,6 +36,7 @@ type QueryInfo struct {
 	Qtype string
 	Addr  string
 	Secure bool
+	Country string
 }
 
 // Global context
@@ -137,8 +138,6 @@ func tinyweb_init(module *C.struct_kr_module) int {
 		for msg := range ch_metrics {
 			var qtype_str [16] byte
 			C.knot_rrtype_to_string(C.uint16_t(msg.qtype), (*C.char)(unsafe.Pointer(&qtype_str[0])), C.size_t(16))
-			fifo_metrics[fifo_metrics_i] = QueryInfo{msg.qname, string(qtype_str[:]), msg.addr.String(), msg.secure}
-			fifo_metrics_i = (fifo_metrics_i + 1) % len(fifo_metrics)
 			// Sample NS country code
 			var cc string
 			switch len(msg.addr) {
@@ -152,6 +151,8 @@ func tinyweb_init(module *C.struct_kr_module) int {
 			} else {
 				geo_freq[cc] = 1
 			}
+			fifo_metrics[fifo_metrics_i] = QueryInfo{msg.qname, string(qtype_str[:]), msg.addr.String(), msg.secure, cc}
+			fifo_metrics_i = (fifo_metrics_i + 1) % len(fifo_metrics)
 		}
 	}()
 	return 0