Changeset 5448

Timestamp:

26/06/2009 01:23:36 (9 months ago)

Author:

NiLuJe

Message:

AMX Mod X:

• Resync GeoIPEx.

Location:

Mirrors/AMXModX/dlls/geoip_ex

Files:

• GeoIP.c (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• geoip_amxx.cpp (modified) (8 diffs)
• geoip_amxx.h (modified) (1 diff)
• include/geoip_ex.inc (modified) (1 diff)
• msvc8/geoip.vcproj (modified) (2 diffs)
• sdk/amxxmodule.cpp (modified) (2 diffs)
• sdk/amxxmodule.h (modified) (1 diff)

Mirrors/AMXModX/dlls/geoip_ex/GeoIP.c

@@ -251 +251 @@
 }
 
-/*
-static
+/* static
 int _file_exists(const char *file_name) {
         struct stat file_stat;
         return( (stat(file_name, &file_stat) == 0) ? 1:0);
-}
-
-int GeoIP_db_avail(int type) {
+} */
+
+/* int GeoIP_db_avail(int type) {
         const char * filePath;
         if (type < 0 || type >= NUM_DB_TYPES) {
@@ -269 +268 @@
         }
         return _file_exists(filePath);
-}
-*/
+}*/
 
 static

Mirrors/AMXModX/dlls/geoip_ex/Makefile

@@ -10 +10 @@
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc-4.1
-NAME = geoipex
+NAME = geoip
 
 BIN_SUFFIX_32 = amxx_i386.so
 BIN_SUFFIX_64 = amxx_amd64.so
 
-OBJECTS = sdk/amxxmodule.cpp GeoIP.c GeoIPCity.c regionName.c timeZone.c geoip_amxx.cpp
+OBJECTS = sdk/amxxmodule.cpp GeoIP.c geoip_amxx.cpp
 
-LINK =
+LINK = 
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
@@ -62 +62 @@
         mkdir -p $(BIN_DIR)
         mkdir -p $(BIN_DIR)/sdk
-        $(MAKE) geoipex
+        $(MAKE) geoip
 
 amd64:
         $(MAKE) all AMD64=true
 
-geoipex: $(OBJ_LINUX)
+geoip: $(OBJ_LINUX)
         $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 

Mirrors/AMXModX/dlls/geoip_ex/geoip_amxx.cpp

@@ -17 +17 @@
 }
 
-/* Deprecated */
+/* Depreceted */
 static cell AMX_NATIVE_CALL amx_geoip_code2(AMX *amx, cell *params)
 {
@@ -29 +29 @@
 }
 
