Changes - j0ke.net Open Build Service

Changes of Revision 45

[-] [+]	Changed	nprobe.changes
@@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Mar 4 20:32:10 UTC 2012 - cs@linux-administrator.com + +- update to release 6.9.2 +- update GeoIP ASnum data +- update nDPI to current svn + +------------------------------------------------------------------- Thu Feb 9 14:57:38 UTC 2012 - cs@linux-administrator.com - update to release 6.9.1
[-] [+]	Changed	nprobe.spec ^
@@ -1,8 +1,8 @@ #!BuildIgnore: post-build-checks %define _default_patch_fuzz 3 -%define reldate 020412 +%define reldate 021712 Name: nprobe -Version: 6.9.1 +Version: 6.9.2 Release: 1 Group: System Summary: Netflow Probe
[-] [+]	Added	nprobe-6.9.2-GeoIPdat-dir.patch ^
@@ -0,0 +1,20 @@ +--- nprobe.c.orig 2011-04-03 13:53:36.000000000 +0200 ++++ nprobe.c 2011-04-04 10:44:26.309788419 +0200 +@@ -3601,7 +3601,7 @@ + + #ifdef HAVE_GEOIP + if(readOnlyGlobals.geo_ip_asn_db == NULL) +- readASs("GeoIPASNum.dat"); ++ readASs("/usr/lib/nprobe/GeoIPASNum.dat"); + + if(!readOnlyGlobals.enableGeoIP) { + if(readOnlyGlobals.geo_ip_city_db != NULL) { +@@ -3610,7 +3610,7 @@ + } + } else { + if(readOnlyGlobals.geo_ip_city_db == NULL) +- readCities("GeoLiteCity.dat"); ++ readCities("/usr/lib/nprobe/GeoLiteCity.dat"); + } + #endif +
	Changed	GeoIPASNum.dat.gz ^
