Merge pull request #1 from OpenGamePanel/master

Updating

OGP/ArmaBE/ArmaBE.pm

@@ -0,0 +1,198 @@
+# ArmaBE - Perl extension BattlEye ARMA Rcon interface
+# Original Source for BattlEye source - https://github.com/Jaegerhaus/BE-RCon-Tools
+#
+# $Id:$
+#
+
+package ArmaBE;
+
+use strict;
+use warnings;
+use IO::Socket::INET;
+
+# release version
+our $VERSION = "0.01";
+
+# create class
+sub new {
+	my $class = shift;
+
+	# create object with defaults
+	my $self = {
+		hostname	=> undef,
+		port		=> 27015,
+		password	=> undef,
+		timeout		=> 5,
+		connected	=> 0,
+		authenticated	=> 0,
+		socket		=> undef,
+		sequence	=> 0,
+	};
+
+	# create object
+	bless($self, $class);
+
+	# initialize class instances
+	$self->init();
+
+	# parse constructor args
+	while (my ($key, $val) = splice(@_, 0, 2)) {
+		$key = lc($key);
+		if    ($key eq "hostname") { $self->hostname($val) }
+		elsif ($key eq "port")     { $self->port($val)     }
+		elsif ($key eq "password") { $self->password($val) }
+		elsif ($key eq "timeout")  { $self->timeout($val)  }
+		else { print STDERR "Unknown attribute: $key\n" }
+	}
+
+	return $self;
+}
+
+# initialize class instances
+sub init {
+	my $self = shift;
+	my $class = ref($self);
+
+	# manipulate symbol table.. gotta love perl
+	no strict "refs";
+	no warnings;
+	foreach my $instance (keys %$self) {
+		*{"${class}::${instance}"} = sub {
+			my $self = shift;
+			my $value = shift;
+			my $ref = \$self->{$instance};
+			if (defined $value) {
+				$$ref = $value;
+				return $self;
+			} else {
+				return $$ref;
+			}
+		};
+	}
+}
+
+# run a command and return its response
+sub run {
+	my $self = shift;
+	my $command = shift;
+
+	if (!$self->connected()) {
+		$self->connect();
+	}
+
+	if (!$self->authenticated()) {
+		$self->authenticate();
+	}
+
+	if ($self->authenticated()) {
+		my $socket = $self->socket();
+		print $socket $self->packet("\1\0".$command);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+# create tcp socket
+sub connect {
+	my $self = shift;
+
+	my $socket = IO::Socket::INET->new(
+		PeerAddr        => $self->hostname(),
+		PeerPort        => $self->port(),
+		Timeout		=> $self->timeout(),
+		Proto           => "udp",
+	) || die "Failed to connect: $!\n";
+
+	$self->socket($socket);
+	$self->connected(1);
+}
+
+# authenticate rcon session
+sub authenticate {
+	my $self = shift;
+
+	# send authentication packet to server
+	my $socket = $self->socket();
+	print $socket $self->packet("\0".$self->password());
+
+	my $response = $self->response();
+	my $authenticated = int(substr($response, -1));
+
+	$self->authenticated($authenticated);
+}
+
+######################
+# PROTOCOL FUNCTIONS #
+######################
+
+# rcon command protocol:
+# https://www.battleye.com/downloads/BERConProtocol.txt
+
+sub crc32 {
+	my ($self,$input,$init_value,$polynomial) = @_;
+
+	$init_value = 0 unless (defined $init_value);
+	$polynomial = 0xedb88320 unless (defined $polynomial);
+
+	my @lookup_table;
+
+	for (my $i=0; $i<256; $i++) {
+		my $x = $i;
+		for (my $j=0; $j<8; $j++) {
+			if ($x & 1) {
+				$x = ($x >> 1) ^ $polynomial;
+			} else {
+				$x = $x >> 1;
+			}
+		}
+		push @lookup_table, $x;
+	}
+
+	my $crc = $init_value ^ 0xffffffff;
+
+	foreach my $x (unpack ('C*', $input)) {
+		$crc = (($crc >> 8) & 0xffffff) ^ $lookup_table[ ($crc ^ $x) & 0xff ];
+	}
+
+	$crc = $crc ^ 0xffffffff;
+
+	return $crc;
+}
+
+# create a packet of type (AUTH or CMD)
+sub packet {
+	my $self = shift;
+	my $payload = shift;
+
+	my $break = pack('C', 0xff);
+	my $packet = "BE"
+		. pack('V', $self->crc32($break . $payload))
+		. $break
+		. $payload;
+
+	return $packet;
+}
+
+# receive packet
+sub response {
+	my $self = shift;
+	my $payload = $self->read();
+
+	return $payload;
+}
+
+# read length of bytes from socket with timeout
+sub read {
+	my $self = shift;
+	my $received;
+	my $socket = $self->socket();
+	
+	$socket->recv($received, 9);
+
+	return unpack('H*', $received);
+}
+
+1;
+
+__END__

OGP/KKrcon/HL2.pm

@@ -46,7 +46,7 @@ sub new {
 		elsif ($key eq "port")     { $self->port($val)     }
 		elsif ($key eq "password") { $self->password($val) }
 		elsif ($key eq "timeout")  { $self->timeout($val)  }
-		else { print STDERR "uknown attribute: $key\n" }
+		else { print STDERR "Unknown attribute: $key\n" }
 	}
 
 	return $self;
@@ -104,7 +104,7 @@ sub connect {
 		Timeout		=> $self->timeout(),
 		Proto           => "tcp",
 		Type            => SOCK_STREAM,
-	) || die "failed to connect: $!\n";
+	) || die "Failed to connect: $!\n";
 
 	$self->socket($socket);
 	$self->connected(1);
@@ -168,18 +168,12 @@ sub packet {
 # receive packet
 sub response {
 	my $self = shift;
+	my $payload = $self->read();
 
-	my $size = unpack("V", $self->read(4));
+	# remove protocol cruft and null terminators
+	$payload =~ s/\x00{2}$//;
 
-	if ($size) {
-		my $payload = $self->read($size);
-
-		# remove protocol cruft and null terminators
-		$payload =~ s/^.{8}//;
-		$payload =~ s/\x00{2}$//;
-
-		return $payload;
-	}
+	return $payload;
 }
 
 # read length of bytes from socket with timeout
@@ -191,10 +185,24 @@ sub read {
 	my $timeout = $self->timeout();
 	my $select = IO::Select->new($socket);
 
-	if ($select->can_read($timeout)) {
-		$socket->sysread(my $read, $length, 0);
-		return $read;
+	my $reply = "";
+	my $buffer;
+
+	my ($size, $request_id, $command_response, $data);
+
+	while ($select->can_read(0.5)) {
+		$socket->recv($buffer, 4, MSG_PEEK);
+		$size = unpack("V", $buffer);
+		last if (!defined($size));
+		$socket->recv($buffer, $size+4, MSG_WAITALL);
+
+		($size, $request_id, $command_response, $data) =
+			unpack('VVVZ*x', $buffer);
+
+		$reply .= "$data";
 	}
+
+	return $reply;
 }
 
 1;

OGP/KKrcon/KKrcon.pm

@@ -69,7 +69,6 @@ sub new
 	$self->{"error"} = "";
 	
 	# Set up socket parameters
-	$self->{"_proto"}  = getprotobyname('udp');
 	$self->{"_ipaddr"} = gethostbyname($self->{"server_host"})
 		or die("KKrcon: could not resolve Host \"" . $self->{"server_host"} . "\"\n");
 	
@@ -128,20 +127,10 @@ sub _sendrecv
 	my $host = $self->{"server_host"};
 	my $port = $self->{"server_port"};
 	my $ipaddr = $self->{"_ipaddr"};
-	my $proto  = $self->{"_proto"};
 	
 	# Open socket
-	socket(RCON, PF_INET, SOCK_DGRAM, $proto)
-		or die("KKrcon: socket: $!\n");
-	
-	# bind causes problems if hostname() gets wrong interface...
-	# and it doesn't seem to be necessary
-	#
-	#my $iaddr = gethostbyname(hostname());
-	#my $paddr = sockaddr_in(0, $iaddr);
-	#bind(RCON, $paddr)
-	#	or die("KKrcon: bind: $!\n");
-	
+	socket(RCON, PF_INET, SOCK_DGRAM, getprotobyname("udp")) or die("KKrcon: socket: $!\n");
+
 	my $hispaddr = sockaddr_in($port, $ipaddr);
 	
 	unless(defined(send(RCON, $msg, 0, $hispaddr)))
@@ -149,26 +138,51 @@ sub _sendrecv
 		die("KKrcon: send $ip:$port : $!");
 	}
 
-	my $rin = "";
+	my $rin;
 	vec($rin, fileno(RCON), 1) = 1;
-	
-	my $ans = "TIMEOUT";
-	if (select($rin, undef, undef, 10.0))
-	{
-		$ans = "";
+	my $ans;
+
+	if (select($rin, undef, undef, 10.0)) {
 		$hispaddr = recv(RCON, $ans, 8192, 0);
-		$ans =~ s/\x00+$//;			# trailing crap
-		$ans =~ s/^\xFF\xFF\xFF\xFFl//;		# HL response
-		$ans =~ s/^\xFF\xFF\xFF\xFFn//;		# QW response
-		$ans =~ s/^\xFF\xFF\xFF\xFF//;		# Q2/Q3 response
-		$ans =~ s/^\xFE\xFF\xFF\xFF.....//;	# old HL bug/feature
+
+		if (defined($ans)) {
+			$ans =~ s/^\xFF\xFF\xFF\xFFprint\n//;    # CoD2 response
+			$ans =~ s/\x00+$//;			# trailing crap
+			$ans =~ s/^\xFF\xFF\xFF\xFFl//;		# HL response
+			$ans =~ s/^\xFF\xFF\xFF\xFFn//;		# QW response
+			$ans =~ s/^\xFF\xFF\xFF\xFF//;		# Q2/Q3 response
+			$ans =~ s/^\xFE\xFF\xFF\xFF.....//;	# old HL bug/feature
+
+			if (length($ans) > 512) {
+				my $tmp;
+				my @explode;
+
+				while (select($rin, undef, undef, 0.05)) {
+					@explode = split(/\n/, $ans);
+					$explode[$#explode] =~ s/^ //;
+					$explode[$#explode] = 'X' . $explode[$#explode];
+					$ans = join("\n", @explode);
+
+					$hispaddr = recv(RCON, $tmp, 8192, 0);
+
+					if (defined($tmp)) {
+						$tmp =~ s/^\xFF\xFF\xFF\xFFprint\n//;    # CoD2 response
+						$tmp =~ s/\x00+$//;			# trailing crap
+						$tmp =~ s/^\xFF\xFF\xFF\xFFl//;		# HL response
+						$tmp =~ s/^\xFF\xFF\xFF\xFFn//;		# QW response
+						$tmp =~ s/^\xFF\xFF\xFF\xFF//;		# Q2/Q3 response
+						$tmp =~ s/^\xFE\xFF\xFF\xFF.....//;	# old HL bug/feature
+						$ans .= $tmp;
+					}
+				}
+			}
+		}
 	}
 	
 	# Close socket
 	close(RCON);
 	
-	if ($ans eq "TIMEOUT")
-	{
+	if (!defined($ans)) {
 		$ans = "";
 		$self->{"error"} = "Rcon timeout";
 	}

OGP/agent_conf.sh

@@ -84,7 +84,8 @@ failed()
 	exit 1
 }
 
-agent_home="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 
+scriptDir="$(dirname "${BASH_SOURCE[0]}")"
+agent_home="$(cd "$scriptDir" && pwd)"
 
 cfgfile=${agent_home}/Cfg/Config.pm
 prefsfile=${agent_home}/Cfg/Preferences.pm

OGP/ogp_agent.pl

@@ -66,6 +66,7 @@ use constant AGENT_PID_FILE =>
 use constant STEAM_LICENSE_OK => "Accept";
 use constant STEAM_LICENSE	=> $Cfg::Config{steam_license};
 use constant MANUAL_TMP_DIR   => Path::Class::Dir->new(AGENT_RUN_DIR, 'tmp');
+use constant SHARED_GAME_TMP_DIR   => Path::Class::Dir->new(AGENT_RUN_DIR, 'shared');
 use constant STEAMCMD_CLIENT_DIR => Path::Class::Dir->new(AGENT_RUN_DIR, 'steamcmd');
 use constant STEAMCMD_CLIENT_BIN =>
   Path::Class::File->new(STEAMCMD_CLIENT_DIR, 'steamcmd.exe');
@@ -143,6 +144,13 @@ if (!-d SCREEN_LOGS_DIR && !mkdir SCREEN_LOGS_DIR)
 	exit -1;
 }
 
+# Check the global shared games folder
+if (!-d SHARED_GAME_TMP_DIR && !mkdir SHARED_GAME_TMP_DIR)
+{
+	logger "Could not create " . SHARED_GAME_TMP_DIR . " directory $!.", 1;
+	exit -1;
+}
+
 # Rotate the log file
 if (-e AGENT_LOG_FILE)
 {
@@ -211,7 +219,7 @@ elsif ($no_startups != 1)
 			my (
 				$home_id,   $home_path,   $server_exe,
 				$run_dir,   $startup_cmd, $server_port,
-				$server_ip, $cpu, $nice, $preStart, $envVars
+				$server_ip, $cpu, $nice, $preStart, $envVars, $game_key
 			   ) = split(',', $_);
 			
 			if (is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) ==
@@ -226,7 +234,7 @@ elsif ($no_startups != 1)
 			universal_start_without_decrypt(
 										 $home_id,   $home_path,   $server_exe,
 										 $run_dir,   $startup_cmd, $server_port,
-										 $server_ip, $cpu, $nice, $preStart, $envVars
+										 $server_ip, $cpu, $nice, $preStart, $envVars, $game_key
 										   );
 		}
 		close(STARTFILE);
@@ -423,7 +431,7 @@ sub create_screen_id
 sub create_screen_cmd
 {
 	my ($screen_id, $exec_cmd) = @_;
-	$exec_cmd = replace_OGP_Vars($screen_id, $exec_cmd);
+	$exec_cmd = replace_OGP_Env_Vars($screen_id, "", "", $exec_cmd);
 	return
 	  sprintf('screen -d -m -t "%1$s" -c ' . SCREENRC_FILE . ' -S %1$s %2$s',
 			  $screen_id, $exec_cmd);
@@ -435,24 +443,30 @@ sub create_screen_cmd_loop
 	my ($screen_id, $exec_cmd, $priority, $affinity, $envVars) = @_;
 	my $server_start_batfile = $screen_id . "_startup_scr.bat";
 	
-	$exec_cmd = replace_OGP_Vars($screen_id, $exec_cmd);
+	$exec_cmd = replace_OGP_Env_Vars($screen_id, "", "", $exec_cmd);
 	
 	# Create batch file that will launch the process and store PID which will be used for killing later
 	open (SERV_START_BAT_SCRIPT, '>', $server_start_batfile);
 	
-	my $batch_server_command = ":TOP" . "\r\n";
+	my $batch_server_command = "\@echo off" . "\r\n"
+	. "setlocal EnableDelayedExpansion" . "\r\n"
+	. ":TOP" . "\r\n";
 	
 	if(defined $envVars && $envVars ne ""){
 		$batch_server_command .= $envVars;
 	}
 	
-	$batch_server_command .= "set starttime=%time%" . "\r\n"
+	$batch_server_command .= "set STARTTIME=%TIME: =0%" . "\r\n"
 	. "start " . $priority . " " . $affinity . " /wait " . $exec_cmd . "\r\n"
-	. "set endtime=%time%" . "\r\n" 
-	. "set /a secs=%endtime:~6,2%" . "\r\n" 
-	. "set /a secs=%secs%-%starttime:~6,2%" . "\r\n"
+	. "set ENDTIME=%TIME: =0%" . "\r\n"
+	. "set \"end=!ENDTIME:%time:~8,1%=%%100)*100+1!\"  &  set \"start=!STARTTIME:%time:~8,1%=%%100)*100+1!\"" . "\r\n"
+	. "set /A \"elap=((((10!end:%time:~2,1%=%%100)*60+1!%%100)-((((10!start:%time:~2,1%=%%100)*60+1!%%100)\"" . "\r\n"
+	. "set /A \"cc=elap%%100+100,elap/=100,ss=elap%%60+100,elap/=60,mm=elap%%60+100,hh=elap/60+100\"" . "\r\n"
+	. "set hour=%hh:~1%" . "\r\n"
+	. "set minute=%mm:~1%" . "\r\n"
+	. "set second=%ss:~1%" . "\r\n"
 	. "if exist SERVER_STOPPED exit" . "\r\n"
-	. "if %secs% lss 15 exit" . "\r\n"
+	. "IF \"%hour%\" == \"00\" IF \"%minute%\" == \"00\" IF %second% lss 15 exit" . "\r\n"
 	. "goto TOP" . "\r\n";
 	
 	print SERV_START_BAT_SCRIPT $batch_server_command;
@@ -466,34 +480,47 @@ sub create_screen_cmd_loop
 
 }
 
-sub replace_OGP_Vars{
-	# This function replaces constants from game server XML Configs with OGP paths for Steam Auto Updates for example
-	my ($screen_id, $exec_cmd) = @_;
-	my $screen_id_for_txt_update = substr ($screen_id, rindex($screen_id, '_') + 1);
-	my $steamInsFile = $screen_id_for_txt_update . "_install.txt";
-	my $steamCMDPath = STEAMCMD_CLIENT_DIR;
-	my $fullPath = Path::Class::File->new($steamCMDPath, $steamInsFile);
-	
-	my $windows_steamCMDPath= clean(`cygpath -wa $steamCMDPath`);
-	$windows_steamCMDPath =~ s#/#\\#g;
-	
-	# If the install file exists, the game can be auto updated, else it will be ignored by the game for improper syntax
-	# To generate the install file, the "Install/Update via Steam" button must be clicked on at least once!
-	if(-e $fullPath){
-		$exec_cmd =~ s/{OGP_STEAM_CMD_DIR}/$windows_steamCMDPath/g;
-		$exec_cmd =~ s/{STEAMCMD_INSTALL_FILE}/$steamInsFile/g;
-	}
-	
-	return $exec_cmd;
-}
-
 sub replace_OGP_Env_Vars{
 	# This function replaces constants from environment variables set in the XML
-	my ($homeid, $homepath, $strToReplace) = @_;
+	my ($screen_id, $homeid, $homepath, $exec_cmd, $game_key) = @_;
+	
+	# Handle steam specific replacements
+	if(defined $screen_id && $screen_id ne ""){
+		my $screen_id_for_txt_update = substr ($screen_id, rindex($screen_id, '_') + 1);
+		my $steamInsFile = $screen_id_for_txt_update . "_install.txt";
+		my $steamCMDPath = STEAMCMD_CLIENT_DIR;
+		my $fullPath = Path::Class::File->new($steamCMDPath, $steamInsFile);
+		
+		my $windows_steamCMDPath= clean(`cygpath -wa $steamCMDPath`);
+		$windows_steamCMDPath =~ s#/#\\#g;
+		
+		# If the install file exists, the game can be auto updated, else it will be ignored by the game for improper syntax
+		# To generate the install file, the "Install/Update via Steam" button must be clicked on at least once!
+		if(-e $fullPath){
+			$exec_cmd =~ s/{OGP_STEAM_CMD_DIR}/$windows_steamCMDPath/g;
+			$exec_cmd =~ s/{STEAMCMD_INSTALL_FILE}/$steamInsFile/g;
+		}
+	}
 
-	$strToReplace =~ s/{OGP_HOME_DIR}/$homepath/g;
+	# Handle home directory replacement
+	if(defined $homepath && $homepath ne ""){
+		$exec_cmd =~ s/{OGP_HOME_DIR}/$homepath/g;
+	}
+	
+	# Handle global game shared directory replacement
+	if(defined $game_key && $game_key ne ""){
+		my $readable_game_key = lc(substr($game_key, 0, rindex($game_key,"_")));
+		my $shared_path = Path::Class::Dir->new(SHARED_GAME_TMP_DIR, $readable_game_key);
+		# Create the folder if it doesn't exist
+		if (!-d $shared_path && !mkdir $shared_path)
+		{
+			logger "Could not create " . $shared_path . " directory $!.", 1;
+		}
+		
+		$exec_cmd =~ s/{OGP_GAME_SHARED_DIR}/$shared_path/g;
+	}
 	
-	return $strToReplace;
+	return $exec_cmd;
 }
 
 sub encode_list
@@ -640,12 +667,9 @@ sub universal_start_without_decrypt
 {
 	my (
 		$home_id, $home_path, $server_exe, $run_dir, $startup_cmd,
-		$server_port, $server_ip, $cpu,	$nice, $preStart, $envVars
+		$server_port, $server_ip, $cpu,	$nice, $preStart, $envVars, $game_key
 	   ) = @_;
 	   
-	# Replace any {OGP_HOME_DIR} in the $start_cmd with the server's home directory path
-	$startup_cmd = replace_OGP_Env_Vars($home_id, $home_path, $startup_cmd);
-	   
 	if (is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) == 1)
 	{
 		logger "This server is already running (ID: $home_id).";
@@ -690,7 +714,7 @@ sub universal_start_without_decrypt
 		my @prestartenvvars = split /[\r\n]+/, $envVars;
 		my $envVarStr = "";
 		foreach my $line (@prestartenvvars) {
-			$line = replace_OGP_Env_Vars($home_id, $home_path, $line);
+			$line = replace_OGP_Env_Vars("", $home_id, $home_path, $line);
 			if($line ne ""){
 				logger "Configuring environment variable: $line";
 				$envVarStr .= "$line\r\n";
@@ -705,6 +729,9 @@ sub universal_start_without_decrypt
 	}
 
 	my $screen_id = create_screen_id(SCREEN_TYPE_HOME, $home_id);
+	
+	# Replace any OGP variables
+	$startup_cmd = replace_OGP_Env_Vars($screen_id, $home_id, $home_path, $startup_cmd, $game_key);
 
 	# Create affinity and priority strings
 	my $priority;
@@ -1027,6 +1054,8 @@ sub stop_server_without_decrypt
 	my ($home_id, $server_ip, $server_port, $control_protocol,
 		$control_password, $control_type, $home_path) = @_;
 		
+	my $usedProtocolToStop = 0;
+		
 	my $startup_file = Path::Class::File->new(GAME_STARTUP_DIR, "$server_ip-$server_port");
 	
 	if (-e $startup_file)
@@ -1076,6 +1105,7 @@ sub stop_server_without_decrypt
 
 			my $rconCommand = "quit";
 			$rcon->execute($rconCommand);
+			$usedProtocolToStop = 1;
 		}
 		elsif ($control_protocol eq "rcon2")
 		{
@@ -1089,6 +1119,24 @@ sub stop_server_without_decrypt
 
 			my $rconCommand = "quit";
 			$rcon2->run($rconCommand);
+			$usedProtocolToStop = 1;
+		}
+		elsif ($control_protocol eq "armabe")
+		{
+			use ArmaBE::ArmaBE;
+			my $armabe = new ArmaBE(
+								  hostname => $server_ip,
+								  port	 => $server_port, # Uses server port for now (Arma 2), Arma 3 BE uses a different, user definable port
+								  password => $control_password,
+								  timeout  => 2
+								 );
+
+			my $rconCommand = "#shutdown";
+			my $armabe_result = $armabe->run($rconCommand);
+			if ($armabe_result) {
+				logger "ArmaBE Shutdown command sent successfully";
+				$usedProtocolToStop = 1;
+			}
 		}
 		system('screen -wipe > /dev/null 2>&1');
 	}
@@ -1099,6 +1147,28 @@ sub stop_server_without_decrypt
 		system("cmd /C taskkill /f /fi 'PID eq $screen_pid' /T");
 		system('screen -wipe > /dev/null 2>&1');
 	}
+		
+	# Gives the server time to shutdown with rcon in case it takes a while for the server to shutdown (arma for example) before we forcefully kill it
+	if ($usedProtocolToStop == 1){
+		my $serverIsRunning = (is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) == 1);
+		my $timeWaited = 0;
+		my $maxWaitTime = 5;
+			
+		# Maximum time to wait can now be configured as a preference
+		if(defined($Cfg::Preferences{protocol_shutdown_waittime}) && $Cfg::Preferences{protocol_shutdown_waittime} =~ /^\d+?$/){
+			$maxWaitTime = $Cfg::Preferences{protocol_shutdown_waittime};
+		}
+		
+		while ($serverIsRunning && $timeWaited < $maxWaitTime) {
+			select(undef, undef, undef, 0.25); # Sleeps for 250ms
+			
+			# Add to time waited
+			$timeWaited += 0.25;
+			
+			# Recheck if server is running
+			$serverIsRunning = (is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) == 1);
+		}
+	}
 	
 	if (is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) == 1)
 	{
@@ -1164,24 +1234,37 @@ sub send_rcon_command
 			my $encoded_content = encode_list(@modedlines);
 			return "1;" . $encoded_content;
 		}
