Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.2:Update
ntop
ntop-3.3.10.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ntop-3.3.10.diff of Package ntop
--- fcUtils.c 2006/01/26 12:45:23 1.1 +++ fcUtils.c 2006/01/26 12:46:25 @@ -654,6 +654,6 @@ memcpy (&entry->pWWN.str[0], &pWWN.str[0], LEN_WWN_ADDRESS); memcpy (&entry->nWWN.str[0], &nWWN.str[0], LEN_WWN_ADDRESS); strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME); - entry->alias[MAX_LEN_SYM_HOST_NAME] = '\0'; + entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0'; } } --- graph.c 2009/08/13 11:51:16 1.1 +++ graph.c 2009/08/13 11:51:54 @@ -1508,13 +1508,11 @@ void drawVsanDomainTrafficDistribution(u_short vsanId, u_char dataSent) { int i, idx=0, numEntries = 0; FcFabricElementHash *hash; - float p[MAX_VSANS_GRAPHED+1]; + float p[MAX_VSANS_GRAPHED+1] = {0}; char *lbl[MAX_VSANS_GRAPHED+1], labels[MAX_VSANS_GRAPHED+1][8]; Counter total; SortedFcDomainStatsEntry *fcDomainStats; - p[MAX_FC_DOMAINS+1] = 0; - hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId); if (hash == NULL) { --- pbuf.c.orig 2009-05-06 14:55:22.000000000 +0000 +++ pbuf.c 2009-08-05 09:06:35.000000000 +0000 @@ -3447,14 +3447,14 @@ && (ipxBuffer[30] == 0x0) /* SAP Response (byte 0) */ && (ipxBuffer[31] == 0x02) /* SAP Response (byte 1) */) { u_int16_t serverType; - char serverName[57]; + char serverName[MAX_LEN_SYM_HOST_NAME]; int i, found; memcpy(&serverType, &ipxBuffer[32], 2); serverType = ntohs(serverType); - memcpy(serverName, &ipxBuffer[34], 56); serverName[56] = '\0'; - for(i=0; i<56; i++) + memcpy(serverName, &ipxBuffer[34], MAX_LEN_SYM_HOST_NAME); serverName[MAX_LEN_SYM_HOST_NAME-1] = '\0'; + for(i=0; i<MAX_LEN_SYM_HOST_NAME; i++) if(serverName[i] == '!') { serverName[i] = '\0'; break; @@ -3622,7 +3622,7 @@ memcpy(nodeName, &p1[7+p1[5+displ]+displ], p1[6+p1[5+displ]+displ]); nodeName[p1[6+p1[5+displ]]] = '\0'; - for(i=0; i<MAX_NODE_TYPES; i++) + for(i=0; i<MAX_NODE_TYPES-1; i++) if((srcHost->nonIPTraffic->atNodeType[i] == NULL) || (strcmp(srcHost->nonIPTraffic->atNodeType[i], nodeName) == 0)) break; --- fcReport.c 2006/03/20 13:55:38 1.1 +++ fcReport.c 2006/03/20 13:59:50 @@ -4066,7 +4066,7 @@ char buf[LEN_GENERAL_WORK_BUFFER], *sign; char *arrowGif, *arrow[48], *theAnchor[48]; char htmlAnchor[64], htmlAnchor1[64]; - char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32]; + char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32]; char hostLinkBuf[LEN_GENERAL_WORK_BUFFER], hostLinkBuf1[LEN_GENERAL_WORK_BUFFER]; FCSession **tmpTable, *session; --- Makefile.am 2006/04/03 09:09:17 1.1 +++ Makefile.am 2006/04/03 09:09:40 @@ -134,8 +134,7 @@ ntop.c pbuf.c \ plugin.c prefs.c protocols.c \ sessions.c term.c util.c utildl.c \ - traffic.c vendor.c version.c \ - ntop_darwin.c + traffic.c vendor.c version.c libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h libntop_la_LIBADD = --- plugins/Makefile.am.orig 2007-07-31 09:05:01.000000000 +0000 +++ plugins/Makefile.am 2007-07-31 09:07:36.000000000 +0000 @@ -95,7 +95,7 @@ # -.libs/libicmpPlugin.so@SO_VERSION_PATCH@: +.libs/libicmpPlugin.so@SO_VERSION_PATCH@: icmpPlugin.o @if test -f libicmpPlugin_la-icmpPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \ else \ @@ -107,7 +107,7 @@ ############### -.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: +.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: lastSeenPlugin.o @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \ else \ @@ -119,7 +119,7 @@ ############### -.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: +.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ else \ @@ -155,7 +155,7 @@ ############### -.libs/librrdPlugin.so@SO_VERSION_PATCH@: +.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o @if test -f librrdPlugin_la-rrdPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ else \ @@ -167,7 +167,7 @@ ############### -.libs/libsflowPlugin.so@SO_VERSION_PATCH@: +.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o @if test -f libsflowPlugin_la-sflowPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ else \ @@ -179,7 +179,7 @@ ############### -.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: +.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: xmldumpPlugin.o @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \ else \ --- plugins/rrdPlugin.c 2009/08/06 12:24:07 1.1 +++ plugins/rrdPlugin.c 2009/08/06 12:24:15 @@ -5035,7 +5035,7 @@ traceEvent(CONST_TRACE_INFO, "THREADMGMT[t%lu]: RRD: Throughput data collection: Thread terminated [p%d]", pthread_self(), getpid()); - return(NULL); + return; } /* ****************************** */ --- globals-core.h.orig 2009-04-17 11:58:52.000000000 +0000 +++ globals-core.h 2009-08-05 09:11:45.000000000 +0000 @@ -254,10 +254,6 @@ #ifdef MAKE_WITH_SAFER_ROUTINES -/* Fix to the free prototype courtesy of Tanner Lovelace <lovelace@opennms.org> */ -/* Fix free() courtesy of Benoit Dolez <bdolez@exosec.fr> */ -#define free(a) { void *__t = (a); ntop_safefree((void**)&(__t), (char*)__FILE__, (int)__LINE__); a = __t; } -extern void ntop_safefree(void **ptr, char* file, int line); #define malloc(sz) ntop_safemalloc((unsigned int)sz, (char*)__FILE__, (int)__LINE__) extern void* ntop_safemalloc(unsigned int sz, char* file, int line); #define calloc(c,sz) ntop_safecalloc(c, sz, (char*)__FILE__, (int)__LINE__) --- configure.in 2009-05-06 14:55:22.000000000 +0000 +++ configure.in.new 2009-07-21 08:17:33.000000000 +0000 @@ -1652,22 +1652,22 @@ dnl> dnl> Lua - http://www.lua.org dnl> -LUA_VERSION=lua-5.1.4 -if test -f "$LUA_VERSION.tar.gz"; then - echo "Lua already present on this machine" -else - wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz -fi - -tar xvfz $LUA_VERSION.tar.gz -cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp -cat /tmp/lua.temp > $LUA_VERSION/src/Makefile -#rm -f /tmp/lua.temp -cd $LUA_VERSION; make posix; cd .. - -LUA_LIB_DIR=$PWD/$LUA_VERSION"/src" -LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} " -INCS="${INCS} -I${LUA_LIB_DIR}" +dnl> LUA_VERSION=lua-5.1.4 +dnl> if test -f "$LUA_VERSION.tar.gz"; then +dnl> echo "Lua already present on this machine" +dnl> else +dnl> wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz +dnl> fi +dnl> +dnl> tar xvfz $LUA_VERSION.tar.gz +dnl> cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp +dnl> cat /tmp/lua.temp > $LUA_VERSION/src/Makefile +dnl> #rm -f /tmp/lua.temp +dnl> cd $LUA_VERSION; make posix; cd .. +dnl> +dnl> LUA_LIB_DIR=$PWD/$LUA_VERSION"/src" +LIBS="-L$libdir -llua ${LIBS} " +INCS="${INCS} -I/usr/include" AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported]) dnl> @@ -1963,39 +1963,39 @@ fi dnl> GeoIP (http://www.maxmind.com/) -if test -f "GeoIP.tar.gz"; then - echo "GeoIP already present on this machine" -else - wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz -fi -tar xvfz GeoIP.tar.gz -GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. -# OSX Fix -GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" -if test -f $GEO_DYLIB; then - ln -s $GEO_DYLIB . -fi - -if test -f "GeoLiteCity.dat"; then - echo "GeoLiteCity.dat already present" -else - wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz - gunzip GeoLiteCity.dat.gz -fi - -if test -f "GeoIPASNum.dat"; then - echo "GeoIPASNum.dat already present" -else - wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz - gunzip GeoIPASNum.dat.gz -fi - - +dnl> if test -f "GeoIP.tar.gz"; then +dnl> echo "GeoIP already present on this machine" +dnl> else +dnl> wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz +dnl> fi +dnl> tar xvfz GeoIP.tar.gz +dnl> GEO_DIR=`find $PWD -type d -name "GeoIP-*"` +dnl> cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. +dnl> # OSX Fix +dnl> GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" +dnl> if test -f $GEO_DYLIB; then +dnl> ln -s $GEO_DYLIB . +dnl> fi +dnl> +dnl> if test -f "GeoLiteCity.dat"; then +dnl> echo "GeoLiteCity.dat already present" +dnl> else +dnl> wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz +dnl> gunzip GeoLiteCity.dat.gz +dnl> fi +dnl> +dnl> if test -f "GeoIPASNum.dat"; then +dnl> echo "GeoIPASNum.dat already present" +dnl> else +dnl> wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz +dnl> gunzip GeoIPASNum.dat.gz +dnl> fi +dnl> +dnl> GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -GEO_IP="$GEO_DIR/libGeoIP/" +GEO_IP="/usr/include/" CFLAGS="$CFLAGS -I$GEO_IP" -LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS" +LDFLAGS="-L$libdir -lGeoIP $LDFLAGS" dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) --- autogen.sh 2009/08/05 08:56:13 1.1 +++ autogen.sh 2009/08/05 08:56:34 @@ -247,15 +247,15 @@ GNU_OR_DIE=0 } -WGET=`find_command 'wget*'` -($WGET --version) < /dev/null > /dev/null 2>&1 || -{ - echo - echo "You must have wget installed to compile $progname." - echo "Download the appropriate package for your distribution, or get the" - echo "source tarball from ftp://ftp.gnu.org/pub/gnu/wget" - GNU_OR_DIE=0 -} +# WGET=`find_command 'wget*'` +# ($WGET --version) < /dev/null > /dev/null 2>&1 || +# { +# echo +# echo "You must have wget installed to compile $progname." +# echo "Download the appropriate package for your distribution, or get the" +# echo "source tarball from ftp://ftp.gnu.org/pub/gnu/wget" +# GNU_OR_DIE=0 +# } if test "$GNU_OR_DIE" -eq 0; then exit 1 --- Makefile.am.orig 2009-04-17 20:27:57.000000000 +0000 +++ Makefile.am 2009-08-05 14:07:49.000000000 +0000 @@ -73,12 +73,9 @@ ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share" ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD" -NTOPDATA = ntop-cert.pem \ - $(ETTER_PASSIVE) \ +NTOPDATA = $(ETTER_PASSIVE) \ oui.txt.gz \ - specialMAC.txt.gz \ - GeoIPASNum.dat \ - GeoLiteCity.dat + specialMAC.txt.gz NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png \ html/*.css html/*.dtd \ @@ -270,8 +266,6 @@ install: install-recursive - cd @GEO_DIR@; make install - @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) @echo "" --- fcUtils.c 2009/08/06 13:13:40 1.1 +++ fcUtils.c 2009/08/06 13:13:51 @@ -659,4 +659,5 @@ strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME); entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0'; } + fclose(fd); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
