Commit Graph

136 Commits

Author SHA1 Message Date
bz
cda2e4ecca Re-connect snmp_bridge to the build. It survived a make universe
(apart from powerpc where the build broke earlier).
2006-12-29 19:24:51 +00:00
bz
999db60bea bridge_snmp.h
* Change the API of bridge_get_basemac to take a maximum buffer length.

bridge_if.c
* Adopt to new API.
* In bridge_attach_newif() remove an additional pointer to the buffer
  by shuffling the code a bit. Also makes the code more readable.

bridge_sys.c
* bridge_get_basemac():
  - Adopt to the new API.
  - Change check for error code of getifaddrs().
  - First check for sa_family != AF_LINK.
  - Copy sockaddr_dl * to get around alignment constraints on some
    platforms.
  - Use strcmp instead of strncmp so that "foo11" != "foo1".
* other functions:
  - Allocate n times of the struct we need instead of arbitrary len,
    cast to the type we want it to be and pass around struct *s instead
    of char *s. This gets us around alignment restrictions on some
    platforms and in addition it is more clear what data is passed around.
  - Name variables for same types consistently.

Reviewed by:    syrinx
2006-12-29 19:23:38 +00:00
bz
edaada5e3a ia64 is nit-picking according to tinderbox so temporary disconnect
the bridge module from the build until this is fixed.
2006-12-21 01:58:22 +00:00
syrinx
df49c9eb5b Connect the snmp_bridge(3) module to the build.
Approved by:	bz (mentor)
2006-12-20 22:08:35 +00:00
syrinx
6825c54d1f Keep in sync with the if_bridge(4) module (rev. 1.20 if_bridgevar.h,
1.12 bridgestp.h) and rename all PointToPoint related variables
from P2P to PTP (s/P2P/PTP/g s/p2p/ptp/g).

Approved by:	bz (mentor)
2006-12-20 22:02:45 +00:00
syrinx
ce61d899be Remove an unused variable.
Approved by:	bz (mentor)
2006-12-20 21:31:28 +00:00
syrinx
358a7eb8bf Do not add 'default:' cases inside a switch() on an enum like the
SNMP option argument. That way the compiler will give a warning in
case of a missing or an extra but unknown 'case:'.
Do the same for SNMP LEAF objects to be prepared once gensnmptree will
auto-generate enums for those too.
Add an abort() after the switch() instead of the 'default:' to catch
any errors. The nice side effect is that the compiler will correctly
track supposed to be 'uninitialized' variables with that.

When trying to set a value sanity check it before calling the OS
dependent API of snmp_bridge to tell whether it is an attempt to
set a bad value or a general error.

Suggested by:	harti (first part)
Approved by:	bz (mentor)
2006-12-15 20:01:57 +00:00
syrinx
a7250df1fb Instead of explicitly initializing variables to avoid compiler warnings,
add a default case to handle the situation when the variables are not
initialized.
Furthermore, abort() if the snmp agent passes an invalid option to the
bridge module. As the option (SET, GET, GETNEXT, COMMIT, ROLLBACK) is
determined by the snmp agent based on the operation requested by user,
this behaviour is unlikely to be abused as a source for a DoS, but if
ever hit will likely reveal a problem in the snmp agent or bridge
module.

Approved by:    bz (mentor)
2006-12-09 20:58:26 +00:00
syrinx
d7ca8e25c2 Add support for RSTP (RFC4318) to the SNMP bridge monitoring module.
Approved by:	bz (mentor)
2006-12-07 22:36:17 +00:00
syrinx
2b14cadbaf Bring in a SNMP module to support monitoring if_bridge(4) interfaces
via bsnmpd(1). The module implements IETF BRIDGE-MIB as defined in
RFC4188 and a private BEGEMOT-BRIDGE-MIB.

Sponsored by:  Google Summer of Code 2006
Reviewed by:   bz
Approved by:   bz (mentor)
2006-11-19 15:42:48 +00:00
harti
d893a05647 Make the generated oid.h dependend on the Makefile. The Makefile defines
the symbols to be extracted from the MIB and if that list of symbols is
changed, oid.h should be re-generated.
2006-11-08 10:36:57 +00:00
glebius
f025652fdc Fix buildworld. 2006-10-31 21:44:46 +00:00
ru
99849399c0 Revise markup. 2006-09-30 19:07:03 +00:00
harti
ec8dc009b1 Reduce the memory requirements for the tables by (1) using malloced strings
instead of maximum sized arrays embedded in the table structures and (2)
using pointers to constant oids instead of copying the oid into each
table structure. This also fixes indexing in the case when a string used
for indexing is longer than the maximum size allowed in the MIB.

