From 25c54dd6d7aea964f4ad436f0d03afddd6653697 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sun, 22 Oct 2023 23:03:24 +0200 Subject: [PATCH] Improved CryNetwork protocol dissector. Signed-off-by: Toni Uhlig --- src/lib/protocols/crynet.c | 2 +- tests/cfgs/default/pcap/crynet.pcap | Bin 9029 -> 17596 bytes tests/cfgs/default/result/crynet.pcap.out | 23 ++++++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/lib/protocols/crynet.c b/src/lib/protocols/crynet.c index 3d410c807..b018f0724 100644 --- a/src/lib/protocols/crynet.c +++ b/src/lib/protocols/crynet.c @@ -54,7 +54,7 @@ static void ndpi_search_crynet(struct ndpi_detection_module_struct *ndpi_struct, return; } - if (ntohs(get_u_int16_t(packet->payload, 3)) != 0x08ed || + if (packet->payload[0] != 0x3c || packet->payload[16] != 0x01 || packet->payload[20] != 0x07 || ntohs(get_u_int16_t(packet->payload, 24)) != 0x0307) diff --git a/tests/cfgs/default/pcap/crynet.pcap b/tests/cfgs/default/pcap/crynet.pcap index ba30c638dc3890ace95f448d0797949438709eb8..2765e3579b157b9c98b36a8954a021a4481197cf 100644 GIT binary patch delta 8334 zcmd5=c{o(<`yYes%;05aEZIZIlI&|Jvb9=L_Od0}i^z{COK1p5NTsBOvSdlJL?T;A zT9tjxuEqB}hiT6A_5SyMf7kn5*SY4JbAQhLx$n>>l3p|@bFDwR0l4h0gR;`mh}&9sf4NU@NHm@g^jD` zKsl>=qCJK{ypFcU0RsR8BLFCU2v9)BLlmSo!~w&ffT6lIK-}K|N{y^nJuD#r$QZJk zAOMKLiDvy6&KVzE_3(*?90M{*7+_1q^U#Er9+4rmFUUtNfnNU3Zo&{JY9X zyNk$H*sj1pwv)O5JpYkVkvcI8dY&PJ+zC=^oj?K*GdT%FZ^k7&3RsZM01&wSiquey zJj4r3R{zxu0FdPZ0Sf2{Lx|5q46B;Cb10ZWB;yM|MPp zqy$I+C;=X#FvsG5ml_}*U~ndIJ8E!}+Y#vk03K#?azN9G)G8zm!Se#*(DNY2&cDbx zA_4Tb*8tjF>jQeE@v9#45dcyr0E(ygAOM&#IBs%?NQzrq2&*2FxYwr$e6$LG~l)@epqs2&IbglgnnKMmO_2msR1=OYV&OalghrJ;Zi!GY8ocjD@* zi1cyVXB)HOlK7*N?Jv0Rn(11q8?*kQC>FvsMAI2mq48>n8*N zLM#fbPhlC7z3RbNaD57K>T9cjj|c!#DHs5hG8RH8MJjk1)dm#dc#8;Ba6UX5g$l*8 zzk7NM?X(ZG7(Z_2cM)akeN!EUVwxwm(&Ka(*0xy&z6%*`3UX!_lAc&sRR{!pd8>HC z;+=5yW~)AJy^y-?7lC`QR+IV$(1hJ=6@mH&AC#_*QpT3h0180mcX8Yd6?f}I6md5z zZz%K-y5h?ll?k@iZFcAL1cEaAX4G%A?A48)*_-;xZVy8+*SKPQR7oC>^zS5l6U9qL_m2DjSQ{qpm{%k7}J9gf1q{*8F!#tV8d`kW#ja03Ax^-<7vF9o6HqWF*tE? z|8Ui6E1oTkQ;qHOE!YlMuCk==GNR@l<&tuRqN6nqI%I`8jljKaVlfl*RHpi3ZtN?VS(}+*fokjRpnHzof6M|GB;b8h`;xN#JT< zt0X;~`zS^3s!`9o%l)2BD{@pNsa?b77}4$SI3+d6Kv)_!Rq@NlpY;hEG4Z$|Leo^3 z6X#OuEgcrK?Hx&C(oza&Y*Qf`XekZFL#q^2$zBQ?qZ6)D?YCY>i3X{t#!ZL@?ol?FrjvrkNSot(r&5M(LN4F4LuNYN?DD6sxmN8S zRG)90%kOo06Q;w+f8woH5yO9agv@)F?lkOr%F#!6uH3* zMK5c3LA?VmxJMJES@?vXf)LV^KnSLpZZV_Uo+T(#v(xIocYCP0;K5`s%$B9lJSg<) zSj5t+iQHnF65j^=iS2!3jw$pK4_#gXE-){UoY{pxHNc@lxEiJ*{)05Ft6{-YL2VeN z2@VyS%&wv(}2Pw2zGBJk_ z6=iJlxwTuSl`aMQO8fZZHtH$J-MgcXv7e|?m7~ep__?{#AyVzY<@DT>&7(}qb(^_w z5Wb&DH9ISp?8ZcFxZ72I&Vq@qrjbqP2KKnbkBNObbQ>ccRetdjIy7%El^51*e?It0 zmEf-=dG&2tjgL=lXIQamWS2H9&QTA^e#-PNRPdIEW38)`hKi%3ib_zaa`bh=w=kB^ z0p+H`A?Jo%BT{CE2hUC2Pw({$=C!QUbK!qmS*>$jt{q8BqwsHboZ+%0D*6tZ@fC=W7o zqD$z{QB6geR?dEwad9LjijSSu|6=H?9BS%j=@F1y(VuyJoNvH@`^ZlEiHl(pm8$&4 zhdpcJ(-bW}ihojzm)j)8tUn{7}AdI%qDlI0|Q-OM4T8<1aoaQ0hFR*}=Ri%Nb{C^RmqTaz2ZC zj@jlIPE2;`%3>{z5QzraczS>a?z?)p@A@fd{w00q_P^^ppa~dY5{B(SuT}OrEO|DC z7OJ}nyT9~baL-5-F=3?6KbRQU{Zs9EM6j#t<0ShP0W0ca&R>#WWHduJ9CfX^<7cbT znW!5@k{r3f4>v+IV1XBIfN2saXp9=Hq++5QEMzmi!z z_#j_1OENV{omqI{3~jnPm2EM%qk{xTocC46AlR_s|zfS{KiEm^YQRgMZ?w|kAx2+=n zV}jwz&#R+LVKM={S2jj!Y{`@~UtwR8pNW4qw0U1pNdT!FNFKKq63q*k<|-x42`#Sl z*bgScOt&JA1|*IZ}}9T&pPOK;zrHfMN#ELqsz8ivL}h|mLwWv z)r-t&)~enF)5KBG7|BO?QhVLiFT>2d$eN)uIxXk8UssBu(@AWA{s``HJ}c|tnWPPG zyV8dVvEPaLS`3TMgQX*zB@dj^X~7oU&i)ojvl30JIx;(K2aTo;RB>>TkDkIW;TWz^ z#Gtx;$WW|*PZ{IRsJSODr=M@2bL&qoINi~_(VBK3?^~usXKdrcgxiFg(bTks0uN`d zl4*`IQmV*p{hii{K(MV>i~yE-=T#Q}_@3+g@1RVrE7gCW9-tQ;c+e4!INi*Q%`?=< zc+jWvz(lfw#d2Je-MsI>o41oy=)Uj3{hy}?H$J~rno*d>>3>AivE}3{%@|DM_z%(` zr>Fb=;6QLlnf#@VQo%N|n`ZjMUq1HV>A8-I^OqzaQl@)%+q2!;Ms-u>Gxqrlr5D*Z zVrTd0v}cVpzi*~{_j=mar|xn4<5&Wx(e0QvE6K23V?;XH9yttqn!EfLTY?58CDk^x zGHF7MS+{>fbThAywL(3<1*E5Qvm7d0(*rwt4o6Xz^QV~M$8_JMo% znMmHi7K6RVZyh_6sh1{tXsg#47q|Y!rXaTDy@!=bCu|i9Myqwh;}Y+iRO!0eh471M zOh5Ng`DF7A1C#a&;eyuY-ux|_R3@ApREUiZs~ zdtPuLX!f-)9~BdDH|(cSz&bs$Tv7Uv@eGr#d8eD%Ncuv5i41QCkABU0wz`Z@TQ-bK zM%CAFz4(Mri7plu4ZAITbUAZ2)jTPu!zTX7DfKf4r?>(~8~p3`wl0TYw|6mX3T3xl zS!;bj4hGn%Xns^dl>lEpDkkALd@15k6;Pa&iynQyXi_;gc}{7CyL3O*42n50@<9CY zy50vrt}AvIJ~+JW)UDY$Gv0SwOw z(a+EoG&{sU8{BrMvQA=@N#q~zi`dH9qbce>Y2Znc7`gp0><9^j4;>XVFpV7rjnUf@ zDfEq$!1uIa3PlrzF$zgRZC53OGFu9|tYT>o+H{xccj-LN5Dl=-96UdH;n@G(6=+XM zHW2()`n`50N^3-ZyNl)gdfSgvV@RM4)L7smZ$A~Ya16&OVo=pk8o&pJ3+OQ!e)|&N z>=YYN-&*DtabeCfqeaonOsrwzgX?tOaP!z%+cD=lXZ;YN|%bQ;=U?N1TgidFi++M)AYj@##Qru1sU6q0xNYSvgt`x_hpwRzso63Ix Dj_F`s delta 997 zcmYL`OK1~O6ozN=Xl|P3(WIJmrq*j)+pZ*J)s==K!IY{Yi`sM%0*O*^6CsEoLfR~} z3oZ686eLi=rIgxix)2$ZYQ+ZyUASwk2!bFH6ec3ZbI-ZeS9 z@6cS@{@3YfnhwHqj2ExGb!nm%H*Rm_nbe_bmnK39Lrm&*1a=KTGhsBs4zG@6^CJ-M zH^dp|9D?Le0G6|aV*Ij43R9eOrK!L#1>PypyvkI*oAS4R1F+nbk3#mF=~DgfE_kV; z@KD97qnio@7!}A|2T)~HV1oI`9`%x)F9DGAu6XB|E5VCN5A7@lyYmR<@4*6a1hJ+- za{*?SS2*sgqXR)EYKTBj8$s+fIJm!pVs#f+G{kfN6oPU|Zsde31_;c4R^W*O$qTR) z4^n>UD{ct+L9*N50N^WxsK0#?Hk1X!z2qpY0gwaT>ZO6UTL4zWRB-(g-oOy4$P}A? z$cxRJZrbo^B#*!vgAQ`#Y#)L6n4eni_0`dVAQLr3t-SiKS7qKcpl5q(3YMFuts`b-2{ z(7;~mkWj+^vdKOx_Qm;MWBpE*MIn1xYO)P~aN_;OM{5I03fft@V?h2aWDH&gOGAnF+*`;Au$ k)D$RB_eeYBk5K>FHvq~ 84.16.230.222:28665 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1901 bytes <-> 1 pkts/175 bytes][Goodput ratio: 69/76][0.77 sec][bytes ratio: 0.831 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 61/0 262/0 85/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 136/175 267/175 69/0][Plen Bins: 0,40,33,0,6,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 2 UDP 192.168.2.100:55645 <-> 78.159.98.94:28375 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1881 bytes <-> 1 pkts/175 bytes][Goodput ratio: 69/76][0.49 sec][bytes ratio: 0.830 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 38/0 201/0 51/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 134/175 267/175 70/0][Plen Bins: 0,46,26,0,6,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 3 UDP 192.168.2.100:56333 <-> 37.58.56.245:20250 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][13 pkts/1634 bytes <-> 2 pkts/350 bytes][Goodput ratio: 67/76][0.49 sec][bytes ratio: 0.647 (Upload)][IAT c2s/s2c min/avg/max/stddev: 5/0 41/0 169/0 43/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 126/175 267/175 61/0][Plen Bins: 0,40,33,0,13,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 4 UDP 192.168.2.100:61837 <-> 78.159.118.97:25383 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1754 bytes <-> 1 pkts/175 bytes][Goodput ratio: 66/76][0.44 sec][bytes ratio: 0.819 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 34/0 112/0 26/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 125/175 283/175 65/0][Plen Bins: 0,46,33,0,6,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 1 UDP 192.168.2.100:55460 <-> 78.159.118.143:21931 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][12 pkts/1562 bytes <-> 3 pkts/525 bytes][Goodput ratio: 68/76][0.94 sec][bytes ratio: 0.497 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/48 88/48 266/48 102/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 130/175 267/175 62/0][Plen Bins: 0,33,33,0,20,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 UDP 192.168.2.100:56970 <-> 84.16.230.222:28665 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1901 bytes <-> 1 pkts/175 bytes][Goodput ratio: 69/76][0.77 sec][bytes ratio: 0.831 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 61/0 262/0 85/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 136/175 267/175 69/0][Plen Bins: 0,40,33,0,6,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 UDP 192.168.2.100:55645 <-> 78.159.98.94:28375 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1881 bytes <-> 1 pkts/175 bytes][Goodput ratio: 69/76][0.49 sec][bytes ratio: 0.830 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 38/0 201/0 51/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 134/175 267/175 70/0][Plen Bins: 0,46,26,0,6,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 UDP 192.168.2.100:60224 <-> 78.159.106.139:28343 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][13 pkts/1682 bytes <-> 2 pkts/350 bytes][Goodput ratio: 67/76][0.67 sec][bytes ratio: 0.656 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 58/0 210/0 72/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 129/175 283/175 66/0][Plen Bins: 0,40,33,0,13,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 5 UDP 192.168.2.100:56333 <-> 37.58.56.245:20250 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][13 pkts/1634 bytes <-> 2 pkts/350 bytes][Goodput ratio: 67/76][0.49 sec][bytes ratio: 0.647 (Upload)][IAT c2s/s2c min/avg/max/stddev: 5/0 41/0 169/0 43/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 126/175 267/175 61/0][Plen Bins: 0,40,33,0,13,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 6 UDP 192.168.2.100:61837 <-> 78.159.118.97:25383 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1754 bytes <-> 1 pkts/175 bytes][Goodput ratio: 66/76][0.44 sec][bytes ratio: 0.819 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 34/0 112/0 26/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 125/175 283/175 65/0][Plen Bins: 0,46,33,0,6,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 7 UDP 192.168.2.100:60751 <-> 84.16.248.143:30098 [proto: 314/CryNetwork][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 1][cat: Game/8][14 pkts/1738 bytes <-> 1 pkts/175 bytes][Goodput ratio: 66/76][0.47 sec][bytes ratio: 0.817 (Upload)][IAT c2s/s2c min/avg/max/stddev: 5/0 36/0 145/0 34/0][Pkt Len c2s/s2c min/avg/max/stddev: 92/175 124/175 267/175 59/0][Plen Bins: 0,46,33,0,6,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]