Commit Graph
56 Commits
Author SHA1 Message Date
Michele Campus b60e82c702 Merge pull request #278 from mgigante/dev_funcproto
Avoid c99 complains about function prototypes
2016-10-20 17:08:04 +02:00
Michele Campus 36956ebf68 Merge pull request #267 from tianzhishuizhu/dev
check udp
2016-09-15 09:50:38 +02:00
Michele Campus 9e9b64a7e7 Merge pull request #266 from tianzhishuizhu/dev
check udp
2016-09-14 10:35:07 +02:00
Michele Campus 6b4b7a9083 Merge pull request #265 from tianzhishuizhu/dev
improve readability
2016-09-13 10:51:35 +02:00
Michele Campus 3cd6456349 Merge pull request #263 from tianzhishuizhu/dev
payload min length
2016-09-08 15:01:28 +02:00
Michele Campus 2ae4db34b0 Merge pull request #261 from tianzhishuizhu/dev
optimization for code duplication
2016-09-08 14:48:54 +02:00
Michele Campus 7364fcc7df Merge pull request #255 from emanuele-f/openvpn
Fix openvpn with multiple hard_reset_client not being recognized
2016-08-28 01:05:08 +02:00
Michele Campus b6802767aa Merge pull request #253 from theirix/fix-drda2
Fix drda in addition to #242
2016-08-22 14:54:56 +02:00
Michele Campus 45f8f72bae Merge pull request #252 from emanuele-f/gmail
Add hotmail service and enable full master protocol detection for sub-protocols
2016-08-22 11:56:06 +02:00
Michele Campus 48341094a3 Merge pull request #248 from theirix/build-check2
Added instructions how to run tests
2016-08-13 16:22:40 +02:00
Michele Campus d1bf5d2bb6 Merge pull request #245 from denisvm/service-slack
added Slack service
2016-08-13 10:54:27 +02:00
Michele Campus 7853c4a90b Merge pull request #244 from emanuele-f/starttls
Add STARTTLS detection
2016-08-12 15:27:11 +02:00
Michele Campus 0e04068952 Merge pull request #242 from theirix/fix-drda
Fixed DRDA detection
2016-08-11 09:16:42 +02:00
Michele Campus 5e1e6a48a4 Merge pull request #241 from theirix/fix-quic
Fixed buffer overflow in QUIC
2016-08-08 09:52:38 +02:00
Michele Campus 5ec1b685d8 Merge pull request #240 from emanuele-f/openvpn
Add openvpn test pcap
2016-08-05 09:16:49 +02:00
Michele Campus 62a5f2350b Merge pull request #239 from emanuele-f/openvpn
OpenVPN detection by opcode, packet ID and session ID
2016-08-05 00:21:31 +02:00
Michele Campus 4fa76bee78 Merge pull request #235 from theirix/fix-overflow-oscar
Fixed overflow in Oscar
2016-07-26 10:37:36 +02:00
Michele Campus 32e6a79e9c Merge pull request #234 from theirix/fix-overflows
Fixed payload overflow in MQTT, DNS
2016-07-25 12:12:47 +02:00
Michele Campus 77fc4be458 Merge pull request #233 from theirix/fix-bgp
Fixed BGP payload overflow
2016-07-25 10:22:47 +02:00
Michele Campus b102caf482 Merge pull request #232 from theirix/dns-int-overflow
Fixed integer overflow in DNS extensions
2016-07-25 10:05:47 +02:00
Michele Campus a0fe6665b2 Merge pull request #203 from alagoutte/scan-build
fix warning found by Clang Analyzer (scan-build)
2016-05-24 22:04:33 +02:00
Michele Campus b05907f592 Merge pull request #204 from alagoutte/fix_warning
fix warning when use -Wdocumentation CFLAG (clang)
2016-05-24 16:54:13 +02:00
Michele Campus ac55d8dd8b Merge pull request #193 from backer-and/dev
Fix QUIC
2016-05-17 23:40:01 +02:00
Michele Campus 32847fcfd0 Merge pull request #190 from backer-and/dev
enhance/refactor quic.c
2016-05-12 22:53:41 +02:00
Michele Campus 86893a2984 Merge pull request #187 from madpilot78/add_needed_symbols
Add symbols needed by ntopng to the shared library export list.
2016-05-09 13:22:23 +02:00
Michele Campus 1d54092c7d Merge pull request #177 from giomasce/dev
Support RX protocol (used by AFS).
2016-04-16 18:03:26 +02:00
Michele Campus a71f525a2b Merge pull request #175 from theirix/reader-asan-2
Combined ASAN overflow detection and buffer modify
2016-04-13 11:06:32 +02:00
Michele Campus da811fbdd0 Merge pull request #173 from theirix/buffer-overflows
Fixed multiple buffer overflows
2016-04-12 23:41:02 +02:00
Michele Campus afea67e303 Merge pull request #170 from srzamfir/dev
Mqtt dissector fix
2016-04-04 00:12:13 +02:00
Michele Campus 697617622c Merge pull request #169 from theirix/build-json-c
Improved autogen.sh, json-c search
2016-04-03 23:58:51 +02:00
Michele Campus 323912371e Merge pull request #161 from srzamfir/dev
Add CoAP and Mqtt (IoT specific protocols) dissectors
2016-03-20 15:51:11 +01:00
Michele Campus 73833e0ef0 Merge pull request #153 from Timothyyy/dev
protocols: sip CANCEL packet detection fix
2016-03-02 11:54:05 +01:00
Michele Campus a2c51a586e Merge pull request #132 from pavel-odintsov/dev
Made ndpi memory allocator type compatible with C++ on x686 platforms
2015-12-31 10:27:54 +01:00
Michele Campus dd3a79dac2 Merge pull request #114 from kYroL01/dev
Refactoring nDPI
2015-11-12 14:57:02 +01:00
Michele Campus 63cab68a96 Merge pull request #111 from xumjbn/dev
fix dissector QQ unkown bug
2015-10-27 10:33:05 +01:00
Michele Campus efac255821 Merge pull request #101 from Tomasu/dev
NDPI_PROTOCOL_KAKAOTALK_VOICE was used instead of NDPI_SERVICE_KAKAOT…
2015-10-08 13:27:57 +02:00
Michele Campus 0d68f8ab5d added free for flow in get_ndpi_flow - deleted dead part in ndpi_typedef.c 2015-07-19 01:21:37 +02:00
Michele Campus 9d1e99ad0a added Oscar test 2015-07-13 15:01:51 +02:00
Michele Campus e3e8b5c6e4 fixed Oscar protocol dissector (4) 2015-07-13 01:05:57 +02:00
Michele Campus e4f4cfb1de fixed Oscar protocol dissector (4) 2015-07-13 01:02:23 +02:00
Michele Campus e178653f48 fixed Oscar protocol dissector (3) 2015-07-12 18:30:08 +02:00
Michele Campus 05f2eb6270 fixed Oscar protocol dissector (2) 2015-07-12 18:03:44 +02:00
Michele Campus 0307c85bd3 fixed Oscar protocol dissector 2015-07-12 17:51:21 +02: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
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
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
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
Michele Campus 37912b6045 fix quic.c and add libtoolize option to autogen.sh 2015-06-20 18:35:04 +02:00