Submitted by:	Victor Cruceru <soc-victor@>
2006-07-14 09:07:56 +00:00
ru
89e2376997 Add missing library dependencies. 2006-04-13 12:49:24 +00:00
ru
388e590f95 Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
2006-03-17 18:54:44 +00:00
harti
bcb2a599a6 Silence some warnings by defining configuration preprocessor symbols. 2006-03-13 09:23:51 +00:00
ru
966af754db A bandaid to unbreak world. 2006-02-27 20:46:34 +00:00
harti
f486c645c1 Link the new file from the vendor fix to the build and install
the new MIB files. Add a target to smilint the MIB files.
2006-02-13 14:12:15 +00:00
joel
87dcb0582d Expand contractions. 2006-02-01 14:33:14 +00:00
erwin
dc5d8abf2c After changing hostres from libdisk to libgeom, it now compiles
and runs on amd64, so revert the stopgap from rev. 1.10

Approved by:		harti
Hardware borrowed from:	simon
2006-01-26 21:32:51 +00:00
harti
8c6899bf00 Replace ki_ocomm by ki_comm. The former will go away.
Submitted by:	Victor Cruceru <soc-victor>
Suggested by:   Julian Elischer
2006-01-26 12:19:10 +00:00
harti
55cbb46d5f Fix a bug in the processor load code: the wrong process was used to
get the inital processor load. Also fix compilation on sparc64 without NDEBUG.
2006-01-26 12:15:06 +00:00
harti
0dafc47595 Fix false positives when searching for disks. Things like adv(4) are not
disks.

Submitted by:	Victor Cruceru <soc-victor@>
2006-01-26 11:49:27 +00:00
harti
14696be4fb Fix the MIB to use libgeom instead of libdisk.
Submitted by:	Victor Cruceru <soc-victor>
2006-01-26 10:13:32 +00:00
obrien
16f258992b Unbreak the AMD64 build by forgoing the 'snmp_hostres' functionality.
Approved by:	harti
2006-01-13 02:09:15 +00:00
harti
ec693c19f9 Fix build without -DNDEBUG.
Spotted by:	obrien
2006-01-12 07:44:40 +00:00
obrien
e404ac795b assert(3) is not used here. 2006-01-12 02:53:42 +00:00
harti
dbbc1d3f9f Connect the HOSTRES MIB to the build. 2006-01-09 12:34:07 +00:00
harti
aa4781a69e msg 2006-01-09 12:33:45 +00:00
philip
59488a6d95 Check for altq presence during module init, and allow module to work even if
altq is not present (just disable the altq bits in that case).

PR:		89601
Submitted by:	Juraj Lutter <otis -at- sk.freebsd.org>
MFC after:	3 days
2005-11-30 21:08:04 +00:00
ru
20486738f8 Fix prototypes. 2005-11-24 14:23:16 +00:00
harti
c8c9ceea67 Use the new bsd.snmpmod.mk makefile to build the modules. The -I pointers
into the contrib directory are still necessary for some of the Makefiles,
because the C-sources there use non-canonical includes ("" includes) to get
at the header files.
2005-11-10 10:14:57 +00:00
harti
c01c7dd3d5 Use the canonical include name for snmpmod.h. The build infrastructure takes
already care to pick up the correct version of the file depending on how
we build.
2005-11-10 10:12:01 +00:00
harti
0b891ae48d Catch up with the import of bsnmp-1.11. Add a couple of new
configuration flags to CFLAGS.
2005-10-04 15:03:39 +00:00
philip
5c88887dda Fix unhandled malloc errors.
PR:		bin/83467
Submitted by:	Dan Lukes <dan -at- obluda.cz>
Prodded by:	glebius
MFC after:	3 days
2005-08-29 10:08:04 +00:00
keramida
ac7c9f771d Fix all the spelling mistakes I could find in the man pages for words
that have at least 3 characters.

MFC after:	1 week
Thanks to:	Music band ``Chingon''
		for keeping me company while searching for these.
2005-07-31 03:30:48 +00:00
kensmith
f97f77429f Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
2005-07-22 17:19:05 +00:00
harti
0a57909c7b No need to specify the include subdirectory. During buildworld the
correct files are included from a temp. include directory.

