head	1.15;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.15
	OPENPKG_E1_MP:1.15
	OPENPKG_E1_MP_2_STABLE:1.13.2.1
	OPENPKG_E1_FP:1.13.2.1
	OPENPKG_2_STABLE_MP:1.15
	OPENPKG_2_STABLE_20061018:1.13.2.1
	OPENPKG_2_STABLE_20060622:1.13
	OPENPKG_2_STABLE:1.13.0.2
	OPENPKG_2_STABLE_BP:1.13
	OPENPKG_2_5_RELEASE:1.12.2.1
	OPENPKG_2_5_SOLID:1.12.0.2
	OPENPKG_2_5_SOLID_BP:1.12
	OPENPKG_2_4_RELEASE:1.10
	OPENPKG_2_4_SOLID:1.10.0.2
	OPENPKG_2_4_SOLID_BP:1.10
	OPENPKG_CW_FP:1.9
	OPENPKG_2_3_RELEASE:1.9
	OPENPKG_2_3_SOLID:1.9.0.2
	OPENPKG_2_3_SOLID_BP:1.9;
locks; strict;
comment	@# @;


1.15
date	2006.12.01.13.06.30;	author rse;	state Exp;
branches;
next	1.14;
commitid	9xoaOVpJkkoxXOWr;

1.14
date	2006.10.09.08.02.04;	author rse;	state Exp;
branches;
next	1.13;
commitid	ge2a3mwDyEiJYYPr;

1.13
date	2005.10.14.09.34.44;	author rse;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2005.09.27.12.44.19;	author rse;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	2005.07.22.14.48.58;	author rse;	state Exp;
branches;
next	1.10;

1.10
date	2005.05.15.17.51.33;	author rse;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2004.12.25.12.38.43;	author rse;	state Exp;
branches;
next	1.8;

1.8
date	2004.12.25.09.44.49;	author rse;	state Exp;
branches;
next	1.7;

1.7
date	2004.12.25.09.32.22;	author rse;	state Exp;
branches;
next	1.6;

1.6
date	2004.12.24.20.56.08;	author rse;	state Exp;
branches;
next	1.5;

1.5
date	2004.12.23.13.26.13;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2004.12.17.22.26.29;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.12.17.18.54.38;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.12.17.16.02.20;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2004.12.16.12.58.02;	author rse;	state Exp;
branches;
next	;

1.13.2.1
date	2006.10.16.14.50.03;	author rse;	state Exp;
branches;
next	1.13.2.2;
commitid	iZxwRSmmWscPXUQr;

1.13.2.2
date	2006.12.22.19.13.22;	author thl;	state Exp;
branches;
next	;
commitid	2LefOfqsS8nsjyZr;

1.12.2.1
date	2005.10.14.09.35.29;	author rse;	state Exp;
branches;
next	;

1.10.2.1
date	2005.07.22.14.51.18;	author rse;	state Exp;
branches;
next	;


desc
@@


1.15
log
@fix tracking of flow-extract and upgrade to latest version
@
text
@Index: flow-tools-0.68/configs/Makefile.in
--- flow-tools-0.68/configs/Makefile.in.orig	2005-05-11 16:20:16 +0200
+++ flow-tools-0.68/configs/Makefile.in	2005-05-15 19:46:26 +0200
@@@@ -88,10 +88,10 @@@@
 am__include = @@am__include@@
 am__quote = @@am__quote@@
 install_sh = @@install_sh@@
-ftsymdir = $(localstatedir)/sym
+ftsymdir = $(datadir)
 ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
 
-ftcfgdir = $(localstatedir)/cfg
+ftcfgdir = $(sysconfdir)
 ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
 subdir = configs
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: flow-tools-0.68/configure
--- flow-tools-0.68/configure.orig	2005-05-11 16:15:55 +0200
+++ flow-tools-0.68/configure	2005-05-15 19:45:32 +0200
@@@@ -1662,7 +1662,6 @@@@
 
 
 
-CFLAGS="-g -Wall"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@@@ -3204,7 +3203,7 @@@@
 
 
 if test "x$WHERE_MYSQL" != "x"; then
-  LIBS="-L$WHERE_MYSQL/lib/mysql"
+  LIBS="-L$WHERE_MYSQL/lib/mysql $LIBS"
   echo "$as_me:$LINENO: checking for my_init in -lmysqlclient" >&5
 echo $ECHO_N "checking for my_init in -lmysqlclient... $ECHO_C" >&6
 if test "${ac_cv_lib_mysqlclient_my_init+set}" = set; then
@@@@ -3345,7 +3344,7 @@@@
 
 
 if test "x$WHERE_PGSQL" != "x"; then
-  LIBS="-L$WHERE_PGSQL/lib/pgsql"
+  LIBS="-L$WHERE_PGSQL/lib $LIBS"
   echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
 echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6
 if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
@@@@ -3402,7 +3401,7 @@@@
 echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
 if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
 
-      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
+      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/postgresql"
       PGSQLLIB="-lpq"
       cat >>confdefs.h <<\_ACEOF
 #define HAVE_PGSQL 1
Index: flow-tools-0.68/docs/flow-capture.1.in
--- flow-tools-0.68/docs/flow-capture.1.in.orig	2004-01-02 22:26:21 +0100
+++ flow-tools-0.68/docs/flow-capture.1.in	2005-05-15 19:45:32 +0200
@@@@ -123,7 +123,7 @@@@
 Configure the number of times flow-capture will create a new file per day\&.
 The default is 95, or every 15 minutes\&.
 .IP "-N\fI nesting_level\fP" 10
-Configure the nesting level for storing flow files\&.  The default is 0\&.
+Configure the nesting level for storing flow files\&.  The default is 3\&.
    -3    YYYY/YYYY-MM/YYYY-MM-DD/flow-file
    -2    YYYY-MM/YYYY-MM-DD/flow-file
    -1    YYYY-MM-DD/flow-file
@@@@ -184,10 +184,9 @@@@
 .SH "EXAMPLES"
 .PP
 Receive flows from the exporter at 10\&.0\&.0\&.1 port 9800\&.  Maintain 5 Gigabytes
-of flow files in /flows/krc4\&.  Mask the source and destination IP addresses
-contained in the flow exports with 255\&.255\&.248\&.0\&.
+of flow files in /flows/krc4\&.
 .PP
