]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands.cpp
/LOADMODULE and /UNLOADMODULE all successfully working!
[user/henk/code/inspircd.git] / src / commands.cpp
index ef95d1f3fb384c12c688332d4492d4275bb7ebda..19dd9f200a070cf9be2106efa08a6229fd31c377 100644 (file)
@@ -91,6 +91,8 @@ extern time_t nb_start;
 
 extern bool nofork;
 
+extern time_t TIME;
+
 extern std::vector<int> fd_reap;
 extern std::vector<std::string> module_names;
 
@@ -268,6 +270,31 @@ void handle_kick(char **parameters, int pcnt, userrec *user)
        NetSendToAll(buffer);
 }
 
+void handle_loadmodule(char **parameters, int pcnt, userrec *user)
+{
+       if (LoadModule(parameters[0]))
+       {
+               WriteOpers("*** NEW MODULE: %s",parameters[0]);
+               WriteServ(user->fd,"975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
+       }
+       else
+       {
+               WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ModuleError());
+       }
+}
+
+void handle_unloadmodule(char **parameters, int pcnt, userrec *user)
+{
+        if (UnloadModule(parameters[0]))
+        {
+                WriteOpers("*** MODULE UNLOADED: %s",parameters[0]);
+                WriteServ(user->fd,"973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
+        }
+        else
+        {
+                WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ModuleError());
+        }
+}
 
 void handle_die(char **parameters, int pcnt, userrec *user)
 {
@@ -523,7 +550,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
                                        
                                strlcpy(Ptr->topic,topic,MAXBUF);
                                strlcpy(Ptr->setby,user->nick,NICKMAX);
-                               Ptr->topicset = time(NULL);
+                               Ptr->topicset = TIME;
                                WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
 
                                // t token must go to ALL servers!!!
@@ -567,7 +594,7 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
        userrec *dest;
        chanrec *chan;
 
-       user->idle_lastmsg = time(NULL);
+       user->idle_lastmsg = TIME;
        
        if (loop_call(handle_privmsg,parameters,pcnt,user,0,pcnt-2,0))
                return;
@@ -655,7 +682,7 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
        userrec *dest;
        chanrec *chan;
 
-       user->idle_lastmsg = time(NULL);
+       user->idle_lastmsg = TIME;
        
        if (loop_call(handle_notice,parameters,pcnt,user,0,pcnt-2,0))
                return;
@@ -792,7 +819,7 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
                        if (!strcasecmp(user->server,dest->server))
                        {
                                // idle time and signon line can only be sent if youre on the same server (according to RFC)
-                               WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
+                               WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
                        }
                        
                        WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
@@ -1265,7 +1292,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
                {
                        if (strchr(i->second->modes,'o'))
                        {
-                               WriteServ(user->fd,"249 %s :%s (%s@%s) Idle: %d",user->nick,i->second->nick,i->second->ident,i->second->dhost,(time(NULL) - i->second->idle_lastmsg));
+                               WriteServ(user->fd,"249 %s :%s (%s@%s) Idle: %d",user->nick,i->second->nick,i->second->ident,i->second->dhost,(TIME - i->second->idle_lastmsg));
                                idx++;
                        }
                }
@@ -1365,7 +1392,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        if (!strcmp(parameters[0],"u"))
        {
                time_t current_time = 0;
-               current_time = time(NULL);
+               current_time = TIME;
                time_t server_uptime = current_time - startup_time;
                struct tm* stime;
                stime = gmtime(&server_uptime);
@@ -1471,7 +1498,7 @@ void handle_map(char **parameters, int pcnt, userrec *user)
        snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName);
        while (strlen(line) < 50)
                strcat(line," ");
-       WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
+       WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)registered_usercount())*100));
        for (int j = 0; j < 32; j++)
        {
                if (me[j] != NULL)
@@ -1481,7 +1508,7 @@ void handle_map(char **parameters, int pcnt, userrec *user)
                                snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(me[j]->connectors[k].GetServerName().c_str()),me[j]->connectors[k].GetServerName().c_str());
                                while (strlen(line) < 50)
                                        strcat(line," ");
-                               WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(me[j]->connectors[k].GetServerName().c_str()),(float)(((float)map_count(me[j]->connectors[k].GetServerName().c_str())/(float)usercnt())*100));
+                               WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(me[j]->connectors[k].GetServerName().c_str()),(float)(((float)map_count(me[j]->connectors[k].GetServerName().c_str())/(float)registered_usercount())*100));
                        }
                }
        }
@@ -1511,18 +1538,22 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
        char Password[MAXBUF];
        char OperType[MAXBUF];
        char TypeName[MAXBUF];
-       char Hostname[MAXBUF];
+       char HostName[MAXBUF];
+       char TheHost[MAXBUF];
        int i,j;
        bool found = false;
        bool fail2 = false;
        char global[MAXBUF];
 
