/**
* Set connection information for specified configured server.
*/
-GLOBAL void
+GLOBAL bool
Conf_SetServer( int ConfServer, CONN_ID Idx )
{
assert( ConfServer > NONE );
if (Conf_Server[ConfServer].conn_id > NONE &&
Conf_Server[ConfServer].conn_id != Idx) {
- Log(LOG_ALERT,
- "Trying to update connection index for already registered server \"%s\": %d/%d - ignored.",
- Conf_Server[ConfServer].name,
- Conf_Server[ConfServer].conn_id, Idx);
- return;
+ Log(LOG_ERR,
+ "Connection %d: Server configuration of \"%s\" already in use by connection %d!",
+ Idx, Conf_Server[ConfServer].name,
+ Conf_Server[ConfServer].conn_id);
+ Conn_Close(Idx, NULL, "Server configuration already in use", true);
+ return false;
}
Conf_Server[ConfServer].conn_id = Idx;
+ return true;
}
/**
GLOBAL int Conf_Test PARAMS((void));
GLOBAL void Conf_UnsetServer PARAMS(( CONN_ID Idx ));
-GLOBAL void Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx ));
+GLOBAL bool Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx ));
GLOBAL int Conf_GetServer PARAMS(( CONN_ID Idx ));
GLOBAL bool Conf_EnableServer PARAMS(( const char *Name, UINT16 Port ));
Client_SetToken( c, TOKEN_OUTBOUND );
/* Register connection */
- Conf_SetServer(Server, new_sock);
+ if (!Conf_SetServer(Server, new_sock))
+ return;
My_Connections[new_sock].sock = new_sock;
My_Connections[new_sock].addr = *dest;
My_Connections[new_sock].client = c;
if (!Client_CheckID(Client, Req->argv[0]))
return DISCONNECTED;
+ /* Mark this connection as belonging to an configured server */
+ if (!Conf_SetServer(i, Client_Conn(Client)))
+ return DISCONNECTED;
+
Client_SetID( Client, Req->argv[0] );
Client_SetHops( Client, 1 );
Client_SetInfo( Client, Req->argv[Req->argc - 1] );
Client_SetToken(Client, atoi(Req->argv[1]));
}
- /* Mark this connection as belonging to an configured server */
- Conf_SetServer(i, Client_Conn(Client));
-
/* Check protocol level */
if (Client_Type(Client) == CLIENT_GOTPASS) {
/* We got a "simple" PASS command, so the peer is