[-] [+]	Changed	nDPI.tar.bz2/src/include/ipq_protocols_osdpi.h ^
@@ -173,11 +173,18 @@ #define NTOP_PROTOCOL_HTTP_PROXY 131 #define NTOP_PROTOCOL_CITRIX 132 #define NTOP_PROTOCOL_NETFLIX 133 +#define NTOP_PROTOCOL_LASTFM 134 +#define NTOP_PROTOCOL_GROOVESHARK 135 +#define NTOP_PROTOCOL_SKYFILE_PREPAID 136 +#define NTOP_PROTOCOL_SKYFILE_RUDICS 137 +#define NTOP_PROTOCOL_SKYFILE_POSTPAID 138 + + /* NOTE: REMEMBER TO UPDATE IPOQUE_PROTOCOL_LONG_STRING / IPOQUE_PROTOCOL_SHORT_STRING */ #endif -#define IPOQUE_LAST_IMPLEMENTED_PROTOCOL 133 +#define IPOQUE_LAST_IMPLEMENTED_PROTOCOL 138 #define IPOQUE_MAX_SUPPORTED_PROTOCOLS (IPOQUE_LAST_IMPLEMENTED_PROTOCOL + 1) @@ -194,7 +201,8 @@ "ICMPv6","DHCPv6","Armagetron","CrossFire","Dofus","Fiesta","Florensia","Guildwars","HTTP Application Activesync","Kerberos", \ "LDAP","MapleStory","msSQL","PPTP","WARCRAFT3","World of Kung Fu","MEEBO", \ "FaceBook","Twitter","DropBox","Gmail","Google Maps","YouTube","Skype","Google","DCE RPC","NetFlow_IPFIX","sFlow", \ - "HTTP Connect","HTTP Proxy","Citrix","Netflix" + "HTTP Connect","HTTP Proxy","Citrix","Netflix","Last.fm","Grooveshark", \ + "Skyfile_prepaid","Skyfile_rudics","Skyfile_postpaid" #define IPOQUE_PROTOCOL_SHORT_STRING "ukn","ftp","pop","smtp","imap","dns","ipp","http","mdns","ntp","netbios","nfs","ssdp", \ "bgp","snmp","xdmcp","smb","syslog","dhcp","postgres","mysql","tds","ddl","i23v5","apple","directconnect","socrates","winmx", \ "manolito","pando","filetopia","iMESH","kontiki","openft","fasttrack","gnutella","edonkey","bittorrent","off","avi", \ @@ -205,7 +213,8 @@ "tftp","afp","stealthnet","aimini","sip","truphone","icmpv6","dhcpv6","armagetron","crossfire","dofus","fiesta","florensia", \ "guildwars","httpactivesync","kerberos","ldap","maplestory","mssql","pptp","warcraft3","wokf","meebo",\ "facebook","twitter","dropbox","gmail","gmaps","youtube","skype","google","dcerpc","netflow","sflow", \ - "http_connect","http_proxy","Citrix","Netflix" + "http_connect","http_proxy","Citrix","Netflix","Last.fm","Grooveshark",\ + "Skyfile_pre", "Skyfile_ru","Skyfile_post" #ifdef __cplusplus }
[-] [+]	Changed	nDPI.tar.bz2/src/include/ipq_public_functions.h ^
@@ -220,7 +220,9 @@ u8 ipoque_detection_flow_protocol_history_contains_protocol(struct ipoque_detection_module_struct *ipoque_struct, u16 protocol_id); #ifdef HAVE_NTOP - unsigned int ntop_guess_undetected_protocol(u_int8_t proto, u_int16_t sport, u_int16_t dport); + unsigned int ntop_guess_undetected_protocol(u8 proto, + u32 shost, u16 sport, + u32 dhost, u16 dport); #endif #ifdef __cplusplus
[-] [+]	Changed	nDPI.tar.bz2/src/lib/ipq_main.c ^
@@ -3245,13 +3245,15 @@ #ifdef HAVE_NTOP -inline u_int is_port(u_int16_t sport, u_int16_t dport, u_int16_t match_port) { +static u_int is_port(u_int16_t sport, u_int16_t dport, u_int16_t match_port) { return(((match_port == sport) \|\| (match_port == dport)) ? 1 : 0); } /* ****************************************************** / -unsigned int ntop_guess_undetected_protocol(u_int8_t proto, u_int16_t sport, u_int16_t dport) { +unsigned int ntop_guess_undetected_protocol(u8 proto, + u32 shost, u16 sport, + u32 dhost, u16 dport) { // printf("ntop_guess_undetected_protocol (proto=%d, %d -> %d)\n", proto, sport, dport); if(proto == IPPROTO_UDP) { @@ -3275,6 +3277,15 @@ else if(is_port(sport, dport, 389)) return(IPOQUE_PROTOCOL_LDAP); } + / Skyfile */ + if((shost == 0xC1A8EA7C) \|\| (dhost == 0xC1A8EA7C)) { + if((shost == 0x0A0A6650) \|\| (dhost == 0x0A0A6650)) { + if((sport == 4708) \|\| (dport == 4708)) return(NTOP_PROTOCOL_SKYFILE_PREPAID); + else if((sport == 4709) \|\| (dport == 4709)) return(NTOP_PROTOCOL_SKYFILE_RUDICS); + else if((sport == 4710) \|\| (dport == 4710)) return(NTOP_PROTOCOL_SKYFILE_POSTPAID); + } + } + return(IPOQUE_PROTOCOL_UNKNOWN); }
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/http.c ^
@@ -477,6 +477,8 @@ { ".gstatic.com", NTOP_PROTOCOL_GOOGLE }, { ".google.com", NTOP_PROTOCOL_GOOGLE }, { ".youtube.", NTOP_PROTOCOL_YOUTUBE }, + { ".last.fm", NTOP_PROTOCOL_LASTFM }, + { ".grooveshark.com", NTOP_PROTOCOL_GROOVESHARK }, { NULL, 0 } };
	Added	nprobe_6.9.2_021712_pro.tgz ^