-  \fBflow-capture -w /flows/krc4 -m 255\&.255\&.248\&.0 -E5G 0/10\&.0\&.0\&.1/9800\fP
+  \fBflow-capture -w /flows/krc4 -E5G 0/10\&.0\&.0\&.1/9800\fP
 .PP
 Receive flows from any exporter on port 9800\&.  Do not perform any flow
 file space management\&.  Store the exports in /flows/krc4\&.  Emit a stat
Index: flow-tools-0.68/lib/ftpaths.h.in
--- flow-tools-0.68/lib/ftpaths.h.in.orig	2003-11-11 17:49:14 +0100
+++ flow-tools-0.68/lib/ftpaths.h.in	2005-05-15 19:45:32 +0200
@@@@ -29,17 +29,17 @@@@
 #ifndef FTPATHS_H
 #define FTPATHS_H
 
-#define FT_PATH_CFG_MAP             "@@localstatedir@@/cfg/map.cfg"
-#define FT_PATH_CFG_TAG             "@@localstatedir@@/cfg/tag.cfg"
-#define FT_PATH_CFG_FILTER          "@@localstatedir@@/cfg/filter.cfg"
-#define FT_PATH_CFG_STAT            "@@localstatedir@@/cfg/stat.cfg"
-#define FT_PATH_CFG_MASK            "@@localstatedir@@/cfg/mask.cfg"
-#define FT_PATH_CFG_XLATE           "@@localstatedir@@/cfg/xlate.cfg"
+#define FT_PATH_CFG_MAP             "@@sysconfdir@@/map.cfg"
+#define FT_PATH_CFG_TAG             "@@sysconfdir@@/tag.cfg"
+#define FT_PATH_CFG_FILTER          "@@sysconfdir@@/filter.cfg"
+#define FT_PATH_CFG_STAT            "@@sysconfdir@@/stat.cfg"
+#define FT_PATH_CFG_MASK            "@@sysconfdir@@/mask.cfg"
+#define FT_PATH_CFG_XLATE           "@@sysconfdir@@/xlate.cfg"
 
-#define FT_PATH_SYM_IP_PROT         "@@localstatedir@@/sym/ip-prot.sym"
-#define FT_PATH_SYM_IP_TYPE         "@@localstatedir@@/sym/ip-type.sym"
-#define FT_PATH_SYM_TCP_PORT        "@@localstatedir@@/sym/tcp-port.sym"
-#define FT_PATH_SYM_ASN             "@@localstatedir@@/sym/asn.sym"
-#define FT_PATH_SYM_TAG             "@@localstatedir@@/sym/tag.sym"
+#define FT_PATH_SYM_IP_PROT         "@@datadir@@/ip-prot.sym"
+#define FT_PATH_SYM_IP_TYPE         "@@datadir@@/ip-type.sym"
+#define FT_PATH_SYM_TCP_PORT        "@@datadir@@/tcp-port.sym"
+#define FT_PATH_SYM_ASN             "@@datadir@@/asn.sym"
+#define FT_PATH_SYM_TAG             "@@datadir@@/tag.sym"
 
 #endif /* FTPATHS_H */
Index: flow-tools-0.68/lib/support.c
--- flow-tools-0.68/lib/support.c.orig	2003-02-13 03:38:43 +0100
+++ flow-tools-0.68/lib/support.c	2005-05-15 19:45:32 +0200
@@@@ -500,26 +500,19 @@@@
 int write_pidfile(int pid, char *file, u_int16 port)
 {
   int fd, len;
-  char str[16], *c;
+  char str[16];
   
-  if (!(c = (char*)malloc(strlen(file)+16)))
-    return -1;
-
-  sprintf(c, "%s.%d", file, (int)port);
-    
   len = sprintf(str, "%u\n", (unsigned)pid);
 
-  if ((fd = open(c, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
-    fterr_warn("open(%s)", c);
-    free (c);
+  if ((fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
+    fterr_warn("open(%s)", file);
     return -1; 
   }
 
 
   if (write(fd, str, len) != len) {
-    fterr_warn("write(%s)", c);
+    fterr_warn("write(%s)", file);
     close (fd);
-    free (c);
     return -1;
   }
 
Index: flow-tools-0.68/src/flow-export.c
--- flow-tools-0.68/src/flow-export.c.orig	2004-03-31 05:11:14 +0200
+++ flow-tools-0.68/src/flow-export.c	2005-05-15 19:45:32 +0200
@@@@ -51,12 +51,12 @@@@
 
 #include <mysql.h>
 
-#define DB_DEFAULT_DBHOST "localhost"
-#define DB_DEFAULT_DBNAME "netflow"
-#define DB_DEFAULT_DBPORT 3306
-#define DB_DEFAULT_DBTABLE "raw"
-#define DB_DEFAULT_DBUSER "netflow"
-#define DB_DEFAULT_DBPWD "netflow"
+#define MYSQL_DB_DEFAULT_DBHOST "localhost"
+#define MYSQL_DB_DEFAULT_DBNAME "netflow"
+#define MYSQL_DB_DEFAULT_DBPORT 3306
+#define MYSQL_DB_DEFAULT_DBTABLE "raw"
+#define MYSQL_DB_DEFAULT_DBUSER "netflow"
+#define MYSQL_DB_DEFAULT_DBPWD "netflow"
 
 #endif /* MYSQL */
 
@@@@ -64,12 +64,12 @@@@
 
 #include <libpq-fe.h>
 
-#define DB_DEFAULT_DBHOST "localhost"
-#define DB_DEFAULT_DBNAME "netflow"
-#define DB_DEFAULT_DBPORT "5432"
-#define DB_DEFAULT_DBTABLE "raw"
-#define DB_DEFAULT_DBUSER "netflow"
-#define DB_DEFAULT_DBPWD "netflow"
+#define PGSQL_DB_DEFAULT_DBHOST "localhost"
+#define PGSQL_DB_DEFAULT_DBNAME "netflow"
+#define PGSQL_DB_DEFAULT_DBPORT "5432"
+#define PGSQL_DB_DEFAULT_DBTABLE "raw"
+#define PGSQL_DB_DEFAULT_DBUSER "netflow"
+#define PGSQL_DB_DEFAULT_DBPWD "netflow"
 
 #endif /* PGSQL*/
 
@@@@ -695,12 +695,12 @@@@
 
   MYSQL mysql;
 
-  db_host = DB_DEFAULT_DBHOST;
-  db_name = DB_DEFAULT_DBNAME;
-  db_port = DB_DEFAULT_DBPORT;
-  db_user = DB_DEFAULT_DBUSER;
-  db_table = DB_DEFAULT_DBTABLE;
-  db_pwd = DB_DEFAULT_DBPWD;
+  db_host = MYSQL_DB_DEFAULT_DBHOST;
+  db_name = MYSQL_DB_DEFAULT_DBNAME;
+  db_port = MYSQL_DB_DEFAULT_DBPORT;
+  db_user = MYSQL_DB_DEFAULT_DBUSER;
+  db_table = MYSQL_DB_DEFAULT_DBTABLE;
+  db_pwd = MYSQL_DB_DEFAULT_DBPWD;
 
   /* parse URI string */
 
@@@@ -759,10 +759,6 @@@@
       strcat (query, values);
       strcat (query, ")");
 
-      if (debug)
-        fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
-          query);
-
       if (mysql_real_query(&mysql, query, strlen(query)) != 0) 
         fterr_warnx("mysql_real_query(): %s", mysql_error(&mysql));
 
@@@@ -872,12 +868,12 @@@@
   PGconn     *conn;
   PGresult   *res;
 
-  db_host = DB_DEFAULT_DBHOST;
-  db_name = DB_DEFAULT_DBNAME;
-  db_port = DB_DEFAULT_DBPORT;
-  db_user = DB_DEFAULT_DBUSER;
-  db_table = DB_DEFAULT_DBTABLE;
-  db_pwd = DB_DEFAULT_DBPWD;
+  db_host = PGSQL_DB_DEFAULT_DBHOST;
+  db_name = PGSQL_DB_DEFAULT_DBNAME;
+  db_port = PGSQL_DB_DEFAULT_DBPORT;
+  db_user = PGSQL_DB_DEFAULT_DBUSER;
+  db_table = PGSQL_DB_DEFAULT_DBTABLE;
+  db_pwd = PGSQL_DB_DEFAULT_DBPWD;
 
   /* parse URI string */
 
@@@@ -930,10 +926,6 @@@@
       strcat (query, values);
       strcat (query, ")");
 
-      if (debug)
-        fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
-          query);
-
       res = PQexec(conn, query);
       if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
         PQclear(res);
Index: flow-tools-0.68/src/flow-fanout.c
--- flow-tools-0.68/src/flow-fanout.c.orig	2005-05-10 17:52:52 +0200
+++ flow-tools-0.68/src/flow-fanout.c	2005-05-15 19:49:06 +0200
@@@@ -498,7 +498,7 @@@@
     /* unicast bind -- multicast support */
     if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
       sizeof(ftnet.loc_addr)) < 0)
-      fterr_err(1, "bind(loc_addr)");
+      fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
 
   } /* not multicast group */
 
