xtables-addons: Avoid redefinition of SHRT_MAX in lua packet script

[openwrt.git] / package / network / utils / xtables-addons / patches / 201-fix-lua-packetscript.patch

diff --git a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
index 966d29d..02250ec 100644 (file)
--- a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
+++ b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
@@ -13,6 +13,21 @@
  {
        uint32_t  verdict;
        lua_packet_segment *p;
+@@ -88,11 +88,11 @@ lua_tg(struct sk_buff *pskb, const struc
+       /* push the lua_packet_segment as a parameter */
+       p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
+       if (pskb->mac_header)
+-              p->start = pskb->mac_header;
++              p->start = skb_mac_header(pskb);
+       else if (pskb->network_header)
+-              p->start = pskb->network_header;
++              p->start = skb_network_header(pskb);
+       else if (pskb->transport_header)
+-              p->start = pskb->transport_header;
++              p->start = skb_transport_header(pskb);
+       p->offset = 0;
+       p->length = (unsigned long)pskb->tail - (unsigned long)p->start;
+       p->changes = NULL;
 @@ -208,16 +208,16 @@ static bool load_script_into_state(uint3
   * some workqueue initialization. So far this is done each time this function
   * is called, subject to change.
@@ -67,18 +82,21 @@
  #define ltable_c
 --- a/extensions/LUA/lua/luaconf.h
 +++ b/extensions/LUA/lua/luaconf.h
-@@ -13,6 +13,10 @@
+@@ -13,8 +13,12 @@
  #if !defined(__KERNEL__)
  #include <limits.h>
  #else
++#include <linux/kernel.h>
++
 +#undef UCHAR_MAX
-+#undef SHRT_MAX
 +#undef BUFSIZ
 +#undef NO_FPU
  #define UCHAR_MAX     255
- #define SHRT_MAX        32767
+-#define SHRT_MAX        32767
  #define BUFSIZ                8192
-@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; 
+ #define NO_FPU
+ #endif
+@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
  */
  #if defined(__KERNEL__)
  #undef LUA_USE_ULONGJMP