Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

import of dnsmasq-2.30.tar.gz

Browse Source
This commit is contained in:
Simon Kelley
2006-04-23 20:00:42 +01:00
parent 309331f52c
commit 26d0dbaf24
15 changed files with 225 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1801,6 +1801,11 @@ version 2.29
as root, and log a warning. Thanks to Scott Wehrenberg as root, and log a warning. Thanks to Scott Wehrenberg
for help tracking this down. for help tracking this down.
version 2.30
Fixed crash when a DHCP client requested a broadcast
reply. This problem was introduced in version 2.29.
Thanks to Sandra Dekkers for the bug report.

2
dnsmasq-rh.spec
View File

@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.29 Version: 2.30
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons

2
dnsmasq-suse.spec
View File

@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.29 Version: 2.30
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers

46
po/de.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-09-27 09:37+0100\n" "PO-Revision-Date: 2005-09-27 09:37+0100\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
# @Simon: Here I need an example to understand it :) # @Simon: Here I need an example to understand it :)
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
# @Simon: Here I need an example to understand it :) # @Simon: Here I need an example to understand it :)
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "lese %s - %d Adressen" msgstr "lese %s - %d Adressen"
@@ -537,7 +537,7 @@ msgstr ""
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "" msgstr ""
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "" msgstr ""
@@ -581,59 +581,59 @@ msgstr ""
msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "" msgstr ""
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "" msgstr ""
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "" msgstr ""
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "" msgstr ""
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "" msgstr ""
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "" msgstr ""
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "" msgstr ""
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "" msgstr ""
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "" msgstr ""
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "" msgstr ""
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "" msgstr ""
@@ -765,27 +765,27 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "" msgstr ""
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "" msgstr ""
#: dhcp.c:641 #: dhcp.c:642
#, c-format #, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "" msgstr ""
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "" msgstr ""
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/es.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-10-07 11:04+0100\n" "PO-Revision-Date: 2005-10-07 11:04+0100\n"
"Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n" "Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n" "Language-Team: Spanish <es@li.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "no se pudo cargar nombres desde %s: %m" msgstr "no se pudo cargar nombres desde %s: %m"
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "nombre err<72>neo en %s l<>nea %d" msgstr "nombre err<72>neo en %s l<>nea %d"
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "nombre err<72>neo en %s l<>nea %d" msgstr "nombre err<72>neo en %s l<>nea %d"
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "direcci<63>nes %s - %d le<6C>das" msgstr "direcci<63>nes %s - %d le<6C>das"
@@ -507,7 +507,7 @@ msgstr "solo un archivo resolv.conf permitido en modo no-poll."
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "debe haber exactamente un resolv.conf desde donde leer dominio." msgstr "debe haber exactamente un resolv.conf desde donde leer dominio."
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "no se pudo leer %s: %m" msgstr "no se pudo leer %s: %m"
@@ -537,7 +537,7 @@ msgstr "no se pudo accesar %s: %m"
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "no se pudo cargar %s: %m" msgstr "no se pudo cargar %s: %m"
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "leyendo %s" msgstr "leyendo %s"
@@ -553,59 +553,59 @@ msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "" msgstr ""
"Ignorando arriendo DHCP para %s porque tiene una parte ilegal de dominio" "Ignorando arriendo DHCP para %s porque tiene una parte ilegal de dominio"
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "no se pudo crear un socket escuchador: %s" msgstr "no se pudo crear un socket escuchador: %s"
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "no se pudo fijar opciones IPv6 sobre el socket escuchador: %s" msgstr "no se pudo fijar opciones IPv6 sobre el socket escuchador: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "no se pudo acoplar socket escuchador para %s: %s" msgstr "no se pudo acoplar socket escuchador para %s: %s"
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "no se pudo escuchar en el socket: %s" msgstr "no se pudo escuchar en el socket: %s"
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "ignorando servidor DNS %s - interface local" msgstr "ignorando servidor DNS %s - interface local"
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "ignorando servidor DNS %s - no se pudo crear/acoplar socket: %m" msgstr "ignorando servidor DNS %s - no se pudo crear/acoplar socket: %m"
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "dominio" msgstr "dominio"
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "no calificado" msgstr "no calificado"
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "dominios" msgstr "dominios"
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "usando direcciones locales solo para %s %s" msgstr "usando direcciones locales solo para %s %s"
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "usando servidor DNS %s#%d para %s %s" msgstr "usando servidor DNS %s#%d para %s %s"
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "usando servidor DNS %s#%d" msgstr "usando servidor DNS %s#%d"
@@ -739,27 +739,27 @@ msgstr "no se puede crear socket crudo ICMP: %s."
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "direcci<63>n IP duplicada en directiva dhcp-config." msgstr "direcci<63>n IP duplicada en directiva dhcp-config."
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "rango DHCP %s -- %s no coincide con m<>scara de red %s" msgstr "rango DHCP %s -- %s no coincide con m<>scara de red %s"
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "no se pudo leer %s:%m" msgstr "no se pudo leer %s:%m"
#: dhcp.c:641 #: dhcp.c:642
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "nombre err<72>neo en %s l<>nea %d" msgstr "nombre err<72>neo en %s l<>nea %d"
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "direcci<63>n IP %s (%s) duplicada en directiva dhcp-config" msgstr "direcci<63>n IP %s (%s) duplicada en directiva dhcp-config"
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/fi.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-11-28 22:05+0000\n" "PO-Revision-Date: 2005-11-28 22:05+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "" msgstr ""
@@ -488,7 +488,7 @@ msgstr ""
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "" msgstr ""
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "" msgstr ""
@@ -532,59 +532,59 @@ msgstr ""
msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "" msgstr ""
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "" msgstr ""
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "" msgstr ""
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "" msgstr ""
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "" msgstr ""
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "" msgstr ""
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "" msgstr ""
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "" msgstr ""
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "" msgstr ""
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "" msgstr ""
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "" msgstr ""
@@ -716,27 +716,27 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "" msgstr ""
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "" msgstr ""
#: dhcp.c:641 #: dhcp.c:642
#, c-format #, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "" msgstr ""
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "" msgstr ""
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/fr.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-10-02 19:05+0100\n" "PO-Revision-Date: 2005-10-02 19:05+0100\n"
"Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n" "Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "Impossible de charger les noms a partir de %s: %m" msgstr "Impossible de charger les noms a partir de %s: %m"
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "lecture %s - %d adresses" msgstr "lecture %s - %d adresses"
@@ -519,7 +519,7 @@ msgstr ""
"on doit avoir exactement un seul fichier resolv.conf pour y recuperer le nom " "on doit avoir exactement un seul fichier resolv.conf pour y recuperer le nom "
"de domaine." "de domaine."
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "impossible de lire %s: %m" msgstr "impossible de lire %s: %m"
@@ -550,7 +550,7 @@ msgstr "impossible d'acceder a %s: %m"
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "impossible de charger %s: %m" msgstr "impossible de charger %s: %m"
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "Lecture %s" msgstr "Lecture %s"
@@ -566,59 +566,59 @@ msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "" msgstr ""
"On ignore le bail DHCP pour %s car il possede un nom de domaine illegal" "On ignore le bail DHCP pour %s car il possede un nom de domaine illegal"
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "impossible de creer une socket de lecture: %s" msgstr "impossible de creer une socket de lecture: %s"
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "impossible d'activer les options IPV6 sur la socket de lecture: %s" msgstr "impossible d'activer les options IPV6 sur la socket de lecture: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "impossible de lier la socket de lecture pour %s: %s" msgstr "impossible de lier la socket de lecture pour %s: %s"
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "impossible de lire sur la socket: %s" msgstr "impossible de lire sur la socket: %s"
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "on ignore le serveur de nom %s - interface locale" msgstr "on ignore le serveur de nom %s - interface locale"
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "on ignore le serveur de nom %s - ne peut construire/lier la socket: %m" msgstr "on ignore le serveur de nom %s - ne peut construire/lier la socket: %m"
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "domaine" msgstr "domaine"
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "non-qualifie" msgstr "non-qualifie"
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "domaines" msgstr "domaines"
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "on utilise les adresses locales seulement pour %s %s" msgstr "on utilise les adresses locales seulement pour %s %s"
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "on utilise le serveur de nom %s#%d pour %s %s" msgstr "on utilise le serveur de nom %s#%d pour %s %s"
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "on utilise le serveur de nom %s#%d" msgstr "on utilise le serveur de nom %s#%d"
@@ -754,29 +754,29 @@ msgstr "ne peut creer de socket en mode raw pour ICMP: %s."
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "adresse IP %s dupliquee dans la directive dhcp-config." msgstr "adresse IP %s dupliquee dans la directive dhcp-config."
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "" msgstr ""
"La plage d'adresses DHCP %s -- %s n'est pas coherente avec le masque de " "La plage d'adresses DHCP %s -- %s n'est pas coherente avec le masque de "
"reseau %s" "reseau %s"
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "impossible de lire %s:%m" msgstr "impossible de lire %s:%m"
#: dhcp.c:641 #: dhcp.c:642
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "adresse IP %s (%s) dupliquee dans la directive dhcp-config." msgstr "adresse IP %s (%s) dupliquee dans la directive dhcp-config."
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/id.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-10-07 11:45+0100\n" "PO-Revision-Date: 2005-10-07 11:45+0100\n"
"Last-Translator: Salman AS <sas@salman.or.id>\n" "Last-Translator: Salman AS <sas@salman.or.id>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -21,19 +21,19 @@ msgid "failed to load names from %s: %m"
msgstr "gagal memuat nama-nama dari %s: %m" msgstr "gagal memuat nama-nama dari %s: %m"
# OK # OK
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "kesalahan nama pada %s baris %d" msgstr "kesalahan nama pada %s baris %d"
# OK # OK
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "kesalahan nama pada %s baris %d" msgstr "kesalahan nama pada %s baris %d"
# OK # OK
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "membaca %s - %d alamat" msgstr "membaca %s - %d alamat"
@@ -605,7 +605,7 @@ msgid "must have exactly one resolv.conf to read domain from."
msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain." msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain."
# OK # OK
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "gagal membaca %s: %m" msgstr "gagal membaca %s: %m"
@@ -640,7 +640,7 @@ msgid "failed to load %s: %m"
msgstr "gagal memuat %S: %m" msgstr "gagal memuat %S: %m"
# OK # OK
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "membaca %s" msgstr "membaca %s"
@@ -659,69 +659,69 @@ msgstr ""
"Mengabaikan lease DHCP untuk %s sebab terdapat bagian domain yang tidak sah" "Mengabaikan lease DHCP untuk %s sebab terdapat bagian domain yang tidak sah"
# OK # OK
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "gagal membuat socket: %s " msgstr "gagal membuat socket: %s "
# OK # OK
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "gagal menyetel IPV6 pada socket: %s" msgstr "gagal menyetel IPV6 pada socket: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "gagal mem-bind socket untuk mendengarkan %s: %s" msgstr "gagal mem-bind socket untuk mendengarkan %s: %s"
# OK # OK
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "gagal mendengarkan di socket: %s" msgstr "gagal mendengarkan di socket: %s"
# OK # OK
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "mengabaikan nameserver %s - antarmuka lokal" msgstr "mengabaikan nameserver %s - antarmuka lokal"
# OK # OK
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %m" msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %m"
# OK # OK
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "domain" msgstr "domain"
# OK # OK
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "tidak memenuhi syarat" msgstr "tidak memenuhi syarat"
# OK # OK
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "domain-domain" msgstr "domain-domain"
# OK # OK
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "menggunakan alamat lokal saja untuk %s %s" msgstr "menggunakan alamat lokal saja untuk %s %s"
# OK # OK
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "menggunakan nameserver %s#%d untuk %s %s" msgstr "menggunakan nameserver %s#%d untuk %s %s"
# OK # OK
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "menggunakan nameserver %s#%d" msgstr "menggunakan nameserver %s#%d"
@@ -883,31 +883,31 @@ msgid "duplicate IP address %s in dhcp-config directive."
msgstr "alamat IP kembar %s dalam direktif dhcp-config" msgstr "alamat IP kembar %s dalam direktif dhcp-config"
# OK # OK
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "jangkauan DHCP %s -- %s tidak konsisten dengan netmask %s" msgstr "jangkauan DHCP %s -- %s tidak konsisten dengan netmask %s"
# OK # OK
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "gagal membaca %s:%m" msgstr "gagal membaca %s:%m"
# OK # OK
#: dhcp.c:641 #: dhcp.c:642
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "kesalahan nama pada %s baris %d" msgstr "kesalahan nama pada %s baris %d"
# OK # OK
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "alamat IP kembar %s (%s) dalam direktif dhcp-config" msgstr "alamat IP kembar %s (%s) dalam direktif dhcp-config"
# OK # OK
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/no.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.25\n" "Project-Id-Version: dnsmasq 2.25\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2006-01-11 17:39+0000\n" "PO-Revision-Date: 2006-01-11 17:39+0000\n"
"Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n" "Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -22,17 +22,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "feilet <20> laste navn fra %s: %m" msgstr "feilet <20> laste navn fra %s: %m"
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "d<>rlig adresse ved %s linje %d" msgstr "d<>rlig adresse ved %s linje %d"
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "d<>rlig navn ved %s linje %d" msgstr "d<>rlig navn ved %s linje %d"
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "les %s - %d adresser" msgstr "les %s - %d adresser"
@@ -499,7 +499,7 @@ msgstr "kun en resolv.conf fil tillat i no-poll modus."
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "m<> ha n<>yaktig en resolv.conf <20> lese domene fra." msgstr "m<> ha n<>yaktig en resolv.conf <20> lese domene fra."
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "feilet <20> lese %s: %m" msgstr "feilet <20> lese %s: %m"
@@ -528,7 +528,7 @@ msgstr "feilet
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "feilet <20> laste %s: %m" msgstr "feilet <20> laste %s: %m"
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "leser %s" msgstr "leser %s"
@@ -543,59 +543,59 @@ msgstr "d
msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "Ignorerer DHCP leie for %s siden den har en ulovlig domene del" msgstr "Ignorerer DHCP leie for %s siden den har en ulovlig domene del"
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "feilet <20> lage lytte socket: %s" msgstr "feilet <20> lage lytte socket: %s"
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "feilet <20> sette IPv6 opsjoner p<> lytte socket: %s" msgstr "feilet <20> sette IPv6 opsjoner p<> lytte socket: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "feilet <20> binde lytte socket for %s: %s" msgstr "feilet <20> binde lytte socket for %s: %s"
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "feilet <20> lytte p<> socket: %s" msgstr "feilet <20> lytte p<> socket: %s"
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "ignorerer navnetjener %s - lokal tilknytning" msgstr "ignorerer navnetjener %s - lokal tilknytning"
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m" msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m"
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "domene" msgstr "domene"
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "ikke kvalifisert" msgstr "ikke kvalifisert"
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "domener" msgstr "domener"
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "benytter lokale adresser kun for %s %s" msgstr "benytter lokale adresser kun for %s %s"
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "benytter navnetjener %s#%d for %s %s" msgstr "benytter navnetjener %s#%d for %s %s"
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "benytter navnetjener %s#%d" msgstr "benytter navnetjener %s#%d"
@@ -728,27 +728,27 @@ msgstr "kan ikke lage ICMP raw socket: %s"
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "dubliserte IP adresser i %s dhcp-config direktiv." msgstr "dubliserte IP adresser i %s dhcp-config direktiv."
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "DHCP omr<6D>de %s -- %s er ikke konsistent med nettmaske %s" msgstr "DHCP omr<6D>de %s -- %s er ikke konsistent med nettmaske %s"
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "feilet <20> lese %s:%m" msgstr "feilet <20> lese %s:%m"
#: dhcp.c:641 #: dhcp.c:642
#, c-format #, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "d<>rlig linje ved %s linje %d" msgstr "d<>rlig linje ved %s linje %d"
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv" msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv"
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "Ignorerer DHCP verts navn %s p<> grunn av ulovlig domene del" msgstr "Ignorerer DHCP verts navn %s p<> grunn av ulovlig domene del"

