~mdw
/
fwd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
And a typo fix.
[fwd]
/
identify.c
diff --git
a/identify.c
b/identify.c
index
265c071
..
34cb545
100644
(file)
--- a/
identify.c
+++ b/
identify.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: identify.c,v 1.
7 2002/02/22 23:43:32
mdw Exp $
+ * $Id: identify.c,v 1.
10 2003/11/29 22:15:19
mdw Exp $
*
* Identifies and logs the client of a connection
*
*
* Identifies and logs the client of a connection
*
@@
-29,6
+29,15
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: identify.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: identify.c,v $
+ * Revision 1.10 2003/11/29 22:15:19 mdw
+ * And a typo fix.
+ *
+ * Revision 1.9 2003/11/29 22:13:43 mdw
+ * Fix bug in identification timout handling.
+ *
+ * Revision 1.8 2003/11/29 20:36:07 mdw
+ * Privileged outgoing connections.
+ *
* Revision 1.7 2002/02/22 23:43:32 mdw
* Call @xfree@ rather than @free@.
*
* Revision 1.7 2002/02/22 23:43:32 mdw
* Call @xfree@ rather than @free@.
*
@@
-133,9
+142,10
@@
static void id_done(id *i)
/* --- Report the final result --- */
/* --- 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->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 --- */
/* --- Dispose of the block --- */
@@
-202,6
+212,7
@@
static void id_ident(ident_reply *ir, void *vp)
static void id_timer(struct timeval *tv, void *vp)
{
id *i = vp;
static void id_timer(struct timeval *tv, void *vp)
{
id *i = vp;
+ i->state |= S_TIMER;
id_done(i);
}
id_done(i);
}