[add] print flag

bin/bancountmysql

@@ -5,23 +5,28 @@ ip=$2
 service=$3
 
 curDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
-echo $curDir
 
 source $curDir/bancount.cfg
 
+allInfoIp=`geoiplookup $ip`;
+
 geoip () {
-	geoiplookup $ip | awk -F, '{print $2}' | sed s/\ //
+	echo $allInfoIp | awk -F, '{print $2}' | sed s/\ //
+}
+
+countryCode () {
+  echo $allInfoIp $ip | awk -F ": " '{ print $2 }' | awk -F "," '{ print $1 }' | head -n 1
 }
 
 case $action in
 
 ban)
-	mysql $mysqldb -u $mysqluser --password=$mysqlpw -e "INSERT INTO bans (ip, service, ban_date, ban_time, country) VALUES ( '$ip', '$service', '`date +%F`', '`date +%T`', '`geoip $ip`');"
+	mysql $mysqldb -u $mysqluser --password=$mysqlpw -e "INSERT INTO bans (ip, service, ban_date, ban_time, country, countryCode) VALUES ( '$ip', '$service', '`date +%F`', '`date +%T`', '`geoip`', '`countryCode`');"
 
 ;;
 
 unban)
-	mysql $mysqldb -u $mysqluser --password=$mysqlpw -e "INSERT INTO unbans (ip, service, unban_date, unban_time, country) VALUES ( '$ip', '$service', '`date +%F`', '`date +%T`', '`geoip $ip`');"
+	mysql $mysqldb -u $mysqluser --password=$mysqlpw -e "INSERT INTO unbans (ip, service, unban_date, unban_time, country, countryCode) VALUES ( '$ip', '$service', '`date +%F`', '`date +%T`', '`geoip`', '`countryCode`');"
 ;;
 
 *)
@@ -36,4 +41,4 @@ EOF
 
 ;;
 
-esac
+esac

bin/fail2bancount.sql

@@ -29,6 +29,7 @@ CREATE TABLE `bans` (
   `ban_date` varchar(10) DEFAULT NULL,
   `ban_time` varchar(8) DEFAULT NULL,
   `country` char(50) NOT NULL DEFAULT 'Martians!',
+  `countryCode` char(3) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -47,6 +48,7 @@ CREATE TABLE `unbans` (
   `unban_date` varchar(10) DEFAULT NULL,
   `unban_time` varchar(8) DEFAULT NULL,
   `country` char(50) DEFAULT NULL,
+  `countryCode` char(3) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;