- Libsmi - lists.ibr.cs.tu-bs.de

ITU mibs
by Anders Broman 16 Apr '08

16 Apr '08

Would it be possible to get the following ITU mibs added to the mib repositorry? <<h341.mib.zip>> Reagrds Anders

2 1

First stepps to make it possible to build libsmi as a .dll
by Anders Broman 16 Apr '08

16 Apr '08

Hi, Included patches to split makefile Into config.nmake and makefile add add a smi.def file needed when building a .dll If this is acceptable I will try to make a common makefile for both options (.exe vs .dll). Regards Anders Index: config.nmake =================================================================== --- config.nmake (revision 0) +++ config.nmake (revision 0) @@ -0,0 +1,50 @@ +# $Id$ +# +# +# + +## +## Project directories -- these may need to be customized for your site +## +## ROOT -- top of the source tree. +## TMPDIR -- location for .obj files. +## TOOLS32 -- location of VC++ compiler installation. +## +ROOT = .\.. +TMPDIR = . +#TOOLS32 = C:\MSDEV +TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 + +## +## Installation paths: +## +## MIBROOT -- definition for default search path (unix-style) +## MIBDIR -- same in windows style +## PIBDIR -- same in windows style +## BINDIR -- destination for the binaries (smidump.exe, ...) +## LIBDIR -- destination for the library (smi.lib) +## +MIBROOT = c:/smi/mibs +PIBROOT = c:/smi/pibs +INSTROOT = c:\smi +MIBDIR = $(INSTROOT)\mibs +PIBDIR = $(INSTROOT)\pibs +BINDIR = $(INSTROOT)\bin +LIBDIR = $(INSTROOT)\lib + +## +## Visual C++ tools +## +PATH=$(TOOLS32)\bin;$(PATH) + +cc32 = cl +CP = copy +RM = del +MKDIR = md + +## +## Definitions: +## +# DEBUG = -W3 -Zi -Od /Yd +INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include +DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 Index: smi.def =================================================================== --- smi.def (revision 0) +++ smi.def (revision 0) @@ -0,0 +1,102 @@ +EXPORTS +optParseOptions +smiInit +smiExit +smiSetErrorLevel +smiGetFlags +smiSetFlags +smiGetPath +smiSetPath +smiSetSeverity +smiReadConfig +smiLoadModule +smiIsLoaded +smiSetErrorHandler +smiGetModule +smiGetFirstModule +smiGetNextModule +smiGetModuleIdentityNode +smiGetFirstImport +smiGetNextImport +smiIsImported +smiGetFirstRevision +smiGetNextRevision +smiGetRevisionLine +smiGetType +smiGetFirstType +smiGetNextType +smiGetParentType +smiGetTypeModule +smiGetTypeLine +smiGetFirstRange +smiGetNextRange +smiGetFirstNamedNumber +smiGetNextNamedNumber +smiGetMacro +smiGetFirstMacro +smiGetNextMacro +smiGetMacroModule +smiGetNode +smiGetNodeByOID +smiGetFirstNode +smiGetNextNode +smiGetParentNode +smiGetRelatedNode +smiGetFirstChildNode +smiGetNextChildNode +smiGetNodeModule +smiGetNodeType +smiGetNodeLine +smiGetFirstElement +smiGetNextElement +smiGetElementNode +smiGetFirstOption +smiGetNextOption +smiGetOptionNode +smiGetOptionLine +smiGetFirstRefinement +smiGetNextRefinement +smiGetRefinementNode +smiGetRefinementType +smiGetRefinementWriteType +smiGetRefinementLine +smiGetFirstUniquenessElement +smiRenderOID +smiRenderValue +smiRenderNode +smiRenderType +smiAsprintf +smiVasprintf +smiGetErrorDescription +smiGetErrorMsg +smiGetErrorTag +smiGetErrorSeverity +smiGetParentIdentity +smiGetNextIdentity +smiGetFirstIdentity +smiGetParentClass +smiGetNextClass +smiGetFirstClass +smiGetNextUniqueAttribute +smiGetFirstUniqueAttribute +smiIsClassScalar +smiGetAttributeParentType +smiGetAttributeParentClass +smiGetNextAttribute +smiGetFirstAttribute +smiGetAttributeNextRange +smiGetAttributeFirstRange +smiGetAttributeNextNamedNumber +smiGetAttributeFirstNamedNumber +smiGetNextEvent +smiGetFirstEvent +smiGetMinSize +smiGetMinSize +smiGetMinSize +smiGetMinSize +smiGetMaxSize +smiGetMaxSize +smiGetMaxSize +smiGetMaxSize +smiGetMinMaxRange +smiGetMinMaxRange Index: makefile =================================================================== --- makefile (revision 8059) +++ makefile (working copy) @@ -13,52 +13,7 @@ # # @(#) $Id$ -## -## Project directories -- these may need to be customized for your site -## -## ROOT -- top of the source tree. -## TMPDIR -- location for .obj files. -## TOOLS32 -- location of VC++ compiler installation. -## -ROOT = .\.. -TMPDIR = . -#TOOLS32 = C:\MSDEV -TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 - -## -## Installation paths: -## -## MIBROOT -- definition for default search path (unix-style) -## MIBDIR -- same in windows style -## PIBDIR -- same in windows style -## BINDIR -- destination for the binaries (smidump.exe, ...) -## LIBDIR -- destination for the library (smi.lib) -## -MIBROOT = c:/smi/mibs -PIBROOT = c:/smi/pibs -INSTROOT = c:\smi -MIBDIR = $(INSTROOT)\mibs -PIBDIR = $(INSTROOT)\pibs -BINDIR = $(INSTROOT)\bin -LIBDIR = $(INSTROOT)\lib - -## -## Visual C++ tools -## -PATH=$(TOOLS32)\bin;$(PATH) - -cc32 = cl -CP = copy -RM = del -MKDIR = md - -## -## Definitions: -## -# DEBUG = -W3 -Zi -Od /Yd -INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include -DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 - +!include "config.nmake" !include <win32.mak> ## @@ -150,11 +105,13 @@ # (flex-src avoids missing unistd.h if _Win32 defined) # $(TMPDIR)\scanner-smi.obj : $(ROOT)\lib\scanner-smi.c - $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(TMPDIR)\scanner-sming.obj : $(ROOT)\lib\scanner-sming.c - $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -D_Win32 -D__STDC__ $(INCLUDES) \ + -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? @@ -182,12 +139,12 @@ /osmixlate.exe $(SMIXLATEOBJS) $(SMILIB) clean: - del *.lib - del *.obj - del *.exe - del *.ilk - del *.pdb - del *.mdp + rm -f *.lib + rm -f *.obj + rm -f *.exe + rm -f *.ilk + rm -f *.pdb + rm -f *.mdp install: all install-doc install-bin install-lib install-mibs install-pibs

