[sdig-devel] sdig/src config.c,NONE,1.1 query.c,NONE,1.1 Makefile.am,1.1,1.2 common.c,1.1,1.2 sdig.c,1.1,1.2 sdig.h,1.1,1.2 snmpget.c,1.1,1.2 snmpget.h,1.1,1.2

[Russell J. <ra...@us...>]

Update of /cvsroot/sdig/sdig/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21796

Modified Files:
	Makefile.am common.c sdig.c sdig.h snmpget.c snmpget.h 
Added Files:
	config.c query.c 
Log Message:
Firsts steps at modularization.


Index: snmpget.c
===================================================================
RCS file: /cvsroot/sdig/sdig/src/snmpget.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** snmpget.c	24 Apr 2006 20:47:30 -0000	1.1
--- snmpget.c	2 May 2006 21:21:37 -0000	1.2
***************
*** 1,26 ****
  /* snmpget.c - SNMP OID retrieval functions for sdig
! 
!    Copyright (C) 2002  Russell Kroll <rk...@ex...>
! 
!    based on snmp-ups.c from Network UPS Tools:
! 
!  *  Copyright (C) 2002 Arnaud Quette <arn...@fr...>
!  *  some parts are Copyright (C) :
   *                Hans Ekkehard Plesser <han...@it...>
! 
!    This program is free software; you can redistribute it and/or modify
!    it under the terms of the GNU General Public License as published by
!    the Free Software Foundation; either version 2 of the License, or
!    (at your option) any later version.
! 
!    This program is distributed in the hope that it will be useful,
!    but WITHOUT ANY WARRANTY; without even the implied warranty of
!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!    GNU General Public License for more details.
! 
!    You should have received a copy of the GNU General Public License
!    along with this program; if not, write to the Free Software
!    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! */
  
  #include <stdio.h>
--- 1,28 ----
  /* snmpget.c - SNMP OID retrieval functions for sdig
!  * 
!  * Copyright (C) 2002  Russell Kroll <rk...@ex...>
!  *
!  * based on snmp-ups.c from Network UPS Tools:
!  *
!  * Copyright (C) 2002 Arnaud Quette <arn...@fr...>
!  * some parts are Copyright (C) :
   *                Hans Ekkehard Plesser <han...@it...>
!  *
!  * This program is free software; you can redistribute it and/or modify
!  * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
!  * (at your option) any later version.
!  *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
!  *
!  * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!  *
!  * $Id$
!  */
  
  #include <stdio.h>
***************
*** 33,39 ****
  #include "common.h"
  
! 	netsnmp_pdu *response;
  
! static int snmpget(char *host, char *community, char *reqoid)
  {
  	int	status;
--- 35,42 ----
  #include "common.h"
  
! netsnmp_pdu *response;
  
! int
! snmpget(char *host, char *community, char *reqoid)
  {
  	int	status;
***************
*** 87,91 ****
  }
  
! int snmpget_int(char *host, char *community, char *reqoid)
  {
  	int	ret;
--- 90,95 ----
  }
  
! int
! snmpget_int(char *host, char *community, char *reqoid)
  {
  	int	ret;
***************
*** 109,113 ****
  }
  
! char *snmpget_mac(char *host, char *community, char *reqoid)
  {
  	int	ret, i;
--- 113,118 ----
  }
  
! char
! *snmpget_mac(char *host, char *community, char *reqoid)
  {
  	int	ret, i;
***************
*** 138,142 ****
  }
  
! char *snmpget_str(char *host, char *community, char *reqoid)
  {
  	int	ret;
--- 143,148 ----
  }
  
! char
! *snmpget_str(char *host, char *community, char *reqoid)
  {
  	int	ret;

Index: sdig.h
===================================================================
RCS file: /cvsroot/sdig/sdig/src/sdig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sdig.h	24 Apr 2006 20:47:30 -0000	1.1
--- sdig.h	2 May 2006 21:21:37 -0000	1.2
***************
*** 41,42 ****
--- 41,49 ----
  	void    *next;
  }       pdtype;
+ 
+ struct response {
+ 	char sysName;
+ 	char ifIdx;
+ 	char ifAlias;
+ 	char ifName;
+ }

--- NEW FILE: query.c ---
/* sdig.c - the Switch Digger main file
 *
 *  Copyright (C) 2000  Russell Kroll <rk...@ex...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

#include <ctype.h>
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h> 
#include <string.h> 
#include <unistd.h> 
#include <arpa/inet.h> 
#include <netinet/in.h> 
#include <sys/socket.h>

#include "sdig.h"
#include "common.h"
#include "snmpget.h"
#include "version.h"

#include "../include/config.h"

stype	*firstsw = NULL;
rtype	*firstrt = NULL;
pdtype	*firstpd = NULL;
litype	*firstli = NULL;

char	*wins = NULL, *nmblookup = NULL, *mactable = NULL,
	*hostinfo = NULL;

int	verbose = 0, fastmode = 0;

static char *findmac(const char *ip, rtype *rtr)
{
	char	query[256], *ret;
	int	ifnum;

	debug(2, "\n\nfindmac: [%s] [%s] [%s]\n", ip, rtr->ip, rtr->pw);

	/* find the router's internal interface number */

	snprintf(query, sizeof(query),
		"IP-MIB::ipAdEntIfIndex.%s", rtr->ip);

	ifnum = snmpget_int(rtr->ip, rtr->pw, query);

	if (ifnum == -1)
		return NULL;

	debug(6, "router interface number for %s is %d\n",
		rtr->ip, ifnum);

	/* now look it up in the net to media table relative to the ifnum */

	/* if digging the router itself, use a different OID */

	if (!strcmp(ip, rtr->ip))
		snprintf(query, sizeof(query), 
			"interfaces.ifTable.ifEntry.ifPhysAddress.%d",
			ifnum);
	else
		snprintf(query, sizeof(query), 
		"ip.ipNetToMediaTable.ipNetToMediaEntry.ipNetToMediaPhysAddress.%d.%s",
		ifnum, ip);

	ret = snmpget_mac(rtr->ip, rtr->pw, query);

	return ret;
}

static int findport(unsigned const char *mac, stype *sw)
{
	char	query[64];

	if (sw->ip == NULL) {
		printf("No switch defined for that network\n");
		exit(1);
	}

	/* build the OID for the mapping of MAC addresses to port numbers */

	snprintf(query, sizeof(query), "SNMPv2-SMI::mib-2.17.4.3.1.2.%u.%u.%u.%u.%u.%u",
		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);

	debug(4, "findport: snmpget_int(%s, %s, %s)\n",
		sw->ip, sw->pw, query);

	return snmpget_int(sw->ip, sw->pw, query);
}

static char *getlink(const char *ip, long port)
{
	litype	*tmp;

	tmp = firstli;

	while (tmp) {
		if ((!strcmp(tmp->ip, ip)) && (tmp->port == port))
			return tmp->desc;

		tmp = tmp->next;
	}

	return NULL;
}

static char *getdesc(const char *ip, long port)
{
	pdtype	*tmp;

	tmp = firstpd;

	while (tmp) {
		if ((!strcmp(tmp->ip, ip)) && (tmp->port == port))
			return tmp->desc;

		tmp = tmp->next;
	}

	return NULL;
}

