SOURCES: net-snmp-snmpnetstat-getbulk.patch - add -CR option to specify bul...

glen glen at pld-linux.org
Thu Jan 22 18:18:13 CET 2009


Author: glen                         Date: Thu Jan 22 17:18:12 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add -CR option to specify bulk size (manual updated too)

---- Files affected:
SOURCES:
   net-snmp-snmpnetstat-getbulk.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/net-snmp-snmpnetstat-getbulk.patch
diff -u SOURCES/net-snmp-snmpnetstat-getbulk.patch:1.2 SOURCES/net-snmp-snmpnetstat-getbulk.patch:1.3
--- SOURCES/net-snmp-snmpnetstat-getbulk.patch:1.2	Thu Jan 22 17:29:55 2009
+++ SOURCES/net-snmp-snmpnetstat-getbulk.patch	Thu Jan 22 18:18:07 2009
@@ -1,5 +1,5 @@
---- net-snmp-5.4.2.1/apps/snmpnetstat/inet.c	2006-04-21 15:30:47.000000000 +0300
-+++ net-snmp-5.4.2.1-dev/apps/snmpnetstat/inet.c	2009-01-22 18:26:23.264301468 +0200
+--- net-snmp-5.4.2.1-dev/apps/snmpnetstat/inet.c	2009-01-22 18:26:23.264301468 +0200
++++ net-snmp-5.4.2.1-dev/apps/snmpnetstat/inet.c	2009-01-22 18:48:30.400620330 +0200
 @@ -106,20 +106,65 @@
  };
  #define TCP_NSTATES 11
@@ -81,18 +81,12 @@
                                     ASN_NULL, NULL,  0);
      if (!var)
          return;
-@@ -135,47 +180,113 @@
-         return;
- 
+@@ -137,45 +182,111 @@
      for (vp = var; vp ; vp=vp->next_variable) {
 -        state = *vp->val.integer;
 -        if (!aflag && state == MIB_TCPCONNSTATE_LISTEN)
 -            continue;
-+		tcpprotoprint_line(name, vp, &first);
-+    }
-+    snmp_free_varbind( var );
-+}
- 
+-
 -        if (first) {
 -            printf("Active Internet (%s) Connections", name);
 -            if (aflag)
@@ -103,6 +97,36 @@
 -                   "Proto", -width, width, "Local Address",
 -                            -width, width, "Remote Address", "(state)");
 -            first=0;
+-        }
+-        
+-        /* Extract the local/remote information from the index values */
+-        cp = tmpAddr.data;
+-        cp[0] = vp->name[ 10 ] & 0xff;
+-        cp[1] = vp->name[ 11 ] & 0xff;
+-        cp[2] = vp->name[ 12 ] & 0xff;
+-        cp[3] = vp->name[ 13 ] & 0xff;
+-        localAddr.s_addr = tmpAddr.addr.s_addr;
+-        localPort        = ntohs(vp->name[ 14 ]);
+-        cp = tmpAddr.data;
+-        cp[0] = vp->name[ 15 ] & 0xff;
+-        cp[1] = vp->name[ 16 ] & 0xff;
+-        cp[2] = vp->name[ 17 ] & 0xff;
+-        cp[3] = vp->name[ 18 ] & 0xff;
+-        remoteAddr.s_addr = tmpAddr.addr.s_addr;
+-        remotePort        = ntohs(vp->name[ 19 ]);
+-
+-        printf("%-5.5s", name);
+-        inetprint(&localAddr,  localPort,  name, 1);
+-        inetprint(&remoteAddr, remotePort, name, 0);
+-        if ( state < 1 || state > TCP_NSTATES )
+-            printf("%d\n", state );
+-        else
+-            printf("%s\n", tcpstates[ state ]);
++		tcpprotoprint_line(name, vp, &first);
+     }
+     snmp_free_varbind( var );
+ }
+ 
 +void
 +tcpprotopr_bulkget(const char *name, oid *root, size_t root_len)
 +{
@@ -130,7 +154,7 @@
 +         */
 +        pdu = snmp_pdu_create(SNMP_MSG_GETBULK);
 +        pdu->non_repeaters = 0;
-+        pdu->max_repetitions = 1024;    /* fill the packet */
++        pdu->max_repetitions = max_getbulk;    /* fill the packet */
 +        snmp_add_null_var(pdu, tcpConnState_oid, tcpConnState_len);
 +
 +        /*
@@ -179,33 +203,8 @@
 +            running = 0;
 +        } else {                /* status == STAT_ERROR */
 +            running = 0;
-         }
--        
--        /* Extract the local/remote information from the index values */
--        cp = tmpAddr.data;
--        cp[0] = vp->name[ 10 ] & 0xff;
--        cp[1] = vp->name[ 11 ] & 0xff;
--        cp[2] = vp->name[ 12 ] & 0xff;
--        cp[3] = vp->name[ 13 ] & 0xff;
--        localAddr.s_addr = tmpAddr.addr.s_addr;
--        localPort        = ntohs(vp->name[ 14 ]);
--        cp = tmpAddr.data;
--        cp[0] = vp->name[ 15 ] & 0xff;
--        cp[1] = vp->name[ 16 ] & 0xff;
--        cp[2] = vp->name[ 17 ] & 0xff;
--        cp[3] = vp->name[ 18 ] & 0xff;
--        remoteAddr.s_addr = tmpAddr.addr.s_addr;
--        remotePort        = ntohs(vp->name[ 19 ]);
- 
--        printf("%-5.5s", name);
--        inetprint(&localAddr,  localPort,  name, 1);
--        inetprint(&remoteAddr, remotePort, name, 0);
--        if ( state < 1 || state > TCP_NSTATES )
--            printf("%d\n", state );
--        else
--            printf("%s\n", tcpstates[ state ]);
--    }
--    snmp_free_varbind( var );
++        }
++
 +        if (response) {
 +            snmp_free_pdu(response);
 +		}
