Skip to content

Commit

Permalink
Apply feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@zdohnal
zdohnal committed Mar 6, 2024
1 parent ab81728 commit 8e03879
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 98 deletions.
48 changes: 34 additions & 14 deletions pappl/dnssd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

static void dns_sd_printer_callback(cups_dnssd_service_t *service, pappl_printer_t *printer, cups_dnssd_flags_t flags);
static void dns_sd_system_callback(cups_dnssd_service_t *service, pappl_system_t *system, cups_dnssd_flags_t flags);
static bool dns_sd_is_loopback(const char *name);


//
Expand Down Expand Up @@ -51,12 +52,12 @@ _papplPrinterRegisterDNSSDNoLock(
const char *papermax; // PaperMax string value (legacy)


if (!printer->dns_sd_name || !printer->system->is_running || (printer->system->options & PAPPL_SOPTIONS_NO_DNS_SD) || !system->reghost || !printer->system->reghost)
if (!printer->dns_sd_name || !printer->system->is_running || (printer->system->options & PAPPL_SOPTIONS_NO_DNS_SD) || !system->listen_hostname || !printer->system->listen_hostname)
return (false);

papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "Registering DNS-SD name '%s' on '%s'", printer->dns_sd_name, printer->system->reghost);
papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "Registering DNS-SD name '%s' on '%s'", printer->dns_sd_name, printer->system->listen_hostname);

if_index = !strcasecmp(system->reghost, "localhost") ? CUPS_DNSSD_IF_INDEX_LOCAL : CUPS_DNSSD_IF_INDEX_ANY;
if_index = dns_sd_is_loopback(system->listen_hostname) ? CUPS_DNSSD_IF_INDEX_LOCAL : CUPS_DNSSD_IF_INDEX_ANY;

// Get attributes and values for the TXT record...
color_supported = ippFindAttribute(printer->driver_attrs, "color-supported", IPP_TAG_BOOLEAN);
Expand Down Expand Up @@ -134,7 +135,7 @@ _papplPrinterRegisterDNSSDNoLock(
break;
}

httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl, sizeof(adminurl), "http", NULL, printer->system->reghost, printer->system->port, "%s/", printer->uriname);
httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl, sizeof(adminurl), "http", NULL, printer->system->listen_hostname, printer->system->port, "%s/", printer->uriname);

// Rename the service as needed...
if (printer->dns_sd_collision)
Expand Down Expand Up @@ -210,7 +211,7 @@ _papplPrinterRegisterDNSSDNoLock(
// Register the _printer._tcp (LPD) service type with a port number of 0 to
// defend our service name but not actually support LPD...
if (ret)
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_printer._tcp", /*domain*/NULL, system->reghost, /*port*/0, /*num_txt*/0, /*txt*/NULL);
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_printer._tcp", /*domain*/NULL, system->listen_hostname, /*port*/0, /*num_txt*/0, /*txt*/NULL);

// Then register the corresponding IPP service types with the real port
// number to advertise our printer...
Expand All @@ -221,7 +222,7 @@ _papplPrinterRegisterDNSSDNoLock(
else
cupsCopyString(regtype, "_ipp._tcp", sizeof(regtype));

ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, regtype, /*domain*/NULL, system->reghost, (uint16_t)system->port, num_txt, txt);
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, regtype, /*domain*/NULL, system->listen_hostname, (uint16_t)system->port, num_txt, txt);
}

if (ret && !(printer->system->options & PAPPL_SOPTIONS_NO_TLS))
Expand All @@ -231,7 +232,7 @@ _papplPrinterRegisterDNSSDNoLock(
else
cupsCopyString(regtype, "_ipps._tcp", sizeof(regtype));

ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, regtype, /*domain*/NULL, system->reghost, (uint16_t)system->port, num_txt, txt);
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, regtype, /*domain*/NULL, system->listen_hostname, (uint16_t)system->port, num_txt, txt);
}

// Add a geo-location record...
Expand All @@ -244,7 +245,7 @@ _papplPrinterRegisterDNSSDNoLock(
num_txt = cupsRemoveOption("rp", num_txt, &txt);
num_txt = cupsRemoveOption("TLS", num_txt, &txt);

ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_pdl-datastream._tcp", /*domain*/NULL, system->reghost, (uint16_t)(9099 + printer->printer_id), num_txt, txt);
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_pdl-datastream._tcp", /*domain*/NULL, system->listen_hostname, (uint16_t)(9099 + printer->printer_id), num_txt, txt);
}