-		else
-		{		
-			if ($control_protocol eq "rcon2")
-			{
-				use KKrcon::HL2;
-				my $rcon2 = new HL2(
-									  hostname => $server_ip,
-									  port	 => $server_port,
-									  password => $control_password,
-									  timeout  => 2
-									 );
-				
-				logger "Sending RCON command to $server_ip:$server_port: \n $rconCommand \n  .";
-						
-				my(@modedlines) = $rcon2->run($rconCommand);
-				my $encoded_content = encode_list(@modedlines);
-				return "1;" . $encoded_content;
-			}
+		elsif ($control_protocol eq "rcon2")
+		{
+			use KKrcon::HL2;
+			my $rcon2 = new HL2(
+								  hostname => $server_ip,
+								  port	 => $server_port,
+								  password => $control_password,
+								  timeout  => 2
+								 );
+			
+			logger "Sending RCON command to $server_ip:$server_port: \n $rconCommand \n  .";
+					
+			my(@modedlines) = $rcon2->run($rconCommand);
+			my $encoded_content = encode_list(@modedlines);
+			return "1;" . $encoded_content;
+		}
+		elsif ($control_protocol eq "armabe")
+		{
+			use ArmaBE::ArmaBE;
+			my $armabe = new ArmaBE(
+								  hostname => $server_ip,
+								  port	 => $server_port, # Uses server port for now (Arma 2), Arma 3 BE uses a different, user definable port
+								  password => $control_password,
+								  timeout  => 2
+								 );
+			
+			logger "Sending RCON command to $server_ip:$server_port: \n $rconCommand \n  .";
+					
+			my(@modedlines) = $armabe->run($rconCommand);
+			my $encoded_content = encode_list(@modedlines);
+			return "1;" . $encoded_content;
 		}
 	}
 	else