46
po/pl.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-10-04 19:17+0100\n" "PO-Revision-Date: 2005-10-04 19:17+0100\n"
"Last-Translator: Tomasz Socha<68>ski <nerdhero@gmail.com>\n" "Last-Translator: Tomasz Socha<68>ski <nerdhero@gmail.com>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -21,17 +21,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "b<><62>d <20>adowania nazw z %s: %m" msgstr "b<><62>d <20>adowania nazw z %s: %m"
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "b<><62>dna nazwa w %s, linia %d" msgstr "b<><62>dna nazwa w %s, linia %d"
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "b<><62>dna nazwa w %s, linia %d" msgstr "b<><62>dna nazwa w %s, linia %d"
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "przeczytano %s - %d adres<65>w" msgstr "przeczytano %s - %d adres<65>w"
@@ -508,7 +508,7 @@ msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll."
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "musisz mie<69> dok<6F>adnie jeden plik resolv.conf do odczytu domen." msgstr "musisz mie<69> dok<6F>adnie jeden plik resolv.conf do odczytu domen."
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "b<><62>d w odczycie %s: %m" msgstr "b<><62>d w odczycie %s: %m"
@@ -538,7 +538,7 @@ msgstr "b
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "b<><62>d <20>adowania %s: %m" msgstr "b<><62>d <20>adowania %s: %m"
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "czytanie %s" msgstr "czytanie %s"
@@ -555,59 +555,59 @@ msgstr ""
"Ignoruj<75> dzier<65>awy DHCP dla %s poniewa<77> zawieraj<61> nieprawid<69>ow<6F> cz<63><7A><EFBFBD> " "Ignoruj<75> dzier<65>awy DHCP dla %s poniewa<77> zawieraj<61> nieprawid<69>ow<6F> cz<63><7A><EFBFBD> "
"domenow<6F>" "domenow<6F>"
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "b<><62>d podczas tworzenia gniazda: %s" msgstr "b<><62>d podczas tworzenia gniazda: %s"
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "b<><62>d ustawienia opcji IPV6 na nas<61>uchuj<75>cym gnie<69>dzie: %s" msgstr "b<><62>d ustawienia opcji IPV6 na nas<61>uchuj<75>cym gnie<69>dzie: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "b<><62>d pod<6F><64>czenia nas<61>uchuj<75>cego gniazda dla %s: %s" msgstr "b<><62>d pod<6F><64>czenia nas<61>uchuj<75>cego gniazda dla %s: %s"
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "b<><62>d w<><77>czenia nas<61>uchiwania gniazda: %s" msgstr "b<><62>d w<><77>czenia nas<61>uchiwania gniazda: %s"
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "ignorowanie serwera nazw %s - interfejs lokalny" msgstr "ignorowanie serwera nazw %s - interfejs lokalny"
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "ignorowanie serwera nazw %s - nie mo<6D>na utworzy<7A>/dowi<77>za<7A> gniazda: %m" msgstr "ignorowanie serwera nazw %s - nie mo<6D>na utworzy<7A>/dowi<77>za<7A> gniazda: %m"
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "domena" msgstr "domena"
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "niekwalifikowany(a/e)" msgstr "niekwalifikowany(a/e)"
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "domeny" msgstr "domeny"
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "w<><77>czenie u<>ywania lokalnych adres<65>w tylko dla %s %s" msgstr "w<><77>czenie u<>ywania lokalnych adres<65>w tylko dla %s %s"
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "u<>ywany serwer nazw: %s#%d dla %s %s" msgstr "u<>ywany serwer nazw: %s#%d dla %s %s"
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "u<>ywany serwer nazw %s#%d" msgstr "u<>ywany serwer nazw %s#%d"
@@ -741,27 +741,27 @@ msgstr "b
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "powt<77>rzenie adresu IP %s w opcji dhcp-config" msgstr "powt<77>rzenie adresu IP %s w opcji dhcp-config"
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "zakres DHCP %s -- %s jest niesp<73>jny z mask<73> sieciow<6F> %s" msgstr "zakres DHCP %s -- %s jest niesp<73>jny z mask<73> sieciow<6F> %s"
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "b<><62>d odczytu %s:%m" msgstr "b<><62>d odczytu %s:%m"
#: dhcp.c:641 #: dhcp.c:642
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "b<><62>dna nazwa w %s, linia %d" msgstr "b<><62>dna nazwa w %s, linia %d"
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "powt<77>rzenie adresu IP %s (%s) w opcji dhcp-config" msgstr "powt<77>rzenie adresu IP %s (%s) w opcji dhcp-config"
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/pt_BR.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.26\n" "Project-Id-Version: dnsmasq 2.26\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2006-01-16 20:42+0000\n" "PO-Revision-Date: 2006-01-16 20:42+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n" "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "" msgstr ""
@@ -488,7 +488,7 @@ msgstr ""
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "" msgstr ""
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "" msgstr ""
@@ -532,59 +532,59 @@ msgstr ""
msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "" msgstr ""
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "" msgstr ""
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "" msgstr ""
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "" msgstr ""
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "" msgstr ""
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "" msgstr ""
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "" msgstr ""
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "" msgstr ""
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "" msgstr ""
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "" msgstr ""
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "" msgstr ""
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "" msgstr ""
@@ -716,27 +716,27 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "" msgstr ""
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "" msgstr ""
#: dhcp.c:641 #: dhcp.c:642
#, c-format #, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "" msgstr ""
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "" msgstr ""
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""

