Changeset 5454

Timestamp:

27/06/2009 19:04:00 (14 months ago)

Author:

NiLuJe

Message:

AMX Mod X:

• Resync GeoIPEx (1.0.1)

Location:

Mirrors/AMXModX/dlls/geoip_ex

Files:

• GeoIP.c (modified) (2 diffs)
• GeoIP.h (modified) (1 diff)
• GeoIPCity.c (modified) (1 diff)
• GeoIPCity.h (modified) (1 diff)
• geoip_amxx.cpp (modified) (5 diffs)
• geoip_amxx.h (modified) (1 diff)
• include/geoip_ex.inc (modified) (2 diffs)
• msvc8/geoip.vcproj (modified) (1 diff)
• sdk/moduleconfig.h (modified) (1 diff)

Mirrors/AMXModX/dlls/geoip_ex/GeoIP.c

@@ -156 +156 @@
 and South America. */
 
-const char GeoIP_country_continent[253][3] = {"--","AS","EU","EU","AS","AS","SA","SA","EU","AS","SA",
+const char GeoIP_country_continent[253][3] = 
+{
+        "--",
+        "AS","EU","EU","AS","AS","SA","SA","EU","AS","SA",
         "AF","AN","SA","OC","EU","OC","SA","AS","EU","SA",
         "AS","EU","AF","EU","AS","AF","AF","SA","AS","SA",
@@ -181 +184 @@
         "SA","SA","AS","OC","OC","OC","AS","AF","EU","AF",
         "AF","EU","AF","--","--","--","EU","EU","EU","EU",
-  "SA","SA"};
+        "SA","SA"
+};
+
+/* 
+        0 - None
+        1 - AF = Africa
+        2 - AS = Asia
+        3 - EU = Europe
+        4 - NA = North America
+        5 - OC = Oceania
+        6 - SA = South America
+*/
+const int GeoIP_country_continent2[253] = 
+{ 
+    0,
+    2,3,3,2,2,6,6,3,2,6,
+    1,4,6,5,3,5,6,2,3,6,
+    2,3,1,3,2,1,1,6,2,6,
+    6,6,2,1,1,3,6,4,2,1,
+    1,1,3,1,5,6,1,2,6,6,
+    6,1,2,2,3,3,1,3,6,6,
+    1,6,3,1,1,1,3,1,3,5,
+    6,5,3,3,3,1,3,6,2,6,
+    1,3,6,1,1,6,1,3,6,6,
+    5,1,6,2,1,6,3,6,3,2,
+    3,2,2,2,2,2,3,3,6,2,
+    2,1,2,2,5,1,6,2,2,2,
+    6,2,2,2,6,3,2,1,1,3,
+    3,3,1,1,3,3,1,5,3,1,
+    2,2,2,5,6,1,6,3,1,2,
+    1,4,2,1,1,5,1,5,1,6,
+    3,3,2,5,5,5,2,6,6,5,
+    5,2,2,3,6,5,6,2,3,5,
+    6,2,1,3,2,1,2,5,1,1,
+    3,2,1,3,3,3,1,3,1,1,
+    6,1,6,2,1,6,1,1,1,2,
+    2,5,2,1,5,2,2,6,5,2,
+    1,3,1,5,4,6,2,3,6,6,
+    6,6,2,5,5,5,2,1,3,1,
+    1,3,1,0,0,0,3,3,3,3,
+    6,6
+};
 
 const char * GeoIPDBDescription[NUM_DB_TYPES] = {NULL, "GeoIP Country Edition", "GeoIP City Edition, Rev 1", "GeoIP Region Edition, Rev 1", "GeoIP ISP Edition", "GeoIP Organization Edition", "GeoIP City Edition, Rev 0", "GeoIP Region Edition, Rev 0","GeoIP Proxy Edition","GeoIP ASNum Edition","GeoIP Netspeed Edition","GeoIP Domain Name Edition"};

Mirrors/AMXModX/dlls/geoip_ex/GeoIP.h

@@ -130 +130 @@
 extern const char * GeoIP_country_name[253];
 extern const char GeoIP_country_continent[253][3];
+extern const int GeoIP_country_continent2[253];
 
 #ifdef DLL

Mirrors/AMXModX/dlls/geoip_ex/GeoIPCity.c

@@ -81 +81 @@
         /* get country */
         record->continent_code = (char *) GeoIP_country_continent[record_buf[0]];
+        record->continent_code2 = (int) GeoIP_country_continent2[record_buf[0]];
         record->country_code = (char *) GeoIP_country_code [record_buf[0]];
         record->country_code3 = (char *) GeoIP_country_code3[record_buf[0]];

