Save work.

pappl/printer-accessors.c

@@ -895,6 +895,28 @@ papplPrinterGetURI(
 }
 
 
+//
+// 'papplPrinterGetUUID()' - Get the UUID associated with a printer.
+//
+
+const char *				// O - UUID string
+papplPrinterGetUUID(
+    pappl_printer_t *printer)		// I - Printer
+{
+  const char	*uuid = NULL;		// UUID string
+
+
+  if (printer)
+  {
+    _papplRWLockRead(printer);
+    uuid = ippGetString(ippFindAttribute(printer->attrs, "printer-uuid", IPP_TAG_URI), 0, NULL);
+    _papplRWUnlock(printer);
+  }
+
+  return (uuid);
+}
+
+
 //
 // 'papplPrinterHoldNewJobs()' - Hold new jobs for printing.
 //
@@ -1774,7 +1796,24 @@ papplPrinterSetProxy(
 
   _papplRWLockWrite(printer);
 
-  // TODO: Start/stop proxy?
+  if (printer->proxy_active)
+  {
+    // Terminate proxy thread...
+    printer->proxy_terminate = true;
+
+    while (printer->proxy_active)
+    {
+      _papplRWUnlock(printer);
+
+      sleep(1);
+
+      _papplRWLockWrite(printer);
+    }
+
+    printer->proxy_terminate = false;
+  }
+
+  // Update the proxy information...
   free(printer->proxy_name);
   free(printer->proxy_uri);
   free(printer->proxy_uuid);
@@ -1786,6 +1825,22 @@ papplPrinterSetProxy(
   _papplRWUnlock(printer);
 
   _papplSystemConfigChanged(printer->system);
+
+  // If the system is running, start the proxy...
+  if (printer->system->is_running && printer->proxy_name)
+  {
+    cups_thread_t	tid;		// Thread ID
+
+    if ((tid = cupsThreadCreate((void *(*)(void *))_papplPrinterRunProxy, printer)) == CUPS_THREAD_INVALID)
+    {
+      // Unable to create listener thread...
+      papplLogPrinter(printer, PAPPL_LOGLEVEL_ERROR, "Unable to create proxy thread: %s", strerror(errno));
+    }
+    else
+    {
+      cupsThreadDetach(tid);
+    }
+  }
 }
 
 

pappl/printer-proxy.c

@@ -51,19 +51,38 @@ _papplPrinterConnectProxy(
     pappl_printer_t *printer)		// I - Printer
 {
   http_t	*http = NULL;		// Connection to server
-  char		resource[1024];		// Resource path
+  char		uri[1024],		// Proxy URI
+		resource[1024];		// Resource path
+  char		*creds,			// Public key and certificate, if any
+		*key;			// Private key, if any
+//  char		*token;			// OAuth 2.0 access token, if any
+//  time_t	token_expires;		// Access token expiration date/time
 
 
-  // TODO: Add client credentials support using proxy_uuid as common name
-  _papplRWLockWrite(printer);
+  // Copy the Infrastructure Printer URI...
+  _papplRWLockRead(printer);
+  cupsCopyString(uri, printer->proxy_uri, sizeof(uri));
+
+  // Get any client credentials using the proxy UUID...
+  creds = cupsCopyCredentials(/*path*/NULL, printer->proxy_uuid);
+  key   = cupsCopyCredentials(/*path*/NULL, printer->proxy_uuid);
+  _papplRWUnlock(printer);
+
+  cupsSetClientCredentials(creds, key);
 
-  if ((http = httpConnectURI(printer->proxy_uri, /*host*/NULL, /*hsize*/0, /*port*/NULL, resource, sizeof(resource), /*blocking*/true, /*msec*/30000, /*cancel*/NULL, /*require_ca*/false)) == NULL)
+  // Connect to the Infrastructure Printer...
+  if ((http = httpConnectURI(uri, /*host*/NULL, /*hsize*/0, /*port*/NULL, resource, sizeof(resource), /*blocking*/true, /*msec*/30000, /*cancel*/NULL, /*require_ca*/false)) == NULL)
+  {
     papplLogPrinter(printer, PAPPL_LOGLEVEL_ERROR, "Unable to connect to infrastructure printer '%s': %s", printer->proxy_uri, cupsGetErrorString());
-  else if (!printer->proxy_resource)
-    printer->proxy_resource = strdup(resource);
+    return (NULL);
+  }
 
+  _papplRWLockWrite(printer);
+  if (!printer->proxy_resource)
+    printer->proxy_resource = strdup(resource);
   _papplRWUnlock(printer);
 
+  // TODO: Set OAuth bearer (access) token, if present...
   return (http);
 }
 

pappl/printer.h

@@ -465,6 +465,7 @@ extern ipp_pstate_t	papplPrinterGetState(pappl_printer_t *printer) _PAPPL_PUBLIC
 extern size_t		papplPrinterGetSupplies(pappl_printer_t *printer, size_t max_supplies, pappl_supply_t *supplies) _PAPPL_PUBLIC;
 extern pappl_system_t	*papplPrinterGetSystem(pappl_printer_t *printer) _PAPPL_PUBLIC;
 extern char		*papplPrinterGetURI(pappl_printer_t *printer, char *buffer, size_t bufsize) _PAPPL_PUBLIC;
+extern const char	*papplPrinterGetUUID(pappl_printer_t *printer) _PAPPL_PUBLIC;
 
 extern bool		papplPrinterHoldNewJobs(pappl_printer_t *printer) _PAPPL_PUBLIC;
 extern void		papplPrinterHTMLFooter(pappl_client_t *client) _PAPPL_PUBLIC;

pappl/system-accessors.c

@@ -2602,10 +2602,10 @@ papplSystemSetPrinterDrivers(
 //     /* Return requested printer */
 //     return (requested_printer);
 //   }
-//   else if (papplSystemGetNumberOfPrinter(papplClientGetSystem(client)) < 32)
+//   else if (papplSystemGetNumberOfPrinters(papplClientGetSystem(client)) < 32)
 //   {
 //     /* Return new printer */
-//     return (papplPrinterCreateInfra(papplClientGetSystem(system), /*printer_id*/0, /*printer_name*/device_uuid, /*num_device_uuids*/1, &device_uuid));
+//     return (papplPrinterCreateInfra(papplClientGetSystem(client), /*printer_id*/0, /*printer_name*/device_uuid, /*num_device_uuids*/1, &device_uuid));
 //   }
 //   else
 //   {

pappl/system.c

@@ -567,6 +567,23 @@ papplSystemRun(pappl_system_t *system)	// I - System
         cupsThreadDetach(tid);
       }
     }