static const char *macmfr(unsigned char *inmac)
{
	FILE	*macdb;
	char	buf[256], *tmp, macfind[16];
	int	i;

	macdb = fopen(mactable, "r");
	if (!macdb)
		return "MAC table file not available";

	/* rewrite the MAC address into something that'll match the table */

	snprintf(macfind, sizeof(macfind), "%02x %02x %02x", 
		inmac[0], inmac[1], inmac[2]);

	while (fgets(buf, sizeof(buf), macdb)) {
		buf[strlen(buf) - 1] = '\0';

		if (!strncasecmp(buf, macfind, 8)) {
			tmp = xstrdup(&buf[9]);
			for (i = strlen(tmp) - 1; i >= 0; i--) {
				if (!isspace(tmp[i])) {
					tmp[i+1] = '\0';
					return tmp;
				}
			}
			return tmp;
		}
	}

	fclose(macdb);
	return "Not available";
}

static char *wins_resolve(const char *host)
{
	char	exec[256], buf[256];
	FILE	*wq;

	if (!wins) {
		fprintf(stderr, "WINS not defined in config file!\n");
		return NULL;
	}

	if (!nmblookup) {
		fprintf(stderr, "NMBLOOKUP not defined in config file!\n");
		return NULL;
	}

	snprintf(exec, sizeof(exec), "%s -U %s -R %s | tail -1 | cut -f 1 -d \" \"",
		nmblookup, wins, host);

	debug(5, "popen: %s\n", exec);
	wq = popen(exec, "r");

	fgets(buf, sizeof(buf), wq);
	pclose(wq);

	buf[strlen(buf) - 1] = '\0';
	debug(7, "read [%s]\n", buf);
	if (!strcmp(buf, "name_query")) {
		fprintf(stderr, "WINS lookup failed\n");
		exit(1);
	}

	printf("  Address: %s (WINS)\n", buf);

	return(xstrdup(buf));
}

static char *dns_resolve(const char *host)
{
	struct	hostent	*dns;
	struct	in_addr	addr;

	if ((dns = gethostbyname(host)) == (struct hostent *) NULL)
		return NULL;

	memcpy(&addr, dns->h_addr, dns->h_length);

	printf("  Address: %s (DNS)\n", inet_ntoa(addr));

	return(xstrdup(inet_ntoa(addr)));
}

static void do_ifdescr(stype *sw, long port)
{
	char	query[256], *ifdescr, *ifname;
	long	ifnum;

	/* first get the switch's ifnum for the port */
	
	snprintf(query, sizeof(query), "SNMPv2-SMI::mib-2.17.1.4.1.2.%ld", port);
	ifnum = snmpget_int(sw->ip, sw->pw, query);

	if (ifnum == -1)
		return;

	snprintf(query, sizeof(query), "IF-MIB::ifName.%ld",
		ifnum);

	ifname = snmpget_str(sw->ip, sw->pw, query);

	if (!ifname) {
		snprintf(query, sizeof(query), "IF-MIB::ifAlias.%ld", ifnum);
		snmpget_str(sw->ip, sw->pw, query);
	}

	snprintf(query, sizeof(query), "IF-MIB::ifDescr.%ld",
		ifnum);

	ifdescr = snmpget_str(sw->ip, sw->pw, query);

	if (ifname) {
		printf(" (%s)", ifname);
		free(ifname);
	}

	if (ifdescr) {
		printf(" [%s]", ifdescr);
		free(ifdescr);
	}
}

static void printport(stype *sw, long port)
{
	char	*ds, *li, *swdesc;
	char	query[256];

	/* don't print if it's a switch-switch link unless in verbose mode */

	li = getlink(sw->ip, port);

	if ((li) && (!verbose))
		return;

	snprintf(query, sizeof(query), "SNMPv2-MIB::sysName.0");
	swdesc = snmpget_str(sw->ip, sw->pw, query);

	if (swdesc)
		printf("   Switch: %s (%s) - %s\n",
			sw->desc, swdesc, sw->ip);
	else
		printf("   Switch: %s - %s\n", sw->desc, sw->ip);

	printf("     Port: %ld", port);
	do_ifdescr(sw, port);
	printf("\n");
	
	if (li)
		printf("     Link: %s\n", li);

	ds = getdesc(sw->ip, port);
	if (ds)
		printf("     Info: %s\n", ds);

	printf("\n");
}

static int isip(const char *buf)
{
	int	i;

	for (i = 0; i < strlen(buf); i++)
		if ((!isdigit(buf[i])) && (buf[i] != '.'))
			return 0;

	return 1;
}

static void dnsreverse(const char *ip)
{
	struct	hostent	*dns;
	struct	in_addr	addr;

#if HAVE_INET_ATON
	inet_aton(ip, &addr);
#elif HAVE_INET_PTON
	inet_pton(AF_INET, ip, &addr);
#else
#error	Cannot convert address
#endif

	dns = gethostbyaddr((char *)&addr, sizeof(struct in_addr), AF_INET);

	if (dns)
		printf(" Hostname: %s (DNS)\n", dns->h_name);
}

static stype *find_switch(const char *ipaddr, stype *last)
{
	stype	*tmp;
	int	addrchk, swchk;

	if (last)
		tmp = last->next;
	else
		tmp = firstsw;

	while (tmp) {
		addrchk = ntohl(inet_addr(ipaddr)) & tmp->mask;
		swchk = tmp->addr & tmp->mask;

		if (swchk == addrchk)
			return tmp;

		tmp = tmp->next;
	}

	return NULL;
}

/* make the octet string into something nicer for humans */
static void printmac(unsigned const char *mac)
{
	int	i;

	for (i = 0; i < 5; i++)
		printf("%02x:", mac[i]);

	printf("%02x", mac[5]);
}

/* ask the switch about where the MAC address is */
static void switchscan(const char *ipaddr, unsigned const char *macaddr)
{
	stype	*sw;
	long	port;

	printf("\n");

	if (debuglevel >= 2) {
		printf("switchscan: seeking (%s, ", ipaddr);
		printmac(macaddr);
		printf(")\n");
	}

	sw = find_switch(ipaddr, NULL);

	while (sw) {
		debug(3, "switchscan: matched %s\n", sw->ip);

		port = findport(macaddr, sw);

		debug(3, "findport got port %d\n", port);

		if (port != -1)
			printport(sw, port);

		sw = find_switch(ipaddr, sw);
	}

	exit(0);
}

static rtype *find_router(const char *ipaddr, rtype *last)
{
	rtype	*tmp;
	int	addrchk, rtchk;

	if (last)
		tmp = last->next;
	else
		tmp = firstrt;

	while (tmp) {
		addrchk = ntohl(inet_addr(ipaddr)) & tmp->mask;
		rtchk = tmp->addr & tmp->mask;

		if (rtchk == addrchk)
			return tmp;

		tmp = tmp->next;
	}

	return NULL;
}

/* run the user's script for extra details about a host */
static void do_hostinfo(const char *ipaddr)
{
	char	exec[256];

	fflush(stdout);

	snprintf(exec, sizeof(exec), "%s %s", hostinfo, ipaddr);
	system(exec);
}

