Merge CUPS 1.4svn-r7524.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@733 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 61 insertions, 16 deletions

diff --git a/backend/backend-private.h b/backend/backend-private.h
index 9bbfa1e50..1a295b9a5 100644
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -28,7 +28,7 @@
 #  include <cups/cups.h>
 #  include <cups/debug.h>
 #  include <cups/i18n.h>
-#  include <cups/snmp.h>
+#  include <cups/snmp-private.h>
 #  include <stdlib.h>
 #  include <errno.h>
 #  include <cups/string.h>
@@ -48,6 +48,7 @@ extern "C" {
  * OID constants...
  */
 
+/* Host MIB */
 #define CUPS_OID_mib2				1,3,6,1,2,1
 
 #define CUPS_OID_host				CUPS_OID_mib2,25
@@ -68,6 +69,7 @@ extern "C" {
 #define CUPS_OID_hrPrinterStatus		CUPS_OID_hrPrinterEntry,1
 #define CUPS_OID_hrPrinterDetectedErrorState	CUPS_OID_hrPrinterEntry,2
 
+/* Printer MIB */
 #define CUPS_OID_printmib			CUPS_OID_mib2,43
 
 #define CUPS_OID_prtGeneral			CUPS_OID_printmib,5
@@ -115,6 +117,39 @@ extern "C" {
 #define CUPS_OID_prtInterpreterLangFamily	CUPS_OID_prtInterpreterEntry,2
 #define CUPS_OID_prtInterpreterLangLevel	CUPS_OID_prtInterpreterEntry,3
 
+/* Printer Port Monitor MIB */
+#define CUPS_OID_enterprises			1,3,6,1,4,1
+#define CUPS_OID_pwg				CUPS_OID_enterprises,2699,1
+#define CUPS_OID_ppmMIB				CUPS_OID_pwg,2
+#define CUPS_OID_ppmMIBObjects			CUPS_OID_ppmMIB,1
+
+#define CUPS_OID_ppmGeneral			CUPS_OID_ppmMIBObjects,1
+
+#define CUPS_OID_ppmPrinter			CUPS_OID_ppmMIBObjects,2
+#define CUPS_OID_ppmPrinterTable		CUPS_OID_ppmPrinter,1
+#define CUPS_OID_ppmPrinterEntry		CUPS_OID_ppmPrinterTable,1
+#define CUPS_OID_ppmPrinterIndex		CUPS_OID_ppmPrinterEntry,1
+#define CUPS_OID_ppmPrinterName			CUPS_OID_ppmPrinterEntry,2
+#define CUPS_OID_ppmPrinterIEEE1284DeviceId	CUPS_OID_ppmPrinterEntry,3
+#define CUPS_OID_ppmPrinterNumberOfPorts	CUPS_OID_ppmPrinterEntry,4
+#define CUPS_OID_ppmPrinterPreferredPortIndex	CUPS_OID_ppmPrinterEntry,5
+#define CUPS_OID_ppmPrinterHrDeviceIndex	CUPS_OID_ppmPrinterEntry,6
+#define CUPS_OID_ppmPrinterSnmpCommunityName	CUPS_OID_ppmPrinterEntry,7
+#define CUPS_OID_ppmPrinterSnmpQueryEnabled	CUPS_OID_ppmPrinterEntry,8
+
+#define CUPS_OID_ppmPort			CUPS_OID_ppmMIBObjects,3
+#define CUPS_OID_ppmPortTable			CUPS_OID_ppmPort,1
+#define CUPS_OID_ppmPortEntry			CUPS_OID_ppmPortTable,1
+#define CUPS_OID_ppmPortIndex			CUPS_OID_ppmPortEntry,1
+#define CUPS_OID_ppmPortEnabled			CUPS_OID_ppmPortEntry,2
+#define CUPS_OID_ppmPortName			CUPS_OID_ppmPortEntry,3
+#define CUPS_OID_ppmPortServiceNameOrURI	CUPS_OID_ppmPortEntry,4
+#define CUPS_OID_ppmPortProtocolType		CUPS_OID_ppmPortEntry,5
+#define CUPS_OID_ppmPortProtocolTargetPort	CUPS_OID_ppmPortEntry,6
+#define CUPS_OID_ppmPortProtocolAltSourceEnabled CUPS_OID_ppmPortEntry,7
+#define CUPS_OID_ppmPortPrtChannelIndex		CUPS_OID_ppmPortEntry,8
+#define CUPS_OID_ppmPortLprByteCountEnabled	CUPS_OID_ppmPortEntry,9
+
 
 /*
  * State constants...
@@ -205,21 +240,31 @@ extern "C" {
  * Prototypes...
  */
 
-extern int	backendDrainOutput(int print_fd, int device_fd);
-extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
-		                   char *make_model, int make_model_size,
-				   const char *scheme, char *uri, int uri_size);
-extern int	backendGetMakeModel(const char *device_id, char *make_model,
-			            int make_model_size);
-extern void	backendNetworkSideCB(int print_fd, int device_fd, int snmp_fd,
-		                     http_addr_t *addr, int use_bc);
-extern ssize_t	backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-		               http_addr_t *addr, int use_bc,
-			       void (*side_cb)(int print_fd, int device_fd,
-					       int snmp_fd, http_addr_t *addr,
-					       int use_bc));
-extern int	backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
-		                    int *page_count, int *printer_state);
+extern void		backendCheckSideChannel(int snmp_fd, http_addr_t *addr);
+extern int		backendDrainOutput(int print_fd, int device_fd);
+extern int		backendGetDeviceID(int fd, char *device_id,
+			                   int device_id_size,
+			                   char *make_model,
+					   int make_model_size,
+					   const char *scheme, char *uri,
+					   int uri_size);
+extern int		backendGetMakeModel(const char *device_id,
+			                    char *make_model,
+				            int make_model_size);
+extern void		backendNetworkSideCB(int print_fd, int device_fd,
+			                     int snmp_fd, http_addr_t *addr,
+					     int use_bc);
+extern const char	*backendResolveURI(char **argv);
+extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
+			               http_addr_t *addr, int use_bc,
+				       void (*side_cb)(int print_fd,
+				                       int device_fd,
+						       int snmp_fd,
+						       http_addr_t *addr,
+						       int use_bc));
+extern int		backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
+			                    int *page_count,
+					    int *printer_state);
 
 #  ifdef __cplusplus
 }