From 27fbf2b6e08f336517230b8dce4a23db053785c1 Mon Sep 17 00:00:00 2001 From: geoffrey Date: Wed, 3 Jul 2024 21:40:01 +0200 Subject: [PATCH] Update project --- load_bpf | Bin 16680 -> 17360 bytes load_bpf.c | 1 - tp_tcp.c | 13 ++++++------- tp_tcp.o | Bin 9360 -> 9200 bytes 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/load_bpf b/load_bpf index 05156a03a67b3df481266a4d5e14639b897b0c8a..c2d9e15e11881ac18e8731ec2020915336dacecf 100755 GIT binary patch literal 17360 zcmeHPYiu0V6~6X5i3!QtMQK!lNDD$KKTuk!1Q3FR(D0~4169E)pc(|!<{6;0Mulv@bLXD*?0C0A zt=d1`Bki1fzVo>Ep1Je5zH|NEP*+EFRh3}!h)ac(PO_1JQmnm%ErbY&7I7kuUlpf| z>40nS3n;al_gC8r=C#Vs15SSXl-|uxQ+CX`g~Z9P98IVSn2UPblKiGoQORz8w+hOf z^@aL0at3MgSl}tue&$X;%FRflZ9lT2nD1A94=c`oB$D5l@*7ir%#TrnK+HLx)O`9q zrQ*4HJ2`=vlP%HOx2y=2Cp40#a<*sAepkYe+WBRP)4opCS1vD$Rr{H%?uw@{9#nPv7$U;MyBz zr)sI))CP)2Hbi94=_gJ@p7eIVZbHe%h`(SyA17Xpjzcl0gp%TECGf98QOf>q*p|ZQ zm9amw41RT)I2V?&KOOcOer|dcK&kc&mBDW)gMU~Cf29omHQ*Y4Zt4I~sy*kTUyIzv zBpaO@Rv8g9ZT3YomYLqLsx6jGm>a^~F;f^uUp$#GGFCWk8HR0I(y%+#YsAATBbH3w zkWCq8%!~`dlHJ#vJ#dXB!;vDOH=2k@kKTyUz0F93<7Sb*Czi|ed-`P^J!vy+nN)jGmC2NuFnXitb~IsHM#4&lMJj7$L@FIkSiML_&p;Rk ziEu2sopOUKu1Do29*!miWb~OXIX{(qsMIW0c6GM48Owajd>055Ti13NexDy#r9)Wm z6q=kuGo2#3_B^Ka^yHS&&4I9-=j;wqeDx`s9UvZq8(Ag?emqAFNlq4XrL z+v=~QD><&PtE40#DzE`UcO?z#r z5c>BITGjcZ`ruQwhYJbGU+@N0`Lo}|v2I}iC6fC|KR%iVo&6`0=@n!AsFYtMnO=3q z4@&ttlIc}re7}^RB$-|@#`jA3QIhG^Vtluhe@!yIQjG7E@&hE(<9j?MyKusqkM!LRJ*Dr2{Ak_6ofP=6 z;;=tM+Fx)Au_ed#+%f&o2bbxGCOmr85&ebZ);t6-Re;+3Xs@h?{dcZ-9V(Gsx=|lo z(LqH$_m(wFA6oGwgt10+X{;ZIBhwy%T(z0~n2+BG3k z({o1<__uI+n5@R;BjUr9?(qW{8bJv@LN8#C(#zcAbo!s5F*9}v40EAZheEH)2zM4D z{DCSNLM5p1Wt4NFk)hCtG`gu^^dJ<2J4S@H0JZM`JQf3DS9~er%K*a{Y=eg4+(R*Q zAq?>yM@5!=66DiT@R>R3lT<$E**?#}=Nank@CuWBY6w=%ySvcY=g=ip=ThZ=1q>Y> zycDpVqK`k95sp&BI_ydgqLPCmI~SEKqDt<8iR{d~mOi}kE`4~_9wbW7Jr9>NW!%RG zcRVJtZ|K9JyU?-yk`ErNL3tnAv2Unl>_)04cNo%sNO370syh(6zwW?Mu>0x`9PG^5 zdHo&Ejor3QFnjkleQ5K2M+wk6MnpQ#+m)D*6t=gU9vQsWT_v>dZq7dXy?QTI_=eiO3UW?y+ zwD}xx5%kvYs&1P-y&DaJNb$do-)YbKqUi}3{)~u$v`Col??nBGQi)f@%L%`4o=_55wT3))Dh9L zoFuH#5n=gB(j98Ta7ySP)8%yW=al+549(R_r6^`9QkC#6g)!65#YY_!If`5Q97 z((^ZBKUeMJZ^IgFb1`3WX39;7fQ`@;he%WYJny1~WTLOwOpGXi@dj1kb{|xB{4E~W zkJT;NAE>1%mH?%^Pjv)KpHk*_VA>_+?SD_(O^xQT!#v-&UOK+ZnJ+E8E&G(iXRy-O+GDYr^-VzNW_JC90$?^Dk@i zH#Pa$t2FmuRP#Opr-cW95i(5+b_nH%G)4NwcCu zsrd5y0x@^W`F&Q#nRF<$qs;6G3zbO;vnKJm> zW$+sGi|Tb>FDJ?VPVJZm{G{pzu`^JtYb2bKui3bI?2Ai)Q~v!b|MG8+FnJ2UdW`?w z0o$IBGnGApN#eh)c1fJACi!;Y6vv&nT`JBjb#mn2MBz46Ce8z8@R!TrpOnGp;kiQj zakobUu1z+(P`U_ssqu3S@I?hHN1-QeWvpy(udhc;?s_q-xPdJv2{VIz9g(Eb7fW`B zV@AYErZYx3J0NHxwPE+eF? z2zvWEVXW+0(;DnD)^v2N4{b0u1Y5g86jg3w>B(ee`%CYK2{?ADH2=%}LbP2b;N0-y z+yf-{=wN|@_vbjnHcjriDe^bWNZ7(Q9JvFhNaKu5=_`&lWphrEFHRt$+FN&!g5o_+ zMkJFo`ooC`?SJZA1FJ|hVPrEVQa+h2I)z2qlD*^IMrw?Oy_>*xK1>h5Llm^@lV4!WY?= zKs=jUX& zf*>r}uJ*NSdvF;wgyYd3RG+jcG8#uC*N1a1e7JkWaZ_;Ih5qd#%`5RJ!n4{YexGN~ z^Gc>GzXAR<7iO8~Im}b4CTc&~aQhW3wxd8fWq+OzF+Zpb-TCAG->m#wmEDM% z&okFlhsmG*2Eg^R|LwrYL`~D_<-sP!$;V05Rwv~kIQ=!{$NZ?%7-d&@afi#F=WEQl zy&Q&R=6AdN`8|pGk7#f>i0fzQUKE_|=lLIV{yPZUyZir3<DY%0;Zw%2qgyw3TCjNUD?^k!*v&{UD@U3(B^E`I6 z5g>@|Y-v(v{B~Z}(-{t=Y!2AAre6k;($35_+F0wz*i$|6M1TD5%;mH2X-+{*I zF9OQcZ}R~qGGjmHpFrXC=Xt|`^5=HC{aOAD1&YP(=lA4Wl|R?R_EeXXXdgad%DkXr zf1b~>g8iMG#~#}d->(8{>V87cAs>F+9=?Cj^}%gNu|P+c+r_OeCD+S_G_7%&NL9zh Mw#5vWgG&_u1V6#mApigX literal 16680 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 Y9wEnNT{=xYDpIty$<|orG4QbBU)E9{{{R30 diff --git a/load_bpf.c b/load_bpf.c index 98d7385..0f5ab34 100644 --- a/load_bpf.c +++ b/load_bpf.c @@ -65,7 +65,6 @@ int main(void){ //printf("%lld\n", stats); struct in_addr *src = (struct in_addr*)&s_reset.saddr; struct in_addr *dest = (struct in_addr*)&s_reset.daddr; - //struct in_addr src = s_reset.saddr; printf("Sport: %d; dport: %d %s %s\n", s_reset.sport, s_reset.dport, inet_ntoa(*src), inet_ntoa(*dest)); } diff --git a/tp_tcp.c b/tp_tcp.c index 9126c54..1601494 100644 --- a/tp_tcp.c +++ b/tp_tcp.c @@ -59,16 +59,15 @@ int tcp_retransmit(struct ctx_reset *ctx){ long long *stats; struct reset *s_reset; int keys = 0; - __u16 sport = 0; - __u16 dport = 0; s_reset = bpf_map_lookup_elem(&tcp_reset_stats, &keys); if (!s_reset) return 0; + if (!ctx) + return 0; + //*stats += 1; - sport = ctx->sport; - dport = ctx->dport; s_reset->saddr[0] = ctx->saddr[0]; s_reset->saddr[1] = ctx->saddr[1]; s_reset->saddr[2] = ctx->saddr[2]; @@ -77,10 +76,10 @@ int tcp_retransmit(struct ctx_reset *ctx){ s_reset->daddr[1] = ctx->daddr[1]; s_reset->daddr[2] = ctx->daddr[2]; s_reset->daddr[3] = ctx->daddr[3];*/ - s_reset->sport = sport; - s_reset->dport = dport; + s_reset->sport = ctx->sport; + s_reset->dport = ctx->dport; //bpf_printk("BPF detected TCP received reset %d - %d %d\n", *stats, dport, sport); - bpf_printk("BPF detected TCP received reset %d %d\n", dport, sport); + bpf_printk("BPF detected TCP received reset %d %d\n", s_reset->sport, s_reset->dport); return 0; } diff --git a/tp_tcp.o b/tp_tcp.o index ad2c7b000f5624417cecac42ecaab86d32b5c4de..8fa2941c18975b8308ac6d5806eeb69f3c476d7d 100644 GIT binary patch delta 2111 zcmYk7eN0_5n^1hCXi?hM6+o^BE~4jKa3{(14tGznmChX^W4){dQb9x_x#Si z@4kEcK04F2^WaR2vQsWiZMw^C_rMBFN*42R>D-JegfW=PLYZYQl1*d6kD@!`#dl;I{cb ztQ=O|{0lgxdWSo{QW&ce7vTqQVd@fTwK6Lj#!p_M3!9Fkn0pX=nYMzZ8qs@{m(XhC zcpBfsD1TPurAi^U;~Ftuh1;qtLnAA4d!*dyD9ljlr2I`WLseBFceyE_6ZL9eA+HHi z{)wo&JDDSii3pQT6-|-icrjnGQpK9#j?YCGhN;9PmP&gvvqE0R983AL9JzU{+Sgd2 z9haERyX!KmxgCr3nk~7y*ps=)N@FOu+L*>ojL}T0$I6y-muJ1k4ec}9B!r!n5yl>f zKb7bo(+5WT$APnCY~Y=63-G-#Ph@{;xzFh z@h#%}!~oGvJVxvw_7PW!3&h`u+weh^i;K6e0@kY5_*C{?SA~+P#vk@Q;|CVs*mgWV zlw5oTRwZ|%e-UG`wdgk__o4q+@C>WNf{IUv2(bVik8;WV=(Up9qX#5! zKyR145&f{_P3R{iZ$^K7*E8Y+&)CRrfidw?PDma=e_rxd^p_;R3;lJ;_n|LJ-iE#` zc@X`ZydOmg;jxx4U@ms_i{xTQ*Cp4{cO)0Tkdj^We5>$#;5pxz@}n2Febe}-H&GYi zoiJY)<14U*T!(-j<2#VhW17pD;SE^SBYYmVuyz&SIuRO#{SjL?{WCJQZh}ew0p)uO zEcm0^9ZPP^P58?n(f+mO>|O}hN4O4&`WO$vJhBtE>SM}E8MHP;l{qhrG(@#c@j=8` ZhsB17vVzORzI89OHb#}@au{iB{vQO)JhK1* delta 2310 zcmaKuYfKzf6vxk<-C1^c@A4SlJIh<-X(L-jc2{Eq*l3_?f;9?dOMpOuu!}Z)+4@LJ zOSEimeMCP%^@BzlMYoCip^f;Zh1ggcZEIs}YhrxGMpL7yU+Ot$XW98+yvhCF^E>C< z=j@%?-@6uj7VDM8idch3O9L*Ux!A52H+UJw_U0zqkUO@p!#&=b&Nv=)avPqD{c}(* zinqj|+@|$^OQyNiBy)QICnspedgDiNY*8i8*lKW!-)w8*F8P7I zR;)uSv=Mt+YEyP+ zI%pm|Q65Qk!n?ErEZYTSvk~O81?ZKVc?H`69v_;WjLaILi9M4e#xuh+;jyVnqphvE zt+}A!g&5+LMadEk`rzTmv{W zmh3VVnrB2VXXs*I{F97v;k5KU*)Tmd6EQlCP-K6TKTOa829~{6KSPJSob_H!(w}f~ zYItB~I6NFNyW?14`C)d@$r+6Z895WK1GI>r0O+1QjP{D0&+$Z0p_OA75H!8FkTs`( zZj&?cP~AlW==xBvD&jK1SB|&?x!4deXvT?k&WvauTs2Gz@mk97WN?14WU8{G_dLx_9D}bp_1G{ zi-qZ3PdA1N#VfIPZE+MkqvO#n2S7FQfQ4(2$1Plo{H%rRkmoI2k9^d^cObuE;RfX6 zNyho%POK-A4zwGwere$*Eem&=DL4&vu|v%)8qrRE8s_MooH!>H%wx+kFhZ9b$c(q;I>rtC2S+6{Bq zIvF#3>8t#m#n+)-UNG8~f;5@#^=muK|0cI&pVz1PHCh(F7G%up6Q9X-Z$KS>;!z%jFSlirjLes`g))oMt5e