X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fstats.cpp;h=9c177c7803c1977de79fdfa996e21253e70865fe;hb=e245dbbad7e91f232482374e9166f18782eaafa0;hp=b295db4a5b95f86855aa8e2e3ac9daef555c15b3;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/stats.cpp b/src/stats.cpp
index b295db4a5..9c177c780 100644
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -65,12 +65,28 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
 		case 'i':
 		{
-			int idx = 0;
 			for (ClassVector::iterator i = this->Config->Classes.begin(); i != this->Config->Classes.end(); i++)
 			{
 				ConnectClass* c = *i;
-				results.push_back(sn+" 215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : this->SE->GetMaxFds())+" "+ConvToStr(idx)+" "+this->Config->ServerName+" *");
-				idx++;
+				std::stringstream res;
+				res << sn << " 215 " << user->nick << " I " << c->name << ' ';
+				if (c->type == CC_ALLOW)
+					res << '+';
+				if (c->type == CC_DENY)
+					res << '-';
+
+				if (c->type == CC_NAMED)
+					res << '*';
+				else
+					res << c->host;
+
+				res << ' ' << c->config->getString("port", "*") << ' ';
+
+				res << c->GetRecvqMax() << ' ' << c->GetSendqSoftMax() << ' ' << c->GetSendqHardMax()
+					<< ' ' << c->GetCommandRate() << ' ' << c->GetPenaltyThreshold();
+				if (c->fakelag)
+					res << '*';
+				results.push_back(res.str());
 			}
 		}
 		break;
@@ -81,6 +97,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 			for (ClassVector::iterator i = this->Config->Classes.begin(); i != this->Config->Classes.end(); i++)
 			{
 				ConnectClass* c = *i;
+				results.push_back(sn+" 215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : this->SE->GetMaxFds())+" "+ConvToStr(idx)+" "+this->Config->ServerName+" *");
 				results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(c->GetPingTime())+" 0 "+ConvToStr(c->GetSendqHardMax())+" :"+
 						ConvToStr(c->GetRecvqMax())+" "+ConvToStr(c->GetRegTimeout()));
 				idx++;
@@ -194,16 +211,21 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 				results.push_back(sn+" 249 "+user->nick+" :Swaps:            "+ConvToStr(R.ru_nswap));
 				results.push_back(sn+" 249 "+user->nick+" :Context Switches: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw));
 
-				timeval tv;
 				char percent[30];
-				gettimeofday(&tv, NULL);
 
-				float n_elapsed = ((tv.tv_sec - this->stats->LastSampled.tv_sec) * 1000000 + tv.tv_usec - this->stats->LastSampled.tv_usec);
+				float n_elapsed = (ServerInstance->Time() - this->stats->LastSampled.tv_sec) * 1000000
+					+ (ServerInstance->Time_ns() - this->stats->LastSampled.tv_nsec) / 1000;
 				float n_eaten = ((R.ru_utime.tv_sec - this->stats->LastCPU.tv_sec) * 1000000 + R.ru_utime.tv_usec - this->stats->LastCPU.tv_usec);
 				float per = (n_eaten / n_elapsed) * 100;
 
 				snprintf(percent, 30, "%03.5f%%", per);
-				results.push_back(sn+" 249 "+user->nick+" :CPU Usage: "+percent);
+				results.push_back(sn+" 249 "+user->nick+" :CPU Use (now):    "+percent);
+
+				n_elapsed = ServerInstance->Time() - ServerInstance->startup_time;
+				n_eaten = (float)R.ru_utime.tv_sec + R.ru_utime.tv_usec / 100000.0;
+				per = (n_eaten / n_elapsed) * 100;
+				snprintf(percent, 30, "%03.5f%%", per);
+				results.push_back(sn+" 249 "+user->nick+" :CPU Use (total):  "+percent);
 			}
 #else
 			PROCESS_MEMORY_COUNTERS MemCounters;
@@ -226,7 +248,8 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 			results.push_back(sn+" 249 "+user->nick+" :nick collisions "+ConvToStr(this->stats->statsCollisions));
 			results.push_back(sn+" 249 "+user->nick+" :dns requests "+ConvToStr(this->stats->statsDnsGood+this->stats->statsDnsBad)+" succeeded "+ConvToStr(this->stats->statsDnsGood)+" failed "+ConvToStr(this->stats->statsDnsBad));
 			results.push_back(sn+" 249 "+user->nick+" :connection count "+ConvToStr(this->stats->statsConnects));
-			snprintf(buffer,MAXBUF," 249 %s :bytes sent %5.2fK recv %5.2fK",user->nick.c_str(),this->stats->statsSent / 1024,this->stats->statsRecv / 1024);
+			snprintf(buffer,MAXBUF," 249 %s :bytes sent %5.2fK recv %5.2fK",
+				user->nick.c_str(),this->stats->statsSent / 1024.0,this->stats->statsRecv / 1024.0);
 			results.push_back(sn+buffer);
 		}
 		break;
@@ -243,6 +266,30 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 			}
 		}
 		break;
+		case 'O':
+		{
+			for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++)
+			{
+				// just the types, not the actual oper blocks...
+				if (i->first[0] != ' ')
+					continue;
+				OperInfo* tag = i->second;
+				tag->init();
+				std::string umodes;
+				std::string cmodes;
+				for(char c='A'; c < 'z'; c++)
+				{
+					ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER);
+					if (mh && mh->NeedsOper() && tag->AllowedUserModes[c - 'A'])
+						umodes.push_back(c);
+					mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
+					if (mh && mh->NeedsOper() && tag->AllowedChanModes[c - 'A'])
+						cmodes.push_back(c);
+				}
+				results.push_back(sn+" 243 "+user->nick+" O "+tag->NameStr() + " " + umodes + " " + cmodes);
+			}
+		}
+		break;
 
 		/* stats l (show user I/O stats) */
 		case 'l':