Changeset 77 for trunk/samba/source/printing/printing.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/printing/printing.c (modified) (30 diffs)

trunk/samba/source/printing/printing.c

@@ -8 +8 @@
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -17 +17 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -77 +76 @@
         fstrcpy( jinfo.sharename, sharename );
         jinfo.jobid = jobid;
-        key.dptr = (char*)&jinfo;
+        key.dptr = (uint8 *)&jinfo;
         key.dsize = sizeof(jinfo);
 
@@ -94 +93 @@
                 rap_jobid = ++next_rap_jobid;
         SSVAL(buf,0,rap_jobid);
-        data.dptr = (char*)buf;
+        data.dptr = buf;
         data.dsize = sizeof(rap_jobid);
         tdb_store(rap_tdb, key, data, TDB_REPLACE);
@@ -115 +114 @@
 
         SSVAL(buf,0,rap_jobid);
-        key.dptr = (char*)buf;
+        key.dptr = buf;
         key.dsize = sizeof(rap_jobid);
         data = tdb_fetch(rap_tdb, key);
@@ -150 +149 @@
         fstrcpy( jinfo.sharename, sharename );
         jinfo.jobid = jobid;
-        key.dptr = (char*)&jinfo;
+        key.dptr = (uint8 *)&jinfo;
         key.dsize = sizeof(jinfo);
 
@@ -167 +166 @@
         SAFE_FREE(data.dptr);
         SSVAL(buf,0,rap_jobid);
-        data.dptr = (char*)buf;
+        data.dptr = buf;
         data.dsize = sizeof(rap_jobid);
         tdb_delete(rap_tdb, key);
@@ -179 +178 @@
 ****************************************************************************/
 
-BOOL print_backend_init(void)
+BOOL print_backend_init(struct messaging_context *msg_ctx)
 {
         const char *sversion = "INFO/version";
@@ -216 +215 @@
 
         /* do NT print initialization... */
-        return nt_printing_init();
+        return nt_printing_init(msg_ctx);
 }
 
@@ -274 +273 @@
 
         SIVAL(&j, 0, jobid);
-        ret.dptr = (char *)&j;
+        ret.dptr = (uint8 *)&j;
         ret.dsize = sizeof(j);
         return ret;
@@ -283 +282 @@
 ***********************************************************************/
  
