License change: Apache License, Version 2.0.

[thirdparty/cups.git] / cups / snmp-private.h

diff --git a/cups/snmp-private.h b/cups/snmp-private.h
index 1745b92593e48a1c1184b6d76248ecec7d36f5a3..4c575c0f1c847c9e54fb076c088094067e7d8d77 100644 (file)
--- a/cups/snmp-private.h
+++ b/cups/snmp-private.h
@@ -1,32 +1,25 @@
 /*
- * "$Id$"
+ * Private SNMP definitions for CUPS.
  *
- *   SNMP definitions for the Common UNIX Printing System (CUPS).
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
- *   This API is PRIVATE and subject to change.  No third-party applications
- *   should use the SNMP API defined in this file.
- *
- *   Copyright 2007-2009 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
-#ifndef _CUPS_SNMP_H_
-#  define _CUPS_SNMP_H_
+#ifndef _CUPS_SNMP_PRIVATE_H_
+#  define _CUPS_SNMP_PRIVATE_H_
 
 
 /*
  * Include necessary headers.
  */
 
-#include "http.h"
+#include <cups/http.h>
 
 
 /*
@@ -34,9 +27,10 @@
  */
 
 #define CUPS_SNMP_PORT         161     /* SNMP well-known port */
+#define CUPS_SNMP_MAX_COMMUNITY        512     /* Maximum size of community name */
 #define CUPS_SNMP_MAX_OID      128     /* Maximum number of OID numbers */
 #define CUPS_SNMP_MAX_PACKET   1472    /* Maximum size of SNMP packet */
-#define CUPS_SNMP_MAX_STRING   512     /* Maximum size of string */
+#define CUPS_SNMP_MAX_STRING   1024    /* Maximum size of string */
 #define CUPS_SNMP_VERSION_1    0       /* SNMPv1 */
 
 
@@ -68,14 +62,14 @@ typedef struct cups_snmp_string_s   /**** String value ****/
 {
   unsigned char        bytes[CUPS_SNMP_MAX_STRING];
                                        /* Bytes in string */
-  int          num_bytes;              /* Number of bytes */
+  unsigned     num_bytes;              /* Number of bytes */
 } cups_snmp_string_t;
 
 union cups_snmp_value_u                        /**** Object value ****/
 {
   int          boolean;                /* Boolean value */
   int          integer;                /* Integer value */
-  unsigned     counter;                /* Counter value */
+  int          counter;                /* Counter value */
   unsigned     gauge;                  /* Gauge value */
   unsigned     timeticks;              /* Timeticks  value */
   int          oid[CUPS_SNMP_MAX_OID]; /* OID value */
@@ -87,10 +81,10 @@ typedef struct cups_snmp_s          /**** SNMP data packet ****/
   const char   *error;                 /* Encode/decode error */
   http_addr_t  address;                /* Source address */
   int          version;                /* Version number */
-  char         community[CUPS_SNMP_MAX_STRING];
+  char         community[CUPS_SNMP_MAX_COMMUNITY];
                                        /* Community name */
   cups_asn1_t  request_type;           /* Request type */
-  int          request_id;             /* request-id value */
+  unsigned     request_id;             /* request-id value */
   int          error_status;           /* error-status value */
   int          error_index;            /* error-index value */
   int          object_name[CUPS_SNMP_MAX_OID];
@@ -140,9 +134,4 @@ extern int          _cupsSNMPWrite(int fd, http_addr_t *address, int version,
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
-#endif /* !_CUPS_SNMP_H_ */
-
-
-/*
- * End of "$Id$".
- */
+#endif /* !_CUPS_SNMP_PRIVATE_H_ */