Explained by:	ru
2005-05-25 12:04:44 +00:00
harti
deef278173 This module was wrongly including header from /usr/include. Give it
the correct path to the source headers.
2005-05-23 12:24:46 +00:00
philip
2ab3cf4f70 Catch up with the bsnmpd daemon's 64bit time ticks. 2005-05-23 11:41:14 +00:00
harti
86a6c190d6 The ticks delivered by the SNMP daemon are now 64-bit, so make our
local tick variable which is used to reduce the number of updates from
kernel structures and to ensure intra-PDU consistency also 64 bit.
2005-05-23 11:24:39 +00:00
harti
d6e5847091 Bump the shared library version number of the modules because of
changes in the module interface.
2005-05-23 11:22:54 +00:00
harti
a0758285d4 Enable tcp-wrapper support in the SNMP daemon.
Submitted by:	glebius
2005-04-26 16:49:15 +00:00
philip
5c298acd0a time_t is signed, so s/uintmax_t/intmax_t/g. Has anyone got an extra pointy
hat for me?  I'm running out of them.

Spotted by:	des
Pointy hat to:	philip
2005-03-15 14:52:11 +00:00
philip
2e1bf3f218 Cast time_t to uintmax_t so they can be printed as %ju without breaking on
various architectures.  This should appease tinderbox on alpha and not break
it anywhere else.

Suggested by:	harti
2005-03-15 10:45:42 +00:00
philip
c78021cad6 Make this compile properly on 64bit machines.
Pointy hat to:	philip
2005-03-14 23:01:25 +00:00
philip
ddd1bb70d9 Add snmp_pf, a bsnmpd module for monitoring (not managing!) pf firewalls.
Currently implemented are most things related to states and interfaces, todo
are address tables and altq.  I've tried to keep this roughly in sync with a
project implementing this for net-snmpd.

Reviewed by:	harti, dhartmei
MFC after:	1 month
2005-03-14 22:16:39 +00:00
harti
c7663fe856 Finish repo-copy of lib/libbsnmp/modules to usr.sbin/bsnmpd/modules.
These modules are modules for the daemon, not for the library so
they should be where the daemon is.
2005-03-14 17:32:16 +00:00
ru
6f67e58f8d who's -> whose 2005-02-13 23:23:30 +00:00
ru
e68efdc747 Let bsd.prog.mk set SRCS and MAN to their default values. 2005-01-28 16:08:11 +00:00
ru
b8a9faaaa3 Fixed punctuation in xrefs. 2005-01-21 20:48:00 +00:00
ru
3b01b84505 NOATM -> NO_ATM 2004-12-21 09:08:06 +00:00
ru
5db2b9d5b3 For variables that are only checked with defined(), don't provide
any fake value.
2004-10-24 15:33:08 +00:00
keramida
65c5851ae2 Delete a .Fn that had no argument and
properly terminate a .Bl with a matching .El

MFC after:	3 days
2004-10-09 04:03:08 +00:00
trhodes
632ac71095 Fix build in the !NOATM case by using the begemot library in place of
using libisc which was a part of BIND8.

Discussed with:	des, re, dougb
Submitted by:	harti (one part)
Reviewed by:	harti (previous version)
2004-09-24 22:10:34 +00:00
harti
f9ec393252 Link to the build again. The problem was that we need a new
gensnmptree for the .def file to parse. This was fixed in
Makefile.inc1.
2004-08-11 16:47:12 +00:00
harti
3d30ca08e0 Again something bad is happening so comment out the ATM module. 2004-08-11 16:01:46 +00:00
harti
90c7ff416f Now, after the import of NgATM-1.1, re-enable the atm module. 2004-08-11 12:27:31 +00:00
scottl
5de16095d4 Disable the snmp_atm module until the source gets fixed. This will unbreak
this portion of the build.
2004-08-10 04:56:39 +00:00
harti
f9e42a4d23 Link the snmp_atm module to the build unless NOATM is defined. 2004-08-09 16:40:39 +00:00
harti
bcd06af9f6 Now that gensnmptree can read and merge more than one tree make
the rule so that the tree .c and .h files can be produced from several
trees.
2004-08-09 16:37:25 +00:00
harti
a150b8c437 A module for bsnmpd(1) that exports a MIB that contains information about
the local ATM interfaces and allows to change some parameters via SNMP.
2004-08-09 16:36:04 +00:00
ru
6651f20e0d Sort SEE ALSO references (in dictionary order, ignoring case). 2004-07-04 20:55:50 +00:00
ru
01548ace15 Mechanically kill hard sentence breaks. 2004-07-02 23:52:20 +00:00
harti
360b53b9a2 Install the MIBs and the definition file to the new location under
/usr/share/snmp.

