summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-18 22:31:34 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-18 22:31:34 +0000
commit9577eca58c66acc260e3a5576ba8235812e14b6b (patch)
tree07ccb4c61bf4430799fcef844b8b79885dbc4212 /src
parent69b414c69ce04ba91eac5754e418a816bcf4f403 (diff)
Checks to stop a server connecting twice
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@659 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/InspIRCd.layout12
-rw-r--r--src/connection.cpp9
-rw-r--r--src/inspircd.cpp2
3 files changed, 15 insertions, 8 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index a15be3eea..5d64f9825 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -14,8 +14,8 @@ LeftChar=1
Open=1
Top=0
CursorCol=1
-CursorRow=6719
-TopLine=6692
+CursorRow=7039
+TopLine=7013
LeftChar=1
[Editor_2]
@@ -141,7 +141,7 @@ LeftChar=1
[Editor_17]
Open=1
Top=0
-CursorCol=31
+CursorCol=25
CursorRow=130
TopLine=76
LeftChar=1
@@ -197,9 +197,9 @@ LeftChar=1
[Editor_24]
Open=1
Top=1
-CursorCol=1
-CursorRow=246
-TopLine=244
+CursorCol=15
+CursorRow=175
+TopLine=155
LeftChar=1
[Editor_25]
Open=1
diff --git a/src/connection.cpp b/src/connection.cpp
index 2ab984332..357295245 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -166,6 +166,15 @@ bool connection::BeginLink(char* targethost, int port, char* password, char* ser
char connect[MAXBUF];
ircd_connector connector;
+ ircd_connector *cn = this->FindServer(servername);
+
+
+ if (cn)
+ {
+ WriteOpers("CONNECT aborted: Server %s already exists from %s",servername,ServerName);
+ return false;
+ }
+
if (this->fd)
{
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6f4565e98..29b3e48be 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -7179,8 +7179,6 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
if (token == 'E') {
char* error_message = finalparam+2;
WriteOpers("ERROR from %s: %s",udp_host,error_message);
- // remove this server from any lists
- RemoveServer(udp_host);
return;
}
else {