Changeset 751 for trunk/server/source3/printing/print_cups.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/printing/print_cups.c (modified) (36 diffs)

trunk/server/source3/printing/print_cups.c

@@ -36 +36 @@
 #endif
 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetName(attr)      attr->name
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetStatusCode(ipp) ipp->request.status.status_code
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+  if (!ipp)
+    return (NULL);
+  return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+  if (!ipp || !ipp->current)
+    return (NULL);
+  return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation(ipp_t *ipp, ipp_op_t op)
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId(ipp_t *ipp, int request_id)
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+
 static SIG_ATOMIC_T gotalarm;
 
@@ -172 +213 @@
         bool ret_ok = false;
 
-        for (attr = response->attrs; attr != NULL;) {
+        for (attr = ippFirstAttribute(response); attr != NULL;) {
                /*
                 * Skip leading attributes until we hit a printer...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -190 +231 @@
                 info       = NULL;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) {
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_PRINTER) {
                         size_t size;
-                        if (strcmp(attr->name, "printer-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "printer-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -202 +243 @@
                         }
 
-                        if (strcmp(attr->name, "printer-info") == 0 &&
-                            attr->value_tag == IPP_TAG_TEXT) {
+                        if (strcmp(ippGetName(attr), "printer-info") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_TEXT) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &info,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -212 +253 @@
                         }
 
-                        if (strcmp(attr->name, "printer-location") == 0 &&
-                            attr->value_tag == IPP_TAG_TEXT) {
+                        if (strcmp(ippGetName(attr), "printer-location") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_TEXT) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &location,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -222 +263 @@
                         }
 
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
 
@@ -302 +343 @@
         request = ippNew();
 
-        request->request.op.operation_id = CUPS_GET_PRINTERS;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, CUPS_GET_PRINTERS);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -344 +385 @@
         request = ippNew();
 
-        request->request.op.operation_id = CUPS_GET_CLASSES;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, CUPS_GET_CLASSES);
+        ippSetRequestId(request, 1);
 
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
@@ -608 +649 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_CANCEL_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_CANCEL_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -635 +676 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to cancel job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -705 +746 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_HOLD_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_HOLD_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -731 +772 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to hold job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -801 +842 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_RELEASE_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_RELEASE_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -827 +868 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to release job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -857 +898 @@
  */
 
-static int cups_job_submit(int snum, struct printjob *pjob)
+static int cups_job_submit(int snum, struct printjob *pjob,
+                           enum printing_types printing_type,
+                           char *lpq_cmd)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -876 +919 @@
         char *filename = NULL;
         size_t size;
-        uint32_t jobid = (uint32_t)-1;
 
         DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
@@ -907 +949 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_PRINT_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_PRINT_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -938 +980 @@
                      pjob->clientmachine);
 
-        /* Get the jobid from the filename. */
-        jobid = print_parse_jobid(pjob->filename);
-        if (jobid == (uint32_t)-1) {
-                DEBUG(0,("cups_job_submit: failed to parse jobid from name %s\n",
-                                pjob->filename ));
-                jobid = 0;
-        }
-
         if (!push_utf8_talloc(frame, &jobname, pjob->jobname, &size)) {
                 goto out;
@@ -951 +985 @@
         new_jobname = talloc_asprintf(frame,
                         "%s%.8u %s", PRINT_SPOOL_PREFIX,
-                        (unsigned int)jobid,
-                        jobname);
+                        pjob->jobid, jobname);
         if (new_jobname == NULL) {
                 goto out;
@@ -984 +1017 @@
         }
         if ((response = cupsDoFileRequest(http, request, uri, pjob->filename)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to print file to %s - %s\n",
                                  lp_printername(snum),
@@ -992 +1025 @@
                         attr_job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER);
                         if(attr_job_id) {
-                                pjob->sysjob = attr_job_id->values[0].integer;
+                                pjob->sysjob = ippGetInteger(attr_job_id, 0);
                                 DEBUG(5,("cups_job_submit: job-id %d\n", pjob->sysjob));
                         } else {
@@ -1114 +1147 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_JOBS;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_GET_JOBS);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1143 +1176 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get jobs for %s - %s\n", uri,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 goto out;
         }
@@ -1157 +1190 @@
         queue  = NULL;
 
-        for (attr = response->attrs; attr != NULL; attr = attr->next) {
+        for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
                /*
                 * Skip leading attributes until we hit a job...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -1198 +1231 @@
                 job_name     = NULL;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_JOB) {
-                        if (attr->name == NULL) {
-                                attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_JOB) {
+                        if (ippGetName(attr) == NULL) {
+                                attr = ippNextAttribute(response);
                                 break;
                         }
 
-                        if (strcmp(attr->name, "job-id") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_id = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-k-octets") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_k_octets = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-priority") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_priority = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-state") == 0 &&
-                            attr->value_tag == IPP_TAG_ENUM)
-                                job_status = (ipp_jstate_t)(attr->values[0].integer);
-
-                        if (strcmp(attr->name, "time-at-creation") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_time = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "job-id") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_id = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-k-octets") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_k_octets = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-priority") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_priority = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-state") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_ENUM)
+                                job_status = (ipp_jstate_t)ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "time-at-creation") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_time = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(frame,
                                                 &job_name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto out;
@@ -1234 +1267 @@
                         }
 
-                        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "job-originating-user-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(frame,
                                                 &user_name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto out;
@@ -1244 +1277 @@
                         }
 
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
 
@@ -1258 +1291 @@
                 }
 
-                temp->job      = job_id;
+                temp->sysjob   = job_id;
                 temp->size     = job_k_octets * 1024;
                 temp->status   = job_status == IPP_JOB_PENDING ? LPQ_QUEUED :
@@ -1290 +1323 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
+        ippSetRequestId(request, 1);
 
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
@@ -1317 +1350 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get printer status for %s - %s\n", printername,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 goto out;
         }
@@ -1328 +1361 @@
 
         if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL) {
-                if (attr->values[0].integer == IPP_PRINTER_STOPPED)
+                if (ippGetInteger(attr, 0) == IPP_PRINTER_STOPPED)
                         status->status = LPSTAT_STOPPED;
                 else
@@ -1338 +1371 @@
                 char *msg = NULL;
                 if (!pull_utf8_talloc(frame, &msg,
-                                attr->values[0].string.text,
+                                ippGetString(attr, 0, NULL),
                                 &size)) {
                         SAFE_FREE(queue);
@@ -1414 +1447 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_PAUSE_PRINTER;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_PAUSE_PRINTER);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1445 +1478 @@
 
         if ((response = cupsDoRequest(http, request, "/admin/")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to pause printer %s - %s\n",
                                  lp_printername(snum),
@@ -1518 +1551 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_RESUME_PRINTER;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_RESUME_PRINTER);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1549 +1582 @@
 
         if ((response = cupsDoRequest(http, request, "/admin/")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to resume printer %s - %s\n",
                                  lp_printername(snum),