Mirrors/AMXModX/dlls/geoip_ex/GeoIPCity.h

@@ -46 +46 @@
         int charset;
         char *continent_code;
+        int continent_code2;
 } GeoIPRecord;
 

Mirrors/AMXModX/dlls/geoip_ex/geoip_amxx.cpp

@@ -17 +17 @@
 }
 
-/* Depreceted */
+/* Deprecated */
 static cell AMX_NATIVE_CALL amx_geoip_code2(AMX *amx, cell *params)
 {
@@ -29 +29 @@
 }
 
-/* Depreceted */
+/* Deprecated */
 static cell AMX_NATIVE_CALL amx_geoip_code3( AMX *amx, cell *params )
 {
@@ -246 +246 @@
         {
                 int len = 0;
-                char *ip = MF_GetAmxString(amx, params[1], 0, &len);
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
 
                 StripPort( ip );
@@ -254 +254 @@
                 {
                         MF_SetAmxString( amx, params[2], rec->continent_code, 2 );
-                        return 1;
+                        return rec->continent_code2;
                 }
         }
@@ -263 +263 @@
 static cell AMX_NATIVE_CALL amx_geoip_distance( AMX *amx, cell *params )
 {
-        REAL RAD_CONVERT  =     (REAL)M_PI / 180;
-        REAL EARTH_RADIUS =     (REAL)6378.2;
+        REAL RAD_CONVERT  = (REAL)0.017453292519943; // ( PI / 180 )
+        REAL EARTH_RADIUS = (REAL)( params[5] ? 3959.0 : 6371.0 ); // miles / km
 
         REAL lat1 = amx_ctof( params[1] ) * RAD_CONVERT;

Mirrors/AMXModX/dlls/geoip_ex/geoip_amxx.h

@@ -3 +3 @@
 
 #define GEOIPDATADIR ""
-
-#define M_PI                    3.14159265358979323846
-
 
 #include <math.h>

Mirrors/AMXModX/dlls/geoip_ex/include/geoip_ex.inc

@@ -133 +133 @@
 native geoip_timezone( const ip[], result[], len = 45 );
 
-/**
- * Lookup the two character continent code for a given IP address.
+ * Lookup the continent code for a given IP address.
  *
+ * @note The code can be retrieved as integer number or string (2 characters).
  * @note Possible continent codes are AF, AS, EU, NA, OC, SA for 
- * Africa, Asia, Europe, North America, Oceania and South America.
+ * Africa(1), Asia(2), Europe(3), North America(4), Oceania(5) and South America(6).
  *
  * @param ip            The IP address to lookup.
- * @return                      true on a successful lookup, false on a failed lookup.
+ * @param result        The result of the geoip lookup. This param is optional. 
+ *                                      If the lookup does not succeed, the buffer is not modified.
+ * @return                      The result of the geoip lookup, 0 on a failed lookup.
  */
-native bool:geoip_continent_code( const ip[], result[3] );
-
+enum Continent
+{
+        AFRICA = 1,
+        ASIA,
+        EUROPE,
+        NORTH_AMERICA,
+        OCEANIA,
+        SOUTH_AMERICA
+}
+native Continent:geoip_continent_code( const ip[], result[3] = "" );
 /**
  * Calculate the distance between geographical coordinates, latitude and longitude.
@@ -151 +161 @@
  * @param lat2          The second IP latitude.
  * @param lon2          The second IP longitude.
- * @param result        The distance as result in kilometer.
+ * @param system    The system of measurement, 0 = Meteric(kilometers) or 1 = English(miles).  
+ * @return                      The distance as result in specified system of measurement.
  */
-native Float:geoip_distance( Float:lat1, Float:lon1, Float:lat2, Float:lon2 );
+native Float:geoip_distance( Float:lat1, Float:lon1, Float:lat2, Float:lon2, system = 0 );

Mirrors/AMXModX/dlls/geoip_ex/msvc8/geoip.vcproj

@@ -124 +124 @@
                         <Tool
                                 Name="VCCLCompilerTool"
+                                Optimization="4"
                                 AdditionalIncludeDirectories="..\;..\sdk"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"

Mirrors/AMXModX/dlls/geoip_ex/sdk/moduleconfig.h

@@ -16 +16 @@
  */
 #define MODULE_NAME "GeoIP Extented"
-#define MODULE_VERSION "1.0.0"
+#define MODULE_VERSION "1.0.1"
 #define MODULE_AUTHOR "AMX Mod X Dev Team / Arkshine"
 #define MODULE_URL "http://www.amxmodx.org/"