Merge pull request #179 from pasanmdev/master

* fixed GEO stats to properly log country code, fixed SDP Session data display for 183 responses

Author: adubovikov

api/RestApi/Report.php

@@ -1027,6 +1027,10 @@ public function getCodecsFromMessagesForTransaction($timestamp, $param) {
 				/* check if this is our reply */
 				if(in_array($d["cseq"], $cseq[$callid]["invcseq"]) || empty($cseq[$callid])) $preset[$callid]["bparty"][] = $d;
 			}
+			else if($d["method"] == "183" && preg_match("/INVITE/i", $d["cseq"]) && $d["content_type"] == "application/sdp") {
+				/* Its possible SDP to be contain in a 183 Session Progress message too */
+				if(in_array($d["cseq"], $cseq[$callid]["invcseq"]) || empty($cseq[$callid])) $preset[$callid]["bparty"][] = $d;
+			}
 			else if(preg_match("/BYE/i", $d["cseq"]) && strlen($d["rtp_stat"]) != 0) {
 				$rtpstats = $this->doXRTPReport($d["rtp_stat"]);
 			}

examples/sipcapture/sipcapture.opensips

@@ -79,7 +79,7 @@ modparam("sipcapture", "hep_route", "my_hep_route")
 modparam("avpops","db_url","mysql://homer_user:[email protected]/homer_statistic")
 
 
-modparam("mmgeoip", "mmgeoip_city_db_path", "/usr/share/GeoIP/GeoIP.dat")
+modparam("mmgeoip", "mmgeoip_city_db_path", "/usr/share/GeoIP/GeoIPCity.dat")
 
 
 route{
@@ -109,8 +109,8 @@ route{
 		avp_db_query("INSERT INTO stats_ip_mem ( method, source_ip, total) VALUES('$rm', '$si', 1) ON DUPLICATE KEY UPDATE total=total+1");
 
 		#GEO
-		if(mmg_lookup("lon:lat","$si","$avp(lat_lon)")) {
-			avp_db_query("INSERT INTO stats_geo_mem ( method, country, lat, lon, total) VALUES('$rm', '$(avp(lat_lon)[3])', '$(avp(lat_lon)[0])', '$(avp(lat_lon)[1])', 1) ON DUPLICATE KEY UPDATE total=total+1");
+		if(mmg_lookup("lon:lat:cc","$si","$avp(lat_lon)")) {
+			avp_db_query("INSERT INTO stats_geo_mem ( method, country, lat, lon, total) VALUES('$rm', '$(avp(lat_lon)[0])', '$(avp(lat_lon)[1])', '$(avp(lat_lon)[2])', 1) ON DUPLICATE KEY UPDATE total=total+1");
 		};