@@ -230,6 +229,82 @@
 +	} else {
 +		tcpprotopr_get(name, tcpConnState_oid, tcpConnState_len);
 +	}
- }
- 
++}
++
  /*
+--- net-snmp-5.4.2.1/man/snmpnetstat.1.def	2009-01-22 18:43:30.073986008 +0200
++++ net-snmp-5.4.2.1-dev/man/snmpnetstat.1.def	2009-01-22 18:57:34.170565184 +0200
+@@ -92,6 +92,12 @@
+ traffic on the configured network interfaces.
+ The fourth form displays statistics about the named protocol.
+ .PP
++.B snmpnetstat
++will issue GETBULK requests to query for information
++if at least protocol version
++.I v2
++is used.
++.PP
+ AGENT identifies a target SNMP agent, which is
+ instrumented to monitor the given objects.
+ At its simplest, the AGENT specification will
+@@ -164,6 +170,11 @@
+ is also present, show per-protocol routing statistics instead of 
+ the routing tables.
+ .PP
++.BI \-CR " repeaters"
++For GETBULK requests,
++.I repeaters
++specifies the max-repeaters value to use.
++.PP
+ When  snmpnetstat is invoked with an interval argument, it
+ displays a running count of statistics related to  network
+ interfaces.
+--- net-snmp-5.4.2.1/apps/snmpnetstat/main.c	2006-09-15 03:48:50.000000000 +0300
++++ net-snmp-5.4.2.1-dev/apps/snmpnetstat/main.c	2009-01-22 18:48:17.313950236 +0200
+@@ -75,9 +75,11 @@
+ int	tflag;		/* show i/f watchdog timers */
+ int	vflag;		/* be verbose */
+ 
++
+ int	interval;	/* repeat interval for i/f stats */
+ char	*intrface;	/* desired i/f for stats, or NULL for all i/fs */
+ int	af;		/* address family */
++int     max_getbulk = 512;  /* specifies the max-repeaters value to use with GETBULK requests */
+ 
+ char    *progname = NULL;
+ 
+@@ -231,6 +233,24 @@
+ 		case 'r':
+ 			rflag = 1;
+ 			break;
++		case 'R':
++                        if (optind < argc) {
++                            if (argv[optind]) {
++                                max_getbulk = atoi(argv[optind]);
++                                if (max_getbulk == 0) {
++                                    usage();
++                                    fprintf(stderr, "Bad -CR option: %s\n", 
++                                            argv[optind]);
++                                    exit(1);
++                                }
++                            }
++                        } else {
++                            usage();
++                            fprintf(stderr, "Bad -CR option: no argument given\n");
++                            exit(1);
++                        }
++                        optind++;
++                        break;
+ 		case 'S':	     /* FreeBSD:
+ 					NetBSD:  Semi-numeric display
+ 					OpenBSD: Show route source selector */
+--- net-snmp-5.4.2.1/apps/snmpnetstat/netstat.h~	2009-01-22 19:09:36.000000000 +0200
++++ net-snmp-5.4.2.1/apps/snmpnetstat/netstat.h	2009-01-22 19:09:38.270836446 +0200
+@@ -62,6 +62,7 @@
+ extern char	*intrface;	/* desired i/f for stats, or NULL for all i/fs */
+ 
+ extern int	af;		/* address family */
++extern int  max_getbulk;  /* specifies the max-repeaters value to use with GETBULK requests */
+ 
+ extern	char *__progname; /* program name, from crt0.o */
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/net-snmp-snmpnetstat-getbulk.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list