From: Marek Vavrusa <marek@vavrusa.com>
Date: Mon, 11 Jan 2016 04:29:51 +0000 (-0800)
Subject: modules/view: fixed direct access to addr family
X-Git-Tag: v1.0.0-beta3~22^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beda0ca1fb94661ce5aa319eb2085217ba02c121;p=thirdparty%2Fknot-resolver.git

modules/view: fixed direct access to addr family
---

diff --git a/modules/view/view.lua b/modules/view/view.lua
index 1efd5fbcd..2550112d0 100644
--- a/modules/view/view.lua
+++ b/modules/view/view.lua
@@ -2,11 +2,6 @@ local kres = require('kres')
 local policy = require('policy')
 local ffi = require('ffi')
 local C = ffi.C
-ffi.cdef[[
-int kr_straddr_family(const char *addr);
-int kr_straddr_subnet(void *dst, const char *addr);
-int kr_bitcmp(const char *a, const char *b, int bits);
-]]
 
 -- Module declaration
 local view = {
@@ -29,7 +24,7 @@ end
 
 -- @function Match IP against given subnet
 local function match_subnet(family, subnet, bitlen, addr)
-	return (family == addr.sa_family) and (C.kr_bitcmp(subnet, addr:ip(), bitlen) == 0)
+	return (family == addr:family()) and (C.kr_bitcmp(subnet, addr:ip(), bitlen) == 0)
 end
 
 -- @function Find view for given request
@@ -64,4 +59,4 @@ view.layer = {
 	end
 }
 
-return view
\ No newline at end of file
+return view