@@@@ -511,7 +511,7 @@@@
   /* unicast bind -- no multicast support */
   if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
     sizeof(ftnet.loc_addr)) < 0)
-    fterr_err(1, "bind(loc_addr)");
+    fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
 
 #endif /* IP_ADD_MEMBERSHIP */
 
Index: flow-extract/grammar.y
--- flow-extract/grammar.y.orig	2006-11-29 16:55:44 +0100
+++ flow-extract/grammar.y	2006-12-01 14:01:56 +0100
@@@@ -25,6 +25,9 @@@@
 #include "timesub.h"
 #include "stdunix.h"
 
+void yyerror(char *msg);
+unsigned long getmask(unsigned long addr);
+
 extern int parse_error;
 #define TCPDATA 6
 #define UDPDATA 17
@@@@ -1159,15 +1162,15 @@@@
      { (char *)0, 0 }
      };
 
-int
-yyerror()
+void
+yyerror(char *msg)
 {
-     fprintf(stderr, "\"%s\", line %d: syntax error.\n",
-	     getfilename(), getlinenum());
+     fprintf(stderr, "\"%s\", line %d: syntax error: %s\n",
+	     getfilename(), getlinenum(), msg);
      parse_error = 1;
 }
 
-int
+unsigned long
 getmask(unsigned long addr)
 {
      if(IN_CLASSA(addr))
Index: flow-extract/hosts.c
--- flow-extract/hosts.c.orig	2006-11-28 17:28:54 +0100
+++ flow-extract/hosts.c	2006-12-01 13:56:18 +0100
@@@@ -23,7 +23,7 @@@@
 static int hnc_init = 0;
 static unsigned long hit = 0, miss = 0, coll = 0;
 
-sigusr1()
+void sigusr1(int sig)
 {
      printf("Hit/Miss: %lu/%lu, Collisions: %lu\n",
 	    hit, miss,coll);
Index: flow-extract/interp.c
--- flow-extract/interp.c.orig	2006-11-28 18:24:39 +0100
+++ flow-extract/interp.c	2006-12-01 13:56:18 +0100
@@@@ -108,10 +108,11 @@@@
                break;
 	  case TIME:
 	       if(!rectime){
+		    time_t t;
                     ftt = ftltime(genrec->sysUpTime, genrec->unix_secs,
                                   genrec->unix_nsecs, genrec->First);
-		    /* tmb = localtime(&ftt.secs); */
-		    tmb = localtime((time_t *)(&ftt.secs));
+		    t = (time_t)ftt.secs;
+		    tmb = localtime(&t);
 		    rectime = tmb->tm_hour*3600 + tmb->tm_min*60 + tmb->tm_sec;
 	       }
 	       return rectime;
Index: flow-extract/timeval.c
--- flow-extract/timeval.c.orig	2006-11-28 19:36:11 +0100
+++ flow-extract/timeval.c	2006-12-01 13:56:18 +0100
@@@@ -7,8 +7,10 @@@@
 {
      struct tm *tm;
      static char buf[50];
+     time_t t;
 
-     tm = localtime((time_t *)(&tp.secs));
+     t = (time_t)tp.secs;
+     tm = localtime(&t);
 
      sprintf(buf, "%02d/%02d/%04d %02d:%02d:%02d",
              tm->tm_mon+1,
Index: flow-tools-0.68/lib/ftfile.c
--- flow-tools-0.68/lib/ftfile.c.orig	2003-02-13 03:38:42 +0100
+++ flow-tools-0.68/lib/ftfile.c	2005-07-22 16:42:39 +0200
@@@@ -417,12 +417,14 @@@@
   long gmt_val;
   char gmt_sign;
   int tm_gmtoff;
+  time_t t;
   
-  if (!(tm = localtime ((time_t*)&ftime))) {
+  t = (time_t)ftime;
+  if (!(tm = localtime (&t))) {
     snprintf(buf, bsize, ".");
   }
 
-  tm_gmtoff = get_gmtoff(ftime);
+  tm_gmtoff = get_gmtoff(t);
 
   /* compute GMT offset */
   if (tm_gmtoff >= 0) {
@@@@ -503,6 +505,7 @@@@
 {
   struct tm *tm;
   char buf[32];
+  time_t t;
 
   /* no directories */
   if (nest == 0)
@@@@ -512,7 +515,8 @@@@
   if ((nest > 3) || (nest < -3))
     return -1;
 
-  if (!(tm = localtime ((time_t*)&ftime)))
+  t = (time_t)ftime;
+  if (!(tm = localtime (&t)))
     return -1;
 
   if (nest == -1)
Index: flow-tools-0.68/lib/ftlib.h
--- flow-tools-0.68/lib/ftlib.h.orig	2005-05-10 17:51:33 +0200
+++ flow-tools-0.68/lib/ftlib.h	2006-10-09 09:53:10 +0200
@@@@ -3026,10 +3026,13 @@@@
 int ftxfield_parse(char *line, u_int64 *xfields);
 
 #ifndef IN_CLASSD_SSM
-#define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
+#define IN_CLASSD_SSM(i) (((u_int32)(i) & 0xff000000) == 0xe8000000)
 #endif /* IN_CLASSD_SSM */
 
 /* MACHINE DEPENDANT */
 #define fmt_uint fmt_uint32
 
+/* workaround GCC 4.0 "lvalue" constraints */
+#define CPTR_ADD(ptr,add) { char *_cp = (char *)(ptr); _cp += (add); (ptr) = _cp; }
+
 #endif /* FTLIB_H */

Index: flow-tools-0.68/lib/ftio.c
--- flow-tools-0.68/lib/ftio.c.orig	2003-02-24 01:51:47 +0100
+++ flow-tools-0.68/lib/ftio.c	2005-09-27 14:37:18 +0200
@@@@ -2267,7 +2267,7 @@@@
         break;
 
       nleft -= nread;
-      (char*)ptr += nread;
+      CPTR_ADD(ptr, nread)
   }
   return (nbytes - nleft);
 } /* readn */
@@@@ -2292,7 +2292,7 @@@@
       return(nwritten); /* error */
 
     nleft -= nwritten;
-    (char*)ptr += nwritten;
+    CPTR_ADD(ptr, nwritten)
   }
   return(nbytes - nleft);
 } /* writen */
Index: flow-tools-0.68/lib/fttlv.c
--- flow-tools-0.68/lib/fttlv.c.orig	2003-02-13 03:38:43 +0100
+++ flow-tools-0.68/lib/fttlv.c	2005-09-27 14:35:25 +0200
@@@@ -68,10 +68,10 @@@@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&v, buf, 4);
 
@@@@ -107,10 +107,10 @@@@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&v, buf, 2);
 
@@@@ -145,10 +145,10 @@@@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&v, buf, 1);
 