-/* Deprecated */
+/* Depreceted */
 static cell AMX_NATIVE_CALL amx_geoip_code3( AMX *amx, cell *params )
 {
@@ -130 +130 @@
 static cell AMX_NATIVE_CALL amx_geoip_city( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString( amx, params[1], 0, &len );
-
-        StripPort( ip );
-        GeoIPRecord* rec = GeoIP_record_by_addr( gi, ip );
-        
-        if ( rec  )
-        {
-                cell res = MF_SetAmxString( amx, params[2], rec->city ? rec->city : "error", params[3] );
-                free( rec );
-                return res;
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
+
+                StripPort( ip );
+                GeoIPRecord* rec = GeoIP_record_by_addr( gi, ip );
+                
+                if ( rec  )
+                {
+                        cell res = MF_SetAmxString( amx, params[2], rec->city ? rec->city : "error", params[3] );
+                        free( rec );
+                        return res;
+                }
         }
         
@@ -148 +151 @@
 static cell AMX_NATIVE_CALL amx_geoip_latitude( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString( amx, params[1], 0, &len );
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-        
-        return ( rec ) ? amx_ftoc( rec->latitude ) : 0;
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+
+                return ( rec ) ? amx_ftoc( rec->latitude ) : 0;
+        }
+        
+        return 0;
 }
 
 static cell AMX_NATIVE_CALL amx_geoip_longitude( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString( amx, params[1], 0, &len );
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-        
-        return ( rec ) ? amx_ftoc( rec->longitude ) : 0;
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+
+                return ( rec ) ? amx_ftoc( rec->longitude ) : 0;
+        }
+        
+        return 0;
 }
 
 static cell AMX_NATIVE_CALL amx_geoip_region( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString(amx, params[1], 0, &len);
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-
-        if ( rec )
-        {
-                MF_SetAmxString( amx, params[2], rec->region, 2 );
-                return 1;
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString(amx, params[1], 0, &len);
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+
+                if ( rec )
+                {
+                        MF_SetAmxString( amx, params[2], rec->region, 2 );
+                        return 1;
+                }
         }
         
@@ -187 +203 @@
 static cell AMX_NATIVE_CALL amx_geoip_region_name( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString( amx, params[1], 0, &len );
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-        
-        if ( rec )
-        {
-                const char *region = GeoIP_region_name_by_code( rec->country_code, rec->region );
-                return MF_SetAmxString( amx, params[2], region, params[3] );
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+                
+                if ( rec )
+                {
+                        const char *region = GeoIP_region_name_by_code( rec->country_code, rec->region );
+                        return MF_SetAmxString( amx, params[2], region, params[3] );
+                }
         }
 
@@ -204 +223 @@
 static cell AMX_NATIVE_CALL amx_geoip_timezone( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString( amx, params[1], 0, &len );
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-
-        if ( rec )
-        {
-                const char *timezone = GeoIP_time_zone_by_country_and_region( rec->country_code, rec->region );
-                return MF_SetAmxString( amx, params[2], timezone, params[3] );
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString( amx, params[1], 0, &len );
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+
+                if ( rec )
+                {
+                        const char *timezone = GeoIP_time_zone_by_country_and_region( rec->country_code, rec->region );
+                        return MF_SetAmxString( amx, params[2], timezone, params[3] );
+                }
         }
 
@@ -221 +243 @@
 static cell AMX_NATIVE_CALL amx_geoip_continent_code( AMX *amx, cell *params )
 {
-        int len = 0;
-        char *ip = MF_GetAmxString(amx, params[1], 0, &len);
-
-        StripPort( ip );
-        GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
-
-        if ( rec )
-        {
-                MF_SetAmxString( amx, params[2], rec->continent_code, 2 );
-                return 1;
-        }
-        
-        return 0;
+        if ( !db_default )
+        {
+                int len = 0;
+                char *ip = MF_GetAmxString(amx, params[1], 0, &len);
+
+                StripPort( ip );
+                GeoIPRecord *rec = GeoIP_record_by_addr( gi, ip );
+
+                if ( rec )
+                {
+                        MF_SetAmxString( amx, params[2], rec->continent_code, 2 );
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+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 lat1 = amx_ctof( params[1] ) * RAD_CONVERT;
+        REAL lon1 = amx_ctof( params[2] ) * RAD_CONVERT;
+        REAL lat2 = amx_ctof( params[3] ) * RAD_CONVERT;
+        REAL lon2 = amx_ctof( params[4] ) * RAD_CONVERT;
+
+        return amx_ftoc( EARTH_RADIUS * acos( sin( lat1 ) * sin( lat2 ) + cos( lat1 ) * cos( lat2 ) * cos( lon2 - lon1 ) ) );
 }
 
@@ -297 +335 @@
         { "geoip_continent_code", amx_geoip_continent_code },
 
+        { "geoip_distance"              , amx_geoip_distance     },
         { NULL                                  , NULL                                   },
 };

Mirrors/AMXModX/dlls/geoip_ex/geoip_amxx.h

@@ -4 +4 @@
 #define GEOIPDATADIR ""
 
+#define M_PI                    3.14159265358979323846
+
+
+#include <math.h>
 #include "amxxmodule.h"
 #include "GeoIP.h"

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

@@ -140 +140 @@
  *
  * @param ip            The IP address to lookup.
- * @param result        The result of the geoip lookup.
+ * @return                      true on a successful lookup, false on a failed lookup.
  */
-native geoip_continent_code( const ip[], result[3] );
+native bool:geoip_continent_code( const ip[], result[3] );
+
+/**
+ * Calculate the distance between geographical coordinates, latitude and longitude.
+ *
+ * @param lat1          The first IP latitude.
+ * @param lon1          The first IP longitude.
+ * @param lat2          The second IP latitude.
+ * @param lon2          The second IP longitude.
+ * @param result        The distance as result in kilometer.
+ */
+native Float:geoip_distance( Float:lat1, Float:lon1, Float:lat2, Float:lon2 );

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

@@ -201 +201 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\svn_version.h"
-                                >
-                        </File>
                 </Filter>
                 <Filter
@@ -258 +254 @@
                         >
                         <File
-                                RelativePath="..\..\..\plugins\include\geoip.inc"
+                                RelativePath="..\geoip.inc"
                                 >
                         </File>

Mirrors/AMXModX/dlls/geoip_ex/sdk/amxxmodule.cpp

@@ -2707 +2707 @@
         va_start(arglst, fmt);
         vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
+        // vsnprintf_s(msg, sizeof(msg), _TRUNCATE, fmt, arglst);
         va_end(arglst);
 
@@ -2718 +2719 @@
         va_start(arglst, fmt);
         vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
+        // vsnprintf_s(msg, sizeof(msg), _TRUNCATE, fmt, arglst);
         va_end(arglst);
 

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

@@ -287 +287 @@
                          * functions above are deprecated. */
                         #pragma warning (disable:4996)
-                                
+
                 #endif
         #else