diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2018-09-25 22:58:58 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2019-02-22 23:12:41 +0100 |
| commit | d9dd3cff349a09af9dd97cd6595f9815ff7eb815 (patch) | |
| tree | ab59515a0e61e146030e902fb275a181abb45a81 | |
| parent | bfd06659462cff84cc877d85d44dcd9603d2a43d (diff) | |
Lua: Adapt to changes in int-new branch
| -rw-r--r-- | filter/filter.c | 2 | ||||
| -rw-r--r-- | lua/common.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/filter/filter.c b/filter/filter.c index 632b4dbf..933b8a90 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -1779,7 +1779,7 @@ f_run(struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int fla res = interpret(filter->root); break; case FILTER_LUA: - res = lua_interpret(filter->lua_chunk, rte, &f_old_rta, tmp_attrs, tmp_pool, flags); + res = lua_interpret(filter->lua_chunk, rte, &f_old_rta, f_eattrs, tmp_pool, flags); break; default: bug("filter type not set"); diff --git a/lua/common.c b/lua/common.c index fad2f857..a9c60489 100644 --- a/lua/common.c +++ b/lua/common.c @@ -123,7 +123,7 @@ static int luaB_ip4_tostring(lua_State *L) { static void lua_puship4(lua_State *L, ip4_addr a) { lua_newtable(L); - lua_settableinteger(L, "addr", a); + lua_settableinteger(L, "addr", ip4_to_u32(a)); lua_newtable(L); lua_settablecfunction(L, "__tostring", luaB_ip4_tostring); @@ -170,7 +170,7 @@ lua_bird_state *luaB_init(lua_State *L, struct linpool *lp) { lua_settablelightuserdata(L, "_internal_state", lbs); - lua_settableip4(L, "router_id", config->router_id); + lua_settableip4(L, "router_id", ip4_from_u32(config->router_id)); lua_setglobal(L, "bird"); |