diff options
| -rw-r--r-- | src/InspIRCd.layout | 12 | ||||
| -rw-r--r-- | src/connection.cpp | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout index 646a6f90b..fcc5c1a7f 100644 --- a/src/InspIRCd.layout +++ b/src/InspIRCd.layout @@ -1,5 +1,5 @@ [Editors] -Focused=1 +Focused=24 Order=1,2,4,6,3,7,25,5,24,-1 [Editor_0] @@ -12,7 +12,7 @@ LeftChar=1 [Editor_1] Open=1 -Top=1 +Top=0 CursorCol=41 CursorRow=7039 TopLine=7007 @@ -196,10 +196,10 @@ LeftChar=1 [Editor_24] Open=1 -Top=0 -CursorCol=38 -CursorRow=219 -TopLine=216 +Top=1 +CursorCol=1 +CursorRow=129 +TopLine=108 LeftChar=1 [Editor_25] Open=1 diff --git a/src/connection.cpp b/src/connection.cpp index 40d28996b..0409f4f47 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -177,6 +177,7 @@ bool connection::BeginLink(char* targethost, int port, char* password, char* ser connector.SetServerName(servername); sprintf(connect,"S %s %s :%s",getservername().c_str(),password,getserverdesc().c_str()); connector.SetState(STATE_NOAUTH_OUTBOUND); + connector.SetHostAndPort(targethost, port); this->connectors.push_back(connector); return this->SendPacket(connect, servername); } @@ -205,6 +206,7 @@ bool connection::MeshCookie(char* targethost, int port, long cookie, char* serve connector.SetServerName(servername); sprintf(connect,"- %d %s :%s",cookie,getservername().c_str(),getserverdesc().c_str()); connector.SetState(STATE_NOAUTH_OUTBOUND); + connector.SetHostAndPort(targethost, port); this->connectors.push_back(connector); return this->SendPacket(connect, servername); } @@ -224,7 +226,6 @@ bool connection::AddIncoming(int fd, char* targethost, int sourceport) // targethost has been turned into an ip... // we dont want this as the server name. - connector.SetHostAndPort(targethost, sourceport); connector.SetServerName(targethost); connector.SetDescriptor(fd); connector.SetState(STATE_NOAUTH_INBOUND); @@ -234,7 +235,8 @@ bool connection::AddIncoming(int fd, char* targethost, int sourceport) int recvbuf = 32768; setsockopt(fd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf)); setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf)); - log(DEBUG,"connection::AddIncoming() Added connection: %s:%d",host,sourceport); + connector.SetHostAndPort(targethost, sourceport); + log(DEBUG,"connection::AddIncoming() Added connection: %s:%d",targethost,sourceport); this->connectors.push_back(connector); return true; } |