@@@@ -183,10 +183,10 @@@@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(v, buf, len);
 
@@@@ -230,16 +230,16 @@@@
     return -1;
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  CPTR_ADD(buf, 4);
 
   bcopy(&ifIndex, buf, 2);
-  (char*)buf += 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(name, buf, n);
 
@@@@ -287,19 +287,19 @@@@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  CPTR_ADD(buf, 4);
 
   bcopy(&entries, buf, 2);
-  (char*)buf += 2;
+  CPTR_ADD(buf, 2);
 
   bcopy(ifIndex_list, buf, esize);
-  (char*)buf += esize;
+  CPTR_ADD(buf, esize);
 
   bcopy(name, buf, n);
 
Index: flow-tools-0.68/lib/ftchash.c
--- flow-tools-0.68/lib/ftchash.c.orig	2003-08-12 20:04:25 +0200
+++ flow-tools-0.68/lib/ftchash.c	2005-09-27 14:35:52 +0200
@@@@ -326,7 +326,7 @@@@
       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
 
       ret = ftch->traverse_rec;
-      (char*)ftch->traverse_rec += ftch->d_size;
+      CPTR_ADD(ftch->traverse_rec, ftch->d_size);
       return ret;
 
     } else {
Index: flow-tools-0.68/lib/ftxlate.c
--- flow-tools-0.68/lib/ftxlate.c.orig	2005-05-11 16:03:30.000000000 +0200
+++ flow-tools-0.68/lib/ftxlate.c	2005-10-14 11:30:05.597516466 +0200
@@@@ -66,15 +66,15 @@@@
 #endif
 
 struct cryptopan {
-  u_int8_t m_key[16]; /* 128 bit secret key */
-  u_int8_t m_pad[16]; /* 128 bit secret pad */
+  u_int8 m_key[16]; /* 128 bit secret key */
+  u_int8 m_pad[16]; /* 128 bit secret pad */
 #ifdef HAVE_OPENSSL
   EVP_CIPHER_CTX *cipher_ctx; /* openssl cipher context */
 #endif /* HAVE_OPENSSL */
 };
 
-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr,
-  u_int32_t *new_addr);
+static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr,
+  u_int32 *new_addr);
 static int cryptopan_free(struct cryptopan *cp);
 static int cryptopan_init(struct cryptopan *cp, unsigned char *key);
 
@@@@ -2095,12 +2095,12 @@@@
  * returns: 0 okay
  *         -1 fail
  */
