From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 12 Mar 2015 14:29:33 +0000 (+0000)
Subject: Rework lua basic API for new IP.
X-Git-Tag: 0.9.0~512^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74cf90975e2071d28f4137710dd0bea5a809bee4;p=rspamd.git

Rework lua basic API for new IP.
---

diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index c9ce21178..ce817d1e1 100644
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -146,8 +146,7 @@ int rspamd_lua_typerror (lua_State *L, int narg, const char *tname);
  * Lua IP address structure
  */
 struct rspamd_lua_ip {
-	rspamd_inet_addr_t addr;
-	gboolean is_valid;
+	rspamd_inet_addr_t *addr;
 };
 
 /**
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index d535f0a1e..5116fff93 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -1508,7 +1508,7 @@ lua_radix_get_key (lua_State * L)
 			ud = luaL_checkudata (L, 2, "rspamd{ip}");
 			if (ud != NULL) {
 				addr = *((struct rspamd_lua_ip **)ud);
-				if (!addr->is_valid) {
+				if (addr->addr == NULL) {
 					msg_err ("rspamd{ip} is not valid");
 					addr = NULL;
 				}
@@ -1519,7 +1519,7 @@ lua_radix_get_key (lua_State * L)
 		}
 
 		if (addr != NULL) {
-			if (radix_find_compressed_addr (radix, &addr->addr)
+			if (radix_find_compressed_addr (radix, addr->addr)
 					!=  RADIX_NO_VALUE) {
 				ret = TRUE;
 			}
diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 60dfb7cf7..e74d7e71c 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -1503,7 +1503,7 @@ lua_task_get_from_ip (lua_State *L)
 	struct rspamd_task *task = lua_check_task (L, 1);
 
 	if (task) {
-		rspamd_lua_ip_push (L, &task->from_addr);
+		rspamd_lua_ip_push (L, task->from_addr);
 	}
 	else {
 		lua_pushnil (L);
@@ -1533,7 +1533,7 @@ lua_task_get_client_ip (lua_State *L)
 	struct rspamd_task *task = lua_check_task (L, 1);
 
 	if (task) {
-		rspamd_lua_ip_push (L, &task->client_addr);
+		rspamd_lua_ip_push (L, task->client_addr);
 	}
 	else {
 		lua_pushnil (L);