/* walk the list of routers checking for the IP address */
static void routerscan(const char *ipaddr)
{
	unsigned char	*macaddr;
	rtype	*rtr;

	/* spew out some additional info about the IP address */
	if (fastmode == 0) {
		dnsreverse(ipaddr);

		if (hostinfo)
			do_hostinfo(ipaddr);
	}

	printf("\n");

	debug(2, "routerscan: looking for a router for host %s\n", ipaddr);

	/* XXX: ping code for waking up sleeping/inactive hosts */

	/* find the first one that covers this network */
	rtr = find_router(ipaddr, NULL);

	while (rtr) {
		debug(3, "routerscan: matched %s\n", rtr->ip);

		/* try to find the target IP address on this router */
		macaddr = findmac(ipaddr, rtr);

		if (macaddr) {
			printf("   Router: %s - %s\n", rtr->desc, rtr->ip);

			printf("      MAC: ");
			printmac(macaddr);
			printf(" (%s)\n", macmfr(macaddr));

			switchscan(ipaddr, macaddr);
		}

		rtr = find_router(ipaddr, rtr);
	}

	fprintf(stderr, "Error: no routers found for %s\n", ipaddr);
	exit(1);
}	

/* turn <name> into an IP address and pass it to the router scanner */
static void resolvename(const char *name)
{
	char	*ipaddr;

	/* first try DNS */
	ipaddr = dns_resolve(name);

	if (ipaddr)
		routerscan(ipaddr);

	/* now try WINS */
	ipaddr = wins_resolve(name);

	if (ipaddr)
		routerscan(ipaddr);

	fprintf(stderr, "Can't resolve %s with DNS or WINS!\n", name);
	exit(1);
}

/* see if the specified mac address is sane, and make it machine-readable */
static char *pack_mac(char *buf)
{
	int	i, cc, sl, v, mp;
	char	*ptr, *cp; 
	static	char	mac[16];

	cc = 0;
	for (i = 0; i < strlen(buf); i++) {

		if (buf[i] == ':')
			cc++;

		if ((!isxdigit(buf[i])) && (buf[i] != ':')) {
			fprintf(stderr, "Invalid MAC address specified: %s\n", buf);
			fprintf(stderr, "Valid characters are hex digits and :\n");
			exit(1);
		}
	}

	if (cc != 5) {
		fprintf(stderr, "Invalid MAC address specified: %s\n", buf);
		fprintf(stderr, "It must contain exactly 5 : separators.\n");
		exit(1);
	}

	strcpy(mac, "");
	ptr = buf;
	sl = strlen(buf);
	mp = 0;

	for (i = 0; i < sl; i++) {
		cp = strchr(ptr, ':');

		if (!cp) {
			v = strtol(ptr, (char **) NULL, 16);

			mac[mp++] = v;
			break;
		}

		*cp++ = '\0';

		v = strtol(ptr, (char **) NULL, 16);
		mac[mp++] = v;

		ptr = cp;
	}	

	return mac;
}

--- NEW FILE: config.c ---
/* sdig.c - the Switch Digger main file
 *
 *  Copyright (C) 2000  Russell Kroll <rk...@ex...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 *  $Id: config.c,v 1.1 2006/05/02 21:21:37 raj2 Exp $
 */

#include <ctype.h>
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h> 
#include <string.h> 
#include <unistd.h> 
#include <arpa/inet.h> 
#include <netinet/in.h> 
#include <sys/socket.h>

#include "sdig.h"
#include "common.h"

#include "../include/config.h"

void
loadconfig(const char *fn)
{
	FILE	*conf;
	char	cfn[256], buf[256], *arg[5];
	int	ln, i;

	if (!fn) {
		snprintf(cfn, sizeof(cfn), "%s/sdig.conf", "CONFPATH");
		conf = fopen(cfn, "r");
	} else {
		conf = fopen(fn, "r");
	}

	if (!conf) {
		fprintf(stderr, "fopen %s: %s\n", cfn, strerror(errno));
		exit(1);
	}

	ln = 0;
	while (fgets(buf, sizeof(buf), conf)) {
		buf[strlen(buf) - 1] = '\0';
		ln++;

		i = parseconf("sdig.conf", ln, buf, arg, 5);

		if (i == 0)
			continue;

		if (!strcmp(arg[0], "ROUTER"))
			addrouter(arg[1], arg[2], arg[3], arg[4]);
		if (!strcmp(arg[0], "SWITCH"))
			addswitch(arg[1], arg[2], arg[3], arg[4]);
		if (!strcmp(arg[0], "LINKINFO"))
			addli(arg[1], arg[2], arg[3]);
		if (!strcmp(arg[0], "PORTDESC"))
			addpd(arg[1], arg[2], arg[3]);
		if (!strcmp(arg[0], "WINS"))
			wins = xstrdup(arg[1]);
		if (!strcmp(arg[0], "NMBLOOKUP"))
			nmblookup = xstrdup(arg[1]);
		if (!strcmp(arg[0], "MACTABLE"))
			mactable = xstrdup(arg[1]);
		if (!strcmp(arg[0], "HOSTINFO"))
			hostinfo = xstrdup(arg[1]);
	}

	fclose(conf);
}

/* split up buf into a number of substrings, returning pointers in arg */
int
parseconf(const char *fn, int ln, char *buf, char **arg, int numargs)
{
	char	*ptr, *ws;
	int	i, buflen, an, state;

	an = state = 0;
	ws = NULL;

	buflen = strlen (buf);
	ptr = buf;

	/* yes, it's a state machine! be afraid! */

	for (i = 0; i < buflen; i++) {
		switch (state) {
			case 0:		/* scan */
				if (*ptr == '"') {
					ws = ptr + 1; 	/* start after quote */
					state = 1;	/* goto quotecollect */
					break;
				}

				if (isspace(*ptr))
					break;		/* loop */

				if (*ptr == '\\') {	/* literal as start */
					if (i == (buflen - 1)) {
						fprintf(stderr, "%s:%d:"
						"\\ at end of line!", 
						fn, ln);
						return 0;	/* failure */
					}

					ws = ptr;

					/* shift string to the left */
					memmove(ptr, ptr+1, buflen-i);

					/* fix length */
					buflen--;

					state = 2;	/* goto collect */
				}

				if (!isspace(*ptr)) {
					ws = ptr;
					state = 2;	/* goto collect */
					break;
				}
			
				break;

			case 1:		/* quotecollect */
				if (*ptr == '"')
					state = 3;	/* goto save */

				if (*ptr == '\\') {	/* literal handling */
					if (i == (buflen - 1)) {
						fprintf(stderr, "%s:%d:"
						"\\ at end of line!", 
						fn, ln);
						return 0;	/* failure */
					}

					/* shift string to the left */
					memmove(ptr, ptr+1, buflen-i);

					/* fix length */
					buflen--;
				}

				break;			/* loop */

			case 2:		/* collect */
				if (*ptr == '\\') {	/* literal handling */
					if (i == (buflen - 1)) {
						fprintf(stderr, "%s:%d:"
						"\\ at end of line!", 
						fn, ln);
						return 0;	/* failure */
					}

					/* shift string to the left */
					memmove(ptr, ptr+1, buflen-i);

					/* fix length */
					buflen--;
					break;		/* loop */
				}

				if (!isspace(*ptr))
					break;		/* loop */

				state = 3;		/* goto save */
		}

		if (state == 3) {		/* save */
			if (an < numargs)
				arg[an++] = ws;
			*ptr = '\0';
			ws = NULL;
			state = 0;
		}

		ptr++;
	}

	if (state == 1) {	/* end-of-string in state 1 == missing quote */
		fprintf(stderr, "%s:%d: Unbalanced \" in line", fn, ln);
		return 0;	/* FAILED */
	}

	if (state == 2) {	/* catch last word when exiting from collect */
		*ptr = '\0';
		if (an < numargs)
			arg[an++] = ws;
	}

	/* zap any leftover pointers */
	for (i = an; i < numargs; i++)
		arg[i] = NULL;

	/* safety catch: don't allow all nulls back as 'success' */
	if (arg[0] == NULL)
		return 0;	/* FAILED (don't parse this) */

	return 1;	/* success */
}