-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr, u_int32_t *new_addr)
+static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr, u_int32 *new_addr)
 {
-  u_int8_t rin_output[16];
-  u_int8_t rin_input[16];
-  u_int8_t *m_pad;
-  u_int32_t result, first4bytes_pad, first4bytes_input;
+  u_int8 rin_output[16];
+  u_int8 rin_input[16];
+  u_int8 *m_pad;
+  u_int32 result, first4bytes_pad, first4bytes_input;
   int i, pos;
 
   result = 0;
@@@@ -2108,10 +2108,10 @@@@
 
   bcopy(m_pad, rin_input, 16);
 
-  first4bytes_pad = (((u_int32_t) m_pad[0]) << 24) +
-                    (((u_int32_t) m_pad[1]) << 16) +
-                    (((u_int32_t) m_pad[2]) << 8) +
-                    (u_int32_t) m_pad[3]; 
+  first4bytes_pad = (((u_int32) m_pad[0]) << 24) +
+                    (((u_int32) m_pad[1]) << 16) +
+                    (((u_int32) m_pad[2]) << 8) +
+                    (u_int32) m_pad[3]; 
 
   /*
    * For each prefixes with length from 0 to 31, generate a bit using the
@@@@ -2134,10 +2134,10 @@@@
       first4bytes_input = ((orig_addr >> (32-pos)) << (32-pos)) |
         ((first4bytes_pad<<pos) >> pos);
 
-    rin_input[0] = (u_int8_t) (first4bytes_input >> 24);
-    rin_input[1] = (u_int8_t) ((first4bytes_input << 8) >> 24);
-    rin_input[2] = (u_int8_t) ((first4bytes_input << 16) >> 24);
-    rin_input[3] = (u_int8_t) ((first4bytes_input << 24) >> 24);
+    rin_input[0] = (u_int8) (first4bytes_input >> 24);
+    rin_input[1] = (u_int8) ((first4bytes_input << 8) >> 24);
+    rin_input[2] = (u_int8) ((first4bytes_input << 16) >> 24);
+    rin_input[3] = (u_int8) ((first4bytes_input << 24) >> 24);
 
     /*
      * Encryption: The Rijndael cipher is used as pseudorandom function.
@


1.14
log
@fix building under Solaris 10/amd64 by replacing one more u_in32_t with u_int32 (which is defined in the sources)
@
text
@d268 3
a270 3
Index: flowextract-2.5/grammar.y
--- flowextract-2.5/grammar.y.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/grammar.y	2005-05-15 19:45:32 +0200
d281 2
a282 1
@@@@ -1159,10 +1162,10 @@@@
d285 1
a285 1
 void
d287 1
d297 9
a305 4
Index: flowextract-2.5/hosts.c
--- flowextract-2.5/hosts.c.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/hosts.c	2005-05-15 19:45:32 +0200
@@@@ -24,7 +24,7 @@@@
d314 4
a317 12
Index: flowextract-2.5/interp.c
--- flowextract-2.5/interp.c.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/interp.c	2005-05-15 19:45:32 +0200
@@@@ -9,6 +9,7 @@@@
 */
 #include <stdio.h>
 #include <sys/types.h>
+#include <time.h>
 #include <sys/time.h>
 #include <ftlib.h>
 #include "extract.h"
@@@@ -107,9 +108,11 @@@@
d321 1
a321 1
+            time_t t;
d324 3
a326 2
-		    tmb = localtime(&ftt.secs);
+            t = (time_t)ftt.secs;
d331 4
a334 20
Index: flowextract-2.5/timesub.c
--- flowextract-2.5/timesub.c.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/timesub.c	2005-05-15 19:45:32 +0200
@@@@ -8,6 +8,7 @@@@
 
 */
 #include <sys/types.h>
+#include <time.h>
 #include <sys/time.h>
 #include "timesub.h"
 
Index: flowextract-2.5/timeval.c
--- flowextract-2.5/timeval.c.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/timeval.c	2005-05-15 19:45:32 +0200
@@@@ -1,3 +1,4 @@@@
+#include <time.h>
 #include <sys/time.h>
 #include <ftlib.h>
 
@@@@ -6,8 +7,10 @@@@
d340 1
a340 1
-     tm = localtime(&tp.secs);
@


1.13
log
@fix building under Solaris by using u_intX local typedefs instead of relying on BSD-style u_intX_t system typedefs
@
text
@d402 9
a410 2
+++ flow-tools-0.68/lib/ftlib.h	2005-09-27 14:41:19 +0200
@@@@ -3032,4 +3032,7 @@@@
@


1.13.2.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d402 2
a403 9
+++ flow-tools-0.68/lib/ftlib.h	2006-10-09 09:53:10 +0200
@@@@ -3026,10 +3026,13 @@@@
 int ftxfield_parse(char *line, u_int64 *xfields);
 
 #ifndef IN_CLASSD_SSM
-#define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
+#define IN_CLASSD_SSM(i) (((u_int32)(i) & 0xff000000) == 0xe8000000)
 #endif /* IN_CLASSD_SSM */
 
@


1.13.2.2
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@d268 3
a270 3
Index: flow-extract/grammar.y
--- flow-extract/grammar.y.orig	2006-11-29 16:55:44 +0100
+++ flow-extract/grammar.y	2006-12-01 14:01:56 +0100
d281 1
a281 2
@@@@ -1159,15 +1162,15 @@@@
      { (char *)0, 0 }
d284 1
a284 1
-int
a285 1
+void
d295 4
a298 9
-int
+unsigned long
 getmask(unsigned long addr)
 {
      if(IN_CLASSA(addr))
Index: flow-extract/hosts.c
--- flow-extract/hosts.c.orig	2006-11-28 17:28:54 +0100
+++ flow-extract/hosts.c	2006-12-01 13:56:18 +0100
@@@@ -23,7 +23,7 @@@@
d307 12
a318 4
Index: flow-extract/interp.c
--- flow-extract/interp.c.orig	2006-11-28 18:24:39 +0100
+++ flow-extract/interp.c	2006-12-01 13:56:18 +0100
@@@@ -108,10 +108,11 @@@@
d322 1
a322 1
+		    time_t t;
d325 2
a326 3
-		    /* tmb = localtime(&ftt.secs); */
-		    tmb = localtime((time_t *)(&ftt.secs));
+		    t = (time_t)ftt.secs;
d331 20
a350 4
Index: flow-extract/timeval.c
--- flow-extract/timeval.c.orig	2006-11-28 19:36:11 +0100
+++ flow-extract/timeval.c	2006-12-01 13:56:18 +0100
@@@@ -7,8 +7,10 @@@@
d356 1
a356 1
-     tm = localtime((time_t *)(&tp.secs));
@


1.12
log
@ok, take the large hammer and get flow-tools finally to build under new GCC 4.0 world order
@
text
@d546 71
@


1.12.2.1
log
@MFC: fix building under Solaris by using u_intX local typedefs instead of relying on BSD-style u_intX_t system typedefs
@
text
@a545 71
Index: flow-tools-0.68/lib/ftxlate.c
--- flow-tools-0.68/lib/ftxlate.c.orig	2005-05-11 16:03:30.000000000 +0200
+++ flow-tools-0.68/lib/ftxlate.c	2005-10-14 11:30:05.597516466 +0200
@@@@ -66,15 +66,15 @@@@
 #endif
 
 struct cryptopan {
-  u_int8_t m_key[16]; /* 128 bit secret key */
-  u_int8_t m_pad[16]; /* 128 bit secret pad */
+  u_int8 m_key[16]; /* 128 bit secret key */
+  u_int8 m_pad[16]; /* 128 bit secret pad */
 #ifdef HAVE_OPENSSL
   EVP_CIPHER_CTX *cipher_ctx; /* openssl cipher context */
 #endif /* HAVE_OPENSSL */
 };
 
-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr,
-  u_int32_t *new_addr);
+static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr,
+  u_int32 *new_addr);
 static int cryptopan_free(struct cryptopan *cp);
 static int cryptopan_init(struct cryptopan *cp, unsigned char *key);
 
