vrr/nDPI
2
0
Fork 0
mirror of https://github.com/vel21ripn/nDPI.git synced 2026-05-06 03:45:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
123 commits 9 branches 12 tags 263 MiB
Commit graph

123 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luca
2f347a33d8 Fixes for issues #40 -> #52 
Implemented sub-protocol detection for SSL/HTTP/HTTPS
 2015-07-11 16:04:58 +02:00
Luca Deri
436af982fd Merge pull request #60 from kYroL01/dev 
fixed upper/lower name and init_non_tcp_udp_dissector
 2015-07-09 00:29:03 -07:00
Michele Campus
1dd0c912c7 fixed upper/lower name and init_non_tcp_udp_dissector 2015-07-09 00:00:27 +02:00
Michele Campus
824c5f82d3 Merge remote-tracking branch 'upstream/dev' into dev 
Conflicts:
	src/include/ndpi_protocols.h
	src/lib/ndpi_main.c
	src/lib/protocols/afp.c
	src/lib/protocols/aimini.c
	src/lib/protocols/applejuice.c
	src/lib/protocols/armagetron.c
	src/lib/protocols/ayiya.c
	src/lib/protocols/battlefield.c
	src/lib/protocols/bgp.c
	src/lib/protocols/bittorrent.c
	src/lib/protocols/ciscovpn.c
	src/lib/protocols/citrix.c
	src/lib/protocols/corba.c
	src/lib/protocols/crossfire.c
	src/lib/protocols/dcerpc.c
	src/lib/protocols/dhcp.c
	src/lib/protocols/dhcpv6.c
	src/lib/protocols/directconnect.c
	src/lib/protocols/directdownloadlink.c
	src/lib/protocols/dns.c
	src/lib/protocols/dofus.c
	src/lib/protocols/dropbox.c
	src/lib/protocols/eaq.c
	src/lib/protocols/edonkey.c
	src/lib/protocols/fasttrack.c
	src/lib/protocols/fiesta.c
	src/lib/protocols/filetopia.c
	src/lib/protocols/florensia.c
	src/lib/protocols/ftp_control.c
	src/lib/protocols/ftp_data.c
	src/lib/protocols/gnutella.c
	src/lib/protocols/gtp.c
	src/lib/protocols/guildwars.c
	src/lib/protocols/h323.c
	src/lib/protocols/halflife2_and_mods.c
	src/lib/protocols/http.c
	src/lib/protocols/http_activesync.c
	src/lib/protocols/iax.c
	src/lib/protocols/icecast.c
	src/lib/protocols/imesh.c
	src/lib/protocols/ipp.c
	src/lib/protocols/irc.c
	src/lib/protocols/jabber.c
	src/lib/protocols/kakaotalk_voice.c
	src/lib/protocols/kerberos.c
	src/lib/protocols/kontiki.c
	src/lib/protocols/ldap.c
	src/lib/protocols/lotus_notes.c
	src/lib/protocols/mail_imap.c
	src/lib/protocols/mail_pop.c
	src/lib/protocols/mail_smtp.c
	src/lib/protocols/maplestory.c
	src/lib/protocols/mdns.c
	src/lib/protocols/meebo.c
	src/lib/protocols/megaco.c
	src/lib/protocols/mgcp.c
	src/lib/protocols/mms.c
	src/lib/protocols/mpegts.c
	src/lib/protocols/msn.c
	src/lib/protocols/mssql.c
	src/lib/protocols/mysql.c
	src/lib/protocols/netbios.c
	src/lib/protocols/netflow.c
	src/lib/protocols/nfs.c
	src/lib/protocols/noe.c
	src/lib/protocols/ntp.c
	src/lib/protocols/openft.c
	src/lib/protocols/openvpn.c
	src/lib/protocols/oracle.c
	src/lib/protocols/oscar.c
	src/lib/protocols/pando.c
	src/lib/protocols/pcanywhere.c
	src/lib/protocols/postgres.c
	src/lib/protocols/pplive.c
	src/lib/protocols/ppstream.c
	src/lib/protocols/pptp.c
	src/lib/protocols/qq.c
	src/lib/protocols/quake.c
	src/lib/protocols/quic.c
	src/lib/protocols/radius.c
	src/lib/protocols/rdp.c
	src/lib/protocols/redis_net.c
	src/lib/protocols/rsync.c
	src/lib/protocols/rtcp.c
	src/lib/protocols/rtmp.c
	src/lib/protocols/rtp.c
	src/lib/protocols/rtsp.c
	src/lib/protocols/sflow.c
	src/lib/protocols/shoutcast.c
	src/lib/protocols/sip.c
	src/lib/protocols/skinny.c
	src/lib/protocols/skype.c
	src/lib/protocols/smb.c
	src/lib/protocols/snmp.c
	src/lib/protocols/socrates.c
	src/lib/protocols/sopcast.c
	src/lib/protocols/soulseek.c
	src/lib/protocols/spotify.c
	src/lib/protocols/ssdp.c
	src/lib/protocols/ssh.c
	src/lib/protocols/ssl.c
	src/lib/protocols/stealthnet.c
	src/lib/protocols/steam.c
	src/lib/protocols/stun.c
	src/lib/protocols/syslog.c
	src/lib/protocols/tds.c
	src/lib/protocols/teamspeak.c
	src/lib/protocols/teamviewer.c
	src/lib/protocols/telegram.c
	src/lib/protocols/telnet.c
	src/lib/protocols/tftp.c
	src/lib/protocols/thunder.c
	src/lib/protocols/tor.c
	src/lib/protocols/tvants.c
	src/lib/protocols/tvuplayer.c
	src/lib/protocols/twitter.c
	src/lib/protocols/usenet.c
	src/lib/protocols/veohtv.c
	src/lib/protocols/vhua.c
	src/lib/protocols/viber.c
	src/lib/protocols/vmware.c
	src/lib/protocols/vnc.c
	src/lib/protocols/warcraft3.c
	src/lib/protocols/whoisdas.c
	src/lib/protocols/winmx.c
	src/lib/protocols/world_of_kung_fu.c
	src/lib/protocols/world_of_warcraft.c
	src/lib/protocols/xbox.c
	src/lib/protocols/xdmcp.c
	src/lib/protocols/yahoo.c
	src/lib/protocols/zattoo.c
	src/lib/protocols/zeromq.c
 2015-07-08 22:21:10 +02:00