cupsFreeOptions(num_txt, txt);
Expand All @@ -255,7 +256,7 @@ _papplPrinterRegisterDNSSDNoLock(
snprintf(adminurl, sizeof(adminurl), "%s/", printer->uriname);
num_txt = cupsAddOption("path", adminurl, 0, &txt);

ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_http._tcp,_printer", /*domain*/NULL, system->reghost, (uint16_t)system->port, num_txt, txt);
ret &= cupsDNSSDServiceAdd(printer->dns_sd_services, "_http._tcp,_printer", /*domain*/NULL, system->listen_hostname, (uint16_t)system->port, num_txt, txt);
cupsFreeOptions(num_txt, txt);
}

Expand Down Expand Up @@ -298,12 +299,12 @@ _papplSystemRegisterDNSSDNoLock(


// Make sure we have all of the necessary information to register the system...
if (!system->dns_sd_name || !system->hostname || !system->reghost || !system->uuid || !system->is_running || (system->options & PAPPL_SOPTIONS_NO_DNS_SD))
if (!system->dns_sd_name || !system->hostname || !system->listen_hostname || !system->uuid || !system->is_running || (system->options & PAPPL_SOPTIONS_NO_DNS_SD))
return (false);

papplLog(system, PAPPL_LOGLEVEL_DEBUG, "Registering DNS-SD name '%s' on '%s'", system->dns_sd_name, system->reghost);
papplLog(system, PAPPL_LOGLEVEL_DEBUG, "Registering DNS-SD name '%s' on '%s'", system->dns_sd_name, system->listen_hostname);

if_index = !strcasecmp(system->reghost, "localhost") ? CUPS_DNSSD_IF_INDEX_LOCAL : CUPS_DNSSD_IF_INDEX_ANY;
if_index = dns_sd_is_loopback(system->listen_hostname) ? CUPS_DNSSD_IF_INDEX_LOCAL : CUPS_DNSSD_IF_INDEX_ANY;

// Rename the service as needed...
if (system->dns_sd_collision)
Expand Down Expand Up @@ -359,14 +360,14 @@ _papplSystemRegisterDNSSDNoLock(
if (system->location != NULL)
num_txt = cupsAddOption("note", system->location, num_txt, &txt);

ret &= cupsDNSSDServiceAdd(system->dns_sd_services, "_ipps-system._tcp", /*domain*/NULL, system->reghost, (uint16_t)system->port, num_txt, txt);
ret &= cupsDNSSDServiceAdd(system->dns_sd_services, "_ipps-system._tcp", /*domain*/NULL, system->listen_hostname, (uint16_t)system->port, num_txt, txt);

cupsFreeOptions(num_txt, txt);
}

// Then the web interface...
if (ret && (system->options & PAPPL_SOPTIONS_MULTI_QUEUE))
ret &= cupsDNSSDServiceAdd(system->dns_sd_services, "_http._tcp,_printer", /*domain*/NULL, system->reghost, (uint16_t)system->port, /*num_txt*/0, /*txt*/NULL);
ret &= cupsDNSSDServiceAdd(system->dns_sd_services, "_http._tcp,_printer", /*domain*/NULL, system->listen_hostname, (uint16_t)system->port, /*num_txt*/0, /*txt*/NULL);

if (ret && system->geo_location)
ret &= cupsDNSSDServiceSetLocation(system->dns_sd_services, system->geo_location);
Expand Down Expand Up @@ -460,3 +461,22 @@ dns_sd_system_callback(
if (flags & CUPS_DNSSD_FLAGS_ERROR)
papplLog(system, PAPPL_LOGLEVEL_ERROR, "DNS-SD registration of '%s' failed.", system->dns_sd_name);
}


//
// 'dns_sd_is_loopback()' - Find out whether the string means
// localhost
//

static bool
dns_sd_is_loopback(const char *name)
{
if (!strcasecmp(name, "localhost"))
return (true);
else if (!strcmp(name, "127.0.0.1"))
return (true);
else if (!strcmp(name, "[::1]"))
return (true);

return (false);
}
2 changes: 0 additions & 2 deletions pappl/mainloop-subcommands.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1745,8 +1745,6 @@ default_system_cb(
if (server_hostname)
papplSystemSetHostName(system, server_hostname);

papplSystemSetRegHostName(system, listen_hostname);

if (!cupsGetOption("private-server", num_options, options))
{
// Listen for TCP/IP connections...
Expand Down
89 changes: 8 additions & 81 deletions pappl/system-accessors.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ papplSystemAddListeners(
ret = add_listeners(system, name, 0, AF_LOCAL);
if (ret && !system->domain_path)
system->domain_path = strdup(name);

system->listen_hostname = NULL;
}
else
#endif // !_WIN32
Expand Down Expand Up @@ -141,6 +143,8 @@ papplSystemAddListeners(
if (ret)
system->port = port;
}

system->listen_hostname = strdup(name);
}
else if (name && *name == '[')
{
Expand Down Expand Up @@ -169,6 +173,8 @@ papplSystemAddListeners(
if (ret)
system->port = port;
}

system->listen_hostname = strdup(name);
}
else
{
Expand Down Expand Up @@ -201,6 +207,8 @@ papplSystemAddListeners(
add_listeners(system, name, port, AF_INET6);
}
}

system->listen_hostname = system->hostname ? strdup(system->hostname) : NULL;
}

return (ret);
Expand Down Expand Up @@ -1250,35 +1258,6 @@ papplSystemGetPort(
}


//
// 'papplSystemGetRegHostName()' - Get hostname under which the services are
// registered.
//
// This function copies hostname used for service registration into the specified buffer.
//

char * // O - Hostname for service registration
papplSystemGetRegHostName(
pappl_system_t *system, // I - System
char *buffer, // I - String buffer
size_t bufsize) // I - Size of string buffer
{
if (system && buffer && bufsize > 0)
{
_papplRWLockRead(system);

if (system->reghost)
cupsCopyString(buffer, system->reghost, bufsize);

_papplRWUnlock(system);
}
else if (buffer)
buffer[0] = '\0';

return (buffer);
}


//
// 'papplSystemGetServerHeader()' - Get the Server: header for HTTP responses.
//
Expand Down Expand Up @@ -2035,15 +2014,6 @@ _papplSystemSetHostNameNoLock(
free(system->hostname);
system->hostname = strdup(value);

// Update registration hostname as well if it is not set or localhost
if (!system->reghost || strcasecmp(system->reghost, "localhost"))
{
if (system->reghost)
free(system->reghost);

system->reghost = strdup(value);
}

// Set the system TLS credentials...
cupsSetServerCredentials(NULL, system->hostname, 1);
}
Expand Down Expand Up @@ -2593,49 +2563,6 @@ papplSystemSetPrinterDrivers(
}


//
// 'papplSystemSetRegHostName()' - Set hostname under which the services will be
// registered.
//
// This function sets the hostname under which services will be registered - it can
// be localhost or the current hostname, otherwise registration hostname will be empty
// and service registration will be disabled (to prevent publishing service for
// different machine or when application listens on domain socket). In case 'name' is NULL,
// the current hostname is set as registration hostname.
//

void
papplSystemSetRegHostName(
pappl_system_t *system, // I - System
const char *name) // I - Hostname
{
const char *value = NULL; // New value

if (!system)
return;

_papplRWLockWrite(system);

if (system->hostname)
{
if (!name)
value = system->hostname;
else if (!strcasecmp(name, system->hostname))
goto end;
else if (!strcasecmp(name, "localhost"))
value = "localhost";

if (system->reghost)
free(system->reghost);

system->reghost = value ? strdup(value) : NULL;
}

end:
_papplRWUnlock(system);
}


//
// 'papplSystemSetSaveCallback()' - Set the save callback.
//
Expand Down
2 changes: 1 addition & 1 deletion pappl/system-private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ struct _pappl_system_s // System data
size_t max_image_size; // Maximum image file size (uncompressed)
int max_image_width, // Maximum image file width
max_image_height; // Maximum image file height
char *reghost; // Hostname for registering services
char *listen_hostname; // Listening and registration hostname
};

typedef struct _pappl_timer_s // Timer callback data
Expand Down
2 changes: 2 additions & 0 deletions pappl/system.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ papplSystemDelete(
free(system->name);
free(system->dns_sd_name);
free(system->hostname);
if (system->listen_hostname)
free(system->listen_hostname);
free(system->domain_path);
free(system->server_header);
free(system->directory);
Expand Down

0 comments on commit 8e03879

Please sign in to comment.