Skip to content

Commit 60c547d

Browse files
committed
Use httpAddrClose to close listener sockets.
1 parent 390e584 commit 60c547d

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tools/ippeveprinter.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,10 +2008,10 @@ delete_printer(
20082008
ippeve_printer_t *printer) // I - Printer
20092009
{
20102010
if (printer->ipv4 >= 0)
2011-
close(printer->ipv4);
2011+
httpAddrClose(/*addr*/NULL, printer->ipv4);
20122012

20132013
if (printer->ipv6 >= 0)
2014-
close(printer->ipv6);
2014+
httpAddrClose(/*addr*/NULL, printer->ipv6);
20152015

20162016
cupsDNSSDDelete(printer->dnssd);
20172017

@@ -5989,7 +5989,7 @@ register_printer(
59895989
if ((printer->services = cupsDNSSDServiceNew(printer->dnssd, if_index, printer->dnssd_name, (cups_dnssd_service_cb_t)dnssd_callback, printer)) == NULL)
59905990
goto error;
59915991

5992-
if (!cupsDNSSDServiceAdd(printer->services, "_printer._tcp", /*domain*/NULL, /*hostname*/NULL, /*port*/0, /*num_txt*/0, /*txt*/NULL))
5992+
if (!cupsDNSSDServiceAdd(printer->services, "_printer._tcp", /*domain*/NULL, printer->hostname, /*port*/0, /*num_txt*/0, /*txt*/NULL))
59935993
goto error;
59945994

59955995
// Then register the _ipp._tcp (IPP) service type with the real port number to
@@ -5999,7 +5999,7 @@ register_printer(
59995999
else
60006000
cupsCopyString(regtype, "_ipp._tcp", sizeof(regtype));
60016001

6002-
if (!cupsDNSSDServiceAdd(printer->services, regtype, /*domain*/NULL, /*hostname*/NULL, (uint16_t)printer->port, num_txt, txt))
6002+
if (!cupsDNSSDServiceAdd(printer->services, regtype, /*domain*/NULL, printer->hostname, (uint16_t)printer->port, num_txt, txt))
60036003
goto error;
60046004

60056005
// Then register the _ipps._tcp (IPP) service type with the real port number
@@ -6009,12 +6009,12 @@ register_printer(
60096009
else
60106010
cupsCopyString(regtype, "_ipps._tcp", sizeof(regtype));
60116011

6012-
if (!cupsDNSSDServiceAdd(printer->services, regtype, /*domain*/NULL, /*hostname*/NULL, (uint16_t)printer->port, num_txt, txt))
6012+
if (!cupsDNSSDServiceAdd(printer->services, regtype, /*domain*/NULL, printer->hostname, (uint16_t)printer->port, num_txt, txt))
60136013
goto error;
60146014

60156015
// Similarly, register the _http._tcp,_printer (HTTP) service type with the
60166016
// real port number to advertise our IPP printer's web interface...
6017-
if (!cupsDNSSDServiceAdd(printer->services, "_http._tcp,_printer", /*domain*/NULL, /*hostname*/NULL, (uint16_t)printer->port, num_txt, txt))
6017+
if (!cupsDNSSDServiceAdd(printer->services, "_http._tcp,_printer", /*domain*/NULL, printer->hostname, (uint16_t)printer->port, num_txt, txt))
60186018
goto error;
60196019

60206020
cupsFreeOptions(num_txt, txt);

0 commit comments

Comments
 (0)