Attachment 443 Details for Bug 1007 – Here's another patch that fixes some print change notify bugs.

[patch] Here's another patch that fixes some print change notify bugs.

look2 (text/plain), 4.22 KB, created by Gerald (Jerry) Carter (dead mail address) on 2004-03-16 09:04:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerald (Jerry) Carter (dead mail address)

Created: 2004-03-16 09:04:49 UTC

Size: 4.22 KB

patch

obsolete

>Index: rpc_server/srv_spoolss_nt.c
>===================================================================
>RCS file: /data/cvs/samba/source/rpc_server/srv_spoolss_nt.c,v
>retrieving revision 1.277.2.78
>diff -u -r1.277.2.78 srv_spoolss_nt.c
>--- rpc_server/srv_spoolss_nt.c	30 Jan 2004 18:38:48 -0000	1.277.2.78
>+++ rpc_server/srv_spoolss_nt.c	16 Mar 2004 17:02:06 -0000
>@@ -1099,58 +1099,6 @@
> 	return True;
> }
> 
>-/* ENUMJOB last timestamp list. */
>-struct ejts_list {
>-	struct ejts_list *next, *prev;
>-	char *printer_name;
>-	struct timeval tv;
>-};
>-
>-static struct ejts_list *ejts_head;
>-
>-static struct ejts_list *find_enumjobs_timestamp(const char *printer_name)
>-{
>-	struct ejts_list *ejtsl;
>-
>-	for( ejtsl = ejts_head; ejtsl; ejtsl = ejtsl->next)
>-		if (strequal(ejtsl->printer_name, printer_name))
>-			return ejtsl;
>-	return NULL;
>-}
>-
>-static void set_enumjobs_timestamp(int snum)
>-{
>-	const char *printer_name = lp_const_servicename(snum);
>-	struct ejts_list *ejtsl = find_enumjobs_timestamp(printer_name);
>-
>-	if (!ejtsl) {
>-		ejtsl = (struct ejts_list *)malloc(sizeof(struct ejts_list));
>-		if (!ejtsl)
>-			return;
>-		ejtsl->printer_name = strdup(printer_name);
>-		if (!ejtsl->printer_name) {
>-			SAFE_FREE(ejtsl);
>-			return;
>-		}
>-		DLIST_ADD(ejts_head, ejtsl);
>-	}
>-
>-	gettimeofday(&ejtsl->tv, NULL);
>-}
>-
>-static int timeval_diff(struct timeval *tv1, struct timeval *tv2)
>-{
>-	if (tv1->tv_sec > tv2->tv_sec)
>-		return 1;
>-	if (tv1->tv_sec < tv2->tv_sec)
>-		return -1;
>-	if (tv1->tv_usec > tv2->tv_usec)
>-		return 1;
>-	if (tv1->tv_usec < tv2->tv_usec)
>-		return -1;
>-	return 0;
>-}
>-
> /********************************************************************
>  Receive a notify2 message list
>  ********************************************************************/
>@@ -1214,29 +1162,6 @@
> 		notify2_unpack_msg( &notify, &msg_tv, msg_ptr, msg_len );
> 		msg_ptr += msg_len;
> 		
>-		/* See if it is still relevent. */
>-		if (notify.type == JOB_NOTIFY_TYPE) {
>-			BOOL status_is_deleting = False;
>-
>-			if (notify.field == JOB_NOTIFY_STATUS && (notify.notify.value[0] & (JOB_STATUS_DELETING|JOB_STATUS_DELETED)))
>-				status_is_deleting = True;
>-
>-			if (!status_is_deleting) {
>-				struct ejts_list *ejtsl = find_enumjobs_timestamp(notify.printer);
>-
>-				if (ejtsl && (timeval_diff(&ejtsl->tv, &msg_tv) > 0)) {
>-
>-					DEBUG(10, ("receive_notify2_message_list: enumjobs ts = %u, %u, msg ts = %u, %u discarding\n",
>-						(unsigned int)ejtsl->tv.tv_sec, (unsigned int)ejtsl->tv.tv_usec,
>-						(unsigned int)msg_tv.tv_sec, (unsigned int)msg_tv.tv_usec ));
>-
>-					/* Message no longer relevent. Ignore it. */
>-					if ( notify.len != 0 )
>-						SAFE_FREE( notify.notify.data );
>-					continue;
>-				}
>-			}
>-		}
> 		/* add to correct list in container */
> 		
> 		notify_msg_ctr_addmsg( &messages, &notify );
>@@ -6518,7 +6443,6 @@
> 	DEBUGADD(4,("count:[%d], status:[%d], [%s]\n", *returned, prt_status.status, prt_status.message));
> 
> 	if (*returned == 0) {
>-		set_enumjobs_timestamp(snum);
> 		SAFE_FREE(queue);
> 		return WERR_OK;
> 	}
>@@ -6526,11 +6450,9 @@
> 	switch (level) {
> 	case 1:
> 		wret = enumjobs_level1(queue, snum, buffer, offered, needed, returned);
>-		set_enumjobs_timestamp(snum);
> 		return wret;
> 	case 2:
> 		wret = enumjobs_level2(queue, snum, buffer, offered, needed, returned);
>-		set_enumjobs_timestamp(snum);
> 		return wret;
> 	default:
> 		SAFE_FREE(queue);
>Index: printing/printing.c
>===================================================================
>RCS file: /data/cvs/samba/source/printing/printing.c,v
>retrieving revision 1.139.2.47
>diff -u -r1.139.2.47 printing.c
>--- printing/printing.c	15 Mar 2004 15:06:33 -0000	1.139.2.47
>+++ printing/printing.c	16 Mar 2004 17:02:09 -0000
>@@ -534,8 +534,22 @@
> 
> 	/* Send notify updates for what has changed */
> 
>-	if ( ret && (old_data.dsize == 0 || old_data.dsize == sizeof(*pjob)) )
>-		pjob_store_notify( snum, jobid, (struct printjob *)old_data.dptr, pjob );
>+	if ( ret ) {
>+		struct printjob old_pjob;
>+
>+		if ( old_data.dsize )
>+		{
>+			if ( unpack_pjob( old_data.dptr, old_data.dsize, &old_pjob ) != -1 )
>+			{
>+				pjob_store_notify( snum, jobid, &old_pjob , pjob );
>+				free_nt_devicemode( &old_pjob.nt_devmode );
>+			}
>+		}
>+		else {
>+			/* new job */
>+			pjob_store_notify( snum, jobid, NULL, pjob );
>+		}
>+	}
> 
> done:
> 	SAFE_FREE( old_data.dptr );

Actions: View

Attachments on bug 1007: 440 | 443 | 492 | 493 | 496 | 504 | 622