summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/mrouted/cfparse.y46
-rw-r--r--usr.sbin/mrouted/defs.h7
-rw-r--r--usr.sbin/mrouted/main.c75
-rw-r--r--usr.sbin/mrouted/prune.c199
-rw-r--r--usr.sbin/mrouted/snmp.c1305
-rw-r--r--usr.sbin/mrouted/snmp.h39
-rw-r--r--usr.sbin/mrouted/vif.c6
7 files changed, 2 insertions, 1675 deletions
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index f60c28bd000..2c26aad4b31 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/usr.sbin/mrouted/cfparse.y
@@ -84,7 +84,6 @@ int numbounds = 0; /* Number of named boundaries */
%token PHYINT TUNNEL NAME
%token DISABLE IGMPV1 SRCRT
%token METRIC THRESHOLD RATE_LIMIT BOUNDARY NETMASK ALTNET
-%token SYSNAM SYSCONTACT SYSVERSION SYSLOCATION
%token <num> BOOLEAN
%token <num> NUMBER
%token <ptr> STRING
@@ -206,26 +205,6 @@ stmt : error
boundlist[numbounds].name = strdup($2);
boundlist[numbounds++].bound = $3;
}
- | SYSNAM STRING {
-#ifdef SNMP
- set_sysName($2);
-#endif /* SNMP */
- }
- | SYSCONTACT STRING {
-#ifdef SNMP
- set_sysContact($2);
-#endif /* SNMP */
- }
- | SYSVERSION STRING {
-#ifdef SNMP
- set_sysVersion($2);
-#endif /* SNMP */
- }
- | SYSLOCATION STRING {
-#ifdef SNMP
- set_sysLocation($2);
-#endif /* SNMP */
- }
;
tunnelmods : /* empty */
@@ -443,15 +422,6 @@ next_word()
continue;
}
q = p;
-#ifdef SNMP
- if (*p == '"') {
- p++;
- while (*p && *p != '"' && *p != '\n')
- p++; /* find next whitespace */
- if (*p == '"')
- p++;
- } else
-#endif
while (*p && *p != ' ' && *p != '\t' && *p != '\n')
p++; /* find next whitespace */
*p++ = '\0'; /* null-terminate string */
@@ -535,22 +505,6 @@ yylex()
yylval.num = n;
return NUMBER;
}
-#ifdef SNMP
- if (!strcmp(q,"sysName"))
- return SYSNAM;
- if (!strcmp(q,"sysContact"))
- return SYSCONTACT;
- if (!strcmp(q,"sysVersion"))
- return SYSVERSION;
- if (!strcmp(q,"sysLocation"))
- return SYSLOCATION;
- if (*q=='"') {
- if (q[ strlen(q)-1 ]=='"')
- q[ strlen(q)-1 ]='\0'; /* trash trailing quote */
- yylval.ptr = q+1;
- return STRING;
- }
-#endif
yylval.ptr = q;
return STRING;
}
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index c7fd46bdb5e..053b9b7f72b 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -271,13 +271,6 @@ extern void k_add_rg(u_int32_t origin, struct gtable *g);
extern int k_del_rg(u_int32_t origin, struct gtable *g);
extern int k_get_version(void);
-#ifdef SNMP
-/* prune.c */
-extern struct rtentry * snmp_find_route();
-extern struct gtable * find_grp();
-extern struct stable * find_grp_src();
-#endif
-
#ifdef RSRR
/* prune.c */
extern struct gtable *kernel_table;
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index e8085894dca..6cfa50222c2 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -24,13 +24,9 @@
#include <fcntl.h>
#include <util.h>
-#ifdef SNMP
-#include "snmp.h"
-#endif
-
#ifndef lint
static char rcsid[] =
- "@(#) $Id: main.c,v 1.14 2003/11/26 01:17:12 millert Exp $";
+ "@(#) $Id: main.c,v 1.15 2005/06/15 14:30:56 robert Exp $";
#endif
extern char *configfilename;
@@ -46,11 +42,7 @@ int max_prune_lifetime = DEFAULT_CACHE_LIFETIME * 2;
int debug = 0;
u_char pruning = 1; /* Enable pruning by default */
-#ifdef SNMP
-#define NHANDLERS 34
-#else
#define NHANDLERS 2
-#endif
static struct ihandler {
int fd; /* File descriptor */
@@ -95,11 +87,6 @@ main(int argc, char *argv[])
fd_set rfds, readers;
int nfds, n, i;
sigset_t mask, omask;
-#ifdef SNMP
- struct timeval timeout, *tvp = &timeout;
- struct timeval sched, *svp = &sched, now, *nvp = &now;
- int index, block;
-#endif
if (geteuid() != 0) {
fprintf(stderr, "must be root\n");
@@ -123,14 +110,6 @@ main(int argc, char *argv[])
goto usage;
} else if (strcmp(*argv, "-p") == 0) {
pruning = 0;
-#ifdef SNMP
- } else if (strcmp(*argv, "-P") == 0) {
- if (argc > 1 && isdigit(*(argv + 1)[0])) {
- argv++, argc--;
- dest_port = atoi(*argv);
- } else
- dest_port = DEFAULT_PORT;
-#endif
} else
goto usage;
argv++, argc--;
@@ -228,20 +207,6 @@ usage: fprintf(stderr,
PROTOCOL_VERSION, MROUTED_VERSION);
#endif
-#ifdef SNMP
- if (i = snmp_init())
- return i;
-
- gettimeofday(nvp, 0);
- if (nvp->tv_usec < 500000L){
- svp->tv_usec = nvp->tv_usec + 500000L;
- svp->tv_sec = nvp->tv_sec;
- } else {
- svp->tv_usec = nvp->tv_usec - 500000L;
- svp->tv_sec = nvp->tv_sec + 1;
- }
-#endif /* SNMP */
-
init_vifs();
#ifdef RSRR
@@ -302,34 +267,7 @@ usage: fprintf(stderr,
dummy = 0;
for(;;) {
bcopy((char *)&readers, (char *)&rfds, sizeof(rfds));
-#ifdef SNMP
- gettimeofday(nvp, 0);
- if (nvp->tv_sec > svp->tv_sec
- || (nvp->tv_sec == svp->tv_sec && nvp->tv_usec > svp->tv_usec)){
- alarmTimer(nvp);
- eventTimer(nvp);
- if (nvp->tv_usec < 500000L){
- svp->tv_usec = nvp->tv_usec + 500000L;
- svp->tv_sec = nvp->tv_sec;
- } else {
- svp->tv_usec = nvp->tv_usec - 500000L;
- svp->tv_sec = nvp->tv_sec + 1;
- }
- }
-
- tvp = &timeout;
- tvp->tv_sec = 0;
- tvp->tv_usec = 500000L;
-
- block = 0;
- snmp_select_info(&nfds, &rfds, tvp, &block);
- if (block == 1)
- tvp = NULL; /* block without timeout */
- if ((n = select(nfds, &rfds, NULL, NULL, tvp)) < 0)
-#else
- if ((n = select(nfds, &rfds, NULL, NULL, NULL)) < 0)
-#endif
- {
+ if ((n = select(nfds, &rfds, NULL, NULL, NULL)) < 0) {
if (errno != EINTR) /* SIGALRM is expected */
logit(LOG_WARNING, errno, "select failed");
continue;
@@ -355,11 +293,6 @@ usage: fprintf(stderr,
(*ihandlers[i].func)(ihandlers[i].fd, &rfds);
}
}
-
-#ifdef SNMP
- snmp_read(&rfds);
- snmp_timeout(); /* poll */
-#endif
}
}
@@ -472,10 +405,6 @@ timer(void)
report_to_all_neighbors(CHANGED_ROUTES);
}
-#ifdef SNMP
- sync_timer();
-#endif
-
/*
* Advance virtual time
*/
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index 2adbf3d37f3..30112cf3d0d 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -372,205 +372,6 @@ update_kernel(struct gtable *g)
Functions that are used externally
****************************************************************************/
-#ifdef SNMP
-#include <sys/types.h>
-#include "snmp.h"
-
-/*
- * Find a specific group entry in the group table
- */
-struct gtable *
-find_grp(u_long grp)
-{
- struct gtable *gt;
-
- for (gt = kernel_table; gt; gt = gt->gt_gnext) {
- if (ntohl(grp) < ntohl(gt->gt_mcastgrp))
- break;
- if (gt->gt_mcastgrp == grp)
- return gt;
- }
- return NULL;
-}
-
-/*
- * Given a group entry and source, find the corresponding source table
- * entry
- */
-struct stable *
-find_grp_src(struct gtable *gt, u_long src)
-{
- struct stable *st;
- u_long grp = gt->gt_mcastgrp;
- struct gtable *gtcurr;
-
- for (gtcurr = gt; gtcurr->gt_mcastgrp == grp; gtcurr = gtcurr->gt_gnext) {
- for (st = gtcurr->gt_srctbl; st; st = st->st_next)
- if (st->st_origin == src)
- return st;
- }
- return NULL;
-}
-
-/*
- * Find next entry > specification
- * gtpp: ordered by group
- * stpp: ordered by source
- */
-int
-next_grp_src_mask(struct gtable *gtpp, struct gtable *stpp, u_long grp,
- u_long src, u_long mask)
-{
- struct gtable *gt, *gbest = NULL;
- struct stable *st, *sbest = NULL;
-
- /* Find first group entry >= grp spec */
- (*gtpp) = kernel_table;
- while ((*gtpp) && ntohl((*gtpp)->gt_mcastgrp) < ntohl(grp))
- (*gtpp)=(*gtpp)->gt_gnext;
- if (!(*gtpp))
- return 0; /* no more groups */
-
- for (gt = kernel_table; gt; gt=gt->gt_gnext) {
- /* Since grps are ordered, we can stop when group changes from gbest */
- if (gbest && gbest->gt_mcastgrp != gt->gt_mcastgrp)
- break;
- for (st = gt->gt_srctbl; st; st=st->st_next) {
-
- /* Among those entries > spec, find "lowest" one */
- if (((ntohl(gt->gt_mcastgrp)> ntohl(grp))
- || (ntohl(gt->gt_mcastgrp)==ntohl(grp)
- && ntohl(st->st_origin)> ntohl(src))
- || (ntohl(gt->gt_mcastgrp)==ntohl(grp)
- && ntohl(st->st_origin)==src && 0xFFFFFFFF>ntohl(mask)))
- && (!gbest
- || (ntohl(gt->gt_mcastgrp)< ntohl(gbest->gt_mcastgrp))
- || (ntohl(gt->gt_mcastgrp)==ntohl(gbest->gt_mcastgrp)
- && ntohl(st->st_origin)< ntohl(sbest->st_origin)))) {
- gbest = gt;
- sbest = st;
- }
- }
- }
- (*gtpp) = gbest;
- (*stpp) = sbest;
- return (*gtpp)!=0;
-}
-
-/*
- * Ensure that sg contains current information for the given group,source.
- * This is fetched from the kernel as a unit so that counts for the entry
- * are consistent, i.e. packet and byte counts for the same entry are
- * read at the same time.
- */
-void
-refresh_sg(struct sioc_sg_req *sg, struct gtable *gt, struct gtable *st)
-{
- static int lastq = -1;
-
- if (quantum != lastq || sg->src.s_addr!=st->st_origin
- || sg->grp.s_addr!=gt->gt_mcastgrp) {
- lastq = quantum;
- sg->src.s_addr = st->st_origin;
- sg->grp.s_addr = gt->gt_mcastgrp;
- ioctl(udp_socket, SIOCGETSGCNT, (char *)sg);
- }
-}
-
-/*
- * Return pointer to a specific route entry. This must be a separate
- * function from find_route() which modifies rtp.
- */
-struct rtentry *
-snmp_find_route(u_long src, u_long mask)
-{
- register struct rtentry *rt;
-
- for (rt = routing_table; rt; rt = rt->rt_next) {
- if (src == rt->rt_origin && mask == rt->rt_originmask)
- return rt;
- }
- return NULL;
-}
-
-/*
- * Find next route entry > specification
- */
-int
-next_route(struct rtentry **rtpp, u_long src, u_long mask)
-{
- struct rtentry *rt, *rbest = NULL;
-
- /* Among all entries > spec, find "lowest" one in order */
- for (rt = routing_table; rt; rt=rt->rt_next) {
- if ((ntohl(rt->rt_origin) > ntohl(src)
- || (ntohl(rt->rt_origin) == ntohl(src)
- && ntohl(rt->rt_originmask) > ntohl(mask)))
- && (!rbest || (ntohl(rt->rt_origin) < ntohl(rbest->rt_origin))
- || (ntohl(rt->rt_origin) == ntohl(rbest->rt_origin)
- && ntohl(rt->rt_originmask) < ntohl(rbest->rt_originmask))))
- rbest = rt;
- }
- (*rtpp) = rbest;
- return (*rtpp)!=0;
-}
-
-/*
- * Given a routing table entry, and a vifi, find the next vifi/entry
- * vifi: vif at which to start looking
- */
-int
-next_route_child(struct rtentry **rtpp, u_long src, u_long mask, vifi_t vifi)
-{
- struct rtentry *rt;
-
- /* Get (S,M) entry */
- if (!((*rtpp) = snmp_find_route(src,mask)))
- if (!next_route(rtpp, src, mask))
- return 0;
-
- /* Continue until we get one with a valid next vif */
- do {
- for (; (*rtpp)->rt_children && *vifi<numvifs; (*vifi)++)
- if (VIFM_ISSET(*vifi, (*rtpp)->rt_children))
- return 1;
- *vifi = 0;
- } while( next_route(rtpp, (*rtpp)->rt_origin, (*rtpp)->rt_originmask) );
-
- return 0;
-}
-
-/*
- * Given a routing table entry, and a vifi, find the next entry
- * equal to or greater than those
- * vifi: vif at which to start looking
- */
-int
-next_child(struct gtable *gtpp, struct gtable *stpp, u_long grp,
- u_long src, u_long mask, vifi_t *vifi)
-{
- struct stable *st;
-
- /* Get (G,S,M) entry */
- if (mask!=0xFFFFFFFF
- || !((*gtpp) = find_grp(grp))
- || !((*stpp) = find_grp_src((*gtpp),src)))
- if (!next_grp_src_mask(gtpp, stpp, grp, src, mask))
- return 0;
-
- /* Continue until we get one with a valid next vif */
- do {
- for (; (*gtpp)->gt_route->rt_children && *vifi<numvifs; (*vifi)++)
- if (VIFM_ISSET(*vifi, (*gtpp)->gt_route->rt_children))
- return 1;
- *vifi = 0;
- } while (next_grp_src_mask(gtpp, stpp, (*gtpp)->gt_mcastgrp,
- (*stpp)->st_origin, 0xFFFFFFFF) );
-
- return 0;
-}
-#endif /* SNMP */
-
/*
* Initialize the kernel table structure
*/
diff --git a/usr.sbin/mrouted/snmp.c b/usr.sbin/mrouted/snmp.c
deleted file mode 100644
index 8f1de69031e..00000000000
--- a/usr.sbin/mrouted/snmp.c
+++ /dev/null
@@ -1,1305 +0,0 @@
-/* $NetBSD: snmp.c,v 1.3 1995/12/10 10:07:16 mycroft Exp $ */
-
-/*
- * Copyright (c) 1992, 2001 Xerox Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither name of the Xerox, PARC, nor the names of its contributors may be used
- * to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE XEROX CORPORATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "defs.h"
-#include <netinet/in_var.h>
-#include "snmp.h"
-#include "snmplib/asn1.h"
-#include "snmplib/party.h"
-#include "snmplib/snmp_impl.h"
-#define MROUTED
-#include "snmpd/snmp_vars.h"
-
- in_port_t dest_port = 0;
- int sdlen = 0;
-
-struct addrCache {
- u_long addr;
- int status;
-#define UNUSED 0
-#define USED 1
-#define OLD 2
-};
-
-static struct addrCache addrCache[10];
-
-/*
- * Initialize the SNMP part of mrouted
- */
-int /* returns: 0 on success, true on error */
-snmp_init(in_port_t dest_port)
-{
- u_long myaddr;
- int ret;
- struct partyEntry *pp;
- struct sockaddr_in me;
- int index, sd, portlist[32];
-
- init_snmp();
- /* init_mib(); why was this here? */
- if (read_party_database("/etc/party.conf") > 0){
- fprintf(stderr, "Couldn't read party database from /etc/party.conf\n");
- exit(0);
- }
- if (read_context_database("/etc/context.conf") > 0){
- fprintf(stderr, "Couldn't read context database from /etc/context.conf\n");
- exit(0);
- }
- if (read_acl_database("/etc/acl.conf") > 0){
- fprintf(stderr, "Couldn't read acl database from /etc/acl.conf\n");
- exit(0);
- }
- if (read_view_database("/etc/view.conf") > 0){
- fprintf(stderr, "Couldn't read view database from /etc/view.conf\n");
- exit(0);
- }
-
- myaddr = get_myaddr();
- if (ret = agent_party_init(myaddr, ".1.3.6.1")){
- if (ret == 1){
- fprintf(stderr, "Conflict found with initial noAuth/noPriv parties... continuing\n");
- } else if (ret == -1){
- fprintf(stderr, "Error installing initial noAuth/noPriv parties, exiting\n");
- exit(1);
- } else {
- fprintf(stderr, "Unknown error, exiting\n");
- exit(2);
- }
- }
-
- printf("Opening port(s): ");
- fflush(stdout);
- party_scanInit();
- for(pp = party_scanNext(); pp; pp = party_scanNext()){
- if ((pp->partyTDomain != DOMAINSNMPUDP)
- || bcmp((char *)&myaddr, pp->partyTAddress, 4))
- continue; /* don't listen for non-local parties */
-
- dest_port = 0;
- bcopy(pp->partyTAddress + 4, &dest_port, 2);
- for(index = 0; index < sdlen; index++)
- if (dest_port == portlist[index])
- break;
- if (index < sdlen) /* found a hit before the end of the list */
- continue;
- printf("%u ", dest_port);
- fflush(stdout);
- /* Set up connections */
- sd = socket(AF_INET, SOCK_DGRAM, 0);
- if (sd < 0){
- perror("socket");
- return 1;
- }
- memset(&me, 0, sizeof me);
- me.sin_family = AF_INET;
- me.sin_addr.s_addr = INADDR_ANY;
- /* already in network byte order (I think) */
- me.sin_port = dest_port;
- if (bind(sd, (struct sockaddr *)&me, sizeof(me)) != 0){
- perror("bind");
- return 2;
- }
- register_input_handler(sd, snmp_read_packet);
- portlist[sdlen] = dest_port;
- if (++sdlen == 32){
- printf("No more sockets... ignoring rest of file\n");
- break;
- }
- }
- printf("\n");
- bzero((char *)addrCache, sizeof(addrCache));
-}
-
-/*
- * Place an IP address into an OID starting at element n
- */
-void
-put_address(oid *name, u_long addr, int n)
-{
- int i;
-
- for (i=n+3; i>=n+0; i--) {
- name[i] = addr & 0xFF;
- addr >>= 8;
- }
-}
-
-/* Get an IP address from an OID starting at element n */
-int
-get_address(oid *name, int length, u_long *addr, int n)
-{
- int i;
- int ok = 1;
-
- (*addr) = 0;
-
- if (length < n+4)
- return 0;
-
- for (i=n; i<n+4; i++) {
- (*addr) <<= 8;
- if (i >= length)
- ok = 0;
- else
- (*addr) |= name[i];
- }
- return ok;
-}
-
-/*
- * Implements scalar objects from DVMRP and Multicast MIBs
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_scalar(register struct variable *vp, register oid *name, register int *length,
- int exact, int *var_len, int (**write_method)() )
-{
- int result;
-
- *write_method = 0;
- result = compare(name, *length, vp->name, (int)vp->namelen);
- if ((exact && (result != 0)) || (!exact && (result >= 0)))
- return NULL;
-
- bcopy((char *)vp->name, (char *)name,
- (int)vp->namelen * sizeof(oid));
- *length = vp->namelen;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case ipMRouteEnable:
- long_return = 1;
- return (u_char *) &long_return;
-
- case dvmrpVersion: {
- static char buff[15];
-
- snprintf(buff, sizeof buff, "mrouted%d.%d",
- PROTOCOL_VERSION, MROUTED_VERSION);
- *var_len = strlen(buff);
- return (u_char *)buff;
- }
-
- case dvmrpGenerationId:
- long_return = dvmrp_genid;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Find if a specific scoped boundary exists on a Vif
- */
-struct vif_acl *
-find_boundary(vifi_t vifi, u_long addr, u_long mask)
-{
- struct vif_acl *n;
-
- for (n = uvifs[vifi].uv_acl; n != NULL; n = n->acl_next) {
- if (addr == n->acl_addr && mask==n->acl_mask)
- return n;
- }
- return NULL;
-}
-
-/*
- * Find the lowest boundary >= (V,A,M) spec
- */
-struct vif_acl *
-next_boundary(vifi_t *vifi, u_long addr, u_long mask)
-{
- struct vif_acl *bestn, *n;
- int i;
-
- for (i = *vifi; i < numvifs; i++) {
- bestn = NULL;
- for (n = uvifs[i].uv_acl; n; n=n->acl_next) {
- if ((i > *vifi || n->acl_addr > addr
- || (n->acl_addr == addr && n->acl_mask >= mask))
- && (!bestn || n->acl_addr < bestn->acl_addr
- || (n->acl_addr==bestn->acl_addr && n->acl_mask<bestn->acl_mask)))
- bestn = n;
- }
- if (bestn) {
- *vifi = i;
- return bestn;
- }
- }
- return NULL;
-}
-
-/*
- * Implements the Boundary Table portion of the DVMRP MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_dvmrpBoundaryTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- vifi_t vifi;
- u_long addr, mask;
- struct vif_acl *bound;
- oid newname[MAX_NAME_LEN];
- int len;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 9)
- return NULL;
-
- if ((vifi = name[vp->namelen]) >= numvifs)
- return NULL;
-
- if (!get_address(name, *length, &addr, vp->namelen+1)
- || !get_address(name, *length, &mask, vp->namelen+5))
- return NULL;
-
- if (!(bound = find_boundary(vifi, addr, mask)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 9) { /* get first entry */
-
- if (len == vp->namelen) {
- vifi = addr = mask = 0;
- } else {
- vifi = name[vp->namelen];
- get_address(name, len, &addr, vp->namelen+1);
- get_address(name, len, &mask, vp->namelen+5);
- }
-
- bound = next_boundary(&vifi,addr,mask);
- if (!bound)
- return NULL;
-
- newname[vp->namelen] = vifi;
- put_address(newname, bound->acl_addr, vp->namelen+1);
- put_address(newname, bound->acl_mask, vp->namelen+5);
- } else { /* get next entry given previous */
- vifi = name[vp->namelen];
- get_address(name, *length, &addr, vp->namelen+1);
- get_address(name, *length, &mask, vp->namelen+5);
-
- if (!(bound = next_boundary(&vifi,addr,mask+1)))
- return NULL;
-
- newname[vp->namelen] = vifi;
- put_address(newname, bound->acl_addr, vp->namelen+1);
- put_address(newname, bound->acl_mask, vp->namelen+5);
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 9;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case dvmrpBoundaryVifIndex:
- long_return = vifi;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Find the lowest neighbor >= (V,A) spec
- */
-struct listaddr *
-next_neighbor(vifi_t *vifi, u_long addr)
-{
- struct listaddr *bestn, *n;
- int i;
-
- for (i = *vifi; i < numvifs; i++) {
- bestn = NULL;
- for (n = uvifs[i].uv_neighbors; n; n=n->al_next) {
- if ((i > *vifi || n->al_addr >= addr)
- && (!bestn || n->al_addr < bestn->al_addr))
- bestn = n;
- }
- if (bestn) {
- *vifi = i;
- return bestn;
- }
- }
- return NULL;
-}
-
-/*
- * Find a neighbor, if it exists off a given Vif
- */
-struct listaddr *
-find_neighbor(vifi_t vifi, u_long addr)
-{
- struct listaddr *n;
-
- for (n = uvifs[vifi].uv_neighbors; n != NULL; n = n->al_next) {
- if (addr == n->al_addr)
- return n;
- }
- return NULL;
-}
-
-/*
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_dvmrpNeighborTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- vifi_t vifi;
- u_long addr, mask;
- struct listaddr *neighbor;
- oid newname[MAX_NAME_LEN];
- int len;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 5)
- return NULL;
-
- if ((vifi = name[vp->namelen]) >= numvifs)
- return NULL;
-
- if (!get_address(name, *length, &addr, vp->namelen+1))
- return NULL;
-
- if (!(neighbor = find_neighbor(vifi, addr)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 5) { /* get first entry */
-
- if (len == vp->namelen) {
- vifi = addr = 0;
- } else {
- vifi = name[vp->namelen];
- get_address(name, len, &addr, vp->namelen+1);
- }
-
- neighbor = next_neighbor(&vifi,addr);
- if (!neighbor)
- return NULL;
-
- newname[vp->namelen] = vifi;
- put_address(newname, neighbor->al_addr, vp->namelen+1);
- } else { /* get next entry given previous */
- vifi = name[vp->namelen];
- get_address(name, *length, &addr, vp->namelen+1);
-
- if (!(neighbor = next_neighbor(&vifi,addr+1)))
- return NULL;
-
- newname[vp->namelen] = vifi;
- put_address(newname, neighbor->al_addr, vp->namelen+1);
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 5;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case dvmrpNeighborUpTime: {
- time_t currtime;
- time(&currtime);
- long_return = (currtime - neighbor->al_ctime)*100;
- return (u_char *) &long_return;
- }
-
- case dvmrpNeighborExpiryTime:
- long_return = (NEIGHBOR_EXPIRE_TIME - neighbor->al_timer
- + secs_remaining_offset()) * 100;
- return (u_char *) &long_return;
-
- case dvmrpNeighborVersion: {
- static char buff[15];
-
- snprintf(buff, sizeof buff, "%d.%d", neighbor->al_pv, neighbor->al_mv);
- *var_len = strlen(buff);
- return (u_char *)buff;
- }
-
- case dvmrpNeighborGenerationId:
- long_return = neighbor->al_genid;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/* Look up ifIndex given uvifs[ifnum].uv_lcl_addr */
-struct in_ifaddr * /* returns: in_ifaddr structure, or null on error */
-ipaddr_to_ifindex(u_long ipaddr, int *ifIndex)
-{
- int interface;
-static struct in_ifaddr in_ifaddr;
-
- Interface_Scan_Init();
- for (;;) {
- if (Interface_Scan_Next(&interface, (char *)0, NULL, &in_ifaddr) == 0)
- return NULL;
-
- if (((struct sockaddr_in *) &(in_ifaddr.ia_addr))->sin_addr.s_addr
- == ipaddr) {
- *ifIndex = interface;
- return &in_ifaddr;
- }
- }
-}
-
-/*
- * Find if a specific scoped boundary exists on a Vif
- */
-struct listaddr *
-find_cache(u_long grp, vifi_t vifi)
-{
- struct listaddr *n;
-
- for (n = uvifs[vifi].uv_groups; n != NULL; n = n->al_next) {
- if (grp == n->al_addr)
- return n;
- }
- return NULL;
-}
-
-/*
- * Find the next group cache entry >= (A,V) spec
- */
-struct listaddr *
-next_cache(u_long addr, vifi_t *vifi)
-{
- struct listaddr *bestn=NULL, *n;
- int i, besti;
-
- /* Step through all entries looking for the next one */
- for (i = 0; i < numvifs; i++) {
- for (n = uvifs[i].uv_groups; n; n=n->al_next) {
- if ((n->al_addr > addr || (n->al_addr == addr && i >= *vifi))
- && (!bestn || n->al_addr < bestn->al_addr
- || (n->al_addr == bestn->al_addr && i < besti))) {
- bestn = n;
- besti = i;
- }
- }
- }
-
- if (bestn) {
- *vifi = besti;
- return bestn;
- }
- return NULL;
-}
-
-/*
- * Implements the IGMP Cache Table portion of the IGMP MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_igmpCacheTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- vifi_t vifi;
- u_long grp;
- int ifIndex;
- struct listaddr *cache;
- oid newname[MAX_NAME_LEN];
- int len;
- struct in_ifaddr *in_ifaddr;
- struct in_multi in_multi, *inm;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 5)
- return NULL;
-
- if ((vifi = name[vp->namelen+4]) >= numvifs)
- return NULL;
-
- if (!get_address(name, *length, &grp, vp->namelen))
- return NULL;
-
- if (!(cache = find_cache(grp, vifi)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 5) { /* get first entry */
-
- if (len == vp->namelen) {
- vifi = grp = 0;
- } else {
- get_address(name, len, &grp, vp->namelen);
- vifi = name[vp->namelen+4];
- }
-
- cache = next_cache(grp,&vifi);
- if (!cache)
- return NULL;
-
- put_address(newname, cache->al_addr, vp->namelen);
- newname[vp->namelen+4] = vifi;
- } else { /* get next entry given previous */
- get_address(name, *length, &grp, vp->namelen);
- vifi = name[vp->namelen+4]+1;
-
- if (!(cache = next_cache(grp,&vifi)))
- return NULL;
-
- put_address(newname, cache->al_addr, vp->namelen);
- newname[vp->namelen+4] = vifi;
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 5;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- /* Look up ifIndex given uvifs[vifi].uv_lcl_addr */
- in_ifaddr = ipaddr_to_ifindex(uvifs[vifi].uv_lcl_addr, &ifIndex);
-
- switch (vp->magic) {
-
- case igmpCacheSelf:
- inm = in_ifaddr->ia_multiaddrs;
- while (inm) {
- klookup( (int)inm, (char *)&in_multi, sizeof(in_multi));
-
- if (in_multi.inm_addr.s_addr == cache->al_addr) {
- long_return = 1; /* true */
- return (u_char *) &long_return;
- }
-
- inm = in_multi.inm_next;
- }
- long_return = 2; /* false */
- return (u_char *) &long_return;
-
- case igmpCacheLastReporter:
- return (u_char *) &cache->al_genid;
-
- case igmpCacheUpTime: {
- time_t currtime;
- time(&currtime);
- long_return = (currtime - cache->al_ctime)*100;
- return (u_char *) &long_return;
- }
-
- case igmpCacheExpiryTime:
- long_return = secs_remaining(cache->al_timerid)*100;
- return (u_char *) &long_return;
-
- case igmpCacheStatus:
- long_return = 1;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Implements the IGMP Interface Table portion of the IGMP MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_igmpInterfaceTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- oid newname[MAX_NAME_LEN];
- register int ifnum;
- int result;
-static struct sioc_vif_req v_req;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- /* find "next" interface */
- for(ifnum = 0; ifnum < numvifs; ifnum++){
- if (!(uvifs[ifnum].uv_flags & VIFF_QUERIER))
- continue;
- newname[vp->namelen] = (oid)ifnum;
- result = compare(name, *length, newname, (int)vp->namelen + 1);
- if ((exact && (result == 0)) || (!exact && (result < 0)))
- break;
- }
- if (ifnum >= numvifs)
- return NULL;
-
- /* Save new OID */
- bcopy((char *)newname, (char *)name, ((int)vp->namelen + 1) * sizeof(oid));
- *length = vp->namelen + 1;
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic){
-
- case igmpInterfaceQueryInterval:
- long_return = GROUP_QUERY_INTERVAL;
- return (u_char *) &long_return;
-
- case igmpInterfaceStatus:
- long_return = 1; /* active */
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Given a virtual interface number, make sure we have the current
- * kernel information for that Vif.
- */
-refresh_vif(struct sioc_vif_req *v_req, int ifnum)
-{
- static int lastq = -1;
-
- if (quantum!=lastq || v_req->vifi != ifnum) {
- lastq = quantum;
- v_req->vifi = ifnum;
- if (ioctl(udp_socket, SIOCGETVIFCNT, (char *)v_req) < 0)
- v_req->icount = v_req->ocount = v_req->ibytes = v_req->obytes = 0;
- }
-}
-
-/*
- * Implements the Multicast Routing Interface Table portion of the Multicast MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_ipMRouteInterfaceTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- oid newname[MAX_NAME_LEN];
- register int ifnum;
- int result;
-static struct sioc_vif_req v_req;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- /* find "next" interface */
- for(ifnum = 0; ifnum < numvifs; ifnum++){
- newname[vp->namelen] = (oid)ifnum;
- result = compare(name, *length, newname, (int)vp->namelen + 1);
- if ((exact && (result == 0)) || (!exact && (result < 0)))
- break;
- }
- if (ifnum >= numvifs)
- return NULL;
-
- /* Save new OID */
- bcopy((char *)newname, (char *)name, ((int)vp->namelen + 1) * sizeof(oid));
- *length = vp->namelen + 1;
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic){
-
- case ipMRouteInterfaceTtl:
- long_return = uvifs[ifnum].uv_threshold;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceType:
- if (uvifs[ifnum].uv_flags & VIFF_SRCRT)
- long_return = 2;
- else if (uvifs[ifnum].uv_flags & VIFF_TUNNEL)
- long_return = 1;
- else if (uvifs[ifnum].uv_flags & VIFF_QUERIER)
- long_return = 3;
- else /* SUBNET */
- long_return = 4;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceState:
- if (uvifs[ifnum].uv_flags & VIFF_DISABLED)
- long_return = 3;
- else if ((uvifs[ifnum].uv_flags & VIFF_DOWN)
- || ((uvifs[ifnum].uv_flags & VIFF_TUNNEL) && (uvifs[ifnum].uv_neighbors==NULL)))
- long_return = 2;
- else /* UP */
- long_return = 1;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceLocalAddress:
- return (u_char *) &uvifs[ifnum].uv_lcl_addr;
-
- case dvmrpVInterfaceRemoteAddress:
- return (u_char *) ((uvifs[ifnum].uv_flags & VIFF_TUNNEL) ?
- &uvifs[ifnum].uv_rmt_addr :
- &uvifs[ifnum].uv_subnet);
-
- case dvmrpVInterfaceRemoteSubnetMask:
- return (u_char *) &uvifs[ifnum].uv_subnetmask;
-
- case dvmrpVInterfaceMetric:
- long_return = uvifs[ifnum].uv_metric;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceRateLimit:
- long_return = uvifs[ifnum].uv_rate_limit;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceInPkts:
- refresh_vif(&v_req, ifnum);
- long_return = v_req.icount;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceOutPkts:
- refresh_vif(&v_req, ifnum);
- long_return = v_req.ocount;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceInOctets:
- refresh_vif(&v_req, ifnum);
- long_return = v_req.ibytes;
- return (u_char *) &long_return;
-
- case dvmrpVInterfaceOutOctets:
- refresh_vif(&v_req, ifnum);
- long_return = v_req.obytes;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Implements the DVMRP Route Table portion of the DVMRP MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_dvmrpRouteTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- u_long src, mask;
- oid newname[MAX_NAME_LEN];
- int len;
- struct rtentry *rt = NULL;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 8)
- return NULL;
-
- if (!get_address(name, *length, &src, vp->namelen)
- || !get_address(name, *length, &mask, vp->namelen+4))
- return NULL;
-
- if (!(rt = snmp_find_route(src, mask)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 8) { /* get first entry */
-
- if (len == vp->namelen) {
- src = mask = 0;
- } else {
- get_address(name, len, &src, vp->namelen);
- get_address(name, len, &mask, vp->namelen+4);
- }
-
- if (!next_route(&rt,src,mask)) /* Get first entry */
- return NULL;
-
- put_address(newname, rt->rt_origin , vp->namelen);
- put_address(newname, rt->rt_originmask, vp->namelen+4);
- } else { /* get next entry given previous */
- get_address(name, *length, &src, vp->namelen);
- get_address(name, *length, &mask, vp->namelen+4);
-
- if (!next_route(&rt, src,mask))
- return NULL;
-
- put_address(newname, rt->rt_origin, vp->namelen);
- put_address(newname, rt->rt_originmask, vp->namelen+4);
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 8;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case dvmrpRouteUpstreamNeighbor:
- return (u_char *) &rt->rt_gateway;
-
- case dvmrpRouteInVifIndex:
- long_return = rt->rt_parent;
- return (u_char *) &long_return;
-
- case dvmrpRouteMetric:
- long_return = rt->rt_metric;
- return (u_char *) &long_return;
-
- case dvmrpRouteExpiryTime:
- long_return = (ROUTE_EXPIRE_TIME - rt->rt_timer
- + secs_remaining_offset()) * 100;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Implements the DVMRP Routing Next Hop Table portion of the DVMRP MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_dvmrpRouteNextHopTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- u_long src, mask;
- vifi_t vifi;
- struct rtentry *rt = NULL;
- oid newname[MAX_NAME_LEN];
- int len;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 9)
- return NULL;
-
- if (!get_address(name, *length, &src, vp->namelen)
- || !get_address(name, *length, &mask, vp->namelen+4)
- || (!(rt=snmp_find_route(src,mask))))
- return NULL;
-
- vifi = name[vp->namelen+8];
- if (!(VIFM_ISSET(vifi, rt->rt_children)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 9) { /* get first entry */
-
- get_address(name, len, &src, vp->namelen);
- get_address(name, len, &mask, vp->namelen+4);
-
- /* Find first child vif */
- vifi=0;
- if (!next_route_child(&rt, src, mask, &vifi))
- return NULL;
-
- put_address(newname, rt->rt_origin, vp->namelen);
- put_address(newname, rt->rt_originmask, vp->namelen+4);
- newname[vp->namelen+8] = vifi;
- } else { /* get next entry given previous */
- vifi = name[vp->namelen+8] + 1;
- if (!get_address(name, *length, &src, vp->namelen)
- || !get_address(name, *length, &mask, vp->namelen+4)
- || !next_route_child(&rt, src, mask, &vifi))
- return NULL;
-
- put_address(newname, rt->rt_origin, vp->namelen);
- put_address(newname, rt->rt_originmask, vp->namelen+4);
- newname[vp->namelen+8] = vifi;
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 9;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case dvmrpRouteNextHopType:
- long_return = (VIFM_ISSET(vifi, rt->rt_leaves))? 1 : 2;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Implements the IP Multicast Route Table portion of the Multicast MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_ipMRouteTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- u_long src, grp, mask;
- struct gtable *gt = NULL;
- struct stable *st = NULL;
-static struct sioc_sg_req sg_req;
- oid newname[MAX_NAME_LEN];
- int len;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 12)
- return NULL;
-
- if (!get_address(name, *length, &grp, vp->namelen)
- || !get_address(name, *length, &src, vp->namelen+4)
- || !get_address(name, *length, &mask, vp->namelen+8)
- || (mask != 0xFFFFFFFF) /* we keep sources now, not subnets */
- || !(gt = find_grp(grp))
- || !(st = find_grp_src(gt,src)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 12) { /* get first entry */
-
- get_address(name, len, &grp, vp->namelen);
- get_address(name, len, &src, vp->namelen+4);
- get_address(name, len, &mask, vp->namelen+8);
-
- if (!next_grp_src_mask(&gt,&st,grp,src,mask)) /* Get first entry */
- return NULL;
-
- put_address(newname, gt->gt_mcastgrp, vp->namelen);
- put_address(newname, st->st_origin, vp->namelen+4);
- put_address(newname, 0xFFFFFFFF, vp->namelen+8);
- } else { /* get next entry given previous */
- get_address(name, *length, &grp , vp->namelen);
- get_address(name, *length, &src , vp->namelen+4);
- get_address(name, *length, &mask, vp->namelen+8);
-
- if (!next_grp_src_mask(&gt, &st, grp,src,mask))
- return NULL;
-
- put_address(newname, gt->gt_mcastgrp, vp->namelen);
- put_address(newname, st->st_origin, vp->namelen+4);
- put_address(newname, 0xFFFFFFFF, vp->namelen+8);
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 12;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case ipMRouteUpstreamNeighbor:
- return (u_char *) &gt->gt_route->rt_gateway;
-
- case ipMRouteInIfIndex:
- long_return = gt->gt_route->rt_parent;
- return (u_char *) &long_return;
-
- case ipMRouteUpTime: {
- time_t currtime;
- time(&currtime);
- long_return = (currtime - gt->gt_ctime)*100;
- return (u_char *) &long_return;
- }
-
- case ipMRouteExpiryTime:
- long_return = 5*((gt->gt_timer+4)/5); /* round up to nearest 5 */
- long_return = (long_return + secs_remaining_offset()) * 100;
- return (u_char *) &long_return;
-
- case ipMRoutePkts:
- refresh_sg(&sg_req, gt, st);
- long_return = sg_req.pktcnt;
- return (u_char *) &long_return;
-
- case ipMRouteOctets:
- refresh_sg(&sg_req, gt, st);
- long_return = sg_req.bytecnt;
- return (u_char *) &long_return;
-
- case ipMRouteDifferentInIfIndexes:
- refresh_sg(&sg_req, gt, st);
- long_return = sg_req.wrong_if;
- return (u_char *) &long_return;
-
- case ipMRouteProtocol:
- long_return = 4;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/*
- * Implements the IP Multicast Routing Next Hop Table portion of the Multicast
- * MIB
- * vp : IN - pointer to variable entry that points here
- * name : IN/OUT - input name requested, output name found
- * length : IN/OUT - length of input and output oid's
- * exact : IN - TRUE if an exact match was requested.
- * var_len : OUT - length of variable or 0 if function returned.
- * write_method: OUT - pointer to function to set variable, otherwise 0
- */
-u_char *
-o_ipMRouteNextHopTable(register struct variable *vp, register oid *name,
- register int *length, int exact, int *var_len, int (**write_method)())
-{
- u_long src, grp, mask, addr;
- vifi_t vifi;
- struct gtable *gt;
- struct stable *st;
- oid newname[MAX_NAME_LEN];
- int len;
-
- /* Copy name OID to new OID */
- bcopy((char *)vp->name, (char *)newname, (int)vp->namelen * sizeof(oid));
-
- if (exact) {
- if (*length != vp->namelen + 17)
- return NULL;
-
- if (!get_address(name, *length, &grp, vp->namelen)
- || !get_address(name, *length, &src, vp->namelen+4)
- || !get_address(name, *length, &mask, vp->namelen+8)
- || !get_address(name, *length, &addr, vp->namelen+13)
- || grp!=addr
- || mask!=0xFFFFFFFF
- || (!(gt=find_grp(grp)))
- || (!(st=find_grp_src(gt,src))))
- return NULL;
-
- vifi = name[vp->namelen+12];
- if (!(VIFM_ISSET(vifi, gt->gt_route->rt_children)))
- return NULL;
-
- bcopy((char *)name, (char *)newname, ((int)*length) * sizeof(oid));
- } else {
- len = *length;
- if (compare(name, *length, vp->name, vp->namelen) < 0)
- len = vp->namelen;
-
- if (len < vp->namelen + 17) { /* get first entry */
-
- get_address(name, len, &grp, vp->namelen);
- get_address(name, len, &src, vp->namelen+4);
- get_address(name, len, &mask, vp->namelen+8);
-
- /* Find first child vif */
- vifi=0;
- if (!next_child(&gt, &st, grp, src, mask, &vifi))
- return NULL;
-
- put_address(newname, gt->gt_mcastgrp, vp->namelen);
- put_address(newname, st->st_origin, vp->namelen+4);
- put_address(newname, 0xFFFFFFFF, vp->namelen+8);
- newname[vp->namelen+12] = vifi;
- put_address(newname, gt->gt_mcastgrp, vp->namelen+13);
-
- } else { /* get next entry given previous */
- vifi = name[vp->namelen+12]+1;
- if (!get_address(name, *length, &grp, vp->namelen)
- || !get_address(name, *length, &src, vp->namelen+4)
- || !get_address(name, *length, &mask, vp->namelen+8)
- || !next_child(&gt, &st, grp, src, mask, &vifi))
- return NULL;
-
- put_address(newname, gt->gt_mcastgrp, vp->namelen);
- put_address(newname, st->st_origin, vp->namelen+4);
- put_address(newname, 0xFFFFFFFF, vp->namelen+8);
- newname[vp->namelen+12] = vifi;
- put_address(newname, gt->gt_mcastgrp, vp->namelen+13);
- }
- }
-
- /* Save new OID */
- *length = vp->namelen + 17;
- bcopy((char *)newname, (char *)name, ((int)*length) * sizeof(oid));
- *write_method = 0;
- *var_len = sizeof(long);
-
- switch (vp->magic) {
-
- case ipMRouteNextHopState:
- long_return = (VIFM_ISSET(vifi, gt->gt_grpmems))? 2 : 1;
- return (u_char *) &long_return;
-
- /* Currently equal to ipMRouteUpTime */
- case ipMRouteNextHopUpTime: {
- time_t currtime;
- time(&currtime);
- long_return = (currtime - gt->gt_ctime)*100;
- return (u_char *) &long_return;
- }
-
- case ipMRouteNextHopExpiryTime:
- long_return = 5*((gt->gt_prsent_timer+4)/5); /* round up to nearest 5*/
- long_return = (long_return + secs_remaining_offset()) * 100;
- return (u_char *) &long_return;
-
- case ipMRouteNextHopClosestMemberHops:
- long_return = 0;
- return (u_char *) &long_return;
-
- case ipMRouteNextHopProtocol:
- long_return = 4;
- return (u_char *) &long_return;
-
- default:
- ERROR("");
- }
- return NULL;
-}
-
-/* sync_timer is called by timer() every TIMER_INTERVAL seconds.
- * Its job is to record this time so that we can compute on demand
- * the approx # seconds remaining until the next timer() call
- */
-static time_t lasttimer;
-
-void
-sync_timer(void)
-{
- time(&lasttimer);
-}
-
-int /* in range [-TIMER_INTERVAL..0] */
-secs_remaining_offset(void)
-{
- time_t tm;
-
- time(&tm);
- return lasttimer-tm;
-}
diff --git a/usr.sbin/mrouted/snmp.h b/usr.sbin/mrouted/snmp.h
deleted file mode 100644
index e4a73ca4a8e..00000000000
--- a/usr.sbin/mrouted/snmp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: snmp.h,v 1.3 1995/12/10 10:07:18 mycroft Exp $ */
-
-/*
- * Copyright (c) 1992, 2001 Xerox Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither name of the Xerox, PARC, nor the names of its contributors may be used
- * to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE XEROX CORPORATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-extern int portlist[32], sdlen;
-extern in_port_t dest_port;
-extern int quantum;
-
-extern int snmp_read_packet();
-
-#define DEFAULT_PORT 161
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index af0934e41b8..b8ef573bb0b 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -556,9 +556,6 @@ accept_group_report(u_int32_t src, u_int32_t dst, u_int32_t group,
if (group == g->al_addr) {
if (r_type == IGMP_v1_HOST_MEMBERSHIP_REPORT)
g->al_old = OLD_AGE_THRESHOLD;
-#ifdef SNMP
- g->al_genid = src;
-#endif /* SNMP */
/** delete old timers, set a timer for expiration **/
g->al_timer = GROUP_EXPIRE_TIME;
@@ -584,9 +581,6 @@ accept_group_report(u_int32_t src, u_int32_t dst, u_int32_t group,
g->al_old = 0;
else
g->al_old = OLD_AGE_THRESHOLD;
-#ifdef SNMP
- g->al_genid = src;
-#endif
/** set a timer for expiration **/
g->al_query = 0;