/* ROUTER <netblock> <ip> <pw> <"desc"> */
void
addrouter(char *net, const char *ip, const char *pw, const char *desc)
{
	rtype	*tmp, *last;
	char	*addr, *mask;

	mask = strchr(net, '/');

	if (!mask)
		return;

	*mask++ = '\0';
	addr = net;

	tmp = last = firstrt;

	while (tmp != NULL) {
		last = tmp;
		tmp = tmp->next;
	}

	tmp = xmalloc(sizeof(rtype));
	tmp->addr = ntohl(inet_addr(addr));
	tmp->pw = xstrdup(pw);
	tmp->ip = xstrdup(ip);
	tmp->desc = xstrdup(desc);
	tmp->next = NULL;

	if (strstr(mask, ".") == NULL) { /* must be a /nn CIDR type block */
		if (atoi(mask) != 32)
			tmp->mask = ((unsigned int) ((1 << atoi(mask)) - 1) <<
				(32 - atoi(mask)));
		else
			tmp->mask = 0xffffffff; /* avoid overflow from 2^32 */
	}
	else
		tmp->mask = ntohl(inet_addr(mask));

	if (last != NULL)
		last->next = tmp;
	else
		firstrt = tmp;
}

/* SWITCH <netblock> <ip> <community> ["<desc>"] */
void
addswitch(char *net, const char *ip, const char *pw, const char *desc)
{
	stype	*tmp, *last;
	char	*addr, *mask;

	mask = strchr(net, '/');

	if (!mask)
		return;

	*mask++ = '\0';
	addr = net;

	tmp = last = firstsw;

	while (tmp != NULL) {
		last = tmp;
		tmp = tmp->next;
	}

	tmp = xmalloc(sizeof(stype));
	tmp->addr = ntohl(inet_addr(addr));
	tmp->pw = xstrdup(pw);
	tmp->ip = xstrdup(ip);
	tmp->desc = xstrdup(desc);
	tmp->firstlink = NULL;
	tmp->next = NULL;

	if (strstr(mask, ".") == NULL) {  /* must be a /nn CIDR type block */
		if (atoi(mask) != 32)
			tmp->mask = ((unsigned int) ((1 << atoi(mask)) - 1) <<
				(32 - atoi(mask)));
		else
			tmp->mask = 0xffffffff; /* avoid overflow from 2^32 */
	}
	else
		tmp->mask = ntohl(inet_addr(mask));

	if (last != NULL)
		last->next = tmp;
	else
		firstsw = tmp;
}

/* LINKINFO <ip> <port> "<desc>" */
void
addli(const char *ip, const char *port, const char *desc)
{
	litype	*tmp, *last;

	tmp = last = firstli;

	while (tmp) {
		last = tmp;
		tmp = tmp->next;
	}

	tmp = xmalloc(sizeof(litype));
	tmp->ip = xstrdup(ip);
	tmp->port = strtol(port, (char **) NULL, 10);
	tmp->desc = xstrdup(desc);

	if (last)
		last->next = tmp;
	else
		firstli = tmp;
}

/* PORTDESC <ip> <port> "<desc>" */
void
addpd(const char *ip, const char *port, const char *desc)
{
	pdtype	*last, *tmp;

	tmp = last = firstpd;

	while (tmp) {
		last = tmp;
		tmp = tmp->next;
	}

	tmp = xmalloc(sizeof(pdtype));
	tmp->ip = xstrdup(ip);
	tmp->port = strtol(port, (char **) NULL, 10);
	tmp->desc = xstrdup(desc);

	if (last)
		last->next = tmp;
	else
		firstpd = tmp;
}

Index: sdig.c
===================================================================
RCS file: /cvsroot/sdig/sdig/src/sdig.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sdig.c	24 Apr 2006 20:47:30 -0000	1.1
--- sdig.c	2 May 2006 21:21:37 -0000	1.2
***************
*** 1,20 ****
  /* sdig.c - the Switch Digger main file
! 
!    Copyright (C) 2000  Russell Kroll <rk...@ex...>
! 
!    This program is free software; you can redistribute it and/or modify
!    it under the terms of the GNU General Public License as published by
!    the Free Software Foundation; either version 2 of the License, or
!    (at your option) any later version.
! 
!    This program is distributed in the hope that it will be useful,
!    but WITHOUT ANY WARRANTY; without even the implied warranty of
!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!    GNU General Public License for more details.
! 
!    You should have received a copy of the GNU General Public License
!    along with this program; if not, write to the Free Software
!    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! */
  
  #include <ctype.h>
--- 1,20 ----
  /* sdig.c - the Switch Digger main file
!  *
!  *  Copyright (C) 2000  Russell Kroll <rk...@ex...>
!  *
!  *  This program is free software; you can redistribute it and/or modify
!  *  it under the terms of the GNU General Public License as published by
!  *  the Free Software Foundation; either version 2 of the License, or
!  *  (at your option) any later version.
!  *
!  *  This program is distributed in the hope that it will be useful,
!  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *  GNU General Public License for more details.
!  *
!  *  You should have received a copy of the GNU General Public License
!  *  along with this program; if not, write to the Free Software
!  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!  */
  
  #include <ctype.h>
***************
*** 37,361 ****
  #include "../include/config.h"
  
! 	stype	*firstsw = NULL;
! 	rtype	*firstrt = NULL;
! 	pdtype	*firstpd = NULL;
! 	litype	*firstli = NULL;
  
! 	char	*wins = NULL, *nmblookup = NULL, *mactable = NULL,
  		*hostinfo = NULL;
  