46
po/ro.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-21 19:59+0100\n" "POT-Creation-Date: 2006-04-23 19:58+0100\n"
"PO-Revision-Date: 2005-11-22 16:46+0000\n" "PO-Revision-Date: 2005-11-22 16:46+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "încărcarea numelor din %s: %m a eşuat" msgstr "încărcarea numelor din %s: %m a eşuat"
#: cache.c:606 dhcp.c:654 #: cache.c:606 dhcp.c:655
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "adresă greşită în %s, linia %d" msgstr "adresă greşită în %s, linia %d"
#: cache.c:633 dhcp.c:668 #: cache.c:633 dhcp.c:669
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "nume greşit în %s linia %d" msgstr "nume greşit în %s linia %d"
#: cache.c:639 dhcp.c:722 #: cache.c:639 dhcp.c:723
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "citesc %s - %d adrese" msgstr "citesc %s - %d adrese"
@@ -500,7 +500,7 @@ msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
"am nevoie de un singur resolv.conf din care să citesc numele domeniului." "am nevoie de un singur resolv.conf din care să citesc numele domeniului."
#: option.c:1884 network.c:501 #: option.c:1884 network.c:481
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "nu pot citi %s: %n" msgstr "nu pot citi %s: %n"
@@ -529,7 +529,7 @@ msgstr "accesarea serverului %s a eşuat: %n"
msgid "failed to load %s: %m" msgid "failed to load %s: %m"
msgstr "nu pot încărca %s: %n" msgstr "nu pot încărca %s: %n"
#: isc.c:93 network.c:505 #: isc.c:93 network.c:485
#, c-format #, c-format
msgid "reading %s" msgid "reading %s"
msgstr "citesc %s" msgstr "citesc %s"
@@ -544,59 +544,59 @@ msgstr "nume invalid în %s"
msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr "Împrumutul DHCP pentru %s va fi ignorat deoarece are domeniu invalid" msgstr "Împrumutul DHCP pentru %s va fi ignorat deoarece are domeniu invalid"
#: network.c:328 dnsmasq.c:129 #: network.c:308 dnsmasq.c:129
#, c-format #, c-format
msgid "failed to create listening socket: %s" msgid "failed to create listening socket: %s"
msgstr "creearea socket-ului de ascultare a eşuat: %s" msgstr "creearea socket-ului de ascultare a eşuat: %s"
#: network.c:335 #: network.c:315
#, c-format #, c-format
msgid "failed to set IPV6 options on listening socket: %s" msgid "failed to set IPV6 options on listening socket: %s"
msgstr "configurarea opţiunilor IPv6 a eşuat pe socket-ul de ascultare: %s" msgstr "configurarea opţiunilor IPv6 a eşuat pe socket-ul de ascultare: %s"
#: network.c:353 #: network.c:333
#, c-format #, c-format
msgid "failed to bind listening socket for %s: %s" msgid "failed to bind listening socket for %s: %s"
msgstr "activarea socket-ului de ascultare pentru %s a eşuat: %s" msgstr "activarea socket-ului de ascultare pentru %s a eşuat: %s"
#: network.c:361 #: network.c:341
#, c-format #, c-format
msgid "failed to listen on socket: %s" msgid "failed to listen on socket: %s"
msgstr "ascultarea pe socket a eşuat: %s" msgstr "ascultarea pe socket a eşuat: %s"
#: network.c:431 #: network.c:411
#, c-format #, c-format
msgid "ignoring nameserver %s - local interface" msgid "ignoring nameserver %s - local interface"
msgstr "ignorăm serverul DNS %s - interfaţă locală" msgstr "ignorăm serverul DNS %s - interfaţă locală"
#: network.c:440 #: network.c:420
#, c-format #, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr "ignorăm serverul DNS %s - nu pot creea/activa socket-ul: %s" msgstr "ignorăm serverul DNS %s - nu pot creea/activa socket-ul: %s"
#: network.c:454 #: network.c:434
msgid "domain" msgid "domain"
msgstr "domeniu" msgstr "domeniu"
#: network.c:456 #: network.c:436
msgid "unqualified" msgid "unqualified"
msgstr "invalid" msgstr "invalid"
#: network.c:456 #: network.c:436
msgid "domains" msgid "domains"
msgstr "domenii" msgstr "domenii"
#: network.c:459 #: network.c:439
#, c-format #, c-format
msgid "using local addresses only for %s %s" msgid "using local addresses only for %s %s"
msgstr "folosim adresele locale doar pentru %S %s" msgstr "folosim adresele locale doar pentru %S %s"
#: network.c:461 #: network.c:441
#, c-format #, c-format
msgid "using nameserver %s#%d for %s %s" msgid "using nameserver %s#%d for %s %s"
msgstr "folosim serverul DNS %s#%d pentru %s %s" msgstr "folosim serverul DNS %s#%d pentru %s %s"
#: network.c:464 #: network.c:444
#, c-format #, c-format
msgid "using nameserver %s#%d" msgid "using nameserver %s#%d"
msgstr "folosim serverul DNS %s#%d" msgstr "folosim serverul DNS %s#%d"
@@ -732,27 +732,27 @@ msgstr "nu pot creea socket ICMP raw: %s."
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "adresă IP duplicat %s în declaraţia dhcp-config." msgstr "adresă IP duplicat %s în declaraţia dhcp-config."
#: dhcp.c:306 #: dhcp.c:307
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "domeniu DHCP %s -- %s nu este consistent cu masca de reţea %s" msgstr "domeniu DHCP %s -- %s nu este consistent cu masca de reţea %s"
#: dhcp.c:622 #: dhcp.c:623
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "citirea %s:%n a eşuat" msgstr "citirea %s:%n a eşuat"
#: dhcp.c:641 #: dhcp.c:642
#, c-format #, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "linie invalidă în %s rândul %d" msgstr "linie invalidă în %s rândul %d"
#: dhcp.c:745 #: dhcp.c:746
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "adresă IP duplicat %s (%s) în declaraţia dhcp-config." msgstr "adresă IP duplicat %s (%s) în declaraţia dhcp-config."
#: dhcp.c:781 #: dhcp.c:782
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "Ignor numele DHCP al maşinii %s deoarece are domeniu DNS ilegal" msgstr "Ignor numele DHCP al maşinii %s deoarece are domeniu DNS ilegal"