Luca
5266c726f2 Reworked protocol initialization. Work in progress (more cleanup is needed) 2015-07-08 11:58:55 -07:00
Michele Campus
a4b22a612e adding init protocol (2) - removed host_match proto defaults 2015-07-08 12:50:46 +02:00
Michele Campus
e222345c85 Merge remote-tracking branch 'upstream/dev' into dev 2015-07-08 10:21:00 +02:00
Michele Campus
2b30cc8f2c adding init protocol (1) 2015-07-07 21:12:49 +02:00
Luca
dc1d7bf47f Introduced ndpi_protocol datatype to handle master+subprotocol 
Reworked protocol/master_protocol
Added new API call to print protocol/master_protocol
      - ndpi_protocol2name()
 2015-07-07 10:50:49 -04:00
Luca
f5d6cd511e Added support for Snapchat 
Reworked code to better handle host-based protocols
 2015-07-05 19:21:12 +02:00
Luca
09c137b27a Merge branch 'dev' of https://github.com/ntop/nDPI into dev 2015-07-01 18:36:54 +02:00
Luca
151f74d596 Reworked skype code 2015-07-01 18:36:33 +02:00
Luca Deri
2ac44376cb Moved to version 1.7.0 2015-07-01 18:14:37 +02:00
Luca
7f807b81fe Added support for subprotocols 
Modified ndpiReaded to print subprotocols
 2015-07-01 18:12:47 +02:00
Luca
60884f9047 Split former protocol into upper and lower protocol 2015-07-01 17:40:14 +02:00
Luca
49ea23530f Code cleanup for improving readability 2015-07-01 16:57:32 +02:00
Luca
07ebed7fae Removed commented code 
Renamed ndpi_int_add_connection() with ndpi_set_detected_protocol()
 2015-07-01 16:45:29 +02:00
Luca
857020c475 Added missing type that defaulted to int 2015-07-01 16:40:43 +02:00
Luca Deri
68af5c221d Merge pull request #53 from kYroL01/dev 
deleted protocol_type (real-correlated)
 2015-07-01 16:32:34 +02:00
