Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt_chaos_c...
/
package
/
network
/
utils
/
xtables-addons
/
patches
/
201-fix-lua-packetscript.patch

201-fix-lua-packetscript.patch 2.1 KB
Permalink History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 
  1. --- a/extensions/LUA/xt_LUA_target.c
    2. 

  2. +++ b/extensions/LUA/xt_LUA_target.c
    3. 

  3. @@ -64,10 +64,10 @@ uint32_t  lua_state_refs[LUA_STATE_ARRAY
    4. 

  4.   * XT_CONTINUE inside the *register_lua_packet_lib* function.
    5. 

  5.   */
    6. 

  6.  
    7. 

  7. -spinlock_t lock = SPIN_LOCK_UNLOCKED;
    8. 

  8. +DEFINE_SPINLOCK(lock);
    9. 

  9.  
    10. 

  10.  static uint32_t 
    11. 

  11. -lua_tg(struct sk_buff *pskb, const struct xt_target_param *par)
    12. 

  12. +lua_tg(struct sk_buff *pskb, const struct xt_action_param *par)
    13. 

  13.  {
    14. 

  14.  	uint32_t  verdict;
    15. 

  15.  	lua_packet_segment *p;
    16. 

  16. @@ -208,16 +208,16 @@ static bool load_script_into_state(uint3
    17. 

  17.   * some workqueue initialization. So far this is done each time this function
    18. 

  18.   * is called, subject to change.
    19. 

  19.   */
    20. 

  20. -static bool
    21. 

  21. +static int
    22. 

  22.  lua_tg_checkentry(const struct xt_tgchk_param *par)
    23. 

  23.  {
    24. 

  24.  	const struct xt_lua_tginfo *info = par->targinfo;
    25. 

  25.  
    26. 

  26.  	if (load_script_into_state(info->state_id, info->script_size, (char *)info->buf)) {
    27. 

  27.  		lua_state_refs[info->state_id]++;
    28. 

  28. -		return true;
    29. 

  29. +		return 0;
    30. 

  30.  	}
    31. 

  31. -	return false;
    32. 

  32. +	return -EINVAL;
    33. 

  33.  }
    34. 

  34.  
    35. 

  35.  /*::*
    36. 

  36. --- a/extensions/LUA/lua/llimits.h
    37. 

  37. +++ b/extensions/LUA/lua/llimits.h
    38. 

  38. @@ -8,7 +8,6 @@
    39. 

  39.  #define llimits_h
    40. 

  40.  
    41. 

  41.  #include <stddef.h>
    42. 

  42. -#include <limits.h>
    43. 

  43.  
    44. 

  44.  #include "lua.h"
    45. 

  45.  
    46. 

  46. --- a/extensions/LUA/lua/lapi.c
    47. 

  47. +++ b/extensions/LUA/lua/lapi.c
    48. 

  48. @@ -4,9 +4,6 @@
    49. 

  49.  ** See Copyright Notice in lua.h
    50. 

  50.  */
    51. 

  51.  
    52. 

  52. -#include <stdarg.h>
    53. 

  53. -#include <math.h>
    54. 

  54. -#include <assert.h>
    55. 

  55.  #include <string.h>
    56. 

  56.  
    57. 

  57.  #define lapi_c
    58. 

  58. --- a/extensions/LUA/lua/ltable.c
    59. 

  59. +++ b/extensions/LUA/lua/ltable.c
    60. 

  60. @@ -18,7 +18,6 @@
    61. 

  61.  ** Hence even when the load factor reaches 100%, performance remains good.
    62. 

  62.  */
    63. 

  63.  
    64. 

  64. -#include <math.h>
    65. 

  65.  #include <string.h>
    66. 

  66.  
    67. 

  67.  #define ltable_c
    68. 

  68. --- a/extensions/LUA/lua/luaconf.h
    69. 

  69. +++ b/extensions/LUA/lua/luaconf.h
    70. 

  70. @@ -13,6 +13,10 @@
    71. 

  71.  #if !defined(__KERNEL__)
    72. 

  72.  #include <limits.h>
    73. 

  73.  #else
    74. 

  74. +#undef UCHAR_MAX
    75. 

  75. +#undef SHRT_MAX
    76. 

  76. +#undef BUFSIZ
    77. 

  77. +#undef NO_FPU
    78. 

  78.  #define UCHAR_MAX	255
    79. 

  79.  #define SHRT_MAX        32767
    80. 

  80.  #define BUFSIZ 		8192
    81. 

  81. @@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; 
    82. 

  82.  */
    83. 

  83.  #if defined(__KERNEL__)
    84. 

  84.  #undef LUA_USE_ULONGJMP
    85. 

  85. +#define setjmp __builtin_setjmp
    86. 

  86. +#define longjmp __builtin_longjmp
    87. 

  87.  #endif
    88. 

  88.  
    89. 

  89.  #if defined(__cplusplus)
    90.