2 3

Problem with vsnprintf and MSVC6
by Anders Broman 15 Apr '08

15 Apr '08

Hi, Would this patch work on unix it works for me on MSVC6: Index: dstring.c =================================================================== --- dstring.c (revision 8016) +++ dstring.c (working copy) @@ -147,7 +147,7 @@ o = ds->len; while (1) { va_copy(ap, _ap); - n = vsnprintf(ds->str + o, ds->len+1 - o, format, ap); + n = _vsnprintf(ds->str + o, ds->len+1 - o, format, ap); va_end(ap); if (n > -1 && n+o <= ds->len) { if (n+o < ds->len) { @@ -186,7 +186,7 @@ if (ds) { while (1) { va_copy(ap, _ap); - n = vsnprintf(ds->str, ds->len+1, format, ap); + n = _vsnprintf(ds->str, ds->len+1, format, ap); va_end(ap); if (n > -1 && n <= ds->len) { if (n < ds->len) { Regards Anders

3 6

When building a .dll the following flags must be added
by Anders Broman 14 Apr '08

14 Apr '08

Index: makefile =================================================================== --- makefile (revision 8042) +++ makefile (working copy) @@ -131,7 +131,7 @@ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\lib}.c{$(TMPDIR)}.obj: - $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ + $(cc32) $(cdebug) $(cflags) -DYYMALLOC=malloc -DYYFREE=free $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\tools}.c{$(TMPDIR)}.obj: Index: win.c

2 1

extern void needed in shhopt.h to build a .dll
by Anders Broman 14 Apr '08

14 Apr '08

Hi, The following patch is needed to build libsmi as a .dll Regards Anders Index: shhopt.h =================================================================== --- shhopt.h (revision 8039) +++ shhopt.h (working copy) @@ -1,4 +1,4 @@ -/* $Id: shhopt.h,v 1.5 2000/03/10 08:32:39 sverrehu Exp $ */ +/* $Id$ */ #ifndef SHHOPT_H #define SHHOPT_H @@ -30,8 +30,8 @@ } optStruct; -void optSetFatalFunc(void (*f)(const char *, ...)); -void optParseOptions(int *argc, char *argv[], +extern void optSetFatalFunc(void (*f)(const char *, ...)); +extern void optParseOptions(int *argc, char *argv[], optStruct opt[], int allowNegNum); #ifdef __cplusplus

2 1

Remove som warnings in dump-svg.c
by Anders Broman 14 Apr '08

14 Apr '08

Index: dump-svg.c =================================================================== --- dump-svg.c (revision 8039) +++ dump-svg.c (working copy) @@ -250,7 +250,6 @@ static void printSVGClose(float xMin, float yMin, float xMax, float yMax) { float scale; - int i; scale = max((xMax-xMin)/CANVASWIDTH,(yMax-yMin)/CANVASHEIGHT); /* enclose whole canvas in its bounding box */ @@ -752,12 +751,12 @@ static void calculateIntersectionPoints(GraphEdge *tEdge) { float alpha, beta; - const float PI = acos(-1); + const float PI = (float)acos(-1); /* calculate intersection of edge and startNode */ - alpha = atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, + alpha = (float)atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, tEdge->startNode->dia.x-tEdge->endNode->dia.x); - beta = atan2(tEdge->startNode->dia.h, tEdge->startNode->dia.w); + beta = (float)atan2(tEdge->startNode->dia.h, tEdge->startNode->dia.w); if (alpha < 0) alpha += PI; if (alpha < beta @@ -772,11 +771,11 @@ tEdge->startNode->dia.w/2; } if (tEdge->startNode->dia.y < tEdge->endNode->dia.y) { - tEdge->dia.startY = tEdge->startNode->dia.y + - fabsf(tEdge->startNode->dia.w*tan(alpha)/2); + tEdge->dia.startY = (float)(tEdge->startNode->dia.y + + fabsf(tEdge->startNode->dia.w*tan(alpha)/2)); } else { - tEdge->dia.startY = tEdge->startNode->dia.y - - fabsf(tEdge->startNode->dia.w*tan(alpha)/2); + tEdge->dia.startY = (float)(tEdge->startNode->dia.y - + fabsf(tEdge->startNode->dia.w*tan(alpha)/2)); } } else { /* intersection at top or bottom border */ @@ -788,18 +787,18 @@ tEdge->startNode->dia.h/2; } if (tEdge->startNode->dia.x < tEdge->endNode->dia.x) { - tEdge->dia.startX = tEdge->startNode->dia.x + - fabsf(tEdge->startNode->dia.h/(2*tan(alpha))); + tEdge->dia.startX = (float)(tEdge->startNode->dia.x + + fabsf(tEdge->startNode->dia.h/(2*tan(alpha)))); } else { - tEdge->dia.startX = tEdge->startNode->dia.x - - fabsf(tEdge->startNode->dia.h/(2*tan(alpha))); + tEdge->dia.startX = (float)(tEdge->startNode->dia.x - + fabsf(tEdge->startNode->dia.h/(2*tan(alpha)))); } } /* calculate intersection of edge and endNode */ - alpha = atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, + alpha = (float)atan2(tEdge->startNode->dia.y-tEdge->endNode->dia.y, tEdge->startNode->dia.x-tEdge->endNode->dia.x); - beta = atan2(tEdge->endNode->dia.h, tEdge->endNode->dia.w); + beta = (float)atan2(tEdge->endNode->dia.h, tEdge->endNode->dia.w); if (alpha < 0) alpha += PI; if (alpha < beta @@ -812,11 +811,11 @@ tEdge->dia.endX = tEdge->endNode->dia.x - tEdge->endNode->dia.w/2; } if (tEdge->startNode->dia.y > tEdge->endNode->dia.y) { - tEdge->dia.endY = tEdge->endNode->dia.y + - fabsf(tEdge->endNode->dia.w*tan(alpha)/2); + tEdge->dia.endY = (float)(tEdge->endNode->dia.y + + fabsf(tEdge->endNode->dia.w*tan(alpha)/2)); } else { - tEdge->dia.endY = tEdge->endNode->dia.y - - fabsf(tEdge->endNode->dia.w*tan(alpha)/2); + tEdge->dia.endY = (float)(tEdge->endNode->dia.y - + fabsf(tEdge->endNode->dia.w*tan(alpha)/2)); } } else { /* intersection at top or bottom border */ @@ -826,11 +825,11 @@ tEdge->dia.endY = tEdge->endNode->dia.y - tEdge->endNode->dia.h/2; } if (tEdge->startNode->dia.x > tEdge->endNode->dia.x) { - tEdge->dia.endX = tEdge->endNode->dia.x + - fabsf(tEdge->endNode->dia.h/(2*tan(alpha))); + tEdge->dia.endX = (float)(tEdge->endNode->dia.x + + fabsf(tEdge->endNode->dia.h/(2*tan(alpha)))); } else { - tEdge->dia.endX = tEdge->endNode->dia.x - - fabsf(tEdge->endNode->dia.h/(2*tan(alpha))); + tEdge->dia.endX = (float)(tEdge->endNode->dia.x - + fabsf(tEdge->endNode->dia.h/(2*tan(alpha)))); } } } @@ -1676,7 +1675,7 @@ int j, k; char *tooltip; SmiElement *smiElement; - StringListElem *tElem, *lastElem; + StringListElem *tElem; printf(" <g id=\"MI%i\" transform=\"translate", *miNr); printf("(%.2f,%.2f)\">\n", *x, *y); @@ -1824,7 +1823,7 @@ /* SmiRevision *smiRevision; */ SmiOption *smiOption; SmiRefinement *smiRefinement; - StringListElem *tElem, *lastElem; + StringListElem *tElem; printf(" <g id=\"MI%i\" transform=\"translate", *miNr); printf("(%.2f,%.2f)\">\n", *x, *y); @@ -2699,7 +2698,7 @@ i--; /* test if we must shrink moduleInformation to fit it into canvas */ - miHeight = ((miCount + i - (2 * j)) * 15 + 10); + miHeight = (float)(((miCount + i - (2 * j)) * 15 + 10)); if (miHeight > maxHeight) scale *= maxHeight/miHeight; @@ -2856,11 +2855,11 @@ if ((dist = intersect(vNode, eEdge))) { if (eEdge->startNode->dia.x == eEdge->endNode->dia.x) { eEdge->startNode->dia.xDisp -= - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); eEdge->endNode->dia.xDisp -= - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); vNode->dia.xDisp += - 8*(dist/fabsf(dist))*fr(1/dist, k); + (float)(8*(dist/fabsf(dist))*fr(1/dist, k)); } else { xDelta = -1*(eEdge->endNode->dia.y -eEdge->startNode->dia.y) @@ -2903,7 +2902,7 @@ vNode->dia.y += (vNode->dia.yDisp/absDisp)*min(absDisp, t); } /* reduce the temperature as the layout approaches a better configuration */ - t *= 0.9; + t *= (float)0.9; } } @@ -2978,7 +2977,7 @@ tComponent->xOffset = *x - tComponent->xMin; *x += 10 + tComponent->xMax - tComponent->xMin; - tComponent->yOffset = -0.5*(tComponent->yMin+tComponent->yMax); + tComponent->yOffset = (float)(-0.5*(tComponent->yMin+tComponent->yMax)); if (tComponent->yMin + tComponent->yOffset < *yMin) *yMin = tComponent->yMin + tComponent->yOffset; if (tComponent->yMax + tComponent->yOffset > *yMax) @@ -3138,10 +3137,8 @@ */ static void generateSVG(int modc, SmiModule **modv) { - GraphNode *tNode, *lastNode = NULL; - GraphEdge *tEdge; - GraphComponent *tComponent; - int group, nodecount=0, singleNodes=1, miCount=0; + GraphNode *lastNode = NULL; + int nodecount=0, singleNodes=1, miCount=0; int i, idCount=0, TCcount=0, miPrint=0; float x=10, xMin=0, yMin=0, xMax=0, yMax=0, maxHeight=0;

1 0

Compiling with MSVC6
by Anders Broman 28 Mar '08

28 Mar '08

Hi, Chacking out tthe latest SVN version I had to manually change in smi.h: #ifdef HAVE_LIMITS_H #include "limits.h" #endif to #include "limits.h" Any ideas why? Regards Anders

3 4

Get rid of Warnings in smixlate.c
by Anders Broman 28 Mar '08

28 Mar '08

Index: smixlate.c =================================================================== --- smixlate.c (revision 7960) +++ smixlate.c (working copy) @@ -69,7 +69,8 @@ static void process(FILE *stream) { - int c, space = 0; + char c; + int space = 0; enum { TXT, NUM, NUMDOT, NUMDOTNUM, OID, OIDDOT, EATSPACE } state = TXT; dstring_t *token, *subst; Regards Anders

3 5

More warning fixes
by Anders Broman 27 Mar '08

27 Mar '08

<<tools.patch>> Included a patch to fix some of the warnings using MSVC6. Regards Anders

1 0

libsmi-0.4.7: 2 of 21 tests failed
by Peter Volkov 26 Mar '08

26 Mar '08

Hello. Resending this message without attachment as previous version occurred to be scrambled inside archives: http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/000994.html I've tried to run test in libsmi-0.4.7 but 2 of 21 tests failed. Is this expected? The failed tests were: comparing `smidump -f sming SNMPv2-MIB' output with dumps/sming/*. comparing `smidump -f sming IF-MIB' output with dumps/sming/*. comparing `smidump -f sming MAU-MIB' output with dumps/sming/*. comparing `smidump -f sming RMON2-MIB' output with dumps/sming/*. *** smidump output differs, see smidump-sming.out/*.diff FAIL: smidump-sming.test [snip] comparing `smidump -f smiv2 SNMPv2-MIB' output with dumps/orig-smiv2/*. comparing `smidump -f smiv2 IF-MIB' output with dumps/orig-smiv2/*. comparing `smidump -f smiv2 MAU-MIB' output with dumps/orig-smiv2/*. comparing `smidump -f smiv2 RMON2-MIB' output with dumps/orig-smiv2/*. *** smidump output differs, see smidump-orig-smiv2.out/*.diff FAIL: smidump-orig-smiv2.test [snip] ==================== 2 of 21 tests failed ==================== Bzip2ed tarball of mentioned directories you can download at the link: http://theor.ran.gpi.ru/tests.fail.tbz2 Summary about build system: default-linux/x86/2007.0, gcc-4.2.3, glibc-2.7-r1, 2.6.23-gentoo-r8 i686 ================================================================= System uname: 2.6.23-gentoo-r8 i686 Intel(R) Pentium(R) M processor 1700MHz app-shells/bash: 3.2_p33 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.61-r1 sys-devel/automake: 1.10.1 sys-devel/binutils: 2.18-r1 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.24 CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=i686 -pipe -mtune=i686" CHOST="i686-pc-linux-gnu" CXXFLAGS="-O2 -march=i686 -pipe -mtune=i686" ================================================================= Thank you in advance for any hints, -- Peter.

3 6