--- flow-print.c.orig	Sat Apr 20 08:27:36 2002
+++ flow-print.c	Tue Feb  4 22:47:33 2003
@@ -665,7 +665,7 @@
   struct fts3rec_all cur;
   struct fts3rec_offsets fo;
   struct ftver ftv;
-  char fmt_buf1[64], fmt_buf2[64];
+  char fmt_buf1[64], fmt_buf2[64], fmt_buf3[64];
   char *rec;
 
   if (ftio_check_xfield(ftio, FT_XFIELD_DPKTS |
@@ -673,7 +673,7 @@
     FT_XFIELD_OUTPUT | FT_XFIELD_SRCADDR | FT_XFIELD_DSTADDR |
     FT_XFIELD_SRCPORT | FT_XFIELD_DSTPORT | FT_XFIELD_UNIX_SECS |
     FT_XFIELD_UNIX_NSECS | FT_XFIELD_SYSUPTIME | FT_XFIELD_TCP_FLAGS |
-    FT_XFIELD_PROT)) {
+    FT_XFIELD_PROT | FT_XFIELD_EXADDR)) {
     fterr_warnx("Flow record missing required field for format.");
     return -1;
   }
@@ -682,10 +682,11 @@
   
   fts3rec_compute_offsets(&fo, &ftv);
 
-  puts("Start             End               Sif   SrcIPaddress    SrcP  DIf   DstIPaddress    DstP    P Fl Pkts       Octets\n");
+  puts("Start             End               Sif   SrcIPaddress    SrcP  DIf   DstIPaddress    DstP    P Fl Pkts       Octets	   Exporter\n");
 
   while ((rec = ftio_read(ftio))) {
 
+    cur.exaddr = ((u_int32*)(rec+fo.exaddr));
     cur.unix_secs = ((u_int32*)(rec+fo.unix_secs));
     cur.unix_nsecs = ((u_int32*)(rec+fo.unix_nsecs));
     cur.sysUpTime = ((u_int32*)(rec+fo.sysUpTime));
@@ -719,15 +720,17 @@
     /* other info */
     fmt_ipv4(fmt_buf1, *cur.srcaddr, FMT_PAD_RIGHT);
     fmt_ipv4(fmt_buf2, *cur.dstaddr, FMT_PAD_RIGHT);
+    fmt_ipv4(fmt_buf3, *cur.exaddr, FMT_PAD_RIGHT);
 
-    printf("%-5u %-15.15s %-5u %-5u %-15.15s %-5u %-3u %-2d %-10lu %-10lu\n",
+    printf("%-5u %-15.15s %-5u %-5u %-15.15s %-5u %-3u %-2d %-10lu %-10lu %-15.15s\n",
 
            (u_int)*cur.input, fmt_buf1, (u_int)*cur.srcport, 
            (u_int)*cur.output, fmt_buf2, (u_int)*cur.dstport,
            (u_int)*cur.prot, 
            (u_int)*cur.tcp_flags & 0x7,
            (u_long)*cur.dPkts, 
-           (u_long)*cur.dOctets);
+           (u_long)*cur.dOctets,
+	   fmt_buf3);
 
     if (options & FT_OPT_NOBUF)
       fflush(stdout);