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

missing ELSE
by Andrew Hood 22 Apr '08

22 Apr '08

Index: config.nmake =================================================================== --- config.nmake (revision 8127) +++ config.nmake (working copy) @@ -74,6 +74,7 @@ TOOLS32 = C:\PROGRA~1\MICROS~2\VC98 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" TOOLS32 = "C:\Program Files\Microsoft Visual Studio 8\VC" +!ELSE !ERROR MSVC_VARIANT unknown !ENDIF -- There's no point in being grown up if you can't be childish sometimes. -- Dr. Who

2 1

dump-sming.c
by Andrew Hood 21 Apr '08

21 Apr '08

Appears to have some bugs. smiGetFirstImport/smiGetNextImport are being used in fprintImports instead of the importList that was built. The attached patch (which can probably be done better) just leaves a couple of: 170d169 < status current; diff errors in "make check" -- There's no point in being grown up if you can't be childish sometimes. -- Dr. Who Index: tools/dump-sming.c =================================================================== --- tools/dump-sming.c (revision 8107) +++ tools/dump-sming.c (working copy) @@ -696,30 +696,30 @@ static void fprintImports(FILE *f, SmiModule *smiModule) { - SmiImport *import; + Import **import; char *lastModuleName = NULL; int pos = 0, len, maxlen = 0; createImportList(smiModule); - for (import = smiGetFirstImport(smiModule); import; import = smiGetNextImport(import)) { - len = strlen(import->module); + for (import = &importList; *import; import = &(*import)->nextPtr) { + len = strlen((*import)->module); maxlen = (len > maxlen) ? len : maxlen; } - for (import = smiGetFirstImport(smiModule); import; import = smiGetNextImport(import)) { - int yaba = !lastModuleName || strcmp(import->module, lastModuleName); + for (import = &importList; *import; import = &(*import)->nextPtr) { + int yaba = !lastModuleName || strcmp((*import)->module, lastModuleName); if (yaba) { if (lastModuleName) { fprint(f, ");\n"); } fprintSegment(f, INDENT, "", 0); - fprint(f, "import %-*s (", maxlen, import->module); + fprint(f, "import %-*s (", maxlen, (*import)->module); pos = INDENT + 12 + maxlen; } else { fprint(f, ", "); } - len = strlen(import->name); + len = strlen((*import)->name); if (len + pos > INDENTMAX) { fprint(f, "\n"); fprintSegment(f, INDENT, "", 0); @@ -727,9 +727,9 @@ fprint(f, " %-*s ", maxlen, ""); pos = INDENT + 12 + maxlen; } - fprint(f, "%s", import->name); + fprint(f, "%s", (*import)->name); pos += len; - lastModuleName = import->module; + lastModuleName = (*import)->module; } if (lastModuleName) {

1 0

Config.nmake missing from distribution
by Anders Broman 21 Apr '08

21 Apr '08

Hi, win/config.nmake nnedes to be added to EXTRA_DIST in toplevel makefile.am. Regards Anders Broman

2 1

libsmi release 0.4.8
by Frank Strauß 21 Apr '08

21 Apr '08

Hi! There is a new release. It - hopefully :-) - clearifies recent confusion with inconsistent version numbers (sorry for that!), adds two new IETF MIBs, fixes numerous compiler warnings, and contains a couple of Windows related updates. As always, thanks to all the people who submitted bug reports and patches! http://www.ibr.cs.tu-bs.de/projects/libsmi/ ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ Enjoy, -frank

2 2

Patch to set tools dir pepending on MSVC version
by Anders Broman 19 Apr '08

19 Apr '08

Hi, Patch to automatically sett the TOOLS32 lib depending on the MSVC version used and explain a bit what to set. <<config.nmake.txt>> Regards Anders

3 3

Libsmi version?
by Anders Broman 18 Apr '08

18 Apr '08

Hi, Shouldn't LIBSMI_PATCHLEVEL=6 be LIBSMI_PATCHLEVEL=7 in configure.in ? Regards Anders

3 2

Typo in config.h
by Anders Broman 18 Apr '08

18 Apr '08

Hi, Sorry I made a typo in config.h I think. Regards Anders Index: config.h =================================================================== --- config.h (revision 8082) +++ config.h (working copy) @@ -1,5 +1,5 @@ /* - * config.h. Generated manually for windows / vc++ 6.0 */ + * config.h. Generated manually for windows / vc++ 6.0 * * @(#) $Id$ */

1 0

Id marking for config.h
by Anders Broman 17 Apr '08

17 Apr '08

Index: config.h =================================================================== --- config.h (revision 8072) +++ config.h (working copy) @@ -1,4 +1,7 @@ -/* config.h. Generated manually for windows / vc++ 6.0 */ +/* + * @(#) $Id$ + * config.h. Generated manually for windows / vc++ 6.0 + */ /* Define if the SMIv1/v2 parser shall be active. */ #define BACKEND_SMI

1 0

Readme updates
by Anders Broman 17 Apr '08

17 Apr '08

Index: README.win =================================================================== --- README.win (revision 8072) +++ README.win (working copy) @@ -20,8 +20,8 @@ Installation ============ -(1) Change the compiler path macro TOOLS32 in ./makefile for the - specific msvc installation. +(1) Set MSVC version used in ./config.nmake. Check the compiler path + macro TOOLS32 in ./config.nmake for the specific msvc installation. (2) To compile simply run @@ -72,7 +72,7 @@ by their 64bit _int64 msvc counterparts. They work ok. see related definitions ./config.h -- The compiler path in ./makefile is hardwired (TOOLS32) +- The compiler path in ./config.nmake is hardwired (TOOLS32) - The installation directories are hardwired in config.h.in

1 0

Re: [Wireshark-dev] Building libsmi from SVN as a .dll
by Andrew Hood 17 Apr '08

17 Apr '08

Anders Broman wrote: > Hi, > I have experemented with building libsmi.dll from libsmi SVN > _http://www.ibr.cs.tu-bs.de/svn/libsmi_ with the included makefile-dll > and smi.def file > > It builds under MSVC6 I have not tested it but if some one likes to play > with it - here it is... > If you find any errors please let me know. I've managed to get your makefile to work with MSVC8. My version attached. A few more -Dxxx make the compiler and linker happy. Adding smiFree to smi.h and EXPORTing it from the DLL lets the memory that is currently being leaked be freed. Juergen agrees this is OK. If have added these to smi.h and EXPORTed them: extern void *smiMalloc(size_t size); extern void *smiRealloc(void *ptr, size_t size); extern char *smiStrdup(const char *s1); extern char *smiStrndup(const char *s1, size_t n); extern void smiFree(void *ptr); I think I have also tracked down one of the reasons wireshark crashes. Take this snippet: ICS3-MIB DEFINITIONS ::= BEGIN IMPORTS OBJECT-TYPE FROM RFC-1212 TRAP-TYPE FROM RFC-1215 westellInterchangeProducts FROM WESTELL-GENERAL-MIB; ics3 OBJECT IDENTIFIER ::= { westellInterchangeProducts 2 2 } smilint gives this warning. ./ICS3-MIB:16: warning: implicit node definition At line 595 oids.c calls smiRenderOID to format the node. The implicit node is not completely filled in, and wireshark/tshark crashes in libsmi. This is not totally unreasonable since implicit nodes should never be seen. Adding: if (kind == OID_KIND_UNKNOWN) continue; (you will have to separate the declarations and initialisations of oid and oid_data) before that call stops the crash. -- There's no point in being grown up if you can't be childish sometimes. -- Dr. Who # # makefile -- # # Makefile for VC++ (tested with version 6.0) for compiling # libsmi and associated tools natively under Win32. # # Copyright (c) 2000-2003 Yigal Hochberg, DMH Software. # Copyright (c) 2000 E. Schoenfelder, Gaertner Datensysteme Braunschweig. # Copyright (c) 2000 J. Schoenwaelder, Technical University of Braunschweig. # # See the file "COPYING" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # @(#) $Id: makefile 3226 2006-02-27 21:48:23Z schoenw $ ## ## 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 TOOLS32 = "C:\Program Files\Microsoft Visual Studio 8\VC" ## ## 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:/usr/local/snmp/mibs PIBROOT = c:/usr/local/snmp/pibs INSTROOT = c:\usr\local MIBDIR = $(INSTROOT)\snmp\mibs PIBDIR = $(INSTROOT)\snmp\pibs BINDIR = $(INSTROOT)\wbin LIBDIR = $(INSTROOT)\wbin ## ## Visual C++ tools ## PATH=$(TOOLS32)\bin;$(PATH) cc32 = cl CP = copy RM = del MKDIR = -mkdir ## ## Definitions: ## # DEBUG = -W3 -Zi -Od /Yd DEBUG = /W3 /Zi /Od /DEBUG /GS /Wp64 /Yd INCLUDES = -I$(ROOT)\lib -I$(ROOT)\win -I$(TOOLS32)\include DEFINES = $(DEBUG) -D_CRT_SECURE_NO_DEPRECATE=1 !include <win32.mak> ## ## Global makefile settings ## LIBSMIOBJS = \ $(TMPDIR)\win.obj \ $(TMPDIR)\shhopt.obj \ $(TMPDIR)\data.obj \ $(TMPDIR)\check.obj \ $(TMPDIR)\error.obj \ $(TMPDIR)\util.obj \ $(TMPDIR)\smi.obj \ $(TMPDIR)\parser-smi.obj \ $(TMPDIR)\scanner-smi.obj \ $(TMPDIR)\parser-sming.obj \ $(TMPDIR)\scanner-sming.obj \ $(TMPDIR)\snprintf.obj SMIQUERYOBJS = \ $(TMPDIR)\smiquery.obj \ SMILINTOBJS = \ $(TMPDIR)\smilint.obj \ SMIXLATEOBJS = \ $(TMPDIR)\smixlate.obj \ $(TMPDIR)\dstring.obj \ SMIDUMPOBJS = \ $(TMPDIR)\smidump.obj \ $(TMPDIR)\dump-sming.obj \ $(TMPDIR)\dump-smi.obj \ $(TMPDIR)\dump-imports.obj \ $(TMPDIR)\dump-types.obj \ $(TMPDIR)\dump-tree.obj \ $(TMPDIR)\dump-mosy.obj \ $(TMPDIR)\dump-corba.obj \ $(TMPDIR)\dump-netsnmp.obj \ $(TMPDIR)\dump-jax.obj \ $(TMPDIR)\dump-xml.obj \ $(TMPDIR)\dump-cm.obj \ $(TMPDIR)\dump-metrics.obj \ $(TMPDIR)\dump-identifiers.obj \ $(TMPDIR)\dump-python.obj \ $(TMPDIR)\dump-perl.obj \ $(TMPDIR)\dump-scli.obj \ $(TMPDIR)\dump-xsd.obj \ $(TMPDIR)\dump-sppi.obj \ $(TMPDIR)\dump-sizes.obj \ $(TMPDIR)\dump-svg.obj \ $(TMPDIR)\dump-compliance.obj \ $(TMPDIR)\dump-boilerplate.obj \ $(TMPDIR)\dump-yang.obj \ $(TMPDIR)\fprint.obj \ $(TMPDIR)\rea.obj \ $(TMPDIR)\fortopat.obj SMIDIFFOBJS = \ $(TMPDIR)\smidiff.obj \ SMILIB = smi.lib SMIDLL = smi.dll ## ## Implicit Targets ## .c.obj: $(cc32) $(cdebug) $(cflags) $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\lib}.c{$(TMPDIR)}.obj: $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD $(INCLUDES) \ -DYYMALLOC=malloc -DYYFREE=free \ $(DEFINES) -Fo$(TMPDIR)\ $< {$(ROOT)\tools}.c{$(TMPDIR)}.obj: $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD $(INCLUDES) \ $(DEFINES) -Fo$(TMPDIR)\ $< ## ## Targets ## all: libs tools libs: $(SMILIB) $(SMIDLL) # special compilation rules # (flex-src avoids missing unistd.h if _Win32 defined) # $(TMPDIR)\scanner-smi.obj : $(ROOT)\lib\scanner-smi.c $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD -D_Win32 -D__STDC__ $(INCLUDES) \ -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(TMPDIR)\scanner-sming.obj : $(ROOT)\lib\scanner-sming.c $(cc32) $(cdebug) $(cflags) -D_DLL -D_MT /MD -D_Win32 -D__STDC__ $(INCLUDES) \ -DYY_NEVER_INTERACTIVE \ $(DEFINES) -Fo$(TMPDIR)\ $? $(SMIDLL): $(SMILIB) # $(link) -entry:_DllMainCRTStartup@12 -dll /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO msvcrt.lib oldnames.lib kernel32.lib ws2_32.lib shell32.lib /DEF:smi.def /OUT:$(SMIDLL) /IMPLIB:$(SMILIB) $(LIBSMIOBJS) link $(dlllflags) $(conlibsdll) /NODEFAULTLIB /machine:i386 msvcrt.lib shell32.lib version.lib /DEBUG /DEF:smi.def /OUT:smi.dll /IMPLIB:smi.lib $(LIBSMIOBJS) $(SMILIB): $(LIBSMIOBJS) $(implib) /out:smi.lib $(LIBSMIOBJS) tools: smiquery.exe smilint.exe smixlate.exe smidump.exe smidiff.exe smiquery.exe: $(SMIQUERYOBJS) $(SMILIB) $(cc32) $(DEFINES) /osmiquery.exe $(SMIQUERYOBJS) $(SMILIB) smilint.exe: $(SMILINTOBJS) $(SMILIB) $(cc32) $(DEFINES) /osmilint.exe $(SMILINTOBJS) $(SMILIB) smidump.exe: $(SMIDUMPOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmidump.exe $(SMIDUMPOBJS) $(SMILIB) smidiff.exe: $(SMIDIFFOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmidiff.exe $(SMIDIFFOBJS) $(SMILIB) smixlate.exe: $(SMIXLATEOBJS) $(SMILIB) $(cc32) $(DEFINES) \ /osmixlate.exe $(SMIXLATEOBJS) $(SMILIB) clean: 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 install-doc: $(MKDIR) $(INSTROOT) $(CP) ..\README $(INSTROOT) $(CP) ..\COPYING $(INSTROOT) $(CP) README.win $(INSTROOT) $(MKDIR) $(INSTROOT)\doc $(CP) ..\doc\*.txt $(INSTROOT)\doc $(CP) ..\doc\*.ps $(INSTROOT)\doc install-bin: $(MKDIR) $(BINDIR) $(CP) *.exe $(BINDIR) install-lib: $(MKDIR) $(LIBDIR) $(CP) *.lib $(LIBDIR) install-mibs: $(MKDIR) $(MIBDIR) $(MKDIR) $(MIBDIR)\iana $(CP) ..\mibs\iana\*.* $(MIBDIR)\iana $(MKDIR) $(MIBDIR)\ietf $(CP) ..\mibs\ietf\*.* $(MIBDIR)\ietf $(MKDIR) $(MIBDIR)\irtf $(CP) ..\mibs\irtf\*.* $(MIBDIR)\irtf $(MKDIR) $(MIBDIR)\tubs $(CP) ..\mibs\tubs\*.* $(MIBDIR)\tubs $(MKDIR) $(MIBDIR)\site install-pibs: $(MKDIR) $(PIBDIR) $(MKDIR) $(PIBDIR)\ietf $(CP) ..\pibs\ietf\*.* $(PIBDIR)\ietf $(MKDIR) $(PIBDIR)\tubs $(CP) ..\pibs\tubs\*.* $(PIBDIR)\tubs $(MKDIR) $(PIBDIR)\site # # Local Variables: # mode: makefile # make: "nmake" # eval: (set (make-local-variable 'this-file) (file-name-nondirectory buffer-file-name)) # eval: (set (make-local-variable 'compile-command) (concat make " -k -f " this-file)) # End: # # EOF: makefile

2 4