diff options
| author | Michele Campus <fci1908@gmail.com> | 2015-07-08 22:21:10 +0200 |
|---|---|---|
| committer | Michele Campus <fci1908@gmail.com> | 2015-07-08 22:21:10 +0200 |
| commit | 824c5f82d3384bb50f39f33c0611816bd897fb57 (patch) | |
| tree | bfc31b688c82bd67368994f463046b9edc517e6d /tests | |
| parent | a4b22a612ed84c9107757c5fa8ec3212e9939441 (diff) | |
| parent | 5266c726f257a6512ccd8de466f939ee950ade83 (diff) | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/result/KakaoTalk_talk.pcap.out | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/result/KakaoTalk_talk.pcap.out b/tests/result/KakaoTalk_talk.pcap.out index cc89066ea..1ec2dbd61 100644 --- a/tests/result/KakaoTalk_talk.pcap.out +++ b/tests/result/KakaoTalk_talk.pcap.out @@ -6,7 +6,7 @@ SSL 10 1517 5 Facebook 2 197 1 Google 2 220 2 HTTP_Proxy 31 3565 3 -TOR 40 10538 1 +Tor 40 10538 1 KakaoTalk_Voice 44 6196 2 1 TCP 10.24.82.188:34533 <-> 120.28.26.242:80 [proto: 7/HTTP][5 pkts/280 bytes] @@ -19,7 +19,7 @@ KakaoTalk_Voice 44 6196 2 8 TCP 110.76.143.50:8080 <-> 10.24.82.188:32968 [proto: 64/SSL_No_Cert][45 pkts/10108 bytes] 9 TCP 139.150.0.125:443 <-> 10.24.82.188:46947 [proto: 91/SSL][5 pkts/1198 bytes] 10 TCP 173.194.72.188:5228 <-> 10.24.82.188:34686 [proto: 126/Google][1 pkts/164 bytes] - 11 TCP 110.76.143.50:9001 <-> 10.24.82.188:58857 [proto: 163/TOR][40 pkts/10538 bytes] + 11 TCP 110.76.143.50:9001 <-> 10.24.82.188:58857 [proto: 163/Tor][40 pkts/10538 bytes] 12 TCP 173.252.122.1:443 <-> 10.24.82.188:52123 [proto: 91/SSL][1 pkts/56 bytes] 13 TCP 10.24.82.188:48489 <-> 203.205.147.215:80 [proto: 131/HTTP_Proxy][15 pkts/1727 bytes][Host: hkminorshort.weixin.qq.com] 14 UDP 1.201.1.174:23047 <-> 10.24.82.188:10269 [proto: 194/KakaoTalk_Voice][22 pkts/3112 bytes] |