Noted by: bmah
2004-04-15 08:56:06 +00:00
harti
376040b33f Use a MANFILTER to patch the man pages to point to the right path.
Noted by: phk
2004-04-14 16:31:54 +00:00
harti
c9204f6495 Put the name of the module first in the list of all .Nm calls with
argument. This makes the output of calling .Nm without an argument
more senseful later on.
2004-04-14 16:11:05 +00:00
harti
48c5eee60f Compare with 0 if comparing an integer, not with NULL. 2004-04-14 16:09:20 +00:00
harti
7d1905e15b Move the SNMP MIBs and tree definitions from /usr/share/bsnmp to
/usr/share/snmp. This mirrors the use of /usr/local/share/snmp and
makes also more sense when non-bsnmp-specific MIBs go in.
2004-04-14 16:06:19 +00:00
markm
0b0ae8e16e Make NULL a (void*)0 whereever possible, and fix the warnings(-Werror)
that this provokes. "Wherever possible" means "In the kernel OR NOT
C++" (implying C).

There are places where (void *) pointers are not valid, such as for
function pointers, but in the special case of (void *)0, agreement
settles on it being OK.

Most of the fixes were NULL where an integer zero was needed; many
of the fixes were NULL where ascii <nul> ('\0') was needed, and a
few were just "other".

Tested on: i386 sparc64
2004-03-05 08:10:19 +00:00
harti
b848950961 Rename the makefile variable MIBS to BMIBS so that it does not
conflict with the environment variable MIBS that is used by net-snmp.
2004-01-24 20:14:03 +00:00
harti
1a1e1de6a0 Rename the MIBS makefile variable to BMIBS so that it does not conflict
with the environment variable MIBS that is used by net-snmp.
2004-01-24 20:12:30 +00:00
harti
9576ee9b99 Create the OID and tree files while building the modules and the daemon
instead of creating them by hand and storing them in the CVS tree. Add
gensnmptree to the bootstrap tools (it is used to generated these files).
This simplifies the update procedure.

Submitted by:	ru
2004-01-23 16:22:49 +00:00
harti
02c00b4d8a Update generated files. 2004-01-23 11:08:47 +00:00
harti
243855a0bf Catch up with import of version 1.5a of bsnmp. 2004-01-23 11:08:17 +00:00
harti
a329575b4e Catch up with the import of version 1.5a of bsnmp.
Fix the script to insert $FreeBSD$ into the generated file instead
of the script's FreeBSD id.
2004-01-23 11:07:55 +00:00
harti
72a445939b Style: remove an empty line. 2004-01-23 11:01:57 +00:00
ru
420b17a9ff Clean up makefiles.
Reviewed by:	harti
2004-01-19 19:26:02 +00:00
harti
91fb8e3f9c Replace all uses of the old netgraph constants NG_*LEN by the new
constants NG_*SIZ that include the trailing NUL byte. This change
is mostly mechanical except for the replacement of a couple of snprintf()
and sprintf() calls with strlcpy.
2003-11-15 15:26:35 +00:00
harti
a13d5675bc Add an empty definition of the MIBS variable so that the makefile does
not try to use a MIBS definition from the environment.

Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>
2003-11-13 10:18:16 +00:00
harti
336e573a13 The snmp_netgraph module depends on libnetgraph. So add a dependency and
add libnetgraph to the list of prebuilt libraries in the main Makefile.

Reviewed by:	ru
2003-11-12 17:09:13 +00:00
harti
a5fa8ea082 Correct the include path so that the include files are found
with include "...".
2003-11-10 14:04:34 +00:00
harti
944e5099fb Fix the build by adjusting the include directives. The problem was
that the sources use "..." includes to get at include files that
later on reside in an include sub-directory.
2003-11-10 13:43:26 +00:00
harti
81d7427dad Add the build infrastructure for the SNMP daemon that is the base
for the NgATM ILMI daemon and for the tree parsing helper program.
2003-11-10 09:22:40 +00:00
harti
7b57d9c631 Add build infrastructure for libbsnmp and the modules. Add the
netgraph module for the SNMP daemon.
2003-11-10 09:17:34 +00:00