+
+    if (printer->proxy_uri)
+    {
+      cups_thread_t	tid;		// Thread ID
+
+      papplLogPrinter(printer, PAPPL_LOGLEVEL_INFO, "Starting proxy thread for '%s'.", printer->proxy_uri);
+
+      if ((tid = cupsThreadCreate((void *(*)(void *))_papplPrinterRunProxy, printer)) == CUPS_THREAD_INVALID)
+      {
+	// Unable to create listener thread...
+	papplLogPrinter(printer, PAPPL_LOGLEVEL_ERROR, "Unable to create proxy thread: %s", strerror(errno));
+      }
+      else
+      {
+        cupsThreadDetach(tid);
+      }
+    }
   }
 
   // Start the USB gadget as needed...

testsuite/Makefile

@@ -51,8 +51,8 @@ test:		testpappl
 	$(MKDIR) testpappl.output
 	echo "./testhttpmon"
 	./testhttpmon 2>test.log
-	echo "./testpappl -c -l testpappl.log -L debug -o testpappl.output -t api,client,pwg-raster,client-10x1000,idle-shutdown"
-	./testpappl -c -l testpappl.log -L debug -o testpappl.output -t api,client,pwg-raster,client-10x1000,idle-shutdown 2>test.log
+	echo "./testpappl -c -l testpappl.log -L debug -o testpappl.output -t api,client,pwg-raster,infra,client-10x1000,idle-shutdown"
+	./testpappl -c -l testpappl.log -L debug -o testpappl.output -t api,client,pwg-raster,infra,client-10x1000,idle-shutdown 2>test.log
 
 
 # HTTP monitor unit test