@@ -1546,7 +1629,7 @@ sub run_before_start_commands
 		if (defined $envVars && $envVars ne ""){
 			my @prestartenvvars = split /[\r\n]+/, $envVars;
 			foreach my $line (@prestartenvvars) {
-				$line = replace_OGP_Env_Vars($server_id, $homedir, $line);
+				$line = replace_OGP_Env_Vars("", $server_id, $homedir, $line);
 				if($line ne ""){
 					logger "Configuring environment variable: $line";
 					system($line);
@@ -1763,7 +1846,7 @@ sub steam_cmd
 ### @return 0 In error case.
 sub steam_cmd_without_decrypt
 {
-	my ($home_id, $home_path, $mod, $modname, $betaname, $betapwd, $user, $pass, $guard, $exec_folder_path, $exec_path, $precmd, $postcmd, $cfg_os) = @_;
+	my ($home_id, $home_path, $mod, $modname, $betaname, $betapwd, $user, $pass, $guard, $exec_folder_path, $exec_path, $precmd, $postcmd, $cfg_os, $filesToLockUnlock, $arch_bits) = @_;
 	
 	# Creates home path if it doesn't exist
 	if ( check_b4_chdir($home_path) != 0)
@@ -1789,6 +1872,12 @@ sub steam_cmd_without_decrypt
 	open  FILE, '>', $installtxt;
 	print FILE "\@ShutdownOnFailedCommand 1\n";
 	print FILE "\@NoPromptForPassword 1\n";
+	
+	# Handle requested SteamCMD architecture
+	if(defined $arch_bits && $arch_bits ne ""){
+		print FILE "\@sSteamCmdForcePlatformBitness " . $arch_bits . "\n";
+	}
+	
 	if($guard ne '')
 	{
 		print FILE "set_steam_guard_code $guard\n";
@@ -1911,7 +2000,7 @@ sub automatic_steam_update
 	my ($home_id, $game_home, $server_ip, $server_port, $exec_path, $exec_folder_path,
 		$control_protocol, $control_password, $control_type,
 		$appId, $modname, $betaname, $betapwd, $user, $pass, $guard, $precmd, $postcmd, $cfg_os, $filesToLockUnlock,
-		$startup_cmd, $cpu, $nice, $preStart, $envVars) = &decrypt_params(@_);
+		$startup_cmd, $cpu, $nice, $preStart, $envVars, $game_key, $arch_bits) = &decrypt_params(@_);
 
 	# Is the server currently running? if it is, we'll try to start it after updating.
 	my $isServerRunning = is_screen_running_without_decrypt(SCREEN_TYPE_HOME, $home_id) == 1 ? 1 : 0;
@@ -1937,7 +2026,7 @@ sub automatic_steam_update
 	}
 
 	# steam_cmd: Returns 0 if the update failed, in which case, don't try starting the server - because we may have an incomplete or corrupt installation.
-	if (steam_cmd_without_decrypt($home_id, $game_home, $appId, $modname, $betaname, $betapwd, $user, $pass, $guard, $exec_folder_path, $exec_path, $precmd, $postcmd, $cfg_os, $filesToLockUnlock) == 0)
+	if (steam_cmd_without_decrypt($home_id, $game_home, $appId, $modname, $betaname, $betapwd, $user, $pass, $guard, $exec_folder_path, $exec_path, $precmd, $postcmd, $cfg_os, $filesToLockUnlock, $arch_bits) == 0)
 	{
 		logger("Failed to start steam_cmd for server $home_id.");
 		return -8;
@@ -1952,7 +2041,7 @@ sub automatic_steam_update
 				if (is_screen_running_without_decrypt(SCREEN_TYPE_UPDATE, $home_id) == 0)
 				{
 
-					if (universal_start_without_decrypt($home_id, $game_home, $exec_path, $exec_folder_path, $startup_cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars) != 1)
+					if (universal_start_without_decrypt($home_id, $game_home, $exec_path, $exec_folder_path, $startup_cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key) != 1)
 					{
 						logger("Failed to start server $home_id after automatic update.");
 						return -7;
@@ -2344,14 +2433,14 @@ sub restart_server_without_decrypt
 {
 	my ($home_id, $server_ip, $server_port, $control_protocol,
 		$control_password, $control_type, $home_path, $server_exe, $run_dir,
-		$cmd, $cpu, $nice, $preStart, $envVars) = @_;
+		$cmd, $cpu, $nice, $preStart, $envVars, $game_key) = @_;
 
 	if (stop_server_without_decrypt($home_id, $server_ip, 
 									$server_port, $control_protocol,
 									$control_password, $control_type, $home_path) == 0)
 	{
 		if (universal_start_without_decrypt($home_id, $home_path, $server_exe, $run_dir,
-											$cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars) == 1)
+											$cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key) == 1)
 		{
 			return 1;
 		}
@@ -2449,7 +2538,7 @@ sub ftp_mgr
 					for (keys @users) {
 						if($users[$_]->{'Name'} eq $login)
 						{
-							splice($data->{'FileZillaServer'}->{'Users'}->{'User'},$_,1);
+							delete $data->{'FileZillaServer'}->{'Users'}->{'User'}[$_];
 							last;
 						}
 					}

OGP/php-query/lgsl/lgsl_protocol.php

@@ -25,14 +25,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"aarmy"			=> "Americas Army",
 		"aarmy3"		=> "Americas Army 3",
 		"arcasimracing"	=> "Arca Sim Racing",
-		"arkse"         => "Ark Survival Evolved",
+		"arkse"			=> "ARK: Survival Evolved",
 		"arma"			=> "ArmA: Armed Assault",
 		"arma2"			=> "ArmA 2",
 		"arma2oa"		=> "ArmA 2 Operation Arrowhead",
 		"arma2co"		=> "ArmA 2 Combined Operations",
 		"arma3"			=> "ArmA 3",
 		"arma3alpha"	=> "ArmA 3 Alpha",
-		"avorion"	=> "Avorion",
+		"avorion"		=> "Avorion",
 		"avp2"			=> "Aliens VS. Predator 2",
 		"avp2010"		=> "Aliens VS. Predator ( 2010 By Rebellion )",
 		"bfbc2"			=> "Battlefield Bad Company 2",
@@ -48,11 +48,12 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"callofduty4"	=> "Call Of Duty 4",
 		"callofdutymw2"	=> "Call of Duty Modern Warfare 2",
 		"cncrenegade"	=> "Command and Conquer: Renegade",
+		"conanexiles"	=> "Conan Exiles",
 		"crysis"		=> "Crysis",
 		"crysiswars"	=> "Crysis Wars",
 		"cs2d"			=> "Counter-Strike 2D",
 		"cube"			=> "Cube Engine",
-		"dayz_arma2co"	=> "Dayz ArmA 2 Combined Operations",
+		"dayzmod"          => "DayZ Mod",
 		"doomskulltag"	=> "Doom - Skulltag",
 		"doomzdaemon"	=> "Doom - ZDaemon",
 		"doom3"			=> "Doom 3",
@@ -108,9 +109,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"quake4"		=> "Quake 4",
 		"ravenshield"	=> "Raven Shield",
 		"redorchestra"	=> "Red Orchestra",
-		"redorchestra2" => "Red Orchestra 2 & Rising Storm",
+		"redorchestra2"	=> "Red Orchestra 2 & Rising Storm",
 		"rfactor"		=> "RFactor",
+		"risingstorm2"	=> "Rising Storm 2: Vietnam",
 		"ror"			=> "Rigs of Rods",
+		"rust"			=> "Rust",
 		"samp"			=> "San Andreas Multiplayer",
 		"savage"		=> "Savage",
 		"savage2"		=> "Savage 2",
@@ -162,7 +165,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"aarmy_"		=> "03",
 		"aarmy3"		=> "26",
 		"arcasimracing"	=> "16",
-		"arkse"         => "05",
+		"arkse"			=> "05",
 		"arma"			=> "09",
 		"arma2"			=> "06",
 		"arma2oa"		=> "06",
@@ -185,11 +188,12 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"callofduty4"	=> "02",
 		"callofdutymw2"	=> "02",
 		"cncrenegade"	=> "03",
+		"conanexiles"	=> "05",
 		"crysis"		=> "06",
 		"crysiswars"	=> "06",
 		"cs2d"			=> "29",
 		"cube"			=> "24",
-		"dayz_arma2co"	=> "06",
+		"dayzmod"  => "05",
 		"doomskulltag"	=> "27",
 		"doomzdaemon"	=> "28",
 		"doom3"			=> "10",
@@ -250,8 +254,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"quake4"		=> "10",
 		"ravenshield"	=> "04",
 		"redorchestra"	=> "13",
-		"redorchestra2" => "05",
+		"redorchestra2"	=> "05",
 		"rfactor"		=> "16",
+		"risingstorm2"	=> "05",
+		"ror"			=> "36",
+		"rust"			=> "05",
 		"samp"			=> "12",
 		"savage"		=> "17",
 		"savage2"		=> "18",
@@ -284,6 +291,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"ut2004"		=> "13",
 		"ut2004_"		=> "03",
 		"ut3"			=> "11",
+		"vbox"			=> "38",
 		"vcmp"			=> "12",
 		"vietcong"		=> "03",
 		"vietcong2"		=> "09",
@@ -305,14 +313,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"aarmy"			=> "qtracker://{IP}:{S_PORT}?game=ArmyOperations&action=show",
 		"aarmy3"		=> "qtracker://{IP}:{S_PORT}?game=AmericasArmy3&action=show",
 		"arcasimracing"	=> "http://en.wikipedia.org/wiki/ARCA_Sim_Racing",
-		"arkse"         => "steam://connect/{IP}:{S_PORT}",
+		"arkse"			=> "steam://connect/{IP}:{Q_PORT}",
 		"arma"			=> "qtracker://{IP}:{S_PORT}?game=ArmedAssault&action=show",
 		"arma2"			=> "http://en.wikipedia.org/wiki/ARMA_2",
 		"arma2oa"		=> "http://en.wikipedia.org/wiki/ARMA_2",
 		"arma2co"		=> "http://en.wikipedia.org/wiki/ARMA_2",
 		"arma3"			=> "steam://connect/{IP}:{S_PORT}",
 		"arma3alpha"	=> "http://en.wikipedia.org/wiki/ARMA_2",
-		"avorion" 	=> "steam://connect/{IP}:{S_PORT}",
+		"avorion"		=> "steam://connect/{IP}:{S_PORT}",
 		"avp2"			=> "qtracker://{IP}:{S_PORT}?game=AliensversusPredator2&action=show",
 		"avp2010"		=> "http://en.wikipedia.org/wiki/Aliens_vs._Predator_%28video_game%29",
 		"bfbc2"			=> "http://en.wikipedia.org/wiki/Battlefield_bad_company_2",
@@ -328,11 +336,12 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"callofduty4"	=> "qtracker://{IP}:{S_PORT}?game=CallOfDuty4&action=show",
 		"callofdutymw2"	=> "aiw://connect/{IP}:{S_PORT}",
 		"cncrenegade"	=> "qtracker://{IP}:{S_PORT}?game=CommandConquerRenegade&action=show",
+		"conanexiles"	=> "steam://connect/{IP}:{S_PORT}",
 		"crysis"		=> "qtracker://{IP}:{S_PORT}?game=Crysis&action=show",
 		"crysiswars"	=> "qtracker://{IP}:{S_PORT}?game=CrysisWars&action=show",
 		"cs2d"			=> "http://www.cs2d.com",
 		"cube"			=> "http://cubeengine.com",
-		"dayz_arma2co"	=> "http://en.wikipedia.org/wiki/ARMA_2",
+		"dayzmod"          => "steam://connect/{IP}:{S_PORT}",
 		"doomskulltag"	=> "http://skulltag.com",
 		"doomzdaemon"	=> "http://www.zdaemon.org",
 		"doom3"			=> "qtracker://{IP}:{S_PORT}?game=Doom3&action=show",
@@ -387,9 +396,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"quake4"		=> "qtracker://{IP}:{S_PORT}?game=Quake4&action=show",
 		"ravenshield"	=> "http://en.wikipedia.org/wiki/Tom_Clancy's_Rainbow_Six_3",
 		"redorchestra"	=> "steam://connect/{IP}:{C_PORT}",
-		"redorchestra2" => "steam://connect/{IP}:{S_PORT}",
+		"redorchestra2"	=> "steam://connect/{IP}:{S_PORT}",
 		"rfactor"		=> "rfactor://{IP}:{S_PORT}",
+		"risingstorm2"	=> "steam://connect/{IP}:{S_PORT}",
 		"ror"			=> "http://www.rigsofrods.com/servers/",
+		"rust"			=> "steam://connect/{IP}:{S_PORT}",
 		"samp"			=> "samp://{IP}:{C_PORT}",
 		"savage"		=> "http://en.wikipedia.org/wiki/Savage:_The_Battle_for_Newerth",
 		"savage2"		=> "http://en.wikipedia.org/wiki/Savage_2:_A_Tortured_Soul",
@@ -431,6 +442,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		// SOFTWARE PORT IS THE QUERY PORT UNLESS SET
 		if (!$s_port) { $s_port = $q_port; }
 
+		// Force the SimpleXMLElement into a plain string
+		$type = (string) $type;
+
 	   // TRY USING THE STANDARD LAUNCH LINK FOR ALTERNATE PROTOCOLS IF ONE IS NOT SET
 		$type = str_replace("_", "", $type);
 
@@ -449,16 +463,18 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "aarmy"			: $c_to_q = 1;		$c_def = 1716;	$q_def = 1717;	$c_to_s = 0;	break;
 			case "aarmy3"			: $c_to_q = 0;		$c_def = 8777;	$q_def = 39300;	$c_to_s = 0;	break;
 			case "arcasimracing"	: $c_to_q = -100;	$c_def = 34397;	$q_def = 34297;	$c_to_s = 0;	break;
-			case "arkse"			: $c_to_q = 0;		$c_def = 0;		$q_def = 0;		$c_to_s = 0;	break;
+			case "arkse"			: $c_to_q = 19238;	$c_def = 7777;	$q_def = 27015;	$c_to_s = 0;	break;
 			case "arma3"			: $c_to_q = 1; 		$c_def = 2302; 	$q_def = 2303; 	$c_to_s = 0; 	break;
-			case "avorion" 			: $c_to_q = 20; 	$c_def = 27000;	$q_def = 27020; $c_to_s = 0;  	break;
+			case "avorion"			: $c_to_q = 20; 	$c_def = 27000;	$q_def = 27020; $c_to_s = 0;  	break;
 			case "bfbc2"			: $c_to_q = 0;		$c_def = 19567;	$q_def = 48888;	$c_to_s = 0;	break;
 			case "bfvietnam"		: $c_to_q = 0;		$c_def = 15567;	$q_def = 23000;	$c_to_s = 0;	break;
 			case "bf1942"			: $c_to_q = 0;		$c_def = 14567;	$q_def = 23000;	$c_to_s = 0;	break;
 			case "bf2"				: $c_to_q = 13333;	$c_def = 16567;	$q_def = 29900;	$c_to_s = 0;	break;
 			case "bf3"				: $c_to_q = 22000;	$c_def = 25200;	$q_def = 47200;	$c_to_s = 0;	break;
 			case "bf2142"			: $c_to_q = 0;		$c_def = 17567;	$q_def = 29900;	$c_to_s = 0;	break;
+			case "conanexiles"		: $c_to_q = 2;		$c_def = 24000;	$q_def = 24002;	$c_to_s = 0;	break;
 			case "cube"				: $c_to_q = 1;		$c_def = 28785;	$q_def = 28786;	$c_to_s = 0;	break;
+			case "dayzmod"                     : $c_to_q = 1;	  	$c_def = 2302;  $q_def = 2303;  $c_to_s = 0;    break;
 			case "dh2005"			: $c_to_q = 0;		$c_def = 23459;	$q_def = 34567;	$c_to_s = 0;	break;
 			case "farcry"			: $c_to_q = 123;	$c_def = 49001;	$q_def = 49124;	$c_to_s = 0;	break;
 			case "flashpoint"		: $c_to_q = 1;		$c_def = 2302;	$q_def = 2303;	$c_to_s = 0;	break;
@@ -469,7 +485,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "hurtworld"		: $c_to_q = 10;		$c_def = 12871;	$q_def = 12881;	$c_to_s = 0;	break;
 			case "kingpin"			: $c_to_q = -10;	$c_def = 31510;	$q_def = 31500;	$c_to_s = 0;	break;
 			case "killingfloor"		: $c_to_q = 1;		$c_def = 7708;	$q_def = 7709;	$c_to_s = 0;	break;
-			case "killingfloor2"		: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
+			case "killingfloor2"	: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
 			case "lif"				: $c_to_q = 2;		$c_def = 28000; $q_def = 28002; $c_to_s = 0;	break;
 			case "modernwarfare3"	: $c_to_q = -1;		$c_def = 27015;	$q_def = 27014;	$c_to_s = 0;	break;
 			case "mohaa"			: $c_to_q = 97;		$c_def = 12203;	$q_def = 12300;	$c_to_s = 0;	break;
@@ -482,8 +498,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "painkiller"		: $c_to_q = 123;	$c_def = 3455;	$q_def = 3578;	$c_to_s = 0;	break;
 			case "ravenshield"		: $c_to_q = 1000;	$c_def = 7777;	$q_def = 8777;	$c_to_s = 0;	break;
 			case "redorchestra"		: $c_to_q = 1;		$c_def = 7758;	$q_def = 7759;	$c_to_s = 0;	break;
-			case "redorchestra2" 	: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
+			case "redorchestra2"	: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
 			case "rfactor"			: $c_to_q = -100;	$c_def = 34397;	$q_def = 34297;	$c_to_s = 0;	break;
+			case "risingstorm2"		: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
 			case "serioussam"		: $c_to_q = 1;		$c_def = 25600;	$q_def = 25601;	$c_to_s = 0;	break;
 			case "soldat"			: $c_to_q = 123;	$c_def = 23073;	$q_def = 23196;	$c_to_s = 0;	break;
 			case "stalker"			: $c_to_q = 2;		$c_def = 5447;	$q_def = 5445;	$c_to_s = 0;	break;
@@ -521,7 +538,6 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 	function lgsl_query_live($type, $ip, $c_port, $q_port, $s_port, $request)
 	{
 //---------------------------------------------------------+
-
 		if (preg_match("/[^0-9a-z\.\-\[\]\:]/i", $ip))
 		{
 			exit("LGSL PROBLEM: INVALID IP OR HOSTNAME");
@@ -1609,7 +1625,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			if (!empty($server['e']['gsgamename'])) { $server['s']['game'] = $server['e']['gsgamename']; } // FEAR
 			if (!empty($server['e']['game_id']))	{ $server['s']['game'] = $server['e']['game_id']; }	// BFVIETNAM
 
-			if ($server['b']['type'] == "arma" || $server['b']['type'] == "arma2" || $server['b']['type'] == "arma2oa" || $server['b']['type'] == "arma2co" || $server['b']['type'] == "dayz_arma2co")
+			if ($server['b']['type'] == "arma" || $server['b']['type'] == "arma2" || $server['b']['type'] == "arma2oa" || $server['b']['type'] == "arma2co" || $server['b']['type'] == "dayzmod")
 			{
 				$server['s']['map'] = $server['e']['mission'];
 			}

bin/ogp_agent

@@ -7,83 +7,114 @@
 #
 # The ogp_agent script should be at the top level of the agent tree
 # Make sure we are in that directory since the script assumes this is the case
+
+#####################
+#  Important VARS   #
+#####################
+
 AGENTDIR="/OGP"
 BASH_PREFS_CONF="$AGENTDIR/Cfg/bash_prefs.cfg"
-chmod -Rf 770 $AGENTDIR
-find $AGENTDIR -type f -print | xargs chmod ug=rw 
-if [ -d "$AGENTDIR/steamcmd" ]; then
-	find $AGENTDIR/steamcmd -iname \*.dll -exec chmod +x {} \;
-	find $AGENTDIR/steamcmd -iname \*.exe -exec chmod +x {} \;
-fi
-if [ -d "$AGENTDIR/screenlogs" ]; then
-	chmod -Rf ug=rwx $AGENTDIR/screenlogs
-fi
-chmod +x $AGENTDIR/ogp_agent.pl &> /dev/null
-chmod +x $AGENTDIR/agent_conf.sh &> /dev/null
-chmod +x /usr/bin/ogp_agent &> /dev/null
+REPONAME=OGP-Agent-Windows
+GitHubUsername="OpenGamePanel"
 
-# Should we perform an automatic update?
-if [ -e $BASH_PREFS_CONF ]
-then
-	source "$BASH_PREFS_CONF"
-	if [ "X$agent_auto_update" == "X1" ]
-	then
-		AUTO_UPDATE="yes"
+#####################
+#     FUNCTIONS     #
+#####################
+
+setupOGPAndReadBashPrefs(){
+
+	# Find CURL
+	if [ -z "$CURL" -o -z "$UNZIP" ]; then
+		checkDepends
 	fi
-	
-	if [ "X$run_pureftpd" == "X0" ]
-	then
-		RUN_PUREFTPD="no"
-	else
-		RUN_PUREFTPD="yes"
+
+	chmod -Rf 770 $AGENTDIR
+	find $AGENTDIR -type f -print | xargs chmod ug=rw 
+	if [ -d "$AGENTDIR/steamcmd" ]; then
+		find $AGENTDIR/steamcmd -iname \*.dll -exec chmod +x {} \;
+		find $AGENTDIR/steamcmd -iname \*.exe -exec chmod +x {} \;
 	fi
-	
-	if [ "X$ftp_ip" != "X" ]
-	then
-		FTP_IP="$ftp_ip"
-	else
-		FTP_IP="0.0.0.0"
+	if [ -d "$AGENTDIR/screenlogs" ]; then
+		chmod -Rf ug=rwx $AGENTDIR/screenlogs
 	fi
-	
-	if [ "X$ftp_port" != "X" ]
+	chmod +x $AGENTDIR/ogp_agent.pl &> /dev/null
+	chmod +x $AGENTDIR/agent_conf.sh &> /dev/null
+	chmod +x /usr/bin/ogp_agent &> /dev/null
+
+	# Should we perform an automatic update?
+	if [ -e $BASH_PREFS_CONF ]
 	then
-		FTP_PORT="$ftp_port"
+		source "$BASH_PREFS_CONF"
+		if [ "X$agent_auto_update" == "X1" ]
+		then
+			AUTO_UPDATE="yes"
+		fi
+		
+		if [ "X$run_pureftpd" == "X0" ]
+		then
+			RUN_PUREFTPD="no"
+		else
+			RUN_PUREFTPD="yes"
+		fi
+		
+		if [ "X$ftp_ip" != "X" ]
+		then
+			FTP_IP="$ftp_ip"
+		else
+			FTP_IP="0.0.0.0"
+		fi
+		
+		if [ "X$ftp_port" != "X" ]
+		then
+			FTP_PORT="$ftp_port"
+		else
+			FTP_PORT="21"
+		fi
+		
+		if [ "X$ftp_pasv_range" != "X" ]
+		then
+			FTP_PASV_STRING="-p $ftp_pasv_range"
+		else
+			FTP_PASV_STRING=""
+		fi
+		
+		# Use custom github update address
+		if [ ! -z "$github_update_username" ]; then
+			if [ -f "$CURL" -a -x "$CURL" ] && [ -f "$UNZIP" -a -x "$UNZIP" ]; then
+				REVISIONTest=`curl -Lks https://github.com/${github_update_username}/${REPONAME}/commits/master.atom | grep -Eo "([a-f0-9]{40})" | head -n 1`
+				if [ ! -z "$REVISIONTest" ]; then
+					GitHubUsername=${github_update_username}
+				fi
+			fi
+		fi
+		
 	else
+		AUTO_UPDATE="yes"
+		RUN_PUREFTPD="yes"
+		FTP_IP="0.0.0.0"
 		FTP_PORT="21"
+		FTP_PASV_STING=""
 	fi
-	
-	if [ "X$ftp_pasv_range" != "X" ]
-	then
-		FTP_PASV_STRING="-p $ftp_pasv_range"
-	else
-		FTP_PASV_STRING=""
-	fi
-else
-	AUTO_UPDATE="yes"
-	RUN_PUREFTPD="yes"
-	FTP_IP="0.0.0.0"
-	FTP_PORT="21"
-	FTP_PASV_STING=""
-fi
 
-if test `id -u` -eq 0; then
-	echo
-	echo
-	echo "************** WARNING ***************"
-	echo "Running the OGP agent as root  "
-	echo "is highly discouraged. It is generally"
-	echo "unnecessary to use root privileges to "
-	echo "execute the agent.         "
-	echo "**************************************"
-	echo
-	echo
-	timeout=10
-	while test $timeout -gt 0; do
-		echo -n "The agent will continue to launch in $timeout seconds\r"
-		timeout=`expr $timeout - 1`
-		sleep 1
-	done
-fi
+	if test `id -u` -eq 0; then
+		echo
+		echo
+		echo "************** WARNING ***************"
+		echo "Running the OGP agent as root  "
+		echo "is highly discouraged. It is generally"
+		echo "unnecessary to use root privileges to "
+		echo "execute the agent.         "
+		echo "**************************************"
+		echo
+		echo
+		timeout=10
+		while test $timeout -gt 0; do
+			echo -n "The agent will continue to launch in $timeout seconds\r"
+			timeout=`expr $timeout - 1`
+			sleep 1
+		done
+	fi
+}
 
 ogpGitCleanup(){
 	echo "Cleaning up..."
@@ -145,18 +176,14 @@ checkDepends() {
 update() {
 	# Run the git update
 	if test -n "$AUTO_UPDATE"; then
-		if [ -z "$CURL" -o -z "$UNZIP" ]; then
-			checkDepends
-		fi
 		if [ -f "$CURL" -a -x "$CURL" ] && [ -f "$UNZIP" -a -x "$UNZIP" ]; then
 			cd $AGENTDIR
 			if [ ! -d tmp ]; then
 				mkdir tmp
 			fi
 			cd tmp
-			REPONAME=OGP-Agent-Windows
-			REVISION=`curl -Lks https://github.com/OpenGamePanel/${REPONAME}/commits/master.atom | grep -Eo "([a-f0-9]{40})" | head -n 1`
-			curl -Os https://raw.githubusercontent.com/OpenGamePanel/${REPONAME}/${REVISION}/bin/ogp_agent
+			REVISION=`curl -Lks https://github.com/${GitHubUsername}/${REPONAME}/commits/master.atom | grep -Eo "([a-f0-9]{40})" | head -n 1`
+			curl -Os https://raw.githubusercontent.com/${GitHubUsername}/${REPONAME}/${REVISION}/bin/ogp_agent
 			currentOGPAgentRunContent=$(cat "./ogp_agent")
 			# Check to make sure ogp_agent downloaded successfully from GitHub before we attempt to replace it.
 			# This should fix random 404 people have been experiencing
@@ -178,7 +205,7 @@ update() {
 			if [ "$CURRENT" == "$REVISION" ]; then
 				echo "The agent is up to date."
 			else
-				URL=https://github.com/OpenGamePanel/${REPONAME}/archive/${REVISION}.zip
+				URL=https://github.com/${GitHubUsername}/${REPONAME}/archive/${REVISION}.zip
 				HEAD=$(curl -L -Os --head -w "%{http_code}" "$URL")
 				if [ "$HEAD" == "200" ]; then
 					echo "Updating agent using curl."
@@ -282,6 +309,10 @@ quit() {
 	kill -2 $$
 }
 
+#####################
+#   MAIN APP CODE   #
+#####################
+
 PATH=/usr/local/bin:/usr/bin:${PATH}
 
 # Start PureFTPD if OGP has been configured to manage FTP users
@@ -289,6 +320,9 @@ if [ ! -z "$RUN_PUREFTPD" ] && [ "$RUN_PUREFTPD" == "yes" ]; then
 	/usr/sbin/pure-ftpd.exe -S ${FTP_IP},${FTP_PORT} ${FTP_PASV_STRING} -lpuredb:/etc/pureftpd.pdb -g /var/run/pure-ftpd.pid &
 fi
 
+# Setup OGP and Read Preferences
+setupOGPAndReadBashPrefs
+
 # Initialise
 init $*