X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/16dfe536b74d2c3d647eff0a6d2858b198707766..4166ea7c41cac762e5e318567a4f993d8442d0a7:/identify.c

diff --git a/identify.c b/identify.c
index 4b22043..092e776 100644
--- a/identify.c
+++ b/identify.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: identify.c,v 1.5 1999/10/10 16:45:34 mdw Exp $
+ * $Id: identify.c,v 1.11 2004/04/08 01:36:25 mdw Exp $
  *
  * Identifies and logs the client of a connection
  *
@@ -26,26 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: identify.c,v $
- * Revision 1.5  1999/10/10 16:45:34  mdw
- * Modified to use new mLib resolver and ident client.
- *
- * Revision 1.4  1999/07/27 18:30:53  mdw
- * Various minor portability fixes.
- *
- * Revision 1.3  1999/07/26 23:26:21  mdw
- * Minor modifications for new design.
- *
- * Revision 1.2  1999/07/03 13:56:59  mdw
- * Log connections to syslog or stderr as appropriate.
- *
- * Revision 1.1.1.1  1999/07/01 08:56:23  mdw
- * Initial revision.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -95,8 +75,8 @@ typedef struct id {
   sel_timer t;				/* Timeout selector */
   bres_client r;			/* Backgd resolver client block */
   ident_request i;			/* Ident client block */
-  char host[64];			/* Resolved hostname */
-  char user[32];			/* Authenticated client user */
+  char host[128];			/* Resolved hostname */
+  char user[64];			/* Authenticated client user */
 } id;
 
 #define S_HOST 1u			/* Read the hostname from resolver */
@@ -127,14 +107,15 @@ static void id_done(id *i)
 
   /* --- Report the final result --- */
 
-  fw_log(i->when, "[%s] %s from %s@%s [%s]",
+  fw_log(i->when, "[%s] %s from %s@%s [%s:%u]",
 	 i->q.desc, i->q.act,
-	 i->user, i->host, inet_ntoa(i->q.rsin.sin_addr));
+	 i->user, i->host,
+	 inet_ntoa(i->q.rsin.sin_addr), (unsigned)ntohs(i->q.rsin.sin_port));
 
   /* --- Dispose of the block --- */
 
   REFFD_DEC(i->q.r);
-  free(i);
+  xfree(i);
 }
 
 /* --- @id_res@ --- *
@@ -196,6 +177,7 @@ static void id_ident(ident_reply *ir, void *vp)
 static void id_timer(struct timeval *tv, void *vp)
 {
   id *i = vp;
+  i->state |= S_TIMER;
   id_done(i);
 }