Postgresql beacon receiving procedure complete and working

2 files changed, 75 insertions, 4 deletions

diff --git a/data/database/tables-SQLite.sql b/data/database/tables-SQLite.sql
new file mode 100755
index 0000000..8ed9471
--- /dev/null
+++ b/data/database/tables-SQLite.sql
@@ -0,0 +1,71 @@
+CREATE TABLE serverlist(
+  id              INTEGER          PRIMARY KEY AUTOINCREMENT,
+  ip              VARCHAR(15)      NOT NULL DEFAULT '0.0.0.0',
+  port            INTEGER          NOT NULL DEFAULT 0,
+  gamename        VARCHAR(100)     NOT NULL DEFAULT ' ',
+  gamever         VARCHAR(50)      NOT NULL DEFAULT ' ',
+  hostname        VARCHAR(100)     NOT NULL DEFAULT ' ',
+  hostport        INTEGER          NOT NULL DEFAULT 0,
+  country         VARCHAR(5),
+  b333ms          BOOLEAN          NOT NULL DEFAULT 0,
+  blacklisted     BOOLEAN          NOT NULL DEFAULT 0,
+  added           timestamptz      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  beacon          timestamptz      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated         timestamptz      NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE pending(
+  id              INTEGER          PRIMARY KEY AUTOINCREMENT,
+  ip              VARCHAR(15)      NOT NULL DEFAULT '0.0.0.0',
+  beaconport      INTEGER          NOT NULL DEFAULT 0,
+  heartbeat       INTEGER          NOT NULL DEFAULT 0,
+  gamename        VARCHAR(25)      NOT NULL DEFAULT ' ',  
+  secure          VARCHAR(12)      NOT NULL DEFAULT ' ',
+  enctype         INTEGER          NOT NULL DEFAULT 0,
+  added           timestamptz      NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE server_info(
+  FOREIGN KEY(server_id) REFERENCES serverlist(id),
+  minnetver           INTEGER      NOT NULL DEFAULT 400,
+  gamever             INTEGER      NOT NULL DEFAULT 400,
+  location            INTEGER      NOT NULL DEFAULT 0,
+  listenserver        BOOLEAN      NOT NULL DEFAULT 1,
+  hostport            INTEGER      NOT NULL DEFAULT 7777,
+  hostname            varchar(200) NOT NULL DEFAULT '',
+  adminname           varchar(200) NOT NULL DEFAULT '',
+  adminemail          varchar(300) NOT NULL DEFAULT '',
+  password            BOOLEAN      NOT NULL DEFAULT 0,
+  gametype            varchar(50)  NOT NULL DEFAULT '',
+  gamestyle           varchar(50)  NOT NULL DEFAULT 'Normal',
+  changelevels        BOOLEAN      NOT NULL DEFAULT 0,
+  maptitle            varchar(100) NOT NULL DEFAULT 'Unknown',
+  mapname             varchar(100) NOT NULL DEFAULT '',
+  numplayers          INTEGER      NOT NULL DEFAULT 0,
+  maxplayers          INTEGER      NOT NULL DEFAULT 0,
+  minplayers          INTEGER      NOT NULL DEFAULT 0,
+  botskill            varchar(30)  NOT NULL DEFAULT 'Novice',
+  balanceteams        BOOLEAN      NOT NULL DEFAULT 0,
+  playersbalanceteams BOOLEAN      NOT NULL DEFAULT 0,
+  friendlyfire        varchar(10)  NOT NULL DEFAULT '0%',
+  maxteams            INTEGER      NOT NULL DEFAULT 4,
+  timelimit           INTEGER      NOT NULL DEFAULT 0,
+  goalteamscore       INTEGER      NOT NULL DEFAULT 0,
+  fraglimit           INTEGER      NOT NULL DEFAULT 0,
+  mutators            TEXT         NOT NULL DEFAULT 'None'
+);
+
+CREATE TABLE player_info(
+  server_id INTEGER       PRIMARY KEY AUTOINCREMENT,
+  player    varchar(40)   NOT NULL DEFAULT 'Player',
+  team      INTEGER       NOT NULL DEFAULT 255,
+  frags     INTEGER       NOT NULL DEFAULT 0,
+  mesh      varchar(100)  NOT NULL DEFAULT '',
+  skin      varchar(100)  NOT NULL DEFAULT '',
+  face      varchar(100)  NOT NULL DEFAULT '',
+  ping      INTEGER       NOT NULL DEFAULT 0,
+  ngsecret  varchar(10)   NOT NULL DEFAULT 'false',
+  updated   timestamptz   NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+
diff --git a/data/masterserver-config.pl b/data/masterserver-config.pl
index f6e0ad7..d9f29c9 100755
--- a/data/masterserver-config.pl
+++ b/data/masterserver-config.pl
@@ -54,7 +54,7 @@ our %S = (
   printlog  => 1, 
   
   # which messages do you NOT want to see in the logs (and screen)?
-  suppress  => " module debug ",
+  suppress  => "debug_spam load hostname udp update add remove",
 
 ################################################################################
 # Network settings                                                             #
@@ -81,8 +81,8 @@ our %S = (
   # Disable checks, all games pass as validated. (0=validate, 1=allow all)
   debug_validate => 0,
   
-  # accept only servers that pass the secure/validate challenge
-  require_secure_beacons => 0,
+  # accept only servers that pass the secure/validate challenge, takes longer
+  require_secure_beacons => 1,
   
   # ignore keys from games that use multiple keys or do not support keys at all
   ignore_beacon_key   => "deusex ut",
@@ -109,7 +109,7 @@ our %S = (
   # "info". Execute at least twice per hour, to avoid time-outs in own data.
   # disabling may break support for certain games.
   beacon_checker_enabled  => 1,
-  beacon_checker_time     => [80, 0.25, 1800],
+  beacon_checker_time     => [80, 0.5, 1800],
 
   # Collect server information for the 333networks main site. Identical
   # mechanism as the Beacon Checker. Disable when not interested in UT info.