From 304747f1fac02038c64dca004a80768db43eeb65 Mon Sep 17 00:00:00 2001 From: lns Date: Tue, 10 Oct 2023 15:53:29 +0200 Subject: [PATCH] Improved MGCP detection by allowing '\r' as line feed. Signed-off-by: lns Signed-off-by: Toni Uhlig --- src/lib/protocols/mgcp.c | 6 ++++-- tests/cfgs/default/pcap/mgcp.pcap | Bin 0 -> 3591 bytes tests/cfgs/default/pcap/mgcp.pcapng | Bin 3988 -> 0 bytes .../result/{mgcp.pcapng.out => mgcp.pcap.out} | 17 ++++++++++------- 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 tests/cfgs/default/pcap/mgcp.pcap delete mode 100644 tests/cfgs/default/pcap/mgcp.pcapng rename tests/cfgs/default/result/{mgcp.pcapng.out => mgcp.pcap.out} (50%) diff --git a/src/lib/protocols/mgcp.c b/src/lib/protocols/mgcp.c index a27959fb6..876325bd3 100644 --- a/src/lib/protocols/mgcp.c +++ b/src/lib/protocols/mgcp.c @@ -1,7 +1,7 @@ /* * mgcp.c * - * Copyright (C) 2017-22 - ntop.org + * Copyright (C) 2017-23 - ntop.org * * This file is part of nDPI, an open source deep packet inspection * library based on the OpenDPI and PACE technology by ipoque GmbH @@ -50,7 +50,9 @@ static void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, s if (packet->payload_packet_len < 8) break; /* packet must end with 0x0d0a or with 0x0a */ - if (packet->payload[packet->payload_packet_len - 1] != 0x0a) break; + if (packet->payload[packet->payload_packet_len - 1] != 0x0a && + packet->payload[packet->payload_packet_len - 1] != 0x0d) + break; if (packet->payload[0] != 'A' && packet->payload[0] != 'C' && packet->payload[0] != 'D' && packet->payload[0] != 'E' && packet->payload[0] != 'M' && packet->payload[0] != 'N' && diff --git a/tests/cfgs/default/pcap/mgcp.pcap b/tests/cfgs/default/pcap/mgcp.pcap new file mode 100644 index 0000000000000000000000000000000000000000..ec74f56cb50b1567cc274800da8275b04323ae75 GIT binary patch literal 3591 zcmcgvYitx%6h7U;(hja=ArZtxZWWElbh|VAV3`5g+HN1V-7eb&3W74-9k-S3Zru)T z2qcnd6j2E%V8S0XF=`C{DTMI)2S1D$C9#N)7&V9iK`KVn5K}zo4(#rdRFzH`sHw*$xf-?G6Z$X}D72ybf6lrNe!rwkV1oa{QkVA|Uk*X}Q|Ls1FX=@0q+ zzG+2<`9041Xg1>nOs3zWq7nh7ldm3D20?s6W_|_R{{;C`&X>)+=N>Fxt-kgZmv)iA z!WHF(Gv5<3im>+gIKXD-g&BC?i}ozMME=gbEaZ}E5$SZ?~>Yx3?`o2xm8r~Sl*LMT?+Ow?he68?WB>n|e1H*kia`vw+-@oZy zp}pdOHMnZYAhLYbFDgt89XkAU34}VJh1%|r^OMg7;fH!b_|3+bu6pnouNT=b`~9-y z@nSN1ld|m1H7i~q$t?D;r`D&0XpO?$0)Yj#Ibb2WBr{=5NCaC8^UXR57ZVTxa-TK1nYWwIOP2F8w+di%rh3&{#&!YS=NNI`!V~N>Aq&6>t~#< z+GvLkBto%>$OWYX=YVl^$@js;Z`NWvg5%4Of|V0ooRta9a?TD%hkmalNNU zOl30N9QW$u_IzUgHuC4pnNME8XVzimY9sQCBi)ktO4bB(fepH}E5oWtF7J z(uUFy7Fn;-q}Hi5YD}$HqiR*GS#52NskLp`)YlTK~GrKrby%^5wTJCSv!wYbsQtBZ{4 zyj_d06IncyHVizFh%BKQ8m?a5=%cshjNb6-dT+fQTCuRmhF2FJRj}qpv`uO6(QvGG zWv&4SMz&3CLvEo(F<5C^YIt4{=%Og|m})C zcDijLMjm{C5D01UMIX?_=nL^d2m$p?V@%j+qXslactDK`0UwMp#-Qii+3n73p-Dp@ zyvdol^LM^;zVmbMaILMJ$3;kD$F?nSBL7y0i<~4QvX(dVht(|2%+gUqR@8lltmO)- zLCbz`*c+jlseB&q8Zsu-$lTJKM)MlP@AB_iTWn=N!4fSTHe>IPiqBT&X#4q*jZ%R= z*PVlKPs_8xpm%b%Sbz-iD*7bFuu%w5E0>aJ!8eiJsKC3 zvV^~V`+l_>cwp^zy}7U)7tb>;&N#U!v)UCOs&?(Q^;7o7 z^0oDV9^BZ+?$?9U2X8F)1xIbw>z4Hi^w3tpq)~U*&3}%iA)hg)kAmQMS6oZp{_Ogd zmtc-Ul6w#Q9wm>&E?s`PnZzc@Fs?%P+P=8TaX-d6?vEx`GtrA5v)UEIVmK@cfgr@Q zoD;?1V((?en!`o=;8cN2^-9!_HG34q-j@)6=JV@UI^jNwg=|>?_-V4us@WkoVxtWV zfAg7ktl2s|>aKA&gL+_~?)Q&-Dtlp$vc$JI-n`fLeHOVr!d=d)O@Pd9r|?Sl&3NQm?%s5I$-gY_{PCk-`$I>?jnBL(=#~a8xeg% zW595I#07H@7EErp1gn*De>&Uz|4;6BO{ZlA^N3vheS!R^Ms-@v$m z8N)AN$k?d)XpdX=EnD1JHrjF`UiI;3hmXN6LeHL9l179F``9PZF`oADbO6w6aVx_5 zh6A}Bzu>71!8J;wPwsBggg#Yn+I@2Kch)kW1j-FaY?r|e0(+9+?-2bwm8Ima#GWV| zdZPVaZ7dw*X-2}MD(Ml-tA&10KieUP8r0BtQL%bmdO$Vggb;Vg8=0jNeHhN#C98k$XLST z>aY~D=?;i!Hy&3(cL1VXH$31KI^v9*fOYf=az~s6e6`R5fkjsk4blTb0yDW|5OG2e zivxQs*raB4tuPCzs48V^hWGG_r+H0Q%zRnpDRzbo{L}DM(KQo)uy~r4O&PLRHK*~Z zHNz)RZ&+v8L#jU^tloaPXFnPm?c2ZD{3A>IGqf^4Hw^!N z46CtkwO?6zZ$9nl%@Id$w)d^xXxDP<%^K# 10.10.244.2:2427 [proto: 94/MGCP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][6 pkts/1254 bytes <-> 6 pkts/418 bytes][Goodput ratio: 79/40][6.26 sec][Hostname/SNI: vg224][bytes ratio: 0.500 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1/0 884/884 3523/3523 1524/1523][Pkt Len c2s/s2c min/avg/max/stddev: 60/57 209/70 846/104 285/19][PLAIN TEXT (RSIP 262662134 )][Plen Bins: 41,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 2 UDP 172.16.1.116:2427 <-> 172.16.1.119:2427 [proto: 94/MGCP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][4 pkts/370 bytes <-> 4 pkts/395 bytes][Goodput ratio: 54/57][80.75 sec][Hostname/SNI: gateway44.myplace.com][bytes ratio: -0.033 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 9/36 26914/26914 76721/76695 35257/35238][Pkt Len c2s/s2c min/avg/max/stddev: 61/98 92/99 103/101 18/1][PLAIN TEXT (RQNT 1 )][Plen Bins: 12,87,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,0,0,0,0,0,0] + 3 UDP 67.232.180.250:38238 -> 186.112.128.179:2427 [proto: 94/MGCP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][1 pkts/98 bytes -> 0 pkts/0 bytes][Goodput ratio: 57/0][< 1 sec][Hostname/SNI: gateway44.myplace.com][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][PLAIN TEXT (RQNT 1 )][Plen Bins: 0,100,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,0,0,0,0,0,0] + 4 UDP 92.173.166.213:51954 -> 83.250.239.33:2427 [proto: 94/MGCP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][1 pkts/98 bytes -> 0 pkts/0 bytes][Goodput ratio: 57/0][< 1 sec][Hostname/SNI: gateway44.myplace.com][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][PLAIN TEXT (RQNT 1 )][Plen Bins: 0,100,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,0,0,0,0,0,0] + 5 UDP 187.43.37.188:40798 -> 196.167.59.124:2427 [proto: 94/MGCP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][1 pkts/98 bytes -> 0 pkts/0 bytes][Goodput ratio: 57/0][< 1 sec][Hostname/SNI: gateway44.myplace.com][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][PLAIN TEXT (RQNT 1 )][Plen Bins: 0,100,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,0,0,0,0,0,0]