diff --git a/config.pl b/config.pl deleted file mode 100755 index 3f565d336b..0000000000 --- a/config.pl +++ /dev/null @@ -1,538 +0,0 @@ -#!/usr/bin/perl -# config script by lighta -#TODO list : -#- don't always override import/file, sed grep ? - -use CPAN; -use strict; -use constant { - SERV_UID => "Serv_userid", - SERV_PW => "Serv_userpass", - SERV_WAN_IP => "Serv_wan_ip", - MAP_PORT => "Map_port", - CHAR_PORT => "Char_port", - LOGIN_PORT => "Login_port", - MD5_ENABLE => "enable_MD5", - SQL_HOST => "SQL_host", - SQL_PORT => "SQL_port", - SQL_UID => "SQL_userid", - SQL_PW => "SQL_userpass", - SQL_MAIN_DB => "SQL_maindb", - SQL_LOG_DB => ,"SQL_logdb", - - MAP_CONF_FILE => "map_conf.txt", - CHAR_CONF_FILE => "char_conf.txt", - LOGIN_CONF_FILE => "login_conf.txt", - INTER_CONF_FILE => "inter_conf.txt", - DESD_CONF_FILE => ".tmp-desd_conf.yml", - MIN_PORT => 2000, #below are usually reserved for system - MAX_PORT => 65535, -}; -BEGIN { #check and install module - my @aCheckModule = ("DBI","DBD::mysql","YAML::XS","Cwd","Getopt::Long","Net::Ping"); - my @aMarkInst = (); - foreach(@aCheckModule) { eval "require $_" or push(@aMarkInst,$_); } - CPAN::install("@aMarkInst") if(@aMarkInst > 0); - foreach(@aCheckModule) { $_->import(); } -} -# setup my defaults option -my $sDsdFile = DESD_CONF_FILE; -my $sAutoyes = 0; -my $sForce = 0; -my $sClean = 0; -my $sTarget = "All"; -my $sHelp = 0; -GetArgs(); -Main(); - -sub GetArgs { - GetOptions( - 'f=s' => \$sDsdFile, #give desired conf file - 'auto=i' => \$sAutoyes, #Force (auto-yes) - 'C=i' => \$sClean, #Clean (like force but remove before adding) - 'target=s' => \$sTarget, #Target (wich setup to run) - 'Force=i' => \$sForce, #Force (bypass verification) - 'help!' => \$sHelp, - ) or $sHelp=1; #display help if invalid option - my $sValidTarget = "All|Conf|DB|Inst"; - - if( $sHelp ) { - print "Incorect option specified, available option are:\n" - ."\t --f filename => file (specify desiredconf to use)\n" - ."\t --auto => auto-yes to question ? \n" - ."\t --C => Clean (remove file, db, user before adding new)\n" - ."\t --target => target (specify wich setup to run [$sValidTarget])\n" - ."\t --Force => Force (bypass verification)\n"; - exit; - } - unless($sTarget =~ /$sValidTarget/){ - print "Incorect target specified, available target are:\n" - ."\t --target => target (specify wich setup to run [(default)$sValidTarget])\n"; - exit; - } - if($sDsdFile ne DESD_CONF_FILE && !(-e -r $sDsdFile)){ - print "Incorect file specified: '$sDsdFile'\n" - ."\t this file doesn't seem to appear on filesystem or unable to read\n"; - exit; - } -} - -sub Main { - print "Welcome to athena config-tool\n"; - #default conf - my %hDefConf = ( SERV_UID => "s1", - SERV_PW => "p1", - SERV_WAN_IP => "localhost", - MAP_PORT => "5121", - CHAR_PORT => "6121", - LOGIN_PORT => "6900", - MD5_ENABLE => "yes", - SQL_HOST => "localhost", - SQL_PORT => "3306", - SQL_UID => "ragnarok", - SQL_PW => "ragnarok", - SQL_MAIN_DB => "ragnarok", - SQL_LOG_DB => ,"ragnarok", - ); - - my $sBasedir = getcwd; #for setupdb - if($sTarget =~ /All|Inst/){ InstallSoft(); } - if($sTarget =~ /All|Conf/) { ConfigConf(\%hDefConf); chdir "$sBasedir"; } - if($sTarget =~ /All|DB/) { ConfigDB(\%hDefConf); chdir "$sBasedir"; } - print "Config done, you should be able to launch and connect server now\n"; - print "NB : Don't forget to update your client clieninfo.xml to match change\n"; -} - -sub InstallSoft { - print "\n Starting InstallSoft \n"; - print "This autoinstall feature is experimental, package name varies from distri and version, couldn't support them all\n"; - #yes we could $^0 or uname -r but $^0 only give perl binary build OS and uname hmm... - my @aSupportedOS = ("Debian","Ubuntu","Fedora","CentOs"); - my $sOSregex = join("|",@aSupportedOS); - my $sOS; - until($sOS =~ /$sOSregex/i){ - print "Please enter your OS:[$sOSregex] or enter 'quit' to exit\n"; - $sOS = <>; chomp($sOS); - last if($sOS eq "quit"); - } - if($sOS eq "quit"){ print "Skipping Software installation\n"; return; } - elsif($sOS =~ /Ubuntu|Debian/i) { #tested on ubuntu 12.10 - my @aListSoft = ("gcc","gdb","zlibc","zlib1g-dev","make","subversion","mysql-client","mysql-server","mysql-common","libmysqlclient-dev","phpmyadmin","libpcre3-dev"); - print "Going to install: @aListSoft\n"; - system("sudo apt-get install @aListSoft"); - } - elsif($sOS =~ /Fedora|CentOs/i){ #tested on fedora 18 - my @aListSoft = ("gcc","gdb","zlib","zlib-devel","make","subversion","mysql-server","phpmyadmin","pcre-devel"); - system("sudo yum install @aListSoft"); - } -} - -sub ConfigConf { my ($rhDefConf) = @_; - print "\n Starting ConfigConf \n"; - my $rhUserConf; - while(1) { - $rhUserConf = GetDesiredConf($rhDefConf); - print "SetupConf using conf : \n"; - ShowConfig($rhUserConf); - last if($sForce || AutoCheckConf($rhUserConf)); - } - ApplySetupConf($rhUserConf); -} - -sub ConfigDB { my ($rhDefConf) = @_; - print "\n Starting ConfigDB \n"; - my $rhUserConf; - while(1) { - $rhUserConf = GetDesiredConf($rhDefConf); - print "SetupDb using conf : \n"; - ShowConfig($rhUserConf); - last if($sForce || AutoCheckConf($rhUserConf)); - } - ApplySetupDB($rhUserConf); -} - -#conf function -sub ApplySetupConf { my ($rhConfig) = @_; - print "\nApplying conf \n"; - my @aTargetfile = (MAP_CONF_FILE,CHAR_CONF_FILE,LOGIN_CONF_FILE,INTER_CONF_FILE); - my $sConfDir = "conf"; - my $sUserConfDir = "import"; - - die "$sConfDir doesn't seem to exist or coudldn't be read/writte" unless(-d -r -w "../$sConfDir"); - chdir "../$sConfDir"; - print "Saving tmp user-conf \n"; - YAML::XS::DumpFile(DESD_CONF_FILE,$rhConfig); - unless(-d "$sUserConfDir") { - print "conf/import directory doesn't exist, create it ? [y/n] (will be generated by compilation otherwise) \n"; - if(GetValidAnwser("y|o|n") =~ /n/i) { die "Couldn't apply conf without import folder\n"; } - mkdir "$sUserConfDir"; - } - chdir $sUserConfDir; - - if($sClean){ unlink @aTargetfile; } #deleting file before applying conf if clean - opendir(DIR, ".") or die $!; - my @aDirfile = grep { /\.txt/ && -f "$_" } readdir(DIR); - close DIR; - print "Current file in directory = [@aDirfile] target = [@aTargetfile] \n"; - - foreach my $sCurfile(@aTargetfile) { - print "Checking if target file: [$sCurfile] exist ? "; - if(-e -r $sCurfile) { - print "Yes\n"; - print "$sCurfile seem to exist, overwritte it [y/n] ?\n"; - if(GetValidAnwser("y|o|n") =~ /n/i) { - print "Only overwritte option supported atm skip file\n\n"; - next; - } - } - else { print "No\n" }; - - print "\t Writting file $sCurfile \n"; - if($sCurfile eq MAP_CONF_FILE) { ApplyMapConf($rhConfig,$sCurfile); } - elsif($sCurfile eq CHAR_CONF_FILE) { ApplyCharConf($rhConfig,$sCurfile); } - elsif($sCurfile eq LOGIN_CONF_FILE) { ApplyLoginConf($rhConfig,$sCurfile); } - elsif($sCurfile eq INTER_CONF_FILE) { ApplyInterConf($rhConfig,$sCurfile); } - } -} - -sub ApplyMapConf { my ($rhUserConf,$sCurfile) = @_; - open FILE, "> $sCurfile" || die "couldn't openfile/create $sCurfile \n"; - print FILE "userid: " . $$rhUserConf{SERV_UID}."\n"; - print FILE "passwd: " . $$rhUserConf{SERV_PW}."\n\n"; - - print FILE "map_ip: " . $$rhUserConf{SERV_WAN_IP}."\n"; - print FILE "map_port: " . $$rhUserConf{MAP_PORT}."\n"; - print FILE "char_port: " . $$rhUserConf{CHAR_PORT}."\n"; -} - -sub ApplyCharConf { my ($rhUserConf,$sCurfile) = @_; - open FILE, "> $sCurfile" || die "couldn't openfile $sCurfile \n"; - print FILE "userid: " . $$rhUserConf{SERV_UID}."\n"; - print FILE "passwd: " . $$rhUserConf{SERV_PW}."\n\n"; - - print FILE "char_ip: " . $$rhUserConf{SERV_WAN_IP}."\n"; - print FILE "char_port: " . $$rhUserConf{CHAR_PORT}."\n"; - print FILE "login_port: " . $$rhUserConf{LOGIN_PORT}."\n"; -} - -sub ApplyLoginConf { my ($rhUserConf,$sCurfile) = @_; - open FILE, "> $sCurfile" || die "couldn't openfile $sCurfile \n"; - print FILE "login_port: " . $$rhUserConf{LOGIN_PORT}."\n"; - print FILE "use_MD5_passwords: " . $$rhUserConf{MD5_ENABLE}."\n"; -} - -sub ApplyInterConf { my ($rhUserConf,$sCurfile) = @_; - open FILE, "> $sCurfile" || die "couldn't openfile $sCurfile \n"; - - print FILE "sql.db_hostname: " . $$rhUserConf{SQL_HOST}."\n"; - print FILE "sql.db_port: " . $$rhUserConf{SQL_PORT}."\n"; - print FILE "sql.db_username: " . $$rhUserConf{SQL_UID}."\n"; - print FILE "sql.db_password: " . $$rhUserConf{SQL_PW}."\n"; - print FILE "sql.db_database: " . $$rhUserConf{SQL_MAIN_DB}."\n\n"; - - print FILE "char_server_ip: " . $$rhUserConf{SQL_HOST}."\n"; - print FILE "char_server_port: " . $$rhUserConf{SQL_PORT}."\n"; - print FILE "char_server_id: " . $$rhUserConf{SQL_UID}."\n"; - print FILE "char_server_pw: " . $$rhUserConf{SQL_PW}."\n"; - print FILE "char_server_db: " . $$rhUserConf{SQL_MAIN_DB}."\n\n"; - - print FILE "sql.map_server_ip: " . $$rhUserConf{SQL_HOST}."\n"; - print FILE "sql.map_server_port: " . $$rhUserConf{SQL_PORT}."\n"; - print FILE "map_server_id: " . $$rhUserConf{SQL_UID}."\n"; - print FILE "map_server_pw: " . $$rhUserConf{SQL_PW}."\n"; - print FILE "map_server_db: " . $$rhUserConf{SQL_MAIN_DB}."\n\n"; - - #todo may we want 2 schema ?? - print FILE "log_db_ip: " . $$rhUserConf{SQL_HOST} ."\n"; - print FILE "log_db_port: " . $$rhUserConf{SQL_PORT}."\n"; - print FILE "log_db_id: " . $$rhUserConf{SQL_UID}."\n"; - print FILE "log_db_pw: " . $$rhUserConf{SQL_PW}."\n"; - print FILE "log_db_db: " . $$rhUserConf{SQL_LOG_DB}."\n\n"; -} - -sub AutoCheckConf { my ($rhConfig) = @_; - print "\n AutoCheckConf, \n you can use option --force=1 to bypass this \n"; - foreach my $sKeys (keys %$rhConfig){ - my $sVal = $$rhConfig{$sKeys}; - if($sKeys =~ /PORT/) { #chek if valid port - if(($sValMAX_PORT)) { - warn "Invalid port specified for $sKeys => $sVal, must be in [".MIN_PORT.":".MAX_PORT."]\n"; - return 0; - } - elsif(!($sKeys =~ /SQL/) && CheckUsedPort($sVal)) { #skip SQL service - warn "Port:$sVal seem to be already in use by system \n"; - return 0; - } - elsif(CheckDupPort($rhConfig,$sKeys)) { - warn "Port:$sVal seem to be already used by other key in config \n"; - return 0; - } - } - elsif($sKeys =~ /IP|HOST/){ #chek if ip valid, can we reach it ? trough SYN ACK - my $p = Net::Ping->new("syn"); - my $sTest = $p->ping($sVal); - $p->close(); - unless($sTest) { - print "Invalide IP/Host, ping couldn't reach $sKeys => $sVal \n NB : ICMP may just be unallowed\n"; - return 0; - } - } - } - return 1; -} - -sub CheckDupPort { my ($rhConfig,$sChkKeys) = @_; - my $sChkport = $$rhConfig{$sChkKeys}; - foreach my $sKeys (keys %$rhConfig){ - next if($sKeys eq $sChkKeys); #skip ourself - my $sVal = $$rhConfig{$sKeys}; - return 1 if($sChkport eq $sVal); - } - return 0; -} -sub CheckUsedPort { my($sPort) = @_; - open PIPE,"netstat -nat |" or die $!; - my @line = grep { /$sPort/ } ; - return scalar(@line); -} - -#Db function -sub ApplySetupDB { my($rhConfig) = @_; - my $sDbH; #db handle - my $sHost = $$rhConfig{SQL_HOST}; - my $sPort = $$rhConfig{SQL_PORT}; - my $sDsn = "dbi:mysql::$sHost:$sPort"; #don't try to auto connect to db - $$rhConfig{"Dsn"} = $sDsn; - - $sDbH = RootCo($rhConfig); - CreateDB($sDbH,$rhConfig); #create db if not exist - $sDbH = CreateUser($sDbH,$rhConfig); #loged as user now - LoadSqlFile($sDbH,$rhConfig); #Load .sql file into db - CreateServUser($sDbH,$rhConfig); - print "SetupDb done \n"; -} - -sub RootCo { my($rhConfig) = @_; - print "\n Entering RootCo \n"; - my $sDbH; - my $sDsn = $$rhConfig{"Dsn"}; #mysql server dest - my $sUser = $$rhConfig{SQL_UID}; #verify desired user - print "My dsn = $sDsn \n"; - if($sUser eq "root"){ - my $sPw = $$rhConfig{SQL_PW}; - $sDbH = DBI->connect($sDsn, "root", $sPw); - unless($sDbH) { warn "Your root password doesn't seem valid for mysql, your desired-conf is wrong \n"; } - } - while($sDbH == 0) { #if can't use user to connect user root - print "Please inser DB root passeword (this won't be saved in any configuration file, needed to create dbs and user)\n"; - my $sRPw = <>; chop($sRPw); - $sDbH = DBI->connect($sDsn, "root", $sRPw); - } - - return $sDbH; -} - -sub CreateDB { my($sDbH,$rhConfig) = @_; - print "\n Entering CreateDB \n"; - my $sDBn = $$rhConfig{SQL_MAIN_DB}; - my $sLogDBn = $$rhConfig{SQL_LOG_DB}; - my @aQuery = ("create database IF NOT EXISTS $sDBn;","create database IF NOT EXISTS $sLogDBn;"); - if($sClean){ #deleting database if clean - unshift(@aQuery,"drop database IF EXISTS $sDBn;"); - unshift(@aQuery,"drop database IF EXISTS $sLogDBn;"); - } - else { - my $sRes = $sDbH->selectcol_arrayref('show databases'); - foreach my $db (@$sRes){ #relevant later for import - if($db eq "$sDBn") { ValidateDBMerge($db); } #may exit here - elsif ($db eq "$sLogDBn") { ValidateDBMerge($db); } #may exit here - } - } - ExeQuery($sDbH,@aQuery); -} - -sub ValidateDBMerge { my($sDBn) = @_; - warn "Database: '$sDBn' seem to already exist exiting\n"; - warn "Continue will load data in existing db would you like to continue ? [y/n] \n"; - if(GetValidAnwser("y|o|n") =~ /n/i) { - print "Exiting setup, please either setup with another dbname or manually\n"; - exit; - } -} - -sub CreateUser { my($sDbH,$rhConfig) = @_; - print "\n Entering CreateUser \n"; - my $sDsn = $$rhConfig{"Dsn"}; - print "My dsn = $sDsn \n"; - my $sHost = $$rhConfig{SQL_HOST}; - my $sPw = $$rhConfig{SQL_PW}; - my $sUser = $$rhConfig{SQL_UID}; - my $sDBn = $$rhConfig{SQL_MAIN_DB}; - my $sLogDBn = $$rhConfig{SQL_LOG_DB}; - - my @aQuery= ("GRANT ALL PRIVILEGES ON $sDBn.* TO $sUser\@'$sHost' IDENTIFIED BY '$sPw' WITH GRANT OPTION", #maindb - "GRANT ALL PRIVILEGES ON $sLogDBn.* TO $sUser\@'$sHost' IDENTIFIED BY '$sPw' WITH GRANT OPTION"); #logdb - my $sUserDbh = DBI->connect($sDsn, $sUser, $sPw, {"PrintError" => 0}); #try connect with user - - if($sUserDbh && !$sClean) { - print "User : $sUser seem to already exist, skipping creation\n" - ."NB please check if you have correct privilege set for db: $sDBn \n"; - } - else { #create user only if not exist (or mode clean) - if($sClean && $sUser ne "root"){ unshift(@aQuery,"DELETE FROM mysql.user WHERE User = '$sUser';"); } - print "Creating user $sUser for dbs : $sDBn and $sLogDBn on $sHost \n"; - ExeQuery($sDbH,@aQuery); - $sUserDbh = DBI->connect($sDsn, $sUser, $sPw); - } - return $sUserDbh; #drop old co and connect with user now -} - -sub LoadSqlFile { my($sDbH,$rhConfig) = @_; - print "\n Entering LoadSqlFile \n"; - my $sDBn = $$rhConfig{SQL_MAIN_DB}; - my $sLogDBn = $$rhConfig{SQL_LOG_DB}; - - my $sSqldir = "sql-files"; - my @aMainFiles = ("main.sql"); #add other file to load for main db here - my @aLogFiles = ("logs.sql"); #add other file to load for log db here - - die "$sSqldir doesn't seem to exist or coudldn't be read" unless(-d -r "../$sSqldir"); - chdir "../$sSqldir"; - print "Checking if target files exist :\n\tMain: [@aMainFiles]\n\tLog: [@aLogFiles]\n"; - - CheckAndLoad(\@aMainFiles,$rhConfig,$sDBn); - CheckAndLoad(\@aLogFiles,$rhConfig,$sLogDBn); - -# my $raMainQuerys = CheckAndAddQuery(\@aMainFiles,$rhConfig); -# my $raLogQuerys = CheckAndAddQuery(\@aLogFiles,$rhConfig); -# ExeQuery($sDbH,"use $sDBn;",@$raMainQuerys,"use $sLogDBn;", @$raLogQuerys); -} - -sub CheckAndLoad { my ($raFiles,$rhConfig,$sDBn) = @_; - my $sHost = $$rhConfig{SQL_HOST}; - my $sPw = $$rhConfig{SQL_PW}; - my $sUser = $$rhConfig{SQL_UID}; - - foreach(@$raFiles) { - unless(-f -r $_){ - print "File : $_ doesn't seem to exist or was unreadable skipped\n"; - next; - } - my $sFileFullPath = Cwd::abs_path($_); - system("mysql -u $sUser --password=$sPw -h $sHost $sDBn < $sFileFullPath"); - } -} - -# query failure atm (shitty perl) -#sub CheckAndAddQuery { my ($raFiles) = @_; -# my @aQuery = (); -# foreach(@$raFiles) { -# unless(-f -r $_){ -# print "File : $_ doesn't seem to exist or was unreadable skipped\n"; -# next; -# } -# my $sFileFullPath = Cwd::abs_path($_); -# my $sInfileQuery = "source $sFileFullPath"; -# #my $sInfileQuery = "\\. $sFileFullPath;"; -# push(@aQuery,$sInfileQuery); -# -# } -# return \@aQuery; -#} - -sub CreateServUser { my($sDbH,$rhConfig) = @_; - my $sUid = $$rhConfig{SERV_UID}; - my $sUpw = $$rhConfig{SERV_PW}; - my $sMD5 = $$rhConfig{MD5_ENABLE}; - my $sDBn = $$rhConfig{SQL_MAIN_DB}; - my @aQuery = ("use $sDBn;","DELETE FROM login WHERE sex='S';"); - if($sMD5){ push(@aQuery,"INSERT INTO login(account_id, userid, user_pass, sex) values(1,'$sUid',MD5('$sUpw'),'S');"); } - else { push(@aQuery,"INSERT INTO login(account_id, userid, user_pass, sex) values(1,'$sUid','$sUpw','S');"); } - ExeQuery($sDbH,@aQuery); -} - -sub ExeQuery { my $sDbH = shift; - my @aQuery = @_; - print "my querys are = [ @aQuery ]\n"; - foreach(@aQuery) { - unless($sDbH->do($_)){ print "Failed to execute query : $_ => $DBI::errstr \n"; } - } -} - -#Common -sub GetValidateConf { my($rhConfig) = @_; - my $rhUserConf; - while (1) { - $rhUserConf = GetUserConf($rhConfig); - print "\n Please Check desired conf \n"; - ShowConfig($rhUserConf); - print "Would you like to apply those setting ? [y/n] "; - last if(GetValidAnwser("y|o|n") =~ /y|o/i); - print "\n Restarting configuration sequence \n"; - } - return $rhUserConf; -} - -sub GetUserConf { my ($rhDefConf) = @_; - my %hConf; - my @sortedkeys = sort keys (%$rhDefConf); - foreach my $sKey (@sortedkeys){ - my $sVal = $$rhDefConf{$sKey}; - print "$sKey : [$sVal] "; - my $sAnwser = <>; chop($sAnwser); - $hConf{"$sKey"} = $sAnwser || $sVal; - } - return \%hConf; -} - -sub ShowConfig { my ($rhUserConf) = @_; - my @sortedkeys = sort keys (%$rhUserConf); - foreach my $sKey (@sortedkeys){ - my $sVal = $$rhUserConf{$sKey}; - if(ref($sVal) eq 'ARRAY') { print " $sKey => [@$sVal] \n";} - else { print " $sKey => [$sVal] \n"; } - } -} - -sub GetValidAnwser { my($sOptReg) = @_; - my $sAnwser = ""; - if($sAutoyes) { $sAnwser="y"; print "\n"; } - else { - while(!($sAnwser =~ /$sOptReg/i)) { - $sAnwser = <>; chop($sAnwser); - print "Please enter a valid option : $sOptReg " unless($sAnwser =~ /$sOptReg/i); - } - } - return $sAnwser; -} - -sub GetDesiredConf { my ($rhDefConf) = @_; - print "Please enter desired confiration\n"; - my $rhUserConf; - my $sDesdConfFile = $sDsdFile; - #if default search in conf otherwise get specified name with cwd - if($sDsdFile eq DESD_CONF_FILE) { $sDesdConfFile = "../conf/".$sDsdFile; } - - print "Checking if there an Desiredconf file \n"; - if(-e -r $sDesdConfFile) { - print "Found Desiredconf \n"; - $rhUserConf = YAML::XS::LoadFile($sDesdConfFile); - if(!($rhUserConf)){ - print "Desiredconf seem invalid or empty, please check file and relaunch setup or entry Config\n"; - $rhUserConf=GetValidateConf($rhDefConf); - } - else { - ShowConfig($rhUserConf); - print "Would you like to apply those setting ? [y/n] "; - if(GetValidAnwser("y|o|n") =~ /n/i) { #no take user entry - print "DesiredConf not applyed, please enter config\n"; - $rhUserConf=GetValidateConf($rhDefConf); - } - } - } - else { #no files take user entry - print "No Desiredconf found, please enter config \n"; - $rhUserConf=GetValidateConf($rhDefConf); - } - return $rhUserConf; -} diff --git a/src/map/guild.c b/src/map/guild.c index ab52b5ae9d..47a6b7917f 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -694,7 +694,7 @@ int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag) if( tsd ) clif_guild_inviteack(tsd,3); return 0; } - sd->guild = g; + guild_makemember(&m,sd); intif_guild_addmember(guild_id, &m); //TODO: send a minimap update to this player @@ -747,7 +747,7 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag) return 0; if(sd==NULL || sd->guild_invite==0){ - // cancel if player not present or invalide guild_id invitation + // cancel if player not present or invalide guild_id invitation if (flag == 0) { ShowError("guild: member added error %d is not online\n",account_id); intif_guild_leave(guild_id,account_id,char_id,0,"** Data Error **"); @@ -758,15 +758,16 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag) sd->guild_invite = 0; sd->guild_invite_account = 0; - if (flag == 1) { //failure + if (flag == 1) { //failure if( sd2!=NULL ) clif_guild_inviteack(sd2,3); return 0; } - //if all ok add player to guild + //if all ok add player to guild sd->status.guild_id = g->guild_id; sd->guild_emblem_id = g->emblem_id; + sd->guild = g; //Packets which were sent in the previous 'guild_sent' implementation. clif_guild_belonginfo(sd,g); clif_guild_notice(sd,g); diff --git a/tools/config.pl b/tools/config.pl index 549a135031..671bc3a54c 100755 --- a/tools/config.pl +++ b/tools/config.pl @@ -54,7 +54,7 @@ sub GetArgs { 'Force=i' => \$sForce, #Force (bypass verification) 'help!' => \$sHelp, ) or $sHelp=1; #display help if invalid option - my $sValidTarget = "All|Conf|DB|Inst"; + my $sValidTarget = "All|Conf|DB|Inst|Dump"; if( $sHelp ) { print "Incorect option specified, available option are:\n" @@ -101,10 +101,48 @@ sub Main { if($sTarget =~ /All|Inst/i){ InstallSoft(); } if($sTarget =~ /All|Conf/i) { ConfigConf(\%hDefConf); chdir "$sBasedir"; } if($sTarget =~ /All|DB/i) { ConfigDB(\%hDefConf); chdir "$sBasedir"; } + if($sTarget =~ /All|Dump/i) { chdir "~"; EnableCoredump(); } print "Config done, you should be able to launch and connect server now\n"; print "NB : Don't forget to update your client clieninfo.xml to match change\n"; } + +sub EnableCoredump { + print "\n Starting Enabling coredump \n"; + my $sCurfile = "~/.bashrc"; + my @lines = (); + my $sJump = .0; + open PIPE,"sudo less $sCurfile |" or die $!; + foreach(){ + push(@lines,$_) if /ulimit/; + } + if(scalar(@lines)>0){ + print "ulimit instruction found in file=$sCurfile\n" + ."\t lines= \n @lines \n" + ."are you sure you want to continue ? [y/n] \n"; + $sJump=1 if(GetValidAnwser("y|o|n") =~ /n/i); + } + system("sudo echo \"ulimit -c unlimited\" >> $sCurfile") unless $sJump==1; + + $sCurfile = "/etc/sysctl.conf"; + @lines = (); + open PIPE,"sudo less $sCurfile |" or die $!; + foreach(){ + push(@lines,$_) if /kernel.core/; + } + if(scalar(@lines)>0){ + print "ulimit instruction found in file=$sCurfile\n" + ."\t line= \n @lines \n" + ."are you sure you want to continue ? [y/n] \n"; + $sJump=2 if(GetValidAnwser("y|o|n") =~ /n/i); + } + unless($sJump==2){ + system('sudo su root -c "echo \"echo kernel.core_uses_pid = 1 >> /etc/sysctl.conf\" | sudo bash"'); + system('sudo su root -c "echo \"echo kernel.core_pattern = /tmp/core-%e-%s-%u-%g-%p-%t >> /etc/sysctl.conf\" | sudo bash"'); + system('sudo su root -c "echo \"echo fs.suid_dumpable = 1 >> /etc/sysctl.conf\" | sudo bash"'); + } +} + sub InstallSoft { print "\n Starting InstallSoft \n"; print "This autoinstall feature is experimental, package name varies from distri and version, couldn't support them all\n"; @@ -551,3 +589,5 @@ sub GetDesiredConf { my ($rhDefConf) = @_; } return $rhUserConf; } + +