+       snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
+
        for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
        {
                ConfValue("oper","name",i,LoginName,&config_f);
                ConfValue("oper","password",i,Password,&config_f);
                ConfValue("oper","type",i,OperType,&config_f);
-               if ((!strcmp(LoginName,parameters[0])) && (!strcmp(Password,parameters[1])))
+               ConfValue("oper","host",i,HostName,&config_f);
+               if ((!strcmp(LoginName,parameters[0])) && (!strcmp(Password,parameters[1])) && (match(TheHost,HostName)))
                {
                        fail2 = true;
                        for (j =0; j < ConfValueEnum("type",&config_f); j++)
@@ -1534,8 +1565,8 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
                                        /* found this oper's opertype */
                                        snprintf(global,MAXBUF,"| %s %s",user->nick,TypeName);
                                        NetSendToAll(global);
-                                       ConfValue("type","host",j,Hostname,&config_f);
-                                       ChangeDisplayedHost(user,Hostname);
+                                       ConfValue("type","host",j,HostName,&config_f);
+                                       ChangeDisplayedHost(user,HostName);
                                        strlcpy(user->oper,TypeName,NICKMAX);
                                        found = true;
                                        fail2 = false;
@@ -1558,6 +1589,7 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
                         snprintf(global,MAXBUF,"M %s +o",user->nick);
                         NetSendToAll(global);
                        FOREACH_MOD OnOper(user);
+                       log(DEFAULT,"OPER: %s!%s@%s opered as type: %s",user->nick,user->ident,user->host,OperType);
                }
        }
        else
@@ -1565,12 +1597,14 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
                if (!fail2)
                {
                        WriteServ(user->fd,"491 %s :Invalid oper credentials",user->nick);
-                       WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
+                       WriteOpers("*** WARNING! qFailed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
+                       log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.",user->nick,user->ident,user->host);
                }
                else
                {
                        WriteServ(user->fd,"491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
                        WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType);
+                        log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host);
                }
        }
        return;
@@ -1772,7 +1806,7 @@ void handle_t(char token,char* params,serverrec* source,serverrec* reply, char*
                WriteChannelLocal(c,u,"TOPIC %s :%s",c->name,topic);
                strlcpy(c->topic,topic,MAXTOPIC);
                strlcpy(c->setby,u->nick,NICKMAX);
-               c->topicset = time(NULL);
+               c->topicset = TIME;
        }       
 }
        
@@ -2076,7 +2110,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        clientlist[nick]->lastping = 1;
        clientlist[nick]->port = 0; // so is this...
        clientlist[nick]->registered = 7; // this however we need to set for them to receive messages and appear online
-       clientlist[nick]->idle_lastmsg = time(NULL); // this is unrealiable and wont actually be used locally
+       clientlist[nick]->idle_lastmsg = TIME; // this is unrealiable and wont actually be used locally
        for (int i = 0; i < MAXCHANS; i++)
        {
                clientlist[nick]->chans[i].channel = NULL;
@@ -2086,7 +2120,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
 
 void handle_F(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host)
 {
-       long tdiff = time(NULL) - atoi(params);
+       long tdiff = TIME - atoi(params);
        if (tdiff)
                WriteOpers("TS split for %s -> %s: %d",source->name,reply->name,tdiff);
 }
@@ -2438,7 +2472,7 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                // Y <TS>
                // start netburst
                case 'Y':
-                       nb_start = time(NULL);
+                       nb_start = TIME;
                        WriteOpers("Server %s is starting netburst.",tcp_host);
                        // now broadcast this new servers address out to all servers that are linked to us,
                        // except the newcomer. They'll all attempt to connect back to it.
@@ -2616,7 +2650,7 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                // F <TS>
                // end netburst
                case 'F':
-                       WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,time(NULL)-nb_start);
+                       WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,TIME-nb_start);
                        handle_F(token,params,source,reply,tcp_host);
                        nb_start = 0;
                        // tell all the other servers to use this authcookie to connect back again
@@ -2631,7 +2665,7 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                // F <TS>
                // end netburst with no mesh creation
                case 'f':
-                       WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,time(NULL)-nb_start);
+                       WriteOpers("Server %s has completed netburst. (%d secs)",tcp_host,TIME-nb_start);
                        handle_F(token,params,source,reply,tcp_host);
                        nb_start = 0;
                        // tell everyone else about the new server name so they just add it in the disconnected
@@ -3206,7 +3240,7 @@ void handle_gline(char **parameters, int pcnt, userrec *user)
        {
                add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                // # <mask> <who-set-it> <time-set> <duration> :<reason>
-               snprintf(netdata,MAXBUF,"# %s %s %ld %ld :%s",parameters[0],user->nick,time(NULL),duration(parameters[1]),parameters[2]);
+               snprintf(netdata,MAXBUF,"# %s %s %ld %ld :%s",parameters[0],user->nick,TIME,duration(parameters[1]),parameters[2]);
                NetSendToAll(netdata);
                if (!duration(parameters[1]))
                {