Handle flags on challenge timers correctly to prevent confusing the event

[tripe] / peer.c

diff --git a/peer.c b/peer.c
index f60f887fc6e247a5778a3efa4e81e30360b25b27..9a2fc5918f66258eec3903f8d3b219184363a736 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: peer.c,v 1.5 2001/03/03 11:15:19 mdw Exp $
+ * $Id: peer.c,v 1.8 2003/05/16 12:09:03 mdw Exp $
  *
  * Communication with the peer
  *
@@ -29,6 +29,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: peer.c,v $
+ * Revision 1.8  2003/05/16 12:09:03  mdw
+ * Allow binding to a chosen address.
+ *
+ * Revision 1.7  2003/04/15 14:12:05  mdw
+ * Insert a newline to improve readability.
+ *
+ * Revision 1.6  2001/06/19 22:07:59  mdw
+ * Use magic number for packet size.
+ *
  * Revision 1.5  2001/03/03 11:15:19  mdw
  * Set the socket send and receive buffers to maximum.  At least this way,
  * we won't drop large packets on the floor.  If the administrator wants to
@@ -207,6 +216,7 @@ void p_txend(peer *p)
 void p_tun(peer *p, buf *b)
 {
   buf *bb = p_txstart(p, MSG_PACKET);
+
   TIMER;
   if (ksl_encrypt(&p->ks, b, bb))
     kx_start(&p->kx);
@@ -269,18 +279,19 @@ const addr *p_addr(peer *p) { return (&p->peer); }
 
 /* --- @p_init@ --- *
  *
- * Arguments:  @unsigned port@ = port number to listen to
+ * Arguments:  @struct in_addr addr@ = address to bind to
+ *             @unsigned port@ = port number to listen to
  *
  * Returns:    ---
  *
  * Use:                Initializes the peer system; creates the socket.
  */
 
-void p_init(unsigned port)
+void p_init(struct in_addr addr, unsigned port)
 {
   int fd;
   struct sockaddr_in sin;
-  int len = 65536;
+  int len = PKBUFSZ;
 
   /* --- Note on socket buffer sizes --- *
    *
@@ -294,7 +305,7 @@ void p_init(unsigned port)
     die(EXIT_FAILURE, "socket creation failed: %s", strerror(errno));
   BURN(sin);
   sin.sin_family = AF_INET;
-  sin.sin_addr.s_addr = INADDR_ANY;
+  sin.sin_addr = addr;
   sin.sin_port = htons(port);
   if (bind(fd, (struct sockaddr *)&sin, sizeof(sin)))
     die(EXIT_FAILURE, "bind failed: %s", strerror(errno));