! 	int	verbose = 0, fastmode = 0;
! 
! static char *findmac(const char *ip, rtype *rtr)
! {
! 	char	query[256], *ret;
! 	int	ifnum;
! 
! 	debug(2, "\n\nfindmac: [%s] [%s] [%s]\n", ip, rtr->ip, rtr->pw);
! 
! 	/* find the router's internal interface number */
! 
! 	snprintf(query, sizeof(query),
! 		"IP-MIB::ipAdEntIfIndex.%s", rtr->ip);
! 
! 	ifnum = snmpget_int(rtr->ip, rtr->pw, query);
! 
! 	if (ifnum == -1)
! 		return NULL;
! 
! 	debug(6, "router interface number for %s is %d\n",
! 		rtr->ip, ifnum);
! 
! 	/* now look it up in the net to media table relative to the ifnum */
! 
! 	/* if digging the router itself, use a different OID */
! 
! 	if (!strcmp(ip, rtr->ip))
! 		snprintf(query, sizeof(query), 
! 			"interfaces.ifTable.ifEntry.ifPhysAddress.%d",
! 			ifnum);
! 	else
! 		snprintf(query, sizeof(query), 
! 		"ip.ipNetToMediaTable.ipNetToMediaEntry.ipNetToMediaPhysAddress.%d.%s",
! 		ifnum, ip);
! 
! 	ret = snmpget_mac(rtr->ip, rtr->pw, query);
! 
! 	return ret;
! }
! 
! static int findport(unsigned const char *mac, stype *sw)
! {
! 	char	query[64];
! 
! 	if (sw->ip == NULL) {
! 		printf("No switch defined for that network\n");
! 		exit(1);
! 	}
! 
! 	/* build the OID for the mapping of MAC addresses to port numbers */
! 
! 	snprintf(query, sizeof(query), "SNMPv2-SMI::mib-2.17.4.3.1.2.%u.%u.%u.%u.%u.%u",
! 		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
! 
! 	debug(4, "findport: snmpget_int(%s, %s, %s)\n",
! 		sw->ip, sw->pw, query);
! 
! 	return snmpget_int(sw->ip, sw->pw, query);
! }
! 
! /* ROUTER <netblock> <ip> <pw> <"desc"> */
! static void addrouter(char *net, const char *ip, const char *pw, 
! 	const char *desc)
! {
! 	rtype	*tmp, *last;
! 	char	*addr, *mask;
! 
! 	mask = strchr(net, '/');
! 
! 	if (!mask)
! 		return;
! 
! 	*mask++ = '\0';
! 	addr = net;
! 
! 	tmp = last = firstrt;
! 
! 	while (tmp != NULL) {
! 		last = tmp;
! 		tmp = tmp->next;
! 	}
! 
! 	tmp = xmalloc(sizeof(rtype));
! 	tmp->addr = ntohl(inet_addr(addr));
! 	tmp->pw = xstrdup(pw);
! 	tmp->ip = xstrdup(ip);
! 	tmp->desc = xstrdup(desc);
! 	tmp->next = NULL;
! 
! 	if (strstr(mask, ".") == NULL) { /* must be a /nn CIDR type block */
! 		if (atoi(mask) != 32)
! 			tmp->mask = ((unsigned int) ((1 << atoi(mask)) - 1) <<
! 				(32 - atoi(mask)));
! 		else
! 			tmp->mask = 0xffffffff; /* avoid overflow from 2^32 */
! 	}
! 	else
! 		tmp->mask = ntohl(inet_addr(mask));
! 
! 	if (last != NULL)
! 		last->next = tmp;
! 	else
! 		firstrt = tmp;
! }
! 
! /* SWITCH <netblock> <ip> <community> ["<desc>"] */
! static void addswitch(char *net, const char *ip, const char *pw, 
! 	const char *desc)
! {
! 	stype	*tmp, *last;
! 	char	*addr, *mask;
! 
! 	mask = strchr(net, '/');
! 
! 	if (!mask)
! 		return;
! 
! 	*mask++ = '\0';
! 	addr = net;
! 
! 	tmp = last = firstsw;
! 
! 	while (tmp != NULL) {
! 		last = tmp;
! 		tmp = tmp->next;
! 	}
! 
! 	tmp = xmalloc(sizeof(stype));
! 	tmp->addr = ntohl(inet_addr(addr));
! 	tmp->pw = xstrdup(pw);
! 	tmp->ip = xstrdup(ip);
! 	tmp->desc = xstrdup(desc);
! 	tmp->firstlink = NULL;
! 	tmp->next = NULL;
! 
! 	if (strstr(mask, ".") == NULL) {  /* must be a /nn CIDR type block */
! 		if (atoi(mask) != 32)
! 			tmp->mask = ((unsigned int) ((1 << atoi(mask)) - 1) <<
! 				(32 - atoi(mask)));
! 		else
! 			tmp->mask = 0xffffffff; /* avoid overflow from 2^32 */
! 	}
! 	else
! 		tmp->mask = ntohl(inet_addr(mask));
! 
! 	if (last != NULL)
! 		last->next = tmp;
! 	else
! 		firstsw = tmp;
! }
! 
! /* LINKINFO <ip> <port> "<desc>" */
! static void addli(const char *ip, const char *port, const char *desc)
! {
! 	litype	*tmp, *last;
! 
! 	tmp = last = firstli;
! 
! 	while (tmp) {
! 		last = tmp;
! 		tmp = tmp->next;
! 	}
! 
! 	tmp = xmalloc(sizeof(litype));
! 	tmp->ip = xstrdup(ip);
! 	tmp->port = strtol(port, (char **) NULL, 10);
! 	tmp->desc = xstrdup(desc);
! 
! 	if (last)
! 		last->next = tmp;
! 	else
! 		firstli = tmp;
! }
! 
! /* PORTDESC <ip> <port> "<desc>" */
! static void addpd(const char *ip, const char *port, const char *desc)
! {
! 	pdtype	*last, *tmp;
! 
! 	tmp = last = firstpd;
! 
! 	while (tmp) {
! 		last = tmp;
! 		tmp = tmp->next;
! 	}
! 
! 	tmp = xmalloc(sizeof(pdtype));
! 	tmp->ip = xstrdup(ip);
! 	tmp->port = strtol(port, (char **) NULL, 10);
! 	tmp->desc = xstrdup(desc);
! 
! 	if (last)
! 		last->next = tmp;
! 	else
! 		firstpd = tmp;
! }
! 
! static void loadconfig(const char *fn)
! {
! 	FILE	*conf;
! 	char	cfn[256], buf[256], *arg[5];
! 	int	ln, i;
! 
! 	if (!fn) {
! 		snprintf(cfn, sizeof(cfn), "%s/sdig.conf", "CONFPATH");
! 		conf = fopen(cfn, "r");
! 	} else {
! 		conf = fopen(fn, "r");
! 	}
! 
! 	if (!conf) {
! 		fprintf(stderr, "fopen %s: %s\n", cfn, strerror(errno));
! 		exit(1);
! 	}
! 
! 	ln = 0;
! 	while (fgets(buf, sizeof(buf), conf)) {
! 		buf[strlen(buf) - 1] = '\0';
! 		ln++;
! 
! 		i = parseconf("sdig.conf", ln, buf, arg, 5);
! 
! 		if (i == 0)
! 			continue;
! 
! 		if (!strcmp(arg[0], "ROUTER"))
! 			addrouter(arg[1], arg[2], arg[3], arg[4]);
! 		if (!strcmp(arg[0], "SWITCH"))
! 			addswitch(arg[1], arg[2], arg[3], arg[4]);
! 		if (!strcmp(arg[0], "LINKINFO"))
! 			addli(arg[1], arg[2], arg[3]);
! 		if (!strcmp(arg[0], "PORTDESC"))
! 			addpd(arg[1], arg[2], arg[3]);
! 		if (!strcmp(arg[0], "WINS"))
! 			wins = xstrdup(arg[1]);
! 		if (!strcmp(arg[0], "NMBLOOKUP"))
! 			nmblookup = xstrdup(arg[1]);
! 		if (!strcmp(arg[0], "MACTABLE"))
! 			mactable = xstrdup(arg[1]);
! 		if (!strcmp(arg[0], "HOSTINFO"))
! 			hostinfo = xstrdup(arg[1]);
! 	}
! 
! 	fclose(conf);
! }
! 
! static char *getlink(const char *ip, long port)
! {
! 	litype	*tmp;
! 
! 	tmp = firstli;
! 
! 	while (tmp) {
! 		if ((!strcmp(tmp->ip, ip)) && (tmp->port == port))
! 			return tmp->desc;
! 
! 		tmp = tmp->next;
! 	}
! 
! 	return NULL;
! }
! 
! static char *getdesc(const char *ip, long port)
! {
! 	pdtype	*tmp;
! 
! 	tmp = firstpd;
! 
! 	while (tmp) {
! 		if ((!strcmp(tmp->ip, ip)) && (tmp->port == port))
! 			return tmp->desc;
! 
! 		tmp = tmp->next;
! 	}
! 
! 	return NULL;
! }
! 
! static const char *macmfr(unsigned char *inmac)
! {
! 	FILE	*macdb;
! 	char	buf[256], *tmp, macfind[16];
! 	int	i;
! 
! 	macdb = fopen(mactable, "r");
! 	if (!macdb)
! 		return "MAC table file not available";
! 
! 	/* rewrite the MAC address into something that'll match the table */
! 
! 	snprintf(macfind, sizeof(macfind), "%02x %02x %02x", 
! 		inmac[0], inmac[1], inmac[2]);
! 
! 	while (fgets(buf, sizeof(buf), macdb)) {
! 		buf[strlen(buf) - 1] = '\0';
! 
! 		if (!strncasecmp(buf, macfind, 8)) {
! 			tmp = xstrdup(&buf[9]);
! 			for (i = strlen(tmp) - 1; i >= 0; i--) {
! 				if (!isspace(tmp[i])) {
! 					tmp[i+1] = '\0';
! 					return tmp;
! 				}
! 			}
! 			return tmp;
! 		}
! 	}
! 
! 	fclose(macdb);
! 	return "Not available";
! }
  
! static void help(const char *prog)
  {
  	printf("SNMP-based router and switch probe for locating client systems.\n\n");
--- 37,52 ----
  #include "../include/config.h"
  
! extern stype	*firstsw = NULL;
! extern rtype	*firstrt = NULL;
! extern pdtype	*firstpd = NULL;
! extern litype	*firstli = NULL;
  
! extern char	*wins = NULL, *nmblookup = NULL, *mactable = NULL,
  		*hostinfo = NULL;
  
! extern int	verbose = 0, fastmode = 0;
  
! static void
! help(const char *prog)
  {
  	printf("SNMP-based router and switch probe for locating client systems.\n\n");
***************
*** 374,758 ****
  }
  
! static char *wins_resolve(const char *host)
! {
! 	char	exec[256], buf[256];
! 	FILE	*wq;
! 
! 	if (!wins) {
! 		fprintf(stderr, "WINS not defined in config file!\n");
! 		return NULL;
! 	}
! 
! 	if (!nmblookup) {
! 		fprintf(stderr, "NMBLOOKUP not defined in config file!\n");
! 		return NULL;
! 	}
! 
! 	snprintf(exec, sizeof(exec), "%s -U %s -R %s | tail -1 | cut -f 1 -d \" \"",
! 		nmblookup, wins, host);
! 
! 	debug(5, "popen: %s\n", exec);
! 	wq = popen(exec, "r");
! 
! 	fgets(buf, sizeof(buf), wq);
! 	pclose(wq);
! 
! 	buf[strlen(buf) - 1] = '\0';
! 	debug(7, "read [%s]\n", buf);
! 	if (!strcmp(buf, "name_query")) {
! 		fprintf(stderr, "WINS lookup failed\n");
! 		exit(1);
! 	}
! 
! 	printf("  Address: %s (WINS)\n", buf);
! 
! 	return(xstrdup(buf));
! }
! 
! static char *dns_resolve(const char *host)
! {
! 	struct	hostent	*dns;
! 	struct	in_addr	addr;
! 
! 	if ((dns = gethostbyname(host)) == (struct hostent *) NULL)
! 		return NULL;
! 
! 	memcpy(&addr, dns->h_addr, dns->h_length);
! 
! 	printf("  Address: %s (DNS)\n", inet_ntoa(addr));
! 
! 	return(xstrdup(inet_ntoa(addr)));
! }
! 
! static void do_ifdescr(stype *sw, long port)
! {
! 	char	query[256], *ifdescr, *ifname;
! 	long	ifnum;
! 
! 	/* first get the switch's ifnum for the port */
! 	
! 	snprintf(query, sizeof(query), "SNMPv2-SMI::mib-2.17.1.4.1.2.%ld", port);
! 	ifnum = snmpget_int(sw->ip, sw->pw, query);
! 
! 	if (ifnum == -1)
! 		return;
! 
! 	snprintf(query, sizeof(query), "IF-MIB::ifName.%ld",
! 		ifnum);
! 
! 	ifname = snmpget_str(sw->ip, sw->pw, query);
! 
! 	if (!ifname) {
! 		snprintf(query, sizeof(query), "IF-MIB::ifAlias.%ld", ifnum);
! 		snmpget_str(sw->ip, sw->pw, query);
! 	}
! 
! 	snprintf(query, sizeof(query), "IF-MIB::ifDescr.%ld",
! 		ifnum);
! 
! 	ifdescr = snmpget_str(sw->ip, sw->pw, query);
! 
! 	if (ifname) {
! 		printf(" (%s)", ifname);
! 		free(ifname);
! 	}
! 
! 	if (ifdescr) {
! 		printf(" [%s]", ifdescr);
! 		free(ifdescr);
! 	}
! }
! 
! static void printport(stype *sw, long port)
! {
! 	char	*ds, *li, *swdesc;
! 	char	query[256];
! 
! 	/* don't print if it's a switch-switch link unless in verbose mode */
! 
! 	li = getlink(sw->ip, port);
! 
! 	if ((li) && (!verbose))
! 		return;
! 
! 	snprintf(query, sizeof(query), "SNMPv2-MIB::sysName.0");
! 	swdesc = snmpget_str(sw->ip, sw->pw, query);
! 
! 	if (swdesc)
! 		printf("   Switch: %s (%s) - %s\n",
! 			sw->desc, swdesc, sw->ip);
! 	else
! 		printf("   Switch: %s - %s\n", sw->desc, sw->ip);
! 
! 	printf("     Port: %ld", port);
! 	do_ifdescr(sw, port);
! 	printf("\n");
! 	
! 	if (li)
! 		printf("     Link: %s\n", li);
! 
! 	ds = getdesc(sw->ip, port);
! 	if (ds)
! 		printf("     Info: %s\n", ds);
! 
! 	printf("\n");
! }
! 
! static int isip(const char *buf)
! {
! 	int	i;
! 
! 	for (i = 0; i < strlen(buf); i++)
! 		if ((!isdigit(buf[i])) && (buf[i] != '.'))
! 			return 0;
! 
! 	return 1;
! }
! 
! static void dnsreverse(const char *ip)
! {
! 	struct	hostent	*dns;
! 	struct	in_addr	addr;
! 
! #if HAVE_INET_ATON
! 	inet_aton(ip, &addr);
! #elif HAVE_INET_PTON
! 	inet_pton(AF_INET, ip, &addr);
! #else
! #error	Cannot convert address
! #endif
! 
! 	dns = gethostbyaddr((char *)&addr, sizeof(struct in_addr), AF_INET);
! 
! 	if (dns)
! 		printf(" Hostname: %s (DNS)\n", dns->h_name);
! }
! 
! static stype *find_switch(const char *ipaddr, stype *last)
! {
! 	stype	*tmp;
! 	int	addrchk, swchk;
! 
! 	if (last)
! 		tmp = last->next;
! 	else
! 		tmp = firstsw;
! 
! 	while (tmp) {
! 		addrchk = ntohl(inet_addr(ipaddr)) & tmp->mask;
! 		swchk = tmp->addr & tmp->mask;
! 
! 		if (swchk == addrchk)
! 			return tmp;
! 
! 		tmp = tmp->next;
! 	}
! 
! 	return NULL;
! }
! 
! /* make the octet string into something nicer for humans */
! static void printmac(unsigned const char *mac)
! {
! 	int	i;
! 
! 	for (i = 0; i < 5; i++)
! 		printf("%02x:", mac[i]);
! 
! 	printf("%02x", mac[5]);
! }
! 
! /* ask the switch about where the MAC address is */
! static void switchscan(const char *ipaddr, unsigned const char *macaddr)
! {
! 	stype	*sw;
! 	long	port;
! 
! 	printf("\n");
! 
! 	if (debuglevel >= 2) {
! 		printf("switchscan: seeking (%s, ", ipaddr);
! 		printmac(macaddr);
! 		printf(")\n");
! 	}
! 
! 	sw = find_switch(ipaddr, NULL);
! 
! 	while (sw) {
! 		debug(3, "switchscan: matched %s\n", sw->ip);
! 
! 		port = findport(macaddr, sw);
! 
! 		debug(3, "findport got port %d\n", port);
! 
! 		if (port != -1)
! 			printport(sw, port);
! 
! 		sw = find_switch(ipaddr, sw);
! 	}
! 
! 	exit(0);
! }
! 
! static rtype *find_router(const char *ipaddr, rtype *last)
! {
! 	rtype	*tmp;
! 	int	addrchk, rtchk;
! 
! 	if (last)
! 		tmp = last->next;
! 	else
! 		tmp = firstrt;
! 
! 	while (tmp) {
! 		addrchk = ntohl(inet_addr(ipaddr)) & tmp->mask;
! 		rtchk = tmp->addr & tmp->mask;
! 
! 		if (rtchk == addrchk)
! 			return tmp;
! 
! 		tmp = tmp->next;
! 	}
! 
! 	return NULL;
! }
! 
! /* run the user's script for extra details about a host */
! static void do_hostinfo(const char *ipaddr)
! {
! 	char	exec[256];
! 
! 	fflush(stdout);
! 
! 	snprintf(exec, sizeof(exec), "%s %s", hostinfo, ipaddr);
! 	system(exec);
! }
! 
! /* walk the list of routers checking for the IP address */
! static void routerscan(const char *ipaddr)
! {
! 	unsigned char	*macaddr;
! 	rtype	*rtr;
! 
! 	/* spew out some additional info about the IP address */
! 	if (fastmode == 0) {
! 		dnsreverse(ipaddr);
! 
! 		if (hostinfo)
! 			do_hostinfo(ipaddr);
! 	}
! 
! 	printf("\n");
! 
! 	debug(2, "routerscan: looking for a router for host %s\n", ipaddr);
! 
! 	/* XXX: ping code for waking up sleeping/inactive hosts */
! 
! 	/* find the first one that covers this network */
! 	rtr = find_router(ipaddr, NULL);
! 
! 	while (rtr) {
! 		debug(3, "routerscan: matched %s\n", rtr->ip);
! 
! 		/* try to find the target IP address on this router */
! 		macaddr = findmac(ipaddr, rtr);
! 
! 		if (macaddr) {
! 			printf("   Router: %s - %s\n", rtr->desc, rtr->ip);
! 
! 			printf("      MAC: ");
! 			printmac(macaddr);
! 			printf(" (%s)\n", macmfr(macaddr));
! 
! 			switchscan(ipaddr, macaddr);
! 		}
! 
! 		rtr = find_router(ipaddr, rtr);
! 	}
! 
! 	fprintf(stderr, "Error: no routers found for %s\n", ipaddr);
! 	exit(1);
! }	
! 
! /* turn <name> into an IP address and pass it to the router scanner */
! static void resolvename(const char *name)
! {
! 	char	*ipaddr;
! 
! 	/* first try DNS */
! 	ipaddr = dns_resolve(name);
! 
! 	if (ipaddr)
! 		routerscan(ipaddr);
! 
! 	/* now try WINS */
! 	ipaddr = wins_resolve(name);
! 
! 	if (ipaddr)
! 		routerscan(ipaddr);
! 
! 	fprintf(stderr, "Can't resolve %s with DNS or WINS!\n", name);
! 	exit(1);
! }
! 
! /* see if the specified mac address is sane, and make it machine-readable */
! static char *pack_mac(char *buf)
! {
! 	int	i, cc, sl, v, mp;
! 	char	*ptr, *cp; 
! 	static	char	mac[16];
! 
! 	cc = 0;
! 	for (i = 0; i < strlen(buf); i++) {
! 
! 		if (buf[i] == ':')
! 			cc++;
! 
! 		if ((!isxdigit(buf[i])) && (buf[i] != ':')) {
! 			fprintf(stderr, "Invalid MAC address specified: %s\n", buf);
! 			fprintf(stderr, "Valid characters are hex digits and :\n");
! 			exit(1);
! 		}
! 	}
! 
! 	if (cc != 5) {
! 		fprintf(stderr, "Invalid MAC address specified: %s\n", buf);
! 		fprintf(stderr, "It must contain exactly 5 : separators.\n");
! 		exit(1);
! 	}
! 
! 	strcpy(mac, "");
! 	ptr = buf;
! 	sl = strlen(buf);
! 	mp = 0;
! 
! 	for (i = 0; i < sl; i++) {
! 		cp = strchr(ptr, ':');
! 
! 		if (!cp) {
! 			v = strtol(ptr, (char **) NULL, 16);
! 
! 			mac[mp++] = v;
! 			break;
! 		}
! 
! 		*cp++ = '\0';
! 
! 		v = strtol(ptr, (char **) NULL, 16);
! 		mac[mp++] = v;
! 
! 		ptr = cp;
! 	}	
! 
! 	return mac;
! }
! 
! int main(int argc, char **argv)
  {
  	char	*prog, *query, *conf = NULL, *mac = NULL;
  	int	i;
  
! 	printf("Switch Digger %s - http://www.exploits.org/sdig/\n\n",
! 		VERSION);
  
  	prog = argv[0];
--- 65,75 ----
  }
  
! int
! main(int argc, char *argv[])
  {
  	char	*prog, *query, *conf = NULL, *mac = NULL;
  	int	i;
  
! 	printf("Switch Digger %s\n\n", VERSION);
  
  	prog = argv[0];

Index: snmpget.h
===================================================================
RCS file: /cvsroot/sdig/sdig/src/snmpget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** snmpget.h	24 Apr 2006 20:47:30 -0000	1.1
--- snmpget.h	2 May 2006 21:21:37 -0000	1.2
***************
*** 1,4 ****
  int snmpget_int(char *host, char *community, char *reqoid);
  char *snmpget_mac(char *host, char *community, char *reqoid);
  char *snmpget_str(char *host, char *community, char *reqoid);
- 
--- 1,7 ----
+ /*
+  * $Id$
+  */
+ 
  int snmpget_int(char *host, char *community, char *reqoid);
  char *snmpget_mac(char *host, char *community, char *reqoid);
  char *snmpget_str(char *host, char *community, char *reqoid);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sdig/sdig/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	24 Apr 2006 20:47:30 -0000	1.1
--- Makefile.am	2 May 2006 21:21:36 -0000	1.2
***************
*** 9,11 ****
--- 9,13 ----
  common.c \
  sdig.c \
+ query.c \
+ config.c \
  snmpget.c

Index: common.c
===================================================================
RCS file: /cvsroot/sdig/sdig/src/common.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** common.c	24 Apr 2006 20:47:30 -0000	1.1
--- common.c	2 May 2006 21:21:37 -0000	1.2
***************
*** 34,38 ****
  #include "common.h"
  
! 	int	debuglevel = 0;
  
  /* debug levels:
--- 34,39 ----
  #include "common.h"
  
! static int		debuglevel = 0;
! static const char	*oom_msg = "Out of memory";
  
  /* debug levels:
***************
*** 46,50 ****
   */
  
! void debug(int level, const char *format, ...)
  {
  	va_list	args;
--- 47,52 ----
   */
  
! void
! debug(int level, const char *format, ...)
  {
  	va_list	args;
***************
*** 58,62 ****
  }
  
! void fatal(const char *fmt, ...)
  {
  	va_list va;
--- 60,65 ----
  }
  
! void
! fatal(const char *fmt, ...)
  {
  	va_list va;
***************
*** 71,206 ****
  }
  
! 
! /* split up buf into a number of substrings, returning pointers in arg */
! int parseconf(const char *fn, int ln, char *buf, char **arg, int numargs)
! {
! 	char	*ptr, *ws;
! 	int	i, buflen, an, state;
! 
! 	an = state = 0;
! 	ws = NULL;
! 
! 	buflen = strlen (buf);
! 	ptr = buf;
! 
! 	/* yes, it's a state machine! be afraid! */
! 
! 	for (i = 0; i < buflen; i++) {
! 		switch (state) {
! 			case 0:		/* scan */
! 				if (*ptr == '"') {
! 					ws = ptr + 1; 	/* start after quote */
! 					state = 1;	/* goto quotecollect */
! 					break;
! 				}
! 
! 				if (isspace(*ptr))
! 					break;		/* loop */
! 
! 				if (*ptr == '\\') {	/* literal as start */
! 					if (i == (buflen - 1)) {
! 						fprintf(stderr, "%s:%d:"
! 						"\\ at end of line!", 
! 						fn, ln);
! 						return 0;	/* failure */
! 					}
! 
! 					ws = ptr;
! 
! 					/* shift string to the left */
! 					memmove(ptr, ptr+1, buflen-i);
! 
! 					/* fix length */
! 					buflen--;
! 
! 					state = 2;	/* goto collect */
! 				}
! 
! 				if (!isspace(*ptr)) {
! 					ws = ptr;
! 					state = 2;	/* goto collect */
! 					break;
! 				}
! 			
! 				break;
! 
! 			case 1:		/* quotecollect */
! 				if (*ptr == '"')
! 					state = 3;	/* goto save */
! 
! 				if (*ptr == '\\') {	/* literal handling */
! 					if (i == (buflen - 1)) {
! 						fprintf(stderr, "%s:%d:"
! 						"\\ at end of line!", 
! 						fn, ln);
! 						return 0;	/* failure */
! 					}
! 
! 					/* shift string to the left */
! 					memmove(ptr, ptr+1, buflen-i);
! 
! 					/* fix length */
! 					buflen--;
! 				}
! 
! 				break;			/* loop */
! 
! 			case 2:		/* collect */
! 				if (*ptr == '\\') {	/* literal handling */
! 					if (i == (buflen - 1)) {
! 						fprintf(stderr, "%s:%d:"
! 						"\\ at end of line!", 
! 						fn, ln);
! 						return 0;	/* failure */
! 					}
! 
! 					/* shift string to the left */
! 					memmove(ptr, ptr+1, buflen-i);
! 
! 					/* fix length */
! 					buflen--;
! 					break;		/* loop */
! 				}
! 
! 				if (!isspace(*ptr))
! 					break;		/* loop */
! 
! 				state = 3;		/* goto save */
! 		}
! 
! 		if (state == 3) {		/* save */
! 			if (an < numargs)
! 				arg[an++] = ws;
! 			*ptr = '\0';
! 			ws = NULL;
! 			state = 0;
! 		}
! 
! 		ptr++;
! 	}
! 
! 	if (state == 1) {	/* end-of-string in state 1 == missing quote */
! 		fprintf(stderr, "%s:%d: Unbalanced \" in line", fn, ln);
! 		return 0;	/* FAILED */
! 	}
! 
! 	if (state == 2) {	/* catch last word when exiting from collect */
! 		*ptr = '\0';
! 		if (an < numargs)
! 			arg[an++] = ws;
! 	}
! 
! 	/* zap any leftover pointers */
! 	for (i = an; i < numargs; i++)
! 		arg[i] = NULL;
! 
! 	/* safety catch: don't allow all nulls back as 'success' */
! 	if (arg[0] == NULL)
! 		return 0;	/* FAILED (don't parse this) */
! 
! 	return 1;	/* success */
! }
! 
! int snprintfcat(char *dst, size_t size, const char *fmt, ...)
  {
  	va_list ap;
--- 74,79 ----
  }
  
! int
! snprintfcat(char *dst, size_t size, const char *fmt, ...)
  {
  	va_list ap;
***************
*** 218,224 ****
  }
  
! static const char *oom_msg = "Out of memory";
! 
! void *xmalloc(size_t size)
  {
  	void *p = malloc(size);
--- 91,96 ----
  }
  
! void
! *xmalloc(size_t size)
  {
  	void *p = malloc(size);
***************
*** 229,233 ****
  }
  
! char *xstrdup(const char *string)
  {
  	char *p = strdup(string);
--- 101,106 ----
  }
  
! char
! *xstrdup(const char *string)
  {
  	char *p = strdup(string);
***************
*** 237,239 ****
  	return p;
  }
- 
--- 110,111 ----