summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-03 13:27:00 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-03 13:27:00 +0000
commit45d179acdd77c2c9469f19d0a053059a75ea03d7 (patch)
treea310f053ae1c6222d1ee6b6dfa3f078fed38aebd
parentcad63bf12a8193e8935255456d0b9e93c37004c9 (diff)
Reordered some on-connect network stuff to stop services being so confused
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1293 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/inspircd.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index fa4605227..c584ca187 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2702,7 +2702,6 @@ void ShowRULES(userrec *user)
void FullConnectUser(userrec* user)
{
statsConnects++;
- user->registered = 7;
user->idle_lastmsg = TIME;
log(DEBUG,"ConnectUser: %s",user->nick);
@@ -2740,6 +2739,9 @@ void FullConnectUser(userrec* user)
}
}
+ // fix by brain: move this below the xline checks to prevent spurious quits going onto the net that dont belong
+ user->registered = 7;
+
WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network);
WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host);
WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,ServerName,VERSION);
@@ -2772,12 +2774,14 @@ void FullConnectUser(userrec* user)
}
}
ShowMOTD(user);
- FOREACH_MOD OnUserConnect(user);
- WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip);
char buffer[MAXBUF];
snprintf(buffer,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname);
NetSendToAll(buffer);
+
+ // fix by brain: these should be AFTER the N token, so other servers know what the HELL we're on about... :)
+ FOREACH_MOD OnUserConnect(user);
+ WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip);
}