* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: conn.c,v 1.8 2001/12/23 22:02:54 alex Exp $
+ * $Id: conn.c,v 1.10 2001/12/25 22:03:47 alex Exp $
*
* connect.h: Verwaltung aller Netz-Verbindungen ("connections")
*
* $Log: conn.c,v $
+ * Revision 1.10 2001/12/25 22:03:47 alex
+ * - Conn_Close() eingefuehrt: war die lokale Funktion Close_Connection().
+ *
+ * Revision 1.9 2001/12/24 01:32:33 alex
+ * - in Conn_WriteStr() wurde das CR+LF nicht angehaengt!
+ * - Fehler-Ausgaben vereinheitlicht.
+ *
* Revision 1.8 2001/12/23 22:02:54 alex
* - Conn_WriteStr() nimmt nun variable Parameter,
* - diverse kleinere Aenderungen.
LOCAL BOOLEAN Handle_Write( CONN_ID Idx );
LOCAL VOID New_Connection( INT Sock );
LOCAL CONN_ID Socket2Index( INT Sock );
-LOCAL VOID Close_Connection( CONN_ID Idx, CHAR *Msg );
LOCAL VOID Read_Request( CONN_ID Idx );
LOCAL BOOLEAN Try_Write( CONN_ID Idx );
{
if( My_Connections[idx].sock == i ) break;
}
- if( idx < MAX_CONNECTIONS ) Close_Connection( idx, "Server going down ..." );
+ if( idx < MAX_CONNECTIONS ) Conn_Close( idx, "Server going down ..." );
else if( FD_ISSET( i, &My_Listener ))
{
close( i );
sock = socket( PF_INET, SOCK_STREAM, 0);
if( sock < 0 )
{
- Log( LOG_ALERT, "Can't create socket: %s", strerror( errno ));
+ Log( LOG_ALERT, "Can't create socket: %s!", strerror( errno ));
return FALSE;
}
/* Socket-Optionen setzen */
if( fcntl( sock, F_SETFL, O_NONBLOCK ) != 0 )
{
- Log( LOG_ALERT, "Can't enable non-blocking mode: %s", strerror( errno ));
+ Log( LOG_ALERT, "Can't enable non-blocking mode: %s!", strerror( errno ));
close( sock );
return FALSE;
}
if( setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0)
{
- Log( LOG_CRIT, "Can't set socket options: %s", strerror( errno ));
+ Log( LOG_CRIT, "Can't set socket options: %s!", strerror( errno ));
/* dieser Fehler kann ignoriert werden. */
}
/* an Port binden */
if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
{
- Log( LOG_ALERT, "Can't bind socket: %s", strerror( errno ));
+ Log( LOG_ALERT, "Can't bind socket: %s!", strerror( errno ));
close( sock );
return FALSE;
}
/* in "listen mode" gehen :-) */
if( listen( sock, 10 ) != 0 )
{
- Log( LOG_ALERT, "Can't listen on soecket: %s", strerror( errno ));
+ Log( LOG_ALERT, "Can't listen on soecket: %s!", strerror( errno ));
close( sock );
return FALSE;
}
read_sockets = My_Sockets;
if( select( My_Max_Fd + 1, &read_sockets, &write_sockets, NULL, &tv ) == -1 )
{
- if( errno != EINTR ) Log( LOG_ALERT, "select(): %s", strerror( errno ));
+ if( errno != EINTR ) Log( LOG_ALERT, "select(): %s!", strerror( errno ));
return;
}
va_list ap;
va_start( ap, Format );
- if( vsnprintf( buffer, MAX_CMDLEN, Format, ap ) == MAX_CMDLEN )
+ if( vsnprintf( buffer, MAX_CMDLEN - 2, Format, ap ) == MAX_CMDLEN - 2 )
{
Log( LOG_ALERT, "String too long to send (connection %d)!", Idx );
- Close_Connection( Idx, "Server error: String too long to send!" );
+ Conn_Close( Idx, "Server error: String too long to send!" );
return FALSE;
}
- ok = Conn_Write( Idx, buffer, strlen( buffer ));
-#ifdef DEBUG
+#ifdef SNIFFER
Log( LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer );
#endif
+
+ strcat( buffer, "\r\n" );
+ ok = Conn_Write( Idx, buffer, strlen( buffer ));
va_end( ap );
return ok;
{
/* der Puffer ist dummerweise voll ... */
Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
- Close_Connection( Idx, NULL );
+ Conn_Close( Idx, NULL );
return FALSE;
}
} /* Conn_Write */
+GLOBAL VOID Conn_Close( CONN_ID Idx, CHAR *Msg )
+{
+ /* Verbindung schliessen */
+
+ assert( Idx >= 0 );
+ assert( My_Connections[Idx].sock >= 0 );
+
+ if( Msg ) Conn_WriteStr( Idx, "ERROR :%s", Msg );
+
+ if( close( My_Connections[Idx].sock ) != 0 )
+ {
+ Log( LOG_ERR, "Error closing connection %d with %s:%d - %s!", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
+ return;
+ }
+ else
+ {
+ Log( LOG_NOTICE, "Connection %d with %s:%d closed.", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port ));
+ }
+
+ Client_Destroy( Client_GetFromConn( Idx ));
+
+ FD_CLR( My_Connections[Idx].sock, &My_Sockets );
+ My_Connections[Idx].sock = NONE;
+} /* Conn_Close */
+
+
LOCAL BOOLEAN Try_Write( CONN_ID Idx )
{
/* Versuchen, Daten aus dem Schreib-Puffer in den
/* Fehler! */
if( errno != EINTR )
{
- Log( LOG_ALERT, "select(): %s", strerror( errno ));
- Close_Connection( Idx, NULL );
+ Log( LOG_ALERT, "select(): %s!", strerror( errno ));
+ Conn_Close( Idx, NULL );
return FALSE;
}
}
if( len < 0 )
{
/* Oops, ein Fehler! */
- Log( LOG_ALERT, "Write error (buffer) on connection %d: %s", Idx, strerror( errno ));
- Close_Connection( Idx, NULL );
+ Log( LOG_ALERT, "Write error (buffer) on connection %d: %s!", Idx, strerror( errno ));
+ Conn_Close( Idx, NULL );
return FALSE;
}
new_sock = accept( Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len );
if( new_sock < 0 )
{
- Log( LOG_CRIT, "Can't accept connection: %s", strerror( errno ));
+ Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
return;
}
} /* Socket2Index */
-LOCAL VOID Close_Connection( CONN_ID Idx, CHAR *Msg )
-{
- /* Verbindung schlie§en */
-
- assert( Idx >= 0 );
- assert( My_Connections[Idx].sock >= 0 );
-
- if( Msg ) Conn_WriteStr( Idx, "ERROR :%s", Msg );
-
- if( close( My_Connections[Idx].sock ) != 0 )
- {
- Log( LOG_ERR, "Error closing connection %d with %s:%d - %s", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
- }
- else
- {
- Log( LOG_NOTICE, "Connection %d with %s:%d closed.", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port ));
- }
-
- Client_Destroy( Client_GetFromConn( Idx ));
-
- FD_CLR( My_Connections[Idx].sock, &My_Sockets );
- My_Connections[Idx].sock = NONE;
-} /* Close_Connection */
-
-
LOCAL VOID Read_Request( CONN_ID Idx )
{
/* Daten von Socket einlesen und entsprechend behandeln.
{
/* Socket wurde geschlossen */
Log( LOG_INFO, "%s:%d is closing the connection ...", inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port));
- Close_Connection( Idx, NULL );
+ Conn_Close( Idx, NULL );
return;
}
if( len < 0 )
{
/* Fehler beim Lesen */
- Log( LOG_ALERT, "Read error on connection %d!", Idx );
- Close_Connection( Idx, "Read error!" );
+ Log( LOG_ALERT, "Read error on connection %d: %s!", Idx, strerror( errno ));
+ Conn_Close( Idx, "Read error!" );
return;
}
* (incl. CR+LF!) werden; vgl. RFC 2812. Wenn soetwas
* empfangen wird, wird der Client disconnectiert. */
Log( LOG_ALERT, "Request too long (connection %d)!", Idx );
- Close_Connection( Idx, "Request too long!" );
+ Conn_Close( Idx, "Request too long!" );
return;
}
projects / ngircd-alex.git / blobdiff