Michele Campus
4089227863 no_real for mpegts.c 2015-06-29 17:09:05 +02:00
Michele Campus
a968718b52 no_real for mpegts.c 2015-06-29 17:06:04 +02:00
Michele Campus
83d46d02d4 Merge pull request #1 from kYroL01/no_real 
No real
 2015-06-29 16:56:54 +02:00
Michele Campus
32cdefb7d7 deleted protocol type (real-correlated)_1 2015-06-29 16:33:29 +02:00
Michele Campus
8da7af7b7b deleted protocol type (real-correlated) 2015-06-29 16:24:51 +02:00
Luca
276a35d36d Added test results for mpeg pcap 2015-06-25 03:59:17 -07:00
Luca
7e28cc0981 Added MPEG TS protocol 
Fixed possible decoding loop in RTCP dissector
Added test pcap for mpegts
 2015-06-25 03:57:50 -07:00
Luca Deri
40292a737a Merge pull request #38 from jnicholls/dns-fix 
Account for the skipping of the DNS RR CLASS field by progressing the…
 2015-06-24 17:42:00 -07:00
Luca Deri
8d5dda9d33 Merge pull request #36 from kYroL01/dev 
fix quic.c
 2015-06-24 17:40:21 -07:00
Jarred Nicholls
1d9d0b89ab Account for the skipping of the DNS RR CLASS field by progressing the payload index forward by an extra 2 octets. Remove commented code. 2015-06-24 20:38:01 -04:00
Michele Campus
dd834c0eeb fix quic.c 2015-06-24 21:39:25 +02:00
Michele Campus
1d698899f6 fix quic.c 2015-06-24 19:36:35 +02:00
Luca
9bb99ed01d Added acknowldgement section 2015-06-24 08:03:53 -07:00
Luca
ce94b7e545 Added support for TIM services generated by tim.com.br and tim.it 2015-06-24 07:57:09 -07:00
Luca
53c0b81dad Reverted fix in quic.c as apparently it invalidates protocol detection 
Added testing files for quickplay
 2015-06-24 07:49:02 -07:00
Luca
2be84d4d64 Added support for QuickPlay streaming service used by companies like hooq.tv 2015-06-24 07:34:57 -07:00
Luca
806c1a48d5 Added fix for fixing a crash when some CLI combination options are used 2015-06-23 07:06:09 -07:00
Luca Deri
4f691de0b5 Merge pull request #32 from kYroL01/dev 
fix quic.c and add libtoolize option to autogen.sh
 2015-06-20 18:51:27 +02:00
Michele Campus
37912b6045 fix quic.c and add libtoolize option to autogen.sh 2015-06-20 18:35:04 +02:00
Luca Deri
d04979402c Added further check 2015-06-19 15:59:46 +02:00
Luca Deri
8a2493c26a Fixed crash caused by IPv6 traffic and KakaoTalk 2015-06-19 11:39:38 +02:00
Luca
b2816d72da Disabled debug messages 2015-06-18 16:31:58 +02:00
Luca
9d361ec772 HTTP response is now dissected so we can match mime types on responses 2015-06-18 16:24:03 +02:00
Luca Deri
5b62fa3464 Merge pull request #29 from commsquare/dev 
Allow Host IP based subprotocols to be added in protos.txt
 2015-06-18 15:52:24 +02:00
Luca Deri
92e813cca4 Merge pull request #30 from sparkon/dev 
Adding more Twitch.tv support
 2015-06-18 15:51:59 +02:00
Edoardo Dominici
a7b7254ac0 Added Twitch ingestion servers and JustinTV CDN 
[ Fixed newline ]
 2015-06-17 15:17:45 +02:00
sparkon
23048378d8 Added Twitch ingestion servers and JustinTV CDN 2015-06-17 14:55:07 +02:00
george.vakras@gmail.com
b16ff0a3dc Fix ip based protocol example in protos.txt 2015-06-17 14:14:19 +02:00
Luca Deri
f97fe9a7b5 Added pcap for SSL regression 2015-06-16 18:34:43 +02:00
Luca Deri
85db524a35 Added fix for detecting SSL certificate decoding. The old code did not discard non-SSL packets thus incrementing a counter when not necessary and thus terminating SSL decoding too early. This causes some SSL certificates not to be properly dissected and thus handled. 2015-06-16 18:31:01 +02:00
Luca
031f1709f2 Test file for mpeg detection 2015-06-15 16:48:50 +02:00