diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-12 14:29:33 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-12 14:29:33 +0000 |
| commit | 74cf90975e2071d28f4137710dd0bea5a809bee4 (patch) | |
| tree | ace6647e57cbcc2746d934bea6049d64610bc6d9 /src/lua | |
| parent | c14def4a6775f49191175e5b5a4e9c8c93b797e1 (diff) | |
| download | rspamd-74cf90975e2071d28f4137710dd0bea5a809bee4.tar.gz rspamd-74cf90975e2071d28f4137710dd0bea5a809bee4.zip | |
Rework lua basic API for new IP.
Diffstat (limited to 'src/lua')
| -rw-r--r-- | src/lua/lua_common.h | 3 | ||||
| -rw-r--r-- | src/lua/lua_config.c | 4 | ||||
| -rw-r--r-- | src/lua/lua_task.c | 4 |
3 files changed, 5 insertions, 6 deletions
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); |