- new file header format (in english);

[ngircd.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index ab48e8506d114d006dc96d2e4e3127b5756145f3..38a7dd529ef8dcc8dca69d8cad55f78e09e5d475 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -2,21 +2,20 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.c,v 1.101 2002/12/02 13:19:37 alex Exp $
- *
- * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
+ * Connection management
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: conn.c,v 1.104 2002/12/12 12:24:18 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdarg.h>
@@ -606,12 +605,12 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
                        out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
                        in_p = (INT)(( in_k * 100 ) / in_z_k );
                        out_p = (INT)(( out_k * 100 ) / out_z_k );
-                       Log( LOG_INFO, "Connection %d (socket %d) with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
+                       Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
                }
                else
 #endif
                {
-                       Log( LOG_INFO, "Connection %d (socket %d) with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
+                       Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
                }
        }
        
@@ -907,10 +906,10 @@ Conn_SendQ( CONN_ID Idx )
 
        assert( Idx > NONE );
 #ifdef USE_ZLIB
-       return My_Connections[Idx].zip.wdatalen;
-#else
-       return My_Connections[Idx].wdatalen;
+       if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen;
+       else
 #endif
+       return My_Connections[Idx].wdatalen;
 } /* Conn_SendQ */
 
 
@@ -941,10 +940,10 @@ Conn_RecvQ( CONN_ID Idx )
 
        assert( Idx > NONE );
 #ifdef USE_ZLIB
-       return My_Connections[Idx].zip.rdatalen;
-#else
-       return My_Connections[Idx].rdatalen;
+       if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen;
+       else
 #endif
+       return My_Connections[Idx].rdatalen;
 } /* Conn_RecvQ */
 
 
@@ -1305,7 +1304,7 @@ Read_Request( CONN_ID Idx )
        if( len == 0 )
        {
                /* 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));
+               Log( LOG_INFO, "%s:%d (%s) is closing the connection ...", My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), inet_ntoa( My_Connections[Idx].addr.sin_addr ));
                Conn_Close( Idx, "Socket closed!", "Client closed connection", FALSE );
                return;
        }