From f1193d5e6f7680e6b8195eea33d740987619ac9c Mon Sep 17 00:00:00 2001 From: Maatuq Date: Tue, 4 Apr 2023 16:20:11 +0400 Subject: [PATCH] add support for gre decapsulation (#1442) (#1921) --- example/reader_util.c | 88 +++++++++++++++++++++++++ src/include/ndpi_typedefs.h | 36 ++++++++++ src/lib/ndpi_utils.c | 4 ++ tests/pcap/gre.pcap | Bin 0 -> 24384 bytes tests/pcap/gre_no_options.pcapng | Bin 448 -> 0 bytes tests/result/gre.pcap.out | 28 ++++++++ tests/result/gre_no_options.pcapng.out | 25 ------- 7 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 tests/pcap/gre.pcap delete mode 100644 tests/pcap/gre_no_options.pcapng create mode 100644 tests/result/gre.pcap.out delete mode 100644 tests/result/gre_no_options.pcapng.out diff --git a/example/reader_util.c b/example/reader_util.c index 678b454b7..76e54900f 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -1791,6 +1791,74 @@ static inline u_int ndpi_skip_vxlan(u_int16_t ip_offset, u_int16_t ip_len){ return ip_offset + ip_len + sizeof(struct ndpi_udphdr) + sizeof(struct ndpi_vxlanhdr); } +static uint32_t ndpi_is_valid_gre_tunnel(const struct pcap_pkthdr *header, + const u_char *packet, const u_int16_t ip_offset, + const u_int16_t ip_len) { + if(header->caplen < ip_offset + ip_len + sizeof(struct ndpi_gre_basehdr)) + return 0; /* Too short for GRE header*/ + uint32_t offset = ip_offset + ip_len; + struct ndpi_gre_basehdr *grehdr = (struct ndpi_gre_basehdr*)&packet[offset]; + offset += sizeof(struct ndpi_gre_basehdr); + /* + rfc-1701 + The GRE flags are encoded in the first two octets. Bit 0 is the + most significant bit, bit 15 is the least significant bit. Bits + 13 through 15 are reserved for the Version field. Bits 5 through + 12 are reserved for future use and MUST be transmitted as zero. + */ + if(NDPI_GRE_IS_FLAGS(grehdr->flags)) + return 0; + if(NDPI_GRE_IS_REC(grehdr->flags)) + return 0; + /*GRE rfc 2890 that update 1701*/ + if(NDPI_GRE_IS_VERSION_0(grehdr->flags)) { + if(NDPI_GRE_IS_CSUM(grehdr->flags)) { + if(header->caplen < offset + 4) + return 0; + /*checksum field and offset field*/ + offset += 4; + } + if(NDPI_GRE_IS_KEY(grehdr->flags)) { + if(header->caplen < offset + 4) + return 0; + offset += 4; + } + if(NDPI_GRE_IS_SEQ(grehdr->flags)) { + if(header->caplen < offset + 4) + return 0; + offset += 4; + } + } else if(NDPI_GRE_IS_VERSION_1(grehdr->flags)) { /*rfc-2637 section 4.1 enhanced gre*/ + if(NDPI_GRE_IS_CSUM(grehdr->flags)) + return 0; + if(NDPI_GRE_IS_ROUTING(grehdr->flags)) + return 0; + if(!NDPI_GRE_IS_KEY(grehdr->flags)) + return 0; + if(NDPI_GRE_IS_STRICT(grehdr->flags)) + return 0; + if(grehdr->protocol != NDPI_GRE_PROTO_PPP) + return 0; + /*key field*/ + if(header->caplen < offset + 4) + return 0; + offset += 4; + if(NDPI_GRE_IS_SEQ(grehdr->flags)) { + if(header->caplen < offset + 4) + return 0; + offset += 4; + } + if(NDPI_GRE_IS_ACK(grehdr->flags)) { + if(header->caplen < offset + 4) + return 0; + offset += 4; + } + } else { /*support only ver 0, 1*/ + return 0; + } + return offset; +} + /* ****************************************************** */ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow, @@ -2295,6 +2363,26 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow, goto datalink_check; } } + } else if(workflow->prefs.decode_tunnels && (proto == IPPROTO_GRE)) { + if(header->caplen < ip_offset + ip_len + sizeof(struct ndpi_gre_basehdr)) + return(nproto); /* Too short for GRE header*/ + u_int32_t offset = 0; + if((offset = ndpi_is_valid_gre_tunnel(header, packet, ip_offset, ip_len))) { + tunnel_type = ndpi_gre_tunnel; + struct ndpi_gre_basehdr *grehdr = (struct ndpi_gre_basehdr*)&packet[ip_offset + ip_len]; + if(grehdr->protocol == ntohs(ETH_P_IP) || grehdr->protocol == ntohs(ETH_P_IPV6)) { + ip_offset = offset; + goto iph_check; + } else if(grehdr->protocol == NDPI_GRE_PROTO_PPP) { // ppp protocol + ip_offset = offset + NDPI_PPP_HDRLEN; + goto iph_check; + } else { + eth_offset = offset; + goto datalink_check; + } + } else { + return(nproto); + } } /* process the packet */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index a5b1175bc..6fa9d5581 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -53,6 +53,7 @@ typedef enum { ndpi_tzsp_tunnel, ndpi_l2tp_tunnel, ndpi_vxlan_tunnel, + ndpi_gre_tunnel, } ndpi_packet_tunnel; /* @@ -536,6 +537,41 @@ struct ndpi_vxlanhdr { u_int8_t reserved; } PACK_OFF; +#ifndef IPPROTO_GRE +#define IPPROTO_GRE 47 +#endif + +#define NDPI_GRE_CSUM ntohs(0x8000) +#define NDPI_GRE_ROUTING ntohs(0x4000) +#define NDPI_GRE_KEY ntohs(0x2000) +#define NDPI_GRE_SEQ ntohs(0x1000) +#define NDPI_GRE_STRICT ntohs(0x0800) +#define NDPI_GRE_REC ntohs(0x0700) +#define NDPI_GRE_ACK ntohs(0x0080) +#define NDPI_GRE_FLAGS ntohs(0x00f8) +#define NDPI_GRE_VERSION ntohs(0x0007) + +#define NDPI_GRE_IS_CSUM(f) ((f) & NDPI_GRE_CSUM) +#define NDPI_GRE_IS_ROUTING(f) ((f) & NDPI_GRE_ROUTING) +#define NDPI_GRE_IS_KEY(f) ((f) & NDPI_GRE_KEY) +#define NDPI_GRE_IS_SEQ(f) ((f) & NDPI_GRE_SEQ) +#define NDPI_GRE_IS_STRICT(f) ((f) & NDPI_GRE_STRICT) +#define NDPI_GRE_IS_REC(f) ((f) & NDPI_GRE_REC) +#define NDPI_GRE_IS_FLAGS(f) ((f) & NDPI_GRE_FLAGS) +#define NDPI_GRE_IS_ACK(f) ((f) & NDPI_GRE_ACK) +#define NDPI_GRE_IS_VERSION_0(f) (((f) & NDPI_GRE_VERSION) == ntohs(0x0000)) +#define NDPI_GRE_IS_VERSION_1(f) (((f) & NDPI_GRE_VERSION) == ntohs(0x0001)) + +#define NDPI_GRE_PROTO_PPP ntohs(0x880b) +#define NDPI_PPP_HDRLEN 4 /* octets for standard ppp header */ + +/* +++++++++++++++++++++++ GRE basic header +++++++++++++++++++++++ */ +PACK_ON +struct ndpi_gre_basehdr { + uint16_t flags; + uint16_t protocol; +} PACK_OFF; + /* ************************************************************ */ /** diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index 5976de3d4..8f89ef7bf 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -1645,6 +1645,10 @@ const char* ndpi_tunnel2str(ndpi_packet_tunnel tt) { case ndpi_vxlan_tunnel: return("VXLAN"); break; + + case ndpi_gre_tunnel: + return("GRE"); + break; } return(""); diff --git a/tests/pcap/gre.pcap b/tests/pcap/gre.pcap new file mode 100644 index 0000000000000000000000000000000000000000..a8cd42a8b494b9a7b6fc8f3aee29920f658a2cb3 GIT binary patch literal 24384 zcmeHP4R90ZnciIy+lVNG53V_!lx&$y4^sc^uXfiUK$0a;vB6*)Qie7amTW|1*~l_K zX-Xh>ZOILn%Z22Uker8HxP&+yOxlFYl)!N`ZOJv6cG~2)q-i>LNjXB(mXc1Ik{|AU zzumPzNh=|9#@LW$KBSdb+MoCNp7;5lefM*FJnq{WhH0Afg(?2{$; zG!$=5XH=Gq*lH~nlXPPi>;o6vC+=^m^?L5y(EG9eStE7K9GpcBtWSj3GI+h3na+5X zn$?L6zao)}b#Lh9MWLEs-Iqwlcu|+V5^Mwu{swM;J%?)yqld0y^nY7eb`~xQHnOn0 z-#E;j5VtbS!_e4mu}bEzZe!nMJ{MxxH-c9)OmAJ&KOQ-D&rNMRuQ?>J+a|Hke`giL zWF9@|BHKLo$-eoFQrY$DD=pt)V7vRKyfftmcK2gfEop9zELq&b_a=JkMM0P^8d9w! z2(_XDp;L6eCDL3c)e0W>@#8Tor!k(ys|7n(`7>zpeeE_%doBpBD|AiSytgw4gQy8&ExjBx5s-j^?bCa zCz)uEW)j`0y53li$KBQ&PuKVXzVOG6bRwRLB{$XdwntNdXOFwJ`#gtYoKd6BoSEqoA7CTk)M@EKeaSyc=}P*hpaG*ySQ5d_8KZi;TK33sPAMANa} zdR~Jo<8hmqKy19>GGQ_>!i#sHA`=kIr}jTQ6nI(=NYI};}UNH7@I1vR8n3qsJJOm=Um=l#J&)qyXCs)PQ;!BAth zxx?zkOIjo0FI8K}scvoyG)7t$R<|`b_*+BO%R=GMvg($$Kud60BoKm~;BVE0)&rga zH9bJT@l<=fI+lngyF079;=R4m&Uj64UsqQ&y{S4K??99{*Z6y(8)V|Knn(=3naFIi zuX_Gfh0W86_0e|NB-NdYXZIj~v^SHE@``|0&g$E(n|k679nb!=-Ss7vKzzLqUb=lz z@I=bM8~{yH6yNqs8dr){~P!Z-O$JQ?p<1J|S`j@N&1 zla8(oQmM#8(o^x5ASSVNynQ{s@5v;(;`I{jf%IwY+q*1|$G)9>@pt!bfpu(T$?4l{ zYX3ho%$d5Imteof{*8T`{o;eou=QGK+s(eshV_5PzTNa8_G|3l*tc0}#j6&d!?_E5 zYkE^6)j6Dw>@)jxygi;+ACLL6BQkz_c`i61JRUd31>@6WAjLv7>| z`;3ORrA_>bc%pMn2FPTFrLQDW6&yv@`A}PGe%A@C^YgnT8;YV!g360SZ}Sp3D$Sx9 z9!4mF7n`0%#L+Vc?QINIt_4L$tcXaSI=0BA7q@QDde~`*AzvUWsY=Cua zWXa7h@v_gMwtw~)w6^E`MBCp3-$+{d#mDwzfB);hq_sUa>%Omm>>M>=ZzzI+!X8vs zF=0Ozx;b1HC$V3sGmKE7SU#Vug8K8g^Tz?2u7G>5Nir`Ey}ht; z0PLaoIKV)&PcO;uGx!DIMh}{KmN!_y1=Mk4V{l{B`O|s4o3L@UFV#)?h$G+_78y<; z-yrWi51th+$UC<@ad`4hSjR?|9NuBKdEO$L?E_k~u`$$a73Gize{b>*`_&3yp?Q^G zf0`aku#InK>^xYamzYB`1-(Sv&dEz0?+jERXJE`QcH1nyg0cJ6{YNLSfpu(7vE!C| z-X^h|MaPblNbD+xV#n21oFRJqf9Tk8Ro_Sq#;!!4arA>{4GV*Czf9EwqM|8&E$9u~ zM&qy<&icKP%_=z#q*D?cNg-6kfppsSu+$6U4{>-Sg~Nx+e^$xCIyNU9vZoKdhT0|a z5UpLG*cmsdR z;wtX-mu;?6bd6sYU)LA!&G4=9bXOu3g`1c~J?l?tix{bPMS^`>d%SQG;tcWjRSR2) zx3AxQymCIQV{^n?t>+zrx5g~Ixe4ATQFtq>_yf^36*S)1GvRqQ-b%P9@+rQu@MRO$ zc)=Iq3h{NC(#`ru$18sV>)4#|#U4KNI>~wek(KjylAH&Ks&HF5?;m`dNX~mNE9c$$ zvo{Al_z_8XqoAY5v=l2~-8-snj5EgDuBVy{d}17b?%Cq?ROK-K@zs6%MVe2{da8*j zi1+(uyj@$T{Sf25_PaEnxVk>$qWzh?8^tAQoYL#5BuUU@K?i#q@5vXlw{0O^ppMCQ zVZvTnQ4~q^>w+JO)j)q!E)0y})rJOD@+mwY({d%fp*z zVBfCTnZ@PO(lT2sl<0xvbmW5EjoUeSAXe4n81Lnd+?!iZh4JZd|K!=?^;E~VV0`Kx zr{iPRQ&oI06d!Kt=Fek%%8$|U;g|=%JQyE+RO_iq50I5x1#d%G4$3;*EpO0*2Hf>C zE29hXi1oFRW#=3>BQIBt%X+FKmX1Tbd2V?80OAlES#mwmyUX9lT>s23>0HmQ#j(T0 zb&%^nu=t>38mXsBzC!1EcG;X8Xg?$G`dt~h-W~+xm$VPdkHWa2R=e36=VAQ5_v1YW zys(bVDSq6I$L}S4u{Vn^7}Vw!f5I4A@%v~qJgNbF@fyt+?8$z&%@-HoHHZC>MVt;cQ*?JS0}P? z^^PgCoQb;;5Cvkv?bOfC%f@9C36*IjBm=FHKqbUYpD2i57v)JI&Dzo?Rc<$#FW62;#J{E1Il4Q@6~oG!~i_kC3?fM5EMj3 zZpd;eBrT*j=z4>y1Ve&f3*`L91-KN>2Q#j%3g=UTAY7#9zYM4za;gh4R9V&xUBTzQ z2H)m678v`Y_2K3QIb|X61el&(9$s2e$e1YqKu$nz*kg@dkQ=6K?0Dpxu#U}%8`z9{ z7x6BaWaXP?%s1{|AwO98rjh?AqcQ( ze>JRQbHrAa`zeC0ei~cs`vhC>4q=Nu!^5-ekjrk(!q%JqCv0q$;FVm#Sh7iHykH42 zgjjlm%29XyVp>1ezhZO35g{XeC7!mO*9bPdFIl^I*tR{n8} zZTrt@o^W+dexCL%M#K(t$~M*=S6Pr?P>S=^DCc>cHCxc;)icEYKak0LLQlIL5VEk#{y1&!;FbPmL@Zf(R2hDg4m8 zJeR_Z)n!&!fqnbL$>6{i==0bdc{_D#Ci3=YU&`WbQdi;rGQ&)|#^UYpPME)9Ugf)g zmc`rBf`hgODA9Kqp?fA{yq7z2FW$>W?zL;OF+NLI-aJseuHw`z;u(KT$H%OzaDQbe zKHSuur!hXKKBnUX^VD2B7$1F9>nchQkfr%UqNYk=!ygE!0l}|>mNyRzsdRR_F{ya5^w;#QA|3LA1YEHrZ_A_dq-`a8d+39xd19*2Ge3? z{FgrYd^$@_&J?KG4^1LIQJ-(8aC-Q;zWqs9$L5IBm1p;%Ub=cEt(Q12`d(G55vvwX zrM(`+>1#)6y~Itg9JmB}X}kgU@*u}T)bB`|h(W~SUT71cJ+S*KCc5CEJ%0o5u?-x2 z3FdUi|5*m-l7`9IuY#H2>kdVJ#H?eFkmtb3=P}rrImbSBpPS`aXj}zz0G^7o7Vd{# xPrdyA`)3|w?y;_oWFISQ9r4hyeo}Whg2#!+3-xq(4)n2dc)SdA_#zzZ{{d}6NumG% literal 0 HcmV?d00001 diff --git a/tests/pcap/gre_no_options.pcapng b/tests/pcap/gre_no_options.pcapng deleted file mode 100644 index 10ccd46a21db420a25f779f5efd81ffa6864eacf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmd<$<>iuLU|{gI(UxKa(*L0VBnIO9K 192.200.144.148:5060 [VLAN: 1][proto: GRE:100/SIP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: VoIP/10][1 pkts/506 bytes -> 0 pkts/0 bytes][Goodput ratio: 81/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][PLAIN TEXT (OPTIONS sip)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,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] + 2 ICMP 10.1.2.1:0 <-> 10.1.2.2:0 [proto: GRE:81/ICMP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/138 bytes <-> 1 pkts/138 bytes][Goodput ratio: 52/52][0.00 sec][Plen Bins: 0,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] diff --git a/tests/result/gre_no_options.pcapng.out b/tests/result/gre_no_options.pcapng.out deleted file mode 100644 index c7bc721c6..000000000 --- a/tests/result/gre_no_options.pcapng.out +++ /dev/null @@ -1,25 +0,0 @@ -Guessed flow protos: 0 - -DPI Packets (other): 1 (1.00 pkts/flow) -Confidence DPI : 1 (flows) -Num dissector calls: 1 (1.00 diss/flow) -LRU cache ookla: 0/0/0 (insert/search/found) -LRU cache bittorrent: 0/0/0 (insert/search/found) -LRU cache zoom: 0/0/0 (insert/search/found) -LRU cache stun: 0/0/0 (insert/search/found) -LRU cache tls_cert: 0/0/0 (insert/search/found) -LRU cache mining: 0/0/0 (insert/search/found) -LRU cache msteams: 0/0/0 (insert/search/found) -LRU cache stun_zoom: 0/0/0 (insert/search/found) -Automa host: 0/0 (search/found) -Automa domain: 0/0 (search/found) -Automa tls cert: 0/0 (search/found) -Automa risk mask: 0/0 (search/found) -Automa common alpns: 0/0 (search/found) -Patricia risk mask: 2/0 (search/found) -Patricia risk: 2/0 (search/found) -Patricia protocols: 2/0 (search/found) - -GRE 2 276 1 - - 1 GRE 203.0.113.1:0 <-> 192.0.2.2:0 [proto: 80/GRE][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/138 bytes <-> 1 pkts/138 bytes][Goodput ratio: 0/0][0.00 sec][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]