From c4344a27acbbe0ec1ab658d4dc3f8d579f695a07 Mon Sep 17 00:00:00 2001 From: sushen339 Date: Tue, 18 Nov 2025 14:56:37 +0800 Subject: [PATCH] --- blockip/bip | Bin 58392 -> 58392 bytes blockip/include/common.h | 2 +- blockip/src/install.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blockip/bip b/blockip/bip index 8444be532b1111703c4b99d8774a718510782ee4..a52f2cc3fcb42aabe7ed0223c7c1d0ba737cb90a 100644 GIT binary patch delta 5247 zcmZ8l4OCNCw!SC87*zgLgorMJK!GCiX9@@i$X~!Pgg*tvf+GT2YJ)(vj8>@FF}88A zyIQR6lOI78EHasA5vyX+N?l_|r*@`e^+})3Gq!yrSl6@jUiG~1-rTe^$y&*G_x{e= zd!K#wIk{`MjXAW9Ih;sl&X#aN`dBE7J@yzIuu4B6WvoK?X)WSgh0sI-C*N|V#QR8cbfgB`0OKNl}mg3KyE z`q#Nhlm|9TX1(oL9W{e3k=bB7wv-0Ju9ewXJGPR(2K%DSYVBA9dANG1Hp^_W9otAL zV4G#O+Kz3ZTCi`(>=rwA4|RauC$qck*fzQbwo_)??AUH%ZeFT>neDY>2PhKkNtqq8 zV^7f^+(N!H)fg{M@}%k7QPP=3n>s zG39|}Emp0!9qUNVV5iA!upR44gJ3;nHr9^yrmw-ymszbH8%Q1=UaD}JEw*E$Cjw2$d27c zYryW7*)coTWZpYt$b-3lw3i8yKw4{&Vsl9iB4zDl(6WE@|r{> z9wZM<7~4TfnkpBk96>lMIEoWIJ zFAik`=Cs9*3I$I$XD7VC=Dw9C2r0``ic$)T3bf7N#X7*25v$gk5}%`Mi3^oe(k1IF zY08pSY(K4C(#@WdbJ7NOjOvq4vPud~4)acc70dSjN;gC8_H-L$yg(wOUmbP*upPZSv%u*2#sky3#sw z6GmppssgL3460aBx`1tH8#cRQd>}eN55mbs>FFK;QVYK0(rWUcny2)+b*{ zwi*-YkLgh?niLs(W}cV)I<*31Tlv(L5s%Wko#8h>GaeR=w=H+Ynb?@;w8l$XXn`;ne# zo1H%q4VyF{$I@@If>B&2vNG6RdYrY{`Ok|b=1(!SIeRf1pxd$DJM|bxkw_~=y*;bdxk#G`4450r1E@7r+%5B$d9JSznq5vJ##Br8Ewto z$>x$mzraluWi9*ar6dK@?Xm=Ri{_R$v1#;v`7`VuT`13BT{LY?0Bbf! ztnqeG@_EwO4@qAU1l^X37n$m?8e6i1E9+3YMdh4xk@ z%%W3hfx(+`8;GPg)W(aJYDv`G^pvK&O?5TjP9283$Pt{CA*z1yxX%oT(!W#W zNXl}Z@jNQe4Jw@}QB4sWQ+y_23KfCN&BF}asEt#<6MbmT%%nFrs@Q4j+1Stgso zCs$-UCHAkwQ&BxTH4m<`^6k!3&Ol+h{h0; z6MR1IlYDNWoCcNhN2~xRXqYxOc+H)TVHU+XiN1kn@r7aZq$nn)QAb0ps&Tp$RF7y* zbRm_Om^^ye5Sn}lEUKwmw2x{^J|-DjEgSL^4H+L;LZF6Wtojwv-BhTp;_I~fLqoapAfT*Mymz=$K9Uj?drIiKacT@c#wkc?tgA4SB#R&2%y zFd2L1h)hSIWXgf%sM0Z@0mmpA8==RcXaY_Q!k{SQ##n@%Y6a?n5&zD4JFp$QX#rmS z5CP$=OyJ7w1t#NG{lj)VjN{=4VEJjzBT(BL1m8vn}GUj2n5&;oDlVY!U|E#`Y(_np!mUYlRm65Utn9@8AY_avtUYT568=3 zZF`Vv;x(jI9wdS|p%mX<8f^Ds6ZC2Oq1h9=Ime%d^udKG1mjr$xSL+>n8Va`pd*OI z()o^5mPSsUxvY?iI+O6Ov#+xN7ybRtPyJA=Z<#a_eZ))!H#rTdce^ot72bZxR zq`A5mx+(>{WeK}bQd{X(S3KTsRfm1qRf;>D%HE@GhhMCzUzU7d@e@nAj2VIsJ(ETzkYHv-TZX#l~n7`bDJa6`%L^ zRynnHa;~5?eT9^F)EDWgJ(>h&@MtdLWyjXen}r&R6eG=Wb>E?=a8;&^3Oa}jP#&?= zd@L7#eAkX;V!f(9G1}FAzh=qw*FJw%Lr?lb**Jyt$H4BI{v?d-=wHE_=pX&7eo=@! zexoxz?e(W^$CFqoojJZ1F8w~p#FX{;EvCT_a@iJQ1HRZVzX5-Cfzk((*dz1Kfz;`A z^|br;;2mOMf)FaBt&^jXWn1qiNtSKh8l5cL`ZJ}nZ0pEW%CfBoV~}NA*QL=aZx?Kh zmKJ${t+ld8mTk?HHd(f{Pr7BfU&a9$Z7q^hvTSRLjLNdD4RS@2aiDFTj~ns;Td(6A zS+;dI9?P<=pW)bI&77@+;VR3vo`tt8+qx8ivTW;1M2Rx|3$|87x;((ve8`n$Tf3n| zmTe7&N?EqG6zXKz)x2#A(KUzPhHsV j!y+hdJly%`_F(OJjB{|iG*JkqK}bI}6wQ<4K@R^9gB@Uw delta 5164 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 Wr>;>MsM1jvq+hy!w!1eX-Tni`2u+{> diff --git a/blockip/include/common.h b/blockip/include/common.h index 3b6eaba..5a70b2b 100644 --- a/blockip/include/common.h +++ b/blockip/include/common.h @@ -25,7 +25,7 @@ #define PERSIST_FILE CONFIG_DIR "/blacklist" #define WHITELIST_FILE CONFIG_DIR "/whitelist" #define INSTALL_PATH "/usr/local/bin/bip" -#define NFT_TABLE "inet filter" +#define NFT_TABLE "inet bip" #define NFT_SET "blacklist" #define NFT_SET_V6 "blacklist_v6" #define NFT_WHITELIST "whitelist" diff --git a/blockip/src/install.c b/blockip/src/install.c index e09d14c..ce465d7 100644 --- a/blockip/src/install.c +++ b/blockip/src/install.c @@ -166,8 +166,8 @@ int install_service(void) { /* 清空bip相关nft表和集合,防止历史残留 */ char nft_clear_cmd[MAX_COMMAND_LEN]; snprintf(nft_clear_cmd, sizeof(nft_clear_cmd), - "nft flush table '%s'; " - "nft delete table '%s' 2>/dev/null;", + "nft flush table %s 2>/dev/null; " + "nft delete table %s 2>/dev/null;", NFT_TABLE, NFT_TABLE); system(nft_clear_cmd);