X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/47a7631fc173b345182df04f67523d3b2fe4ba83..755e6619263d316dc46fa504e0c333c963ec8eaa:/inet.c diff --git a/inet.c b/inet.c index 5b83a05..ad93beb 100644 --- a/inet.c +++ b/inet.c @@ -7,24 +7,24 @@ /*----- 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. */ -#include "fw.h" +#include "fwd.h" /*----- Data structures ---------------------------------------------------*/ @@ -234,7 +234,7 @@ static int srcopt(scanner *sc, addr_opts *ao) /* --- Find the netmask, if any --- */ if (sc->t != '/') - m.s_addr = ~0ul; + m.s_addr = (in_addr_t)~0ul; else { token(sc); DRESET(&d); @@ -365,7 +365,7 @@ static reffd *inet_accept(int fd, addr_opts *ao, const char *desc) inet_srcopts *io = (inet_srcopts *)ao; int nfd; id_req q; - size_t lsinsz = sizeof(q.lsin), rsinsz = sizeof(q.rsin); + socklen_t lsinsz = sizeof(q.lsin), rsinsz = sizeof(q.rsin); int act = ACL_ALLOW; /* --- Accept the new connection --- */