Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / cups / testsnmp.c

diff --git a/cups/testsnmp.c b/cups/testsnmp.c
index 2e0ef0d3d93751f4c73ad03d562525f6f08de9bf..52983a9684a3a1674cad625a9a2a86cfab2f8616 100644 (file)
--- a/cups/testsnmp.c
+++ b/cups/testsnmp.c
@@ -3,7 +3,7 @@
  *
  *   SNMP test program for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2008 by Apple Inc.
+ *   Copyright 2008-2009 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -37,7 +37,6 @@
  */
 
 static void    print_packet(cups_snmp_t *packet, void *data);
-static int     *scan_oid(const char *s, int *oid, int oidsize);
 static int     show_oid(int fd, const char *community,
                         http_addr_t *addr, const char *s, int walk);
 static void    usage(void);
@@ -119,8 +118,8 @@ main(int  argc,                             /* I - Number of command-line args */
   if (!oid)
   {
     if (!show_oid(fd, community,  &(host->addr),
-                  walk ? "1.3.6.1.2.1.43" :
-                        "1.3.6.1.2.1.43.10.2.1.4.1.1", walk))
+                  walk ? ".1.3.6.1.2.1.43" :
+                        ".1.3.6.1.2.1.43.10.2.1.4.1.1", walk))
       return (1);
   }
   
@@ -137,14 +136,12 @@ print_packet(cups_snmp_t *packet, /* I - SNMP response packet */
              void        *data)                /* I - User data pointer (not used) */
 {
   int  i;                              /* Looping var */
+  char temp[1024];                     /* Temporary OID string */
 
 
   (void)data;
 
-  printf("%d", packet->object_name[0]);
-  for (i = 1; packet->object_name[i] >= 0; i ++)
-    printf(".%d", packet->object_name[i]);
-  fputs(" = ", stdout);
+  printf("%s = ", _cupsSNMPOIDToString(packet->object_name, temp, sizeof(temp)));
 
   switch (packet->object_type)
   {
@@ -158,11 +155,13 @@ print_packet(cups_snmp_t *packet, /* I - SNMP response packet */
        break;
 
     case CUPS_ASN1_BIT_STRING :
-       printf("BIT-STRING \"%s\"\n", packet->object_value.string);
+       printf("BIT-STRING \"%s\"\n",
+              (char *)packet->object_value.string.bytes);
        break;
 
     case CUPS_ASN1_OCTET_STRING :
-       printf("OCTET-STRING \"%s\"\n", packet->object_value.string);
+       printf("OCTET-STRING \"%s\"\n",
+              (char *)packet->object_value.string.bytes);
        break;
 
     case CUPS_ASN1_NULL_VALUE :
@@ -170,16 +169,14 @@ print_packet(cups_snmp_t *packet, /* I - SNMP response packet */
        break;
 
     case CUPS_ASN1_OID :
-       printf("OID %d", packet->object_value.oid[0]);
-       for (i = 1; packet->object_value.oid[i] >= 0; i ++)
-         printf(".%d", packet->object_value.oid[i]);
-       putchar('\n');
+       printf("OID %s\n", _cupsSNMPOIDToString(packet->object_value.oid,
+                                               temp, sizeof(temp)));
        break;
 
     case CUPS_ASN1_HEX_STRING :
        fputs("Hex-STRING", stdout);
-       for (i = 0; i < packet->object_value.hex_string.num_bytes; i ++)
-         printf(" %02X", packet->object_value.hex_string.bytes[i]);
+       for (i = 0; i < packet->object_value.string.num_bytes; i ++)
+         printf(" %02X", packet->object_value.string.bytes[i]);
        putchar('\n');
        break;
 
@@ -207,38 +204,6 @@ print_packet(cups_snmp_t *packet,  /* I - SNMP response packet */
 }
 
 
-/*
- * 'scan_oid()' - Scan an OID value.
- */
-
-static int *                           /* O - OID or NULL on error */
-scan_oid(const char *s,                        /* I - OID string */
-         int        *oid,              /* I - OID array */
-        int        oidsize)            /* I - Size of OID array in integers */
-{
-  int  i;                              /* Index into OID array */
-  char *ptr;                           /* Pointer into string */
-
-
-  for (ptr = (char *)s, i = 0, oidsize --; ptr && *ptr && i < oidsize; i ++)
-  {
-    if (!isdigit(*ptr & 255))
-      return (NULL);
-
-    oid[i] = strtol(ptr, &ptr, 10);
-    if (ptr && *ptr == '.')
-      ptr ++;
-  }
-
-  if (i >= oidsize)
-    return (NULL);
-
-  oid[i] = -1;
-
-  return (oid);
-}
-
-
 /*
  * 'show_oid()' - Show the specified OID.
  */
@@ -253,9 +218,10 @@ show_oid(int         fd,           /* I - SNMP socket */
   int          i;                      /* Looping var */
   int          oid[CUPS_SNMP_MAX_OID]; /* OID */
   cups_snmp_t  packet;                 /* SNMP packet */
+  char         temp[1024];             /* Temporary OID string */
 
 
-  if (!scan_oid(s, oid, sizeof(oid) / sizeof(oid[0])))
+  if (!_cupsSNMPStringToOID(s, oid, sizeof(oid) / sizeof(oid[0])))
   {
     puts("testsnmp: Bad OID");
     return (0);
@@ -263,10 +229,7 @@ show_oid(int         fd,           /* I - SNMP socket */
 
   if (walk)
   {
-    printf("_cupsSNMPWalk(%d", oid[0]);
-    for (i = 1; oid[i] >= 0; i ++)
-      printf(".%d", oid[i]);
-    puts("):");
+    printf("_cupsSNMPWalk(%s): ", _cupsSNMPOIDToString(oid, temp, sizeof(temp)));
 
     if (_cupsSNMPWalk(fd, addr, CUPS_SNMP_VERSION_1, community, oid, 5.0,
                      print_packet, NULL) < 0)
@@ -277,10 +240,7 @@ show_oid(int         fd,           /* I - SNMP socket */
   }
   else
   {
-    printf("_cupsSNMPWrite(%d", oid[0]);
-    for (i = 1; oid[i] >= 0; i ++)
-      printf(".%d", oid[i]);
-    fputs("): ", stdout);
+    printf("_cupsSNMPWrite(%s): ", _cupsSNMPOIDToString(oid, temp, sizeof(temp)));
 
     if (!_cupsSNMPWrite(fd, addr, CUPS_SNMP_VERSION_1, community,
                       CUPS_ASN1_GET_REQUEST, 1, oid))