@@@@ -2095,12 +2095,12 @@@@
  * returns: 0 okay
  *         -1 fail
  */
-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr, u_int32_t *new_addr)
+static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr, u_int32 *new_addr)
 {
-  u_int8_t rin_output[16];
-  u_int8_t rin_input[16];
-  u_int8_t *m_pad;
-  u_int32_t result, first4bytes_pad, first4bytes_input;
+  u_int8 rin_output[16];
+  u_int8 rin_input[16];
+  u_int8 *m_pad;
+  u_int32 result, first4bytes_pad, first4bytes_input;
   int i, pos;
 
   result = 0;
@@@@ -2108,10 +2108,10 @@@@
 
   bcopy(m_pad, rin_input, 16);
 
-  first4bytes_pad = (((u_int32_t) m_pad[0]) << 24) +
-                    (((u_int32_t) m_pad[1]) << 16) +
-                    (((u_int32_t) m_pad[2]) << 8) +
-                    (u_int32_t) m_pad[3]; 
+  first4bytes_pad = (((u_int32) m_pad[0]) << 24) +
+                    (((u_int32) m_pad[1]) << 16) +
+                    (((u_int32) m_pad[2]) << 8) +
+                    (u_int32) m_pad[3]; 
 
   /*
    * For each prefixes with length from 0 to 31, generate a bit using the
@@@@ -2134,10 +2134,10 @@@@
       first4bytes_input = ((orig_addr >> (32-pos)) << (32-pos)) |
         ((first4bytes_pad<<pos) >> pos);
 
-    rin_input[0] = (u_int8_t) (first4bytes_input >> 24);
-    rin_input[1] = (u_int8_t) ((first4bytes_input << 8) >> 24);
-    rin_input[2] = (u_int8_t) ((first4bytes_input << 16) >> 24);
-    rin_input[3] = (u_int8_t) ((first4bytes_input << 24) >> 24);
+    rin_input[0] = (u_int8) (first4bytes_input >> 24);
+    rin_input[1] = (u_int8) ((first4bytes_input << 8) >> 24);
+    rin_input[2] = (u_int8) ((first4bytes_input << 16) >> 24);
+    rin_input[3] = (u_int8) ((first4bytes_input << 24) >> 24);
 
     /*
      * Encryption: The Rijndael cipher is used as pseudorandom function.
@


1.11
log
@port flowtools to real 64-bit platforms like FreeBSD/amd64 where time_t is a 64-bit integer and hence we have to explicitly _cast_ a 32-bit integer value into the 64-bit time_t variable before we pass a pointer to the time_t variable to localtime(3)
@
text
@d400 146
@


1.10
log
@upgrading package: flowtools 0.67 -> 0.68
@
text
@d362 38
@


1.10.2.1
log
@MFC: port to 64-bit platforms where time_t is usually not a 32-bit integer
@
text
@a361 38
Index: flow-tools-0.68/lib/ftfile.c
--- flow-tools-0.68/lib/ftfile.c.orig	2003-02-13 03:38:42 +0100
+++ flow-tools-0.68/lib/ftfile.c	2005-07-22 16:42:39 +0200
@@@@ -417,12 +417,14 @@@@
   long gmt_val;
   char gmt_sign;
   int tm_gmtoff;
+  time_t t;
   
-  if (!(tm = localtime ((time_t*)&ftime))) {
+  t = (time_t)ftime;
+  if (!(tm = localtime (&t))) {
     snprintf(buf, bsize, ".");
   }
 
-  tm_gmtoff = get_gmtoff(ftime);
+  tm_gmtoff = get_gmtoff(t);
 
   /* compute GMT offset */
   if (tm_gmtoff >= 0) {
@@@@ -503,6 +505,7 @@@@
 {
   struct tm *tm;
   char buf[32];
+  time_t t;
 
   /* no directories */
   if (nest == 0)
@@@@ -512,7 +515,8 @@@@
   if ((nest > 3) || (nest < -3))
     return -1;
 
-  if (!(tm = localtime ((time_t*)&ftime)))
+  t = (time_t)ftime;
+  if (!(tm = localtime (&t)))
     return -1;
 
   if (nest == -1)
@


1.9
log
@fix flow-fanout command according to hint on flow-tools mailing list
@
text
@d1 7
a7 7
Index: flow-tools-0.67/configs/Makefile.in
--- flow-tools-0.67/configs/Makefile.in.orig	2004-12-25 10:38:17 +0100
+++ flow-tools-0.67/configs/Makefile.in	2004-12-25 10:40:33 +0100
@@@@ -117,10 +117,10 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
d17 4
a20 6
Index: flow-tools-0.67/lib/ftpaths.h.in
--- flow-tools-0.67/lib/ftpaths.h.in.orig	2003-11-11 17:49:14 +0100
+++ flow-tools-0.67/lib/ftpaths.h.in	2004-12-25 10:35:31 +0100
@@@@ -29,17 +29,17 @@@@
 #ifndef FTPATHS_H
 #define FTPATHS_H
a21 30
-#define FT_PATH_CFG_MAP             "@@localstatedir@@/cfg/map.cfg"
-#define FT_PATH_CFG_TAG             "@@localstatedir@@/cfg/tag.cfg"
-#define FT_PATH_CFG_FILTER          "@@localstatedir@@/cfg/filter.cfg"
-#define FT_PATH_CFG_STAT            "@@localstatedir@@/cfg/stat.cfg"
-#define FT_PATH_CFG_MASK            "@@localstatedir@@/cfg/mask.cfg"
-#define FT_PATH_CFG_XLATE           "@@localstatedir@@/cfg/xlate.cfg"
+#define FT_PATH_CFG_MAP             "@@sysconfdir@@/map.cfg"
+#define FT_PATH_CFG_TAG             "@@sysconfdir@@/tag.cfg"
+#define FT_PATH_CFG_FILTER          "@@sysconfdir@@/filter.cfg"
+#define FT_PATH_CFG_STAT            "@@sysconfdir@@/stat.cfg"
+#define FT_PATH_CFG_MASK            "@@sysconfdir@@/mask.cfg"
+#define FT_PATH_CFG_XLATE           "@@sysconfdir@@/xlate.cfg"
 
-#define FT_PATH_SYM_IP_PROT         "@@localstatedir@@/sym/ip-prot.sym"
-#define FT_PATH_SYM_IP_TYPE         "@@localstatedir@@/sym/ip-type.sym"
-#define FT_PATH_SYM_TCP_PORT        "@@localstatedir@@/sym/tcp-port.sym"
-#define FT_PATH_SYM_ASN             "@@localstatedir@@/sym/asn.sym"
-#define FT_PATH_SYM_TAG             "@@localstatedir@@/sym/tag.sym"
+#define FT_PATH_SYM_IP_PROT         "@@datadir@@/ip-prot.sym"
+#define FT_PATH_SYM_IP_TYPE         "@@datadir@@/ip-type.sym"
+#define FT_PATH_SYM_TCP_PORT        "@@datadir@@/tcp-port.sym"
+#define FT_PATH_SYM_ASN             "@@datadir@@/asn.sym"
+#define FT_PATH_SYM_TAG             "@@datadir@@/tag.sym"
 
 #endif /* FTPATHS_H */
Index: flow-tools-0.67/configure
--- flow-tools-0.67/configure.orig	2003-12-04 07:19:41 +0100
+++ flow-tools-0.67/configure	2004-12-24 21:23:56 +0100
@@@@ -1674,7 +1674,6 @@@@
           ac_config_headers="$ac_config_headers lib/ftconfig.h:lib/ftconfig.h.in"
d28 1
a28 1
@@@@ -3209,7 +3208,7 @@@@
d37 2
a38 2
@@@@ -3279,7 +3278,7 @@@@
 fi
d46 1
a46 1
@@@@ -3336,7 +3335,7 @@@@
d55 3
a57 3
Index: flow-tools-0.67/docs/flow-capture.1.in
--- flow-tools-0.67/docs/flow-capture.1.in.orig	2003-11-29 07:41:31 +0100
+++ flow-tools-0.67/docs/flow-capture.1.in	2004-12-17 19:48:35 +0100
d80 41
a120 39
Index: flow-tools-0.67/src/flow-cat.c
--- flow-tools-0.67/src/flow-cat.c.orig	2003-04-02 20:03:01 +0200
+++ flow-tools-0.67/src/flow-cat.c	2004-12-17 17:46:49 +0100
@@@@ -550,7 +550,7 @@@@
       if (done)
         break;
 
-next_file:
+next_file: continue;
 
     }  /* FOREACH filename in dir */
 
Index: flow-tools-0.67/src/flow-dscan.c
--- flow-tools-0.67/src/flow-dscan.c.orig	2003-11-25 11:14:27 +0100
+++ flow-tools-0.67/src/flow-dscan.c	2004-12-17 17:46:49 +0100
@@@@ -559,7 +559,7 @@@@
     if (ds.ager_timeout && (!(total_flows % 1000)))
       ager(&ds, total_flows32);
 
-skip2:
+skip2: continue;
 
 
   } /* while rec */
@@@@ -805,7 +805,7 @@@@
   ager_i = 0;
   fterr_info("ager: reset hash run");
 
-skip3:
+skip3: return;
 
 } /* ager */
 
