|
[-]
[+]
|
Changed |
ntop.changes
|
|
|
|
[-]
[+]
|
Changed |
ntop.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
dotpath-3.3.9.diff
^
|
| @@ -1,11 +0,0 @@
---- report.c.orig 2008-06-12 09:31:27.000000000 +0200
-+++ report.c 2008-06-12 09:44:42.000000000 +0200
-@@ -2301,7 +2301,7 @@
- if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
- snprintf(dotPath, sizeof(dotPath), "%s", buf);
- } else {
-- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
- storePrefsValue("dot.path", dotPath); /* Set the default */
- }
-
|
|
[-]
[+]
|
Deleted |
dotpath-3.3.99.1.diff
^
|
| @@ -1,11 +0,0 @@
---- report.c.orig 2008-06-12 09:31:27.000000000 +0200
-+++ report.c 2008-06-12 09:44:42.000000000 +0200
-@@ -2301,7 +2301,7 @@
- if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
- snprintf(dotPath, sizeof(dotPath), "%s", buf);
- } else {
-- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
- storePrefsValue("dot.path", dotPath); /* Set the default */
- }
-
|
|
|
Renamed |
dotpath-4.0.3.diff
^
|
|
[-]
[+]
|
Deleted |
dotpath-4.0.diff
^
|
| @@ -1,11 +0,0 @@
---- report.c.orig 2008-06-12 09:31:27.000000000 +0200
-+++ report.c 2008-06-12 09:44:42.000000000 +0200
-@@ -2301,7 +2301,7 @@
- if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
- snprintf(dotPath, sizeof(dotPath), "%s", buf);
- } else {
-- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
- storePrefsValue("dot.path", dotPath); /* Set the default */
- }
-
|
|
[-]
[+]
|
Deleted |
ntop-3.3.10.diff
^
|
| @@ -1,144 +0,0 @@
---- ssl.c 2006/01/26 12:55:30 1.1
-+++ ssl.c 2006/01/26 12:55:59
-@@ -304,7 +304,7 @@
- int term_ssl_connection(int fd) {
- int i, rc;
-
-- if(!myGlobals.sslInitialized) return;
-+ if(!myGlobals.sslInitialized) return 0;
-
- for(i=0; i<MAX_SSL_CONNECTIONS; i++) {
- if((myGlobals.ssl[i].ctx != NULL)
---- 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 2006/01/26 12:47:15 1.1
-+++ graph.c 2006/01/26 12:47:54
-@@ -2635,7 +2635,7 @@
- Counter total;
- SortedFcDomainStatsEntry *fcDomainStats;
-
-- p[MAX_FC_DOMAINS+1] = 0;
-+ p[MAX_FC_DOMAINS] = 0;
-
- hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId);
-
---- 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 \
---- pbuf.c.orig 2008-05-31 11:52:12.000000000 +0200
-+++ pbuf.c 2008-06-12 09:38:33.000000000 +0200
-@@ -3431,14 +3431,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;
---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100
-+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200
-@@ -256,10 +256,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__)
|
|
[-]
[+]
|
Deleted |
ntop-3.3.9-configure-geoip.patch.old
^
|
| @@ -1,17 +0,0 @@
---- configure.in.orig 2009-01-11 20:37:48.000000000 +0100
-+++ configure.in 2009-01-11 20:38:25.000000000 +0100
-@@ -1889,6 +1889,14 @@
- dnl> GeoIP (http://www.maxmind.com/)
- if test -f "GeoIP.tar.gz"; then
- echo "GeoIP already present on this machine"
-+ tar xvfz GeoIP.tar.gz
-+ GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
-+ cd $GEO_DIR; ./configure; make; cd ..
-+ # OSX Fix
-+ GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
-+ if test -f $GEO_DYLIB; then
-+ ln -s $GEO_DYLIB .
-+ fi
- else
- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
- tar xvfz GeoIP.tar.gz
|
|
[-]
[+]
|
Deleted |
ntop-3.3.9-geoip.patch
^
|
| @@ -1,47 +0,0 @@
---- configure.in.orig 2009-01-11 20:37:48.000000000 +0100
-+++ configure.in 2009-01-11 21:16:15.000000000 +0100
-@@ -1887,20 +1887,6 @@
- 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
-- tar xvfz GeoIP.tar.gz
-- GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
-- cd $GEO_DIR; ./configure; make; cd ..
-- # OSX Fix
-- GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
-- if test -f $GEO_DYLIB; then
-- ln -s $GEO_DYLIB .
-- fi
--fi
--
- if test -f "GeoLiteCity.dat"; then
- echo "GeoLiteCity.dat already present"
- else
-@@ -1916,10 +1902,9 @@
- fi
-
-
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
-+GEO_IP="/usr/include"
- CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
-+LDFLAGS="$LDFLAGS -L$LIBDIR -lGeoIP"
-
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
-
---- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100
-+++ Makefile.am 2009-01-11 21:25:30.000000000 +0100
-@@ -270,8 +270,6 @@
-
- install: install-recursive
-
-- cd @GEO_DIR@; make install
--
- @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
-
- @echo ""
|
|
[-]
[+]
|
Deleted |
ntop-3.3.9.diff
^
|
| @@ -1,162 +0,0 @@
---- ssl.c 2006/01/26 12:55:30 1.1
-+++ ssl.c 2006/01/26 12:55:59
-@@ -304,7 +304,7 @@
- int term_ssl_connection(int fd) {
- int i, rc;
-
-- if(!myGlobals.sslInitialized) return;
-+ if(!myGlobals.sslInitialized) return 0;
-
- for(i=0; i<MAX_SSL_CONNECTIONS; i++) {
- if((myGlobals.ssl[i].ctx != NULL)
---- 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 2006/01/26 12:47:15 1.1
-+++ graph.c 2006/01/26 12:47:54
-@@ -2635,7 +2635,7 @@
- Counter total;
- SortedFcDomainStatsEntry *fcDomainStats;
-
-- p[MAX_FC_DOMAINS+1] = 0;
-+ p[MAX_FC_DOMAINS] = 0;
-
- hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId);
-
---- 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 \
-@@ -131,7 +131,7 @@
-
- ###############
-
--.libs/libpdaPlugin.so@SO_VERSION_PATCH@:
-+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o
- @if test -f libpdaPlugin_la-pdaPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \
- else \
-@@ -143,7 +143,7 @@
-
- ###############
-
--.libs/libremotePlugin.so@SO_VERSION_PATCH@:
-+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o
- @if test -f libremotePlugin_la-remotePlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.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 \
---- pbuf.c.orig 2008-05-31 11:52:12.000000000 +0200
-+++ pbuf.c 2008-06-12 09:38:33.000000000 +0200
-@@ -3431,14 +3431,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;
---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100
-+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200
-@@ -256,10 +256,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__)
|
|
[-]
[+]
|
Deleted |
ntop-3.3.99.1-geoip.patch
^
|
| @@ -1,69 +0,0 @@
---- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100
-+++ Makefile.am 2009-01-11 21:25:30.000000000 +0100
-@@ -270,8 +270,6 @@
-
- install: install-recursive
-
-- cd @GEO_DIR@; make install
--
- @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
-
- @echo ""
---- configure.in.orig 2009-05-06 16:55:22.000000000 +0200
-+++ configure.in 2009-05-23 11:06:17.000000000 +0200
-@@ -1652,20 +1652,7 @@
- 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"
-+LUA_LIB_DIR="/usr/include"
- LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
- INCS="${INCS} -I${LUA_LIB_DIR}"
- AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
-@@ -1963,20 +1950,6 @@
- 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
-@@ -1992,10 +1965,9 @@
- fi
-
-
--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="$LDFLAGS -L$LIBDIR -lGeoIP"
-
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
-
|
|
[-]
[+]
|
Deleted |
ntop-3.3.99.1.diff
^
|
| @@ -1,103 +0,0 @@
---- ssl.c 2006/01/26 12:55:30 1.1
-+++ ssl.c 2006/01/26 12:55:59
-@@ -304,7 +304,7 @@
- int term_ssl_connection(int fd) {
- int i, rc;
-
-- if(!myGlobals.sslInitialized) return;
-+ if(!myGlobals.sslInitialized) return 0;
-
- for(i=0; i<MAX_SSL_CONNECTIONS; i++) {
- if((myGlobals.ssl[i].ctx != NULL)
---- 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 \
---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100
-+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200
-@@ -256,10 +256,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__)
|
|
[-]
[+]
|
Changed |
ntop-4.0.3.diff
^
|
| @@ -1,69 +1,178 @@
---- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100
-+++ Makefile.am 2009-01-11 21:25:30.000000000 +0100
-@@ -270,8 +270,6 @@
-
- install: install-recursive
-
-- cd @GEO_DIR@; make install
--
- @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
-
+--- ssl.c 2006/01/26 12:55:30 1.1
++++ ssl.c 2006/01/26 12:55:59
+@@ -304,7 +304,7 @@
+ int term_ssl_connection(int fd) {
+ int i, rc;
+
+- if(!myGlobals.sslInitialized) return;
++ if(!myGlobals.sslInitialized) return 0;
+
+ for(i=0; i<MAX_SSL_CONNECTIONS; i++) {
+ if((myGlobals.ssl[i].ctx != NULL)
+--- 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;
+--- 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 \
+@@ -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 \
+--- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100
++++ globals-core.h 2008-06-12 09:40:14.000000000 +0200
+@@ -256,10 +256,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__)
+--- Makefile.am.orig 2010-10-24 12:01:01.000000000 +0200
++++ Makefile.am 2011-01-13 22:17:14.468981475 +0100
+@@ -133,8 +133,7 @@
+ ntop.c pbuf.c database.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 = config.h
+ libntop_la_LIBADD = $(BASE_LIBS)
+@@ -372,22 +371,22 @@
+ dnvt:
+ @echo ""
+ @echo ""
+- @echo -n "Preparing "
+- @if test -f oui.txt; then \
+- rm -rf oui.txt; \
+- fi
+- @if test -f oui.txt.gz.old; then \
+- rm -rf oui.txt.gz.old; \
+- fi;
+- @mv oui.txt.gz oui.txt.gz.old
+- @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
+- @echo ""
+- @wget -c http://standards.ieee.org/regauth/oui/oui.txt
+- @gzip oui.txt
+- @echo ""
+- @echo ""
+- @echo -n "Old file lines were: "
+- @gunzip -c oui.txt.gz.old | wc -l
++ #@echo -n "Preparing "
++ #@if test -f oui.txt; then \
++ # rm -rf oui.txt; \
++ #fi
++ #@if test -f oui.txt.gz.old; then \
++ # rm -rf oui.txt.gz.old; \
++ #fi;
++ #@mv oui.txt.gz oui.txt.gz.old
++ #@echo "(old oui.txt.gz file is now oui.txt.gz.old)"
++ #@echo ""
++ #@wget -c http://standards.ieee.org/regauth/oui/oui.txt
++ #@gzip oui.txt
++ #@echo ""
++ #@echo ""
++ #@echo -n "Old file lines were: "
++ #@gunzip -c oui.txt.gz.old | wc -l
+ @echo -n "New file lines are: "
+ @gunzip -c oui.txt.gz | wc -l
+ @echo ""
+@@ -406,25 +405,25 @@
+ @echo "Preparing "
@echo ""
---- configure.in.orig 2009-05-06 16:55:22.000000000 +0200
-+++ configure.in 2009-05-23 11:06:17.000000000 +0200
-@@ -1652,20 +1652,7 @@
- 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"
-+LUA_LIB_DIR="/usr/include"
- LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
- INCS="${INCS} -I${LUA_LIB_DIR}"
- AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
-@@ -1963,20 +1950,6 @@
- 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
-@@ -1992,10 +1965,9 @@
- fi
-
-
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
-+GEO_IP="/usr/include"
- CFLAGS="$CFLAGS -I$GEO_IP"
|
|
|
Changed |
GeoIP.tar.bz2
^
|
|
|
Changed |
GeoIPASNum.dat.gz
^
|
|
|
Changed |
GeoLiteCity.dat.gz
^
|
|
[-]
[+]
|
Added |
etter.finger.os.gz
^
|
| @@ -0,0 +1,1815 @@
+############################################################################
+# #
+# ettercap -- etter.finger.os -- passive OS fingerprint database #
+# #
+# Copyright (C) 2001-2004 ALoR & NaGA #
+# #
+# 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. #
+# #
+############################################################################
+# #
+# Version : $Revision: 1.22 $ #
+# Last updated on : $Date: 2005/06/24 10:29:49 $ #
+# Total entries : 1765 #
+# #
+############################################################################
+# #
+# The fingerprint database has the following structure: #
+# #
+# WWWW:MSS:TTL:WS:S:N:D:T:F:LEN:OS #
+# #
+# WWWW: 4 digit hex field indicating the TCP Window Size #
+# MSS : 4 digit hex field indicating the TCP Option Maximum Segment Size #
+# if omitted in the packet or unknown it is "_MSS" #
+# TTL : 2 digit hex field indicating the IP Time To Live #
+# WS : 2 digit hex field indicating the TCP Option Window Scale #
+# if omitted in the packet or unknown it is "WS" #
+# S : 1 digit field indicating if the TCP Option SACK permitted is true #
+# N : 1 digit field indicating if the TCP Options contain a NOP #
+# D : 1 digit field indicating if the IP Don't Fragment flag is set #
+# T : 1 digit field indicating if the TCP Timestamp is present #
+# F : 1 digit ascii field indicating the flag of the packet #
+# S = SYN #
+# A = SYN + ACK #
+# LEN : 2 digit hex field indicating the length of the packet #
+# if irrilevant or unknown it is "LT" #
+# OS : an ascii string representing the OS #
+# #
+# IF YOU FIND A NEW FINGERPRING, PLEASE MAIL IT US WITH THE RESPECTIVE OS #
+# or use the appropriate form at: #
+# http://ettercap.sourceforge.net/index.php?s=stuff&p=fingerprint #
+# #
+# TO GET THE LATEST DATABASE: #
+# #
+# ettercap -U #
+# #
+############################################################################
+
+0000:05B4:80:WS:0:0:1:0:S:2C:Novell netware 5.00
+0000:_MSS:80:WS:0:0:0:0:A:LT:3Com Access Builder 4000 7.2
+0000:_MSS:FF:WS:0:0:0:0:A:28:Windows XP
+0008:_MSS:40:WS:0:0:0:0:S:28:Red Hat Linux 7.2 Kernel 2.4.7-10
+0010:_MSS:40:WS:0:0:0:0:S:28:Gentoo Linux (Kernel 2.6.6-rc1)
+0017:05B4:40:00:0:1:0:1:A:3C:Gestetner printer
+0040:_MSS:80:WS:0:0:0:0:A:LT:Gold Card Ethernet Interface Firm. Ver. 3.19 (95.01.16)
+0046:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter
+0096:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter V 1.2.4
+0100:0218:FF:WS:0:0:0:0:A:2C:Allied Hub
+0100:_MSS:80:WS:0:0:0:0:A:LT:Allied Telesyn AT-S10 version 3.0 on an AT-TS24TR hub
+0100:_MSS:80:WS:0:0:1:0:A:LT:Xyplex Network9000
+0109:0109:40:00:0:1:0:1:A:3C:Debian Potato (2.2), Linux 2.2.17
+0200:0000:40:WS:0:0:0:0:S:LT:Linux 2.0.35 - 2.0.37
+0200:0200:40:00:0:1:0:0:A:30:Linux
+0200:0200:40:WS:0:0:0:0:A:2C:Ascend MAX 1800
+0200:05B4:40:00:0:0:0:0:S:2C:Linux 2.0.35 - 2.0.38
+0200:05B4:40:00:0:0:0:0:S:LT:Linux 2.0.38
+0200:05B4:40:34:0:0:0:0:S:LT:Linux 2.0.33
+0200:05B4:40:WS:0:0:0:0:S:2C:Linux 2.0.34-38
+0200:05B4:40:WS:0:0:0:0:S:LT:Linux 2.0.36
+0200:05B4:FF:WS:0:0:0:0:A:2C:Router 3Com 812 ADSL
+0200:_MSS:40:WS:0:0:0:0:S:28:Windows XP
+0200:_MSS:40:WS:0:0:1:0:A:28:ESESA TCP/IP Stack
+0200:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
+0200:_MSS:80:00:0:1:0:0:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
+0200:_MSS:80:00:0:1:0:1:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
+0200:_MSS:80:WS:0:0:0:0:A:LT:3COM / USR TotalSwitch Firmware: 02.02.00R
+0212:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
+0212:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
+0212:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
+0212:_MSS:80:WS:0:0:0:0:A:LT:CacheOS (CacheFlow 2000 proxy cache)
+0212:_MSS:80:WS:0:0:1:0:A:LT:Linux 2.2.5 - 2.2.13 SMP
+0212:_MSS:80:WS:0:1:0:0:A:LT:NetBSD 1.4 running on a SPARC IPX
+0212:_MSS:80:WS:0:1:0:1:A:LT:NetBSD 1.4 running on a SPARC IPX
+0212:_MSS:80:WS:0:1:1:0:A:LT:NetBSD 1.4 / Generic mac68k (Quadra 610)
+0212:_MSS:80:WS:0:1:1:1:A:LT:NetBSD 1.4 / Generic mac68k (Quadra 610)
+0218:0218:40:00:0:1:0:1:A:LT:NetBSD
+0218:0218:40:WS:0:0:0:0:A:2C:Windows 98
+0244:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter/PC
+03CA:_MSS:80:WS:0:0:0:0:A:LT:MPE/iX 5.5
+03E0:0550:40:05:1:1:1:1:S:LT:Windows 2000
+03E0:05B4:20:05:1:1:1:1:S:40:Windows 2000 server
+03F2:_MSS:80:00:0:0:0:0:A:LT:Lexmark Optra S Printer
+03F2:_MSS:80:WS:0:0:0:0:A:LT:Lexmark Optra S Printer
+03F6:0218:FF:WS:0:0:0:0:A:2C:Lexmark Optra SC Printer
+03F6:_MSS:80:WS:0:0:0:0:A:LT:Lexmark Optra S Printer
+0400:0109:40:10:0:1:0:1:S:3C:Linux
+0400:0200:FF:WS:0:0:0:0:A:2C:Zyxel Prestige 10
+0400:0218:FF:WS:0:0:0:0:A:2C:3Com Superstack II
+0400:0400:20:WS:0:0:0:0:A:2C:Windows 2000
+0400:0400:40:00:1:1:0:1:A:3C:ElsaLanCom (SoHo ISDN Router)
+0400:0400:80:WS:0:0:0:0:A:2C:Prime SharePH-1UNW (hardware printserver)
+0400:0400:80:WS:0:0:0:0:S:2C:NCSA 2.3.07
+0400:0500:80:WS:0:0:0:0:A:2C:ITC Version i7.13 of 02-07-99 (embedded device)
+0400:0594:FF:WS:0:0:0:0:A:2C:3Com SuperStack 3 Switch 4400
+0400:059C:FF:WS:0:0:0:0:A:18:3Com SuperStack 3300xm version 2.71 prom 1.00
+0400:059C:FF:WS:0:0:0:0:A:2C:3Com SuperStack II 3300
+0400:05A4:FF:WS:0:0:0:0:A:2C:3Com SuperStack II 3000
+0400:05B4:40:00:0:1:0:1:S:3C:Windows 44
+0400:05B4:40:WS:0:0:0:0:A:2C:FORE ES-2810 Switch
+0400:05B4:FF:WS:0:0:0:0:A:2C:3Com 812 ADSL ROUTER
+0400:05C8:20:WS:0:0:0:0:A:2C:Nortel BayStack Access Node
+0400:0901:40:10:0:1:0:1:S:3C:Mac OS X 102.4
+0400:_MSS:40:WS:0:0:0:0:S:28:Linux 2.4.18
+0400:_MSS:80:00:0:1:0:0:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
+0400:_MSS:80:00:0:1:0:1:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
+0400:_MSS:80:WS:0:0:0:0:A:LT:3com Office Connect Router 810
+0400:_MSS:80:WS:0:0:1:0:A:LT:Aironet 630-2400 V3.3P Wireless LAN bridge
+0420:0114:40:00:1:1:1:1:A:3C:Linux 2.4.18-rc4
+0424:_MSS:80:WS:0:0:0:0:A:LT:Intel InBusiness Print Station
+0430:_MSS:80:WS:0:0:0:0:A:LT:PacketShaper 4000 v4.1.3b2 2000-04-05
+052A:052A:40:00:1:1:0:1:A:3C:Debian Potato (2.2), Linux 2.2.20
+0534:0534:80:WS:0:0:1:0:A:2C:Netware
+0550:0550:40:WS:0:0:0:0:A:2C:Linux 2.4
+0564:0564:40:00:1:1:1:1:A:3C:Linux kernel 2.4
+0564:0564:40:WS:0:0:0:0:A:2C:Linux
+0564:0564:40:WS:1:0:1:1:A:38:Linux 2.4
+0564:0564:80:WS:1:1:1:0:A:LT:Windows 2000
+0564:6405:40:00:0:1:1:1:A:3C:Solaris
+0564:6405:40:WS:0:1:1:1:A:38:Mac OS
+0578:0578:08:WS:0:0:0:0:A:2C:Minix 16-bit/Intel 2.0.3
+0578:0578:40:WS:0:0:0:0:A:2C:CVP Telsey
+0578:0578:40:WS:0:0:0:0:S:2C:Windows 2000
+0578:_MSS:40:WS:0:0:0:0:A:28:Elsa Router
+0578:_MSS:80:WS:0:0:0:0:A:LT:Minix 32-bit/Intel 2.0.0
+0584:0584:80:00:1:1:1:1:A:3C:Red Hat Linux 8.0 (Psyche)
+0584:0584:FF:00:0:1:1:1:A:3C:OpenBSD
+05AC:0218:40:WS:0:0:0:0:A:2C:AXIS Printer
+05B4:03E8:40:00:0:1:1:1:A:3C:Mac OS X 10.3.8
+05B4:052A:40:00:0:1:0:1:A:3C:NetBSD 1.6.1
+05B4:052A:40:00:1:1:0:1:A:3C:Debian Sarge, Linux 2.4.24-1
+05B4:0564:40:01:0:1:1:1:A:3C:FreeBSD 5.1-RELEASE
+05B4:0564:40:WS:1:1:0:0:A:30:Red Hat Linux 9.0
+05B4:0564:80:WS:1:1:0:0:A:30:Windows 2000
+05B4:05B4:20:WS:0:0:0:0:A:2C:Windows XP
+05B4:05B4:40:00:0:1:0:1:S:3C:HP LaserJet 4550 Printer
+05B4:05B4:40:00:0:1:1:1:A:3C:FreeBSD
+05B4:05B4:40:00:1:1:1:1:A:3C:Red Hat Linux release 6.2 (Zoot) Kernel 2.2.14-5.0
+05B4:05B4:40:00:1:1:1:1:A:40:SunOS 5.8
+05B4:05B4:40:01:1:1:1:1:A:40:Solaris 8
+05B4:05B4:40:WS:1:1:1:0:A:30:Windows 2000 Server
+05B4:05B4:40:WS:1:1:1:0:S:30:Windows XP SP1
+05B4:05B4:80:WS:0:0:0:0:A:2C:Zebra ZPL
+05B4:05B4:80:WS:1:1:1:0:A:30:Windows 2000 Server
+05B4:05B4:FF:00:1:1:1:1:A:40:Solaris 7
+05B4:05B4:FF:WS:0:0:0:0:A:2C:FreeBSD/i386
+05B4:B405:40:00:0:1:1:1:A:LT:Red Hat 7.1 (kernel 2.4.3)
+05B4:B405:80:00:0:1:1:1:A:LT:Windows 2000 Server
+05B4:_MSS:80:00:0:1:0:0:A:LT:HP JetDirect Card (J4169A) in an HP LaserJet 8150
+05B4:_MSS:80:WS:0:0:0:0:A:LT:TOPS-20 Monitor 7(102540)-1,TD-1
+05B4:_MSS:80:WS:0:1:1:0:A:LT:Network Appliance NetCache 5.1D4
+05B4:_MSS:80:WS:0:1:1:1:A:LT:Network Appliance NetCache 5.1D4
+05DC:0FD8:40:WS:0:0:0:0:A:2C:D-Link dsl604 wireless router
+05DC:_MSS:80:WS:0:0:0:0:A:LT:Gandalf LanLine Router
+05EA:05EA:20:WS:0:0:0:0:A:2C:Pocket pc 2003
+0600:0300:20:WS:0:0:0:0:S:2C:Chase IOLAN Terminal Server v3.3.09 - TCP
+0600:_MSS:80:WS:0:0:0:0:A:LT:Chase IOLAN Terminal Server v3.5.02 CDi
+0640:05B4:40:WS:0:0:0:0:A:2C:APC MasterSwitch Network Power Controller
+0640:_MSS:80:WS:0:0:0:0:A:LT:APC MasterSwitch Network Power Controller
+0648:0218:40:WS:0:0:0:0:A:2C:HP Printer
+0648:_MSS:80:WS:0:0:0:0:A:LT:FastComm FRAD F9200-DS-DNI -- Ver. 4.2.3A
+06C2:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRAS Remote Access Server v1.1.8 - 1.3.12
+0700:_MSS:80:00:0:0:0:0:A:LT:Lantronix ETS16P Version V3.5/2(970721)
+0700:_MSS:80:WS:0:0:0:0:A:LT:Lantronix ETS16P Version V3.5/2(970721)
+073F:_MSS:80:00:0:0:0:0:A:LT:Novell NetWare 3.12 or 386 TCP/IP
+073F:_MSS:80:WS:0:0:0:0:A:LT:CLIX R3.1 Vr.7.6.20 6480
+07D0:_MSS:80:00:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
+07D0:_MSS:80:WS:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
+0800:0109:40:10:0:1:0:1:S:3C:Linux
+0800:0200:FF:WS:0:0:0:0:A:2C:Cisco
+0800:0578:FF:WS:0:0:0:0:A:2C:NetGear Hardware Router
+0800:_MSS:40:WS:0:0:0:0:A:28:Connexa
+0800:_MSS:40:WS:0:0:0:0:S:28:Window 2000 SP3
+0800:_MSS:80:00:0:0:0:0:A:LT:KA9Q
+0800:_MSS:80:00:0:0:0:1:A:LT:KA9Q
+0800:_MSS:80:WS:0:0:0:0:A:LT:3Com Access Builder 4000 7.2
+0800:_MSS:80:WS:0:0:1:0:A:LT:HP Procurve Routing Switch 9304M
+0808:_MSS:80:WS:0:0:0:0:A:LT:Siemens HICOM 300 Phone switch (WAML LAN card)
+0834:0578:FF:WS:0:0:0:0:A:2C:BeWan 2.3.6
+0834:7805:FF:WS:0:0:0:0:A:2C:Vigor 2900G
+0848:_MSS:80:WS:0:0:0:0:A:LT:Intergraph Workstation (2000 Series) running CLiX R3.1
+0860:0218:40:00:1:1:1:0:S:30:Windows 9x
+0860:0218:40:00:1:1:1:0:S:3C:Windows 9x
+0860:0218:40:00:1:1:1:0:S:LT:Windows 9x
+0860:0218:40:WS:0:0:0:0:A:2C:Windows 98
+0860:0218:80:WS:0:0:1:0:A:2C:Windows 98
+0860:0218:FF:WS:0:0:0:0:S:LT:Cisco IGS 3000 IOS 11.x(16), 2500 IOS 11.2(3)P
+0860:05B4:40:WS:0:0:1:0:A:2C:Windows 98
|
|
|
Deleted |
ntop-3.3.9.tar.gz
^
|
|
|
Deleted |
ntop-3.4-RC1.tar.bz2
^
|
|
|
Deleted |
ntop-3.4-pre2.tar.gz
^
|
|
|
Changed |
ntop-4.0.3.tar.bz2
^
|
|
|
Deleted |
ntop-4.0.tar.bz2
^
|
|
[-]
[+]
|
Added |
oui.txt.gz
^
|
| @@ -0,0 +1,92117 @@
+
+OUI Organization
+company_id Organization
+ Address
+
+
+00-00-00 (hex) XEROX CORPORATION
+000000 (base 16) XEROX CORPORATION
+ M/S 105-50C
+ 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-01 (hex) XEROX CORPORATION
+000001 (base 16) XEROX CORPORATION
+ ZEROX SYSTEMS INSTITUTE
+ M/S 105-50C 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-02 (hex) XEROX CORPORATION
+000002 (base 16) XEROX CORPORATION
+ XEROX SYSTEMS INSTITUTE
+ M/S 105-50C 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-03 (hex) XEROX CORPORATION
+000003 (base 16) XEROX CORPORATION
+ ZEROX SYSTEMS INSTITUTE
+ M/S 105-50CEW AVENUE 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-04 (hex) XEROX CORPORATION
+000004 (base 16) XEROX CORPORATION
+ OFFICE SYSTEMS DIVISION
+ M/S 105-50C 800 PHILLIPS ROAD4
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-05 (hex) XEROX CORPORATION
+000005 (base 16) XEROX CORPORATION
+ OFFICE SYSTEMS DIVISION
+ M/S 105-50C 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-06 (hex) XEROX CORPORATION
+000006 (base 16) XEROX CORPORATION
+ OFFICE SYSTEMS DIVISION
+ M/S 105-50C 800 PHILLIPS ROAD4
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-07 (hex) XEROX CORPORATION
+000007 (base 16) XEROX CORPORATION
+ OFFICE SYSTEMS DIVISION
+ M/S 105-50C 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-08 (hex) XEROX CORPORATION
+000008 (base 16) XEROX CORPORATION
+ OFFICE SYSTEMS DIVISION
+ M/S/ 105-50C 800 PHILLIPS ROAD
+ WEBSTER NY 14580
+ UNITED STATES
+
+00-00-09 (hex) XEROX CORPORATION
+000009 (base 16) XEROX CORPORATION
+ 1350 JEFFERSON ROAD
+ ROCHESTER NY 14623
+ UNITED STATES
+
+00-00-0A (hex) OMRON TATEISI ELECTRONICS CO.
+00000A (base 16) OMRON TATEISI ELECTRONICS CO.
+ SECTION NFF, SYSTEM R&D LABS.
+ RESEARCH & TECH. ASSESSMNT DIV SHIMOKAII
+ KYOTO 617 JAPAN
+ JAPAN
+
+00-00-0B (hex) MATRIX CORPORATION
+00000B (base 16) MATRIX CORPORATION
+ 1203 NEW HOPE ROAD
+ RALEIGH NORTH CAROLINA 276
+ UNITED STATES
+
+00-00-0C (hex) CISCO SYSTEMS, INC.
+00000C (base 16) CISCO SYSTEMS, INC.
+ 170 WEST TASMAN DRIVE
+ SAN JOSE CA 95134-1706
+ UNITED STATES
+
+00-00-0D (hex) FIBRONICS LTD.
+00000D (base 16) FIBRONICS LTD.
+ MATAM TECHNOLOGY CENTER
+ HAIFA 31905
+ ISRAEL
+ ISRAEL
+
+00-00-0E (hex) FUJITSU LIMITED
+00000E (base 16) FUJITSU LIMITED
+ Musashi-kosugi Tower Place Bldg.,
+ Kosugi-cho 1-chome,Nakahara-ku
+ KAWASAKI 211 Kanagawa
+ JAPAN
+
+00-00-0F (hex) NEXT, INC.
+00000F (base 16) NEXT, INC.
+ 3475 DEER CREEK ROAD
+ PALO ALTO CA 94304
+ UNITED STATES
+
+00-00-10 (hex) SYTEK INC.
+000010 (base 16) SYTEK INC.
+ 1225 CHARLESTON ROAD
+ MOUNTAIN VIEW CA 94043
+ UNITED STATES
+
+00-00-11 (hex) NORMEREL SYSTEMES
+000011 (base 16) NORMEREL SYSTEMES
+ 58 RUE POTTIER
+ 78150 LE CHESNAY
+ FRANCE
+ FRANCE
+
+00-00-12 (hex) INFORMATION TECHNOLOGY LIMITED
+000012 (base 16) INFORMATION TECHNOLOGY LIMITED
+ MAYLANDS AVE. HEMEL HEMPSTEAD
+ HERTS ENGLAND
+ UNITED KINGDOM
+
+00-00-13 (hex) CAMEX
+000013 (base 16) CAMEX
+ 75 KNEELAND STREET
+ BOSTON MA 02111
+ UNITED STATES
+
+00-00-14 (hex) NETRONIX
+000014 (base 16) NETRONIX
+ 1372 MCDOWELL BLVD.
+ PETULAMA CA 94952
+ UNITED STATES
+
+00-00-15 (hex) DATAPOINT CORPORATION
+000015 (base 16) DATAPOINT CORPORATION
+ 9725 DATAPOINT DRIVE
+ MS S-37
+ SAN ANTONIO TX 78284
+ UNITED STATES
+
+00-00-16 (hex) DU PONT PIXEL SYSTEMS .
+000016 (base 16) DU PONT PIXEL SYSTEMS .
+ MEADLAKE PLACE
+ THORPE LEA ROAD EGHAM, SURREY TW20 8HE
+ ENGLAND
+ UNITED KINGDOM
+
+00-00-17 (hex) TEKELEC
+000017 (base 16) TEKELEC
+ 26540 AGOURA ROAD
+ CALABASAS CA 91302
+ UNITED STATES
+
+00-00-18 (hex) WEBSTER COMPUTER CORPORATION
+000018 (base 16) WEBSTER COMPUTER CORPORATION
+ 16040 REDWOOD LODGE ROAD
+ LOS GATOS CA 95033-9260
+ UNITED STATES
+
+00-00-19 (hex) APPLIED DYNAMICS INTERNATIONAL
+000019 (base 16) APPLIED DYNAMICS INTERNATIONAL
+ 3800 STONE SCHOOL ROAD
+ ANN ARBOR MI 48104-2499
+ UNITED STATES
+
+00-00-1A (hex) ADVANCED MICRO DEVICES
+00001A (base 16) ADVANCED MICRO DEVICES
+ P.O. BOX 3453
+ M/S 26
+ SUNNYVALE CA 94088
+ UNITED STATES
+
+00-00-1B (hex) NOVELL INC.
+00001B (base 16) NOVELL INC.
+ 122 EAST 1700 SOUTH
+ M/S: E-12-1
+ PROVO UT 84606
+ UNITED STATES
+
+00-00-1C (hex) BELL TECHNOLOGIES
+00001C (base 16) BELL TECHNOLOGIES
+ 330 WARREN AVENUE
+ FREMONT CA 94539
+ UNITED STATES
+
+00-00-1D (hex) CABLETRON SYSTEMS, INC.
+00001D (base 16) CABLETRON SYSTEMS, INC.
|
