Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to set up eBot behind NAT. #103 #104

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −3
Open

Allow to set up eBot behind NAT. #103 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config/config.ini.smp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ MYSQL_PASS = "ebotv3"
MYSQL_BASE = "ebotv3"

[Config]
BOT_IP = "127.0.0.1"
; EXTERNAL_IP = "" ; External IP address. Uncomment if you are behind NAT or using virtualization like lxc/docker.
; URL_ROOT="http://ebot.example.com" ; without trailing slash. Used for demo upload. Uncomment if CS:GO is on different server.
BOT_IP = "127.0.0.1" ; IP of interface to listen on. Make sure it is not 127.0.0.1 if CS:GO server is on different server.
BOT_PORT = 12360
MANAGE_PLAYER = 1
DELAY_BUSY_SERVER = 120
Expand Down
27 changes: 27 additions & 0 deletions src/eBot/Config/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class Config extends Singleton {
private $mysql_pass;
private $mysql_base;
private $bot_ip;
private $external_ip;
private $url_root;
private $bot_port;
private $messages = array();
private $record_name = "ebot";
Expand Down Expand Up @@ -54,8 +56,19 @@ public function __construct() {
$this->mysql_base = $config["MYSQL_BASE"];

$this->bot_ip = $config["BOT_IP"];
$this->external_ip = $config["EXTERNAL_IP"];

if($this->external_ip == ""){
$this->external_ip = $this->bot_ip;
}

$this->url_root = $config["URL_ROOT"];
$this->bot_port = $config["BOT_PORT"];

if($this->url_root == ""){
$this->url_root = 'http://'.$this->bot_ip.':'.$this->bot_port;
}

$this->delay_busy_server = $config["DELAY_BUSY_SERVER"];

$this->maps = $config["MAP"];
Expand Down Expand Up @@ -173,6 +186,20 @@ public function getBot_ip() {
public function setBot_ip($bot_ip) {
$this->bot_ip = $bot_ip;
}
public function getExternal_ip() {
return $this->external_ip;
}

public function setExternal_ip($external_ip) {
$this->external_ip = $external_ip;
}
public function getUrl_root() {
return $this->url_root;
}

public function setUrl_root($url_root) {
$this->url_root = $url_root;
}

public function getBot_port() {
return $this->bot_port;
Expand Down
4 changes: 2 additions & 2 deletions src/eBot/Match/Match.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function __construct($match_id, $server_ip, $rcon) {
$this->rcon = new Rcon($ip[0], $ip[1], $rcon);
$this->rconPassword = $rcon;
Logger::log("RCON init ok");
$this->rcon->send("log on; mp_logdetail 3; logaddress_del " . \eBot\Config\Config::getInstance()->getBot_ip() . ":" . \eBot\Config\Config::getInstance()->getBot_port() . ";logaddress_add " . \eBot\Config\Config::getInstance()->getBot_ip() . ":" . \eBot\Config\Config::getInstance()->getBot_port());
$this->rcon->send("log on; mp_logdetail 3; logaddress_del " . \eBot\Config\Config::getInstance()->getExternal_ip() . ":" . \eBot\Config\Config::getInstance()->getBot_port() . ";logaddress_add " . \eBot\Config\Config::getInstance()->getExternal_ip() . ":" . \eBot\Config\Config::getInstance()->getBot_port());
$this->rcon->send("sv_rcon_whitelist_address \"" . \eBot\Config\Config::getInstance()->getBot_ip() . "\"");
$this->addMatchLog("- RCON connection OK", true, false);
} catch (\Exception $ex) {
Expand Down Expand Up @@ -593,7 +593,7 @@ public function taskExecute($name) {
$this->addLog("Stopping record and pushing demo...");
// $this->rcon->send("tv_stoprecord");
if (\eBot\Config\Config::getInstance()->getDemoDownload()) {
$this->rcon->send('tv_stoprecord; ' . 'csay_tv_demo_push "' . $this->currentRecordName . '.dem" "http://' . \eBot\Config\Config::getInstance()->getBot_ip() . ':' . \eBot\Config\Config::getInstance()->getBot_port() . '/upload"');
$this->rcon->send('tv_stoprecord; ' . 'csay_tv_demo_push "' . $this->currentRecordName . '.dem" "' . \eBot\Config\Config::getInstance()->getUrl_root() . '/upload"');
} else {
$this->rcon->send("tv_stoprecord");
}
Expand Down