Index: flow-tools-0.67/src/flow-fanout.c
--- flow-tools-0.67/src/flow-fanout.c.orig	2003-12-01 00:38:37 +0100
+++ flow-tools-0.67/src/flow-fanout.c	2004-12-25 13:32:08 +0100
@@@@ -412,6 +412,7 @@@@
   /* default UDP listen port is FT_PORT */
   ftnet.dst_port = (ftpi.dst_port) ? ftpi.dst_port : FT_PORT;
d122 6
a127 3
+  ftnet.loc_addr.sin_family = AF_INET;
   ftnet.loc_addr.sin_addr.s_addr = htonl(ftpi.loc_ip);
   ftnet.loc_addr.sin_port = htons(ftnet.dst_port);
d129 7
a135 6
@@@@ -486,7 +487,7 @@@@
     /* unicast bind -- multicast support */
     if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
       sizeof(ftnet.loc_addr)) < 0)
-      fterr_err(1, "bind()");
+      fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
a136 1
   } /* not multicast group */
d138 7
a144 8
@@@@ -499,7 +500,7 @@@@
   /* unicast bind -- no multicast support */
   if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
     sizeof(ftnet.loc_addr)) < 0)
-    fterr_err(1, "bind()");
+    fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
 
 #endif /* IP_ADD_MEMBERSHIP */
d146 3
a148 24
@@@@ -839,7 +840,7 @@@@
     
       } /* fte.buf_size */
     
-skip1:
+skip1: ;
 
     } /* if FD_ISSET */
 
Index: flow-tools-0.67/src/flow-receive.c
--- flow-tools-0.67/src/flow-receive.c.orig	2003-11-25 06:37:04 +0100
+++ flow-tools-0.67/src/flow-receive.c	2004-12-17 17:46:49 +0100
@@@@ -732,7 +732,7 @@@@
 
       } /* for */
 
-skip1:
+skip1: continue;
 
     } /* if FD_ISSET */
 