-int unpack_pjob( char* buf, int buflen, struct printjob *pjob )
+int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob )
 {
         int     len = 0;
@@ -519 +518 @@
         BOOL                    ret = False;
         struct tdb_print_db     *pdb = get_print_db_byname(sharename);
-        char                    *buf = NULL;
+        uint8                   *buf = NULL;
         int                     len, newlen, buflen;
         
@@ -555 +554 @@
         
                 if (buflen != len) {
-                        buf = (char *)SMB_REALLOC(buf, len);
+                        buf = (uint8 *)SMB_REALLOC(buf, len);
                         if (!buf) {
                                 DEBUG(0,("pjob_store: failed to enlarge buffer!\n"));
@@ -868 +867 @@
                 return (pid_t)-1;
         slprintf(keystr, sizeof(keystr)-1, "UPDATING/%s", sharename);
-        key.dptr = keystr;
-        key.dsize = strlen(keystr);
+        key = string_tdb_data(keystr);
 
         data = tdb_fetch(pdb->tdb, key);
@@ -906 +904 @@
 
         slprintf(keystr, sizeof(keystr)-1, "UPDATING/%s", sharename);
-        key.dptr = keystr;
-        key.dsize = strlen(keystr);
+        key = string_tdb_data(keystr);
         
         DEBUG(5, ("set_updating_pid: %s updating lpq cache for print share %s\n", 
@@ -920 +917 @@
         
         SIVAL( buffer, 0, updating_pid);
-        data.dptr = (char *)buffer;
+        data.dptr = buffer;
         data.dsize = 4;         /* we always assume this is a 4 byte value */
 
@@ -961 +958 @@
         size_t len;
         size_t i;
-        uint qcount;
+        unsigned int qcount;
 
         if (max_reported_jobs && (max_reported_jobs < pts->qcount))
@@ -987 +984 @@
         }
 
-        if ((data.dptr = (char *)SMB_MALLOC(data.dsize)) == NULL)
+        if ((data.dptr = (uint8 *)SMB_MALLOC(data.dsize)) == NULL)
                 return;
 
@@ -1234 +1231 @@
         /* store the new queue status structure */
         slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", sharename);
-        key.dptr = keystr;
-        key.dsize = strlen(keystr);
+        key = string_tdb_data(keystr);
 
         status.qcount = qcount;
-        data.dptr = (char *)&status;
+        data.dptr = (uint8 *)&status;
         data.dsize = sizeof(status);
         tdb_store(pdb->tdb, key, data, TDB_REPLACE);    
@@ -1352 +1348 @@
 this is the receive function of the background lpq updater
 ****************************************************************************/
-static void print_queue_receive(int msg_type, struct process_id src,
-                                void *buf, size_t msglen,
-                                void *private_data)
+static void print_queue_receive(struct messaging_context *msg,
+                                void *private_data,
+                                uint32_t msg_type,
+                                struct server_id server_id,
+                                DATA_BLOB *data)
 {
         fstring sharename;
@@ -1361 +1359 @@
         size_t len;
 
-        len = tdb_unpack( (char *)buf, msglen, "fdPP",
+        len = tdb_unpack( (uint8 *)data->data, data->length, "fdPP",
                 sharename,
                 &printing_type,
@@ -1398 +1396 @@
                 DEBUG(5,("start_background_queue: background LPQ thread started\n"));
 
-                claim_connection( NULL, "smbd lpq backend", 0, False, 
+                claim_connection( NULL, "smbd lpq backend",
                         FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_PRINT_GENERAL);
 
@@ -1405 +1403 @@
                 }
 
-                message_register(MSG_PRINTER_UPDATE, print_queue_receive,
-                                 NULL);
+                messaging_register(smbd_messaging_context(), NULL,
+                                   MSG_PRINTER_UPDATE, print_queue_receive);
                 
                 DEBUG(5,("start_background_queue: background LPQ thread waiting for messages\n"));
@@ -1428 +1426 @@
                         
                         DEBUG(10,("start_background_queue: background LPQ thread got a message\n"));
-                        message_dispatch();
+                        message_dispatch(smbd_messaging_context());
 
                         /* process any pending print change notify messages */
 
-                        print_notify_send_messages(0);
+                        print_notify_send_messages(smbd_messaging_context(),
+                                                   0);
                 }
         }
@@ -1446 +1445 @@
         fstring sharename;
         pstring lpqcommand, lprmcommand;
-        char *buffer = NULL;
+        uint8 *buffer = NULL;
         size_t len = 0;
         size_t newlen;
@@ -1500 +1499 @@
                 lprmcommand );
 
-        buffer = SMB_XMALLOC_ARRAY( char, len );
+        buffer = SMB_XMALLOC_ARRAY( uint8, len );
 
         /* now pack the buffer */
@@ -1538 +1537 @@
         /* finally send the message */
         
-        message_send_pid(pid_to_procid(background_lpq_updater_pid),
-                 MSG_PRINTER_UPDATE, buffer, len, False);
+        messaging_send_buf(smbd_messaging_context(),
+                           pid_to_procid(background_lpq_updater_pid),
+                           MSG_PRINTER_UPDATE, (uint8 *)buffer, len);
 
         SAFE_FREE( buffer );
@@ -1608 +1608 @@
         if (i == data.dsize) {
                 /* We weren't in the list. Realloc. */
-                data.dptr = (char *)SMB_REALLOC(data.dptr, data.dsize + 8);
+                data.dptr = (uint8 *)SMB_REALLOC(data.dptr, data.dsize + 8);
                 if (!data.dptr) {
                         DEBUG(0,("print_notify_register_pid: Relloc fail for printer %s\n",
@@ -2303 +2303 @@
 
         SIVAL(&store_jobid, 0, jobid);
-        data.dptr = (char *)&store_jobid;
+        data.dptr = (uint8 *)&store_jobid;
         data.dsize = 4;
 
@@ -2702 +2702 @@
         ZERO_STRUCTP(status);
         slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", sharename);
-        key.dptr = keystr;
-        key.dsize = strlen(keystr);
+        key = string_tdb_data(keystr);
+
         data = tdb_fetch(pdb->tdb, key);
         if (data.dptr) {