2
src/config.h
View File

@@ -10,7 +10,7 @@
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#define VERSION "2.29" #define VERSION "2.30"
#define FTABSIZ 150 /* max number of outstanding requests */ #define FTABSIZ 150 /* max number of outstanding requests */
#define MAX_PROCS 20 /* max no children for TCP requests */ #define MAX_PROCS 20 /* max no children for TCP requests */

1
src/dhcp.c
View File

@@ -241,6 +241,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
{ {
/* broadcast to 255.255.255.255 */ /* broadcast to 255.255.255.255 */
struct in_pktinfo *pkt; struct in_pktinfo *pkt;
msg.msg_control = control_u.control;
msg.msg_controllen = sizeof(control_u); msg.msg_controllen = sizeof(control_u);
cmptr = CMSG_FIRSTHDR(&msg); cmptr = CMSG_FIRSTHDR(&msg);
dest.sin_addr.s_addr = INADDR_BROADCAST; dest.sin_addr.s_addr = INADDR_BROADCAST;

38
src/network.c
View File

@@ -184,7 +184,7 @@ int enumerate_interfaces(struct daemon *daemon)
static int create_ipv6_listener(struct listener **link, int port) static int create_ipv6_listener(struct listener **link, int port)
{ {
union mysockaddr addr; union mysockaddr addr;
int tcpfd, fd, flags, save; int tcpfd, fd, flags;
struct listener *l; struct listener *l;
int opt = 1; int opt = 1;
@@ -204,13 +204,8 @@ static int create_ipv6_listener(struct listener **link, int port)
errno == EINVAL); errno == EINVAL);
if ((tcpfd = socket(AF_INET6, SOCK_STREAM, 0)) == -1) if ((tcpfd = socket(AF_INET6, SOCK_STREAM, 0)) == -1)
{ return 0;
save = errno;
close(fd);
errno = save;
return 0;
}
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
setsockopt(fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 || setsockopt(fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
@@ -227,14 +222,8 @@ static int create_ipv6_listener(struct listener **link, int port)
bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 || bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 ||
listen(tcpfd, 5) == -1 || listen(tcpfd, 5) == -1 ||
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)
{ return 0;
save = errno;
close(fd);
close(tcpfd);
errno = save;
return 0;
}
l = safe_malloc(sizeof(struct listener)); l = safe_malloc(sizeof(struct listener));
l->fd = fd; l->fd = fd;
l->tcpfd = tcpfd; l->tcpfd = tcpfd;
@@ -261,15 +250,10 @@ struct listener *create_wildcard_listeners(int port)
addr.in.sin_len = sizeof(struct sockaddr_in); addr.in.sin_len = sizeof(struct sockaddr_in);
#endif #endif
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 ||
(tcpfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
return NULL; return NULL;
if ((tcpfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
close (fd);
return NULL;
}
if (setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || if (setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 || bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 ||
listen(tcpfd, 5) == -1 || listen(tcpfd, 5) == -1 ||
@@ -288,12 +272,8 @@ struct listener *create_wildcard_listeners(int port)
setsockopt(fd, IPPROTO_IP, IP_RECVIF, &opt, sizeof(opt)) == -1 || setsockopt(fd, IPPROTO_IP, IP_RECVIF, &opt, sizeof(opt)) == -1 ||
#endif #endif
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)
{ return NULL;
close(fd);
close(tcpfd);
return NULL;
}
l = safe_malloc(sizeof(struct listener)); l = safe_malloc(sizeof(struct listener));
l->family = AF_INET; l->family = AF_INET;
l->fd = fd; l->fd = fd;