/* -*-c-*-
*
- * $Id: un.c,v 1.3 2000/08/01 17:58:32 mdw Exp $
- *
* Protocol specific definitions for Unix-domain sockets
*
* (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: un.c,v $
- * Revision 1.3 2000/08/01 17:58:32 mdw
- * Remove unnecessary <ctype.h> header.
- *
- * Revision 1.2 1999/07/27 18:30:53 mdw
- * Various minor portability fixes.
- *
- * Revision 1.1 1999/07/26 23:34:11 mdw
- * New socket address types.
- *
- */
-
-/*----- Header files ------------------------------------------------------*/
-
-#include "config.h"
-#undef sun /* Cretins */
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <mLib/alloc.h>
-#include <mLib/dstr.h>
-#include <mLib/report.h>
-#include <mLib/sub.h>
-
-#include "addr.h"
-#include "conf.h"
-#include "fattr.h"
-#include "fw.h"
-#include "reffd.h"
-#include "scan.h"
-#include "un.h"
+#include "fwd.h"
/*----- Data structures ---------------------------------------------------*/
dstr d = DSTR_INIT;
un_addr *ua;
- conf_name(sc, '/', &d);
+ conf_fname(sc, &d);
ua = xmalloc(sizeof(addr) +
offsetof(struct sockaddr_un, sun_path) +
d.len + 1);
static void un_destroy(addr *a)
{
un_addr *ua = (un_addr *)a;
- free(ua);
+ xfree(ua);
}
/* --- @print@ --- */
/* --- @option@ --- */
-static int un_option(scanner *sc, addr_opts *ao)
+static int srcopt(scanner *sc, addr_opts *ao)
{
un_opts *uo = (un_opts *)ao;
- CONF_BEGIN(sc, "unix", "Unix domain socket")
+ CONF_BEGIN(sc, "source", "Unix domain socket source")
if (fattr_option(sc, uo ? &uo->f : &fattr_global))
CONF_ACCEPT;
CONF_END;
}
+static int un_option(scanner *sc, addr_opts *ao, unsigned type)
+{
+ CONF_BEGIN(sc, "unix", "Unix domain socket");
+ if (type != ADDR_DEST && srcopt(sc, ao))
+ CONF_ACCEPT;
+ CONF_END;
+}
+
/* --- @accept@ --- */
static reffd *un_accept(int fd, addr_opts *ao, const char *desc)
{
char buf[PATH_MAX + sizeof(struct sockaddr)];
struct sockaddr_un *sun = (struct sockaddr_un *)buf;
- int sunsz = sizeof(buf);
-
+ socklen_t sunsz = sizeof(buf);
+
if ((nfd = accept(fd, (struct sockaddr *)sun, &sunsz)) < 0)
return (0);
}
DESTROY(uo);
}
-/* --- @bound@ --- */
+/* --- @bind@ --- */
-static void un_bound(addr *a, addr_opts *ao)
+static int un_bind(addr *a, addr_opts *ao)
{
un_addr *ua = (un_addr *)a;
un_opts *uo = (un_opts *)ao;
- if (fattr_apply(ua->sun.sun_path, &uo->f)) {
- dstr d = DSTR_INIT;
- un_print(a, ADDR_SRC, &d);
- fw_log(-1, "[%s] couldn't apply file attributes: %s",
- d.buf, strerror(errno));
- dstr_destroy(&d);
- }
+ int fd;
+
+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+ goto fail_0;
+ if (bind(fd, (struct sockaddr *)&ua->sun, sizeof(ua->sun)))
+ goto fail_1;
+ if (fattr_apply(ua->sun.sun_path, &uo->f))
+ goto fail_1;
+ return (fd);
+
+fail_1:
+ close(fd);
+fail_0:
+ return (-1);
}
/* --- @unbind@ --- */
unlink(ua->sun.sun_path);
}
+/* --- @connect@ --- */
+
+static int un_connect(addr *a, addr_opts *ao, conn *c, endpt *e)
+{
+ un_addr *ua = (un_addr *)a;
+ int fd;
+
+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+ goto fail_0;
+ return (conn_init(c, sel, fd, (struct sockaddr *)&ua->sun, sizeof(ua->sun),
+ starget_connected, e));
+fail_0:
+ return (-1);
+}
+
/* --- Protocol definition --- */
addr_ops un_ops = {
- "unix", PF_UNIX,
+ "unix",
un_read, un_destroy, un_print,
- un_initopts, un_option, un_accept, un_freeopts, un_bound, un_unbind
+ un_initopts, un_option, 0, un_freeopts, un_bind, un_unbind, un_accept,
+ 0, 0, un_connect
};
/*----- That's all, folks -------------------------------------------------*/
~mdw / fwd / blobdiff