Index: flow-tools-0.67/src/flow-export.c
--- flow-tools-0.67/src/flow-export.c.orig	2003-12-04 06:55:31 +0100
+++ flow-tools-0.67/src/flow-export.c	2004-12-24 21:33:22 +0100
d187 1
a187 1
@@@@ -694,12 +694,12 @@@@
d206 1
a206 1
@@@@ -758,10 +758,6 @@@@
d217 1
a217 1
@@@@ -871,12 +867,12 @@@@
d236 1
a236 1
@@@@ -929,10 +925,6 @@@@
d247 20
a266 16
Index: flow-tools-0.67/lib/support.c
--- flow-tools-0.67/lib/support.c.orig	2003-02-13 03:38:43 +0100
+++ flow-tools-0.67/lib/support.c	2004-12-17 23:17:21 +0100
@@@@ -500,26 +500,19 @@@@
 int write_pidfile(int pid, char *file, u_int16 port)
 {
   int fd, len;
-  char str[16], *c;
+  char str[16];
   
-  if (!(c = (char*)malloc(strlen(file)+16)))
-    return -1;
-
-  sprintf(c, "%s.%d", file, (int)port);
-    
   len = sprintf(str, "%u\n", (unsigned)pid);
d268 6
a273 7
-  if ((fd = open(c, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
-    fterr_warn("open(%s)", c);
-    free (c);
+  if ((fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
+    fterr_warn("open(%s)", file);
     return -1; 
   }
d275 8
d284 10
a293 7
   if (write(fd, str, len) != len) {
-    fterr_warn("write(%s)", c);
+    fterr_warn("write(%s)", file);
     close (fd);
-    free (c);
     return -1;
   }
d296 2
a297 2
--- flowextract-2.5/hosts.c.orig	2003-04-28 20:22:02.000000000 +0200
+++ flowextract-2.5/hosts.c	2004-12-23 14:15:53.786366142 +0100
a306 31
Index: flowextract-2.5/timeval.c
--- flowextract-2.5/timeval.c.orig	2003-04-28 20:22:02.000000000 +0200
+++ flowextract-2.5/timeval.c	2004-12-23 14:15:04.349213600 +0100
@@@@ -1,3 +1,4 @@@@
+#include <time.h>
 #include <sys/time.h>
 #include <ftlib.h>
 
@@@@ -6,8 +7,10 @@@@
 {
      struct tm *tm;
      static char buf[50];
+     time_t t;
 
-     tm = localtime(&tp.secs);
+     t = (time_t)tp.secs;
+     tm = localtime(&t);
 
      sprintf(buf, "%02d/%02d/%04d %02d:%02d:%02d",
              tm->tm_mon+1,
Index: flowextract-2.5/timesub.c
--- flowextract-2.5/timesub.c.orig	2003-04-28 20:22:02.000000000 +0200
+++ flowextract-2.5/timesub.c	2004-12-23 14:12:10.194290425 +0100
@@@@ -8,6 +8,7 @@@@
 
 */
 #include <sys/types.h>
+#include <time.h>
 #include <sys/time.h>
 #include "timesub.h"
 
d308 2
a309 2
--- flowextract-2.5/interp.c.orig	2003-04-28 20:22:02.000000000 +0200
+++ flowextract-2.5/interp.c	2004-12-23 14:14:33.287259341 +0100
d331 9
a339 4
Index: flowextract-2.5/grammar.y
--- flowextract-2.5/grammar.y.orig	2003-04-28 20:22:02.000000000 +0200
+++ flowextract-2.5/grammar.y	2004-12-23 14:10:36.294498083 +0100
@@@@ -25,6 +25,9 @@@@
a340 1
 #include "stdunix.h"
d342 7
a348 8
+void yyerror(char *msg);
+unsigned long getmask(unsigned long addr);
+
 extern int parse_error;
 #define TCPDATA 6
 #define UDPDATA 17
@@@@ -1159,10 +1162,10 @@@@
      };
d350 1
a350 3
 void
-yyerror()
+yyerror(char *msg)
d352 7
a358 6
-     fprintf(stderr, "\"%s\", line %d: syntax error.\n",
-	     getfilename(), getlinenum());
+     fprintf(stderr, "\"%s\", line %d: syntax error: %s\n",
+	     getfilename(), getlinenum(), msg);
      parse_error = 1;
 }
d360 2
@


1.8
log
@cleanup filesystem hierarchy to more strictly comply to the OpenPKG standards
@
text
@d147 10
a156 2
+++ flow-tools-0.67/src/flow-fanout.c	2004-12-24 22:07:56 +0100
@@@@ -486,7 +486,7 @@@@
d165 1
a165 1
@@@@ -499,7 +499,7 @@@@
d174 1
a174 1
@@@@ -839,7 +839,7 @@@@
@


1.7
log
@switch to more silent compilation (we are the packager, not the developer) and print more reasonable errors on bind() failure in flow-fanout
@
text
@d1 48
@


1.6
log
@add RDBMS support to flow-export; capture logs from flow-fanout
@
text
@d4 9
a12 1
@@@@ -3209,7 +3209,7 @@@@
d21 1
a21 1
@@@@ -3279,7 +3279,7 @@@@
d30 1
a30 1
@@@@ -3336,7 +3336,7 @@@@
d99 19
a117 1
+++ flow-tools-0.67/src/flow-fanout.c	2004-12-17 17:46:49 +0100
@


1.5
log
@port to Linux and Solaris
@
text
@d1 30
d113 101
@


1.4
log
@do not append the port to the pidfile automatically and remove the pidfile after stopping
@
text
@d117 67
d185 2
a186 2
--- flowextract-2.5/grammar.y.orig	2003-04-28 20:22:02 +0200
+++ flowextract-2.5/grammar.y	2004-12-17 16:40:36 +0100
@


1.3
log
@add optional support for automatically running the flow-capture tool
@
text
@d83 34
@


1.2
log
@add flowextract and Perl API Cflow
@
text
@d1 25
d28 1
a28 1
+++ flow-tools-0.67/src/flow-cat.c	2004-12-17 16:37:33 +0100
d40 1
a40 1
+++ flow-tools-0.67/src/flow-dscan.c	2004-12-17 16:37:33 +0100
d61 1
a61 1
+++ flow-tools-0.67/src/flow-fanout.c	2004-12-17 16:37:33 +0100
d73 1
a73 1
+++ flow-tools-0.67/src/flow-receive.c	2004-12-17 16:37:33 +0100
@


1.1
log
@new package: flowtools 0.67 (NetFlow Tools)
@
text
@d1 3
a3 3
Index: src/flow-cat.c
--- src/flow-cat.c.orig	2003-04-02 20:03:01 +0200
+++ src/flow-cat.c	2004-12-16 13:12:06 +0100
d13 3
a15 3
Index: src/flow-dscan.c
--- src/flow-dscan.c.orig	2003-11-25 11:14:27 +0100
+++ src/flow-dscan.c	2004-12-16 13:10:55 +0100
d34 15
a48 3
Index: src/flow-receive.c
--- src/flow-receive.c.orig	2003-11-25 06:37:04 +0100
+++ src/flow-receive.c	2004-12-16 13:11:19 +0100
d58 26
a83 11
Index: src/flow-fanout.c
--- src/flow-fanout.c.orig	2003-12-01 00:38:37 +0100
+++ src/flow-fanout.c	2004-12-16 13:11:36 +0100
@@@@ -839,7 +839,7 @@@@
     
       } /* fte.buf_size */
     
-skip1:
+skip1: ;
 
     } /* if FD_ISSET */
@