/* -*-c-*-
*
- * $Id: chan.c,v 1.6 2003/10/31 13:56:14 mdw Exp $
- *
* Channel management
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
- * This file is part of the `fw' port forwarder.
+ * This file is part of the `fwd' port forwarder.
*
- * `fw' is free software; you can redistribute it and/or modify
+ * `fwd' 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.
- *
- * `fw' is distributed in the hope that it will be useful,
+ *
+ * `fwd' is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
- * along with `fw'; if not, write to the Free Software Foundation,
+ * along with `fwd'; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: chan.c,v $
- * Revision 1.6 2003/10/31 13:56:14 mdw
- * Fix data corruption in channel\!
- *
- * Revision 1.5 2000/07/19 17:55:43 mdw
- * (writechan): Pointless tweak: when the buffer is empty, reset the start
- * pointer to the beginning. This saves doing slightly trickier
- * @writev(2)@ calls when loading is light.
- *
- * Revision 1.4 1999/08/31 17:42:49 mdw
- * Use `sel_force' to avoid a `select' call between reads and writes.
- *
- * Revision 1.3 1999/07/27 18:30:53 mdw
- * Various minor portability fixes.
- *
- * Revision 1.2 1999/07/26 23:27:52 mdw
- * Minor modifications for new design.
- *
- * Revision 1.1.1.1 1999/07/01 08:56:23 mdw
- * Initial revision.
- *
- */
-
-/*----- Header files ------------------------------------------------------*/
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <sys/uio.h>
-
-#include <mLib/alloc.h>
-#include <mLib/conn.h>
-#include <mLib/sel.h>
-
-#include "chan.h"
-#include "fw.h"
+#include "fwd.h"
#ifdef CHAN_DEBUG
# define D(x) x
if (w < 0) {
if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
return;
+ c->err = errno;
goto close;
- }
- else if (w == 0)
+ } else if (w == 0)
goto close;
else if (c->len == CHAN_BUFSZ && !(c->f & CHANF_CLOSE))
sel_addfile(&c->r);
if (r < 0) {
if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
return;
+ c->err = errno;
goto close;
- }
- else if (r == 0)
+ } else if (r == 0)
goto close;
else if (c->len == 0 && (c->f & CHANF_READY)) {
sel_addfile(&c->w);