Changeset 1960

Timestamp:

01/17/08 09:36:20 (12 months ago)

Author:

aturner

Message:

sync up workspace to allow merge of 3.2.4 changes. refs #42

Location:

trunk

Files:

• . (modified) (1 prop)
• aclocal.m4 (modified) (5 diffs)
• src/config.h.in (modified) (6 diffs)
• src/fragroute/mod.c (modified) (4 diffs)
• src/tcpr.h (modified) (2 diffs)
• src/tcprewrite.c (modified) (4 diffs)

trunk

@@ -16 +16 @@
 *.tmproj
 *.exe
+*.tar.gz

@@ -16 +16 @@
 *.tmproj
 *.exe
+*.tar.gz

trunk/aclocal.m4

@@ -7499 +7499 @@
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Saturday May  5, 2007 at 12:02:37 PM PDT
+dnl It has been AutoGen-ed  Saturday July 28, 2007 at 01:01:51 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
@@ -7582 +7582 @@
   AC_CHECK_LIB(gen, pathfind)
   AC_FUNC_VPRINTF
-  AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr strrchr])
+  AC_CHECK_FUNCS([strsignal mmap canonicalize_file_name snprintf strdup strchr strrchr])
 [  INVOKE_LIBOPTS_MACROS_FIRST_done=yes
 fi]])
@@ -7917 +7917 @@
 dnl @synopsis  LIBOPTS_CHECK
 dnl
-dnl Time-stamp:        "2006-09-23 19:36:24 bkorb"
+dnl Time-stamp:        "2007-07-04 11:41:40 bkorb"
 dnl Last Committed:    $Date$
 dnl
@@ -7924 +7924 @@
 dnl the config tests that the library needs.  Invoke the
 dnl "INVOKE_LIBOPTS_MACROS" macro iff we are building libopts.
+dnl
+dnl  This file is part of AutoGen.
+dnl  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved
+dnl
+dnl  AutoGen is free software: you can redistribute it and/or modify it
+dnl  under the terms of the GNU General Public License as published by the
+dnl  Free Software Foundation, either version 3 of the License, or
+dnl  (at your option) any later version.
+dnl
+dnl  AutoGen is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl  See the GNU General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU General Public License along
+dnl  with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 dnl Default to system libopts
@@ -8005 +8021 @@
 ])
 # liboptschk.m4 serial 1 (autogen - 5.7.3)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl copyright (c) 2005 by Bruce Korb - all rights reserved
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

trunk/src/config.h.in

@@ -1 @@
-/* src/config.h.in.  Generated from configure.in by autoheader.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Enable debuging code and support for the -d option */
 #undef DEBUG
 
+/* Enable dmalloc function arg checking */
+#undef DMALLOC_FUNC_CHECK
+
 /* Enable Electric Fence memory debugger */
 #undef EFENCE
@@ -10 +13 @@
 #undef ENABLE_64BITS
 
+/* Enable dmalloc */
+#undef ENABLE_DMALLOC
+
 /* Enable dynamically linking libs */
 #undef ENABLE_DYNAMIC_LINK
 
-/* Enable building flowreplay (alpha) */
-#undef ENABLE_FLOWREPLAY
+/* Enable fragroute module */
+#undef ENABLE_FRAGROUTE
 
 /* Enable use of pcap_findalldevs() */
@@ -122 +128 @@
 #undef HAVE_INTTYPES_H
 
+/* Do we have libdnet? */
+#undef HAVE_LIBDNET
+
 /* Define to 1 if you have the `gen' library (-lgen). */
 #undef HAVE_LIBGEN
@@ -252 +261 @@
 #undef HAVE_STRRCHR
 
+/* Define to 1 if you have the `strsignal' function. */
+#undef HAVE_STRSIGNAL
+
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
@@ -260 +272 @@
 /* Define to 1 if `tv_sec' is member of `struct timeval'. */
 #undef HAVE_STRUCT_TIMEVAL_TV_SEC
+
+/* Define to 1 if you have the <sysexits.h> header file. */
+#undef HAVE_SYSEXITS_H
 
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
@@ -363 +378 @@
    <sysmacros.h>. */
 #undef MAJOR_IN_SYSMACROS
+
+/* Define this if optional arguments are disallowed */
+#undef NO_OPTIONAL_OPT_ARGS
 
 /* This is our package name */

trunk/src/fragroute/mod.c

@@ -91 +91 @@
                 return (-1);
         }
-        
+    warn("opened config file...");
         /* read the file, one line at a time... */
         for (i = 1; fgets(buf, sizeof(buf), fp) != NULL; i++) {
@@ -106 +106 @@
                 }
                 
+        warnx("argc = %d, %s, %s, %s", argc, argv[0], argv[1], argv[2]);
                 /* check first keyword against modules */
                 for (m = mods; *m != NULL; m++) {
-                        if (strcasecmp((*m)->name, argv[0]) == 0)
+                        if (strcasecmp((*m)->name, argv[0]) == 0) {
+                warnx("comparing %s to %s", argv[0], (*m)->name);
                                 break;
+                        }
                 }
                 
@@ -141 +144 @@
         /* close the file */
         fclose(fp);
-
+    warn("close file...");
+    
         if (ret == 0) {
                 buf[0] = '\0';
@@ -149 +153 @@
                 }
                 buf[strlen(buf) - 4] = '\0';
-                sprintf(errbuf, "%s", buf);
-        ret = -1;
+                sprintf(errbuf, "wtf: %s", buf);
+        // ret = -1;
         }
         return (ret);

trunk/src/tcpr.h

@@ -71 +71 @@
 #define TCPR_TCP_DNSV4_H      0x0e    /**< TCP DNS v4 header:   14 bytes */
 #define TCPR_ETH_H            0x0e    /**< Ethernet header:     14 bytes */
+#define TCPR_ETH_MTU          1500    /**< Ethernet MTU size: 1500 bytes */
 #define TCPR_FDDI_H           0x15    /**< FDDI header:         21 bytes */
 #define TCPR_ICMPV4_H         0x04    /**< ICMP header base:     4 bytes */
@@ -1588 +1589 @@
 };
 
+
 /*
  *  Token Ring Header

trunk/src/tcprewrite.c

@@ -107 +107 @@
                 tcpedit_geterr(tcpedit));
     }
-
+    
    /* open up the output file */
     options.outfile = safe_strdup(OPT_ARG(OUTFILE));
@@ -118 +118 @@
         pcap_datalink_val_to_name(pcap_datalink(dlt_pcap)));
 
+#ifdef ENABLE_FRAGROUTE
     if (options.fragroute_args) {
         if ((options.frag_ctx = fragroute_init(65535, options.fragroute_args, ebuf)) == NULL)
             errx(1, "%s", ebuf);
     }
+#endif
 
 #ifdef ENABLE_VERBOSE
@@ -227 +229 @@
     const u_char *pktdata = NULL;               /* packet from libpcap */
     u_char **packet = NULL;                     /* packet from tcpedit */
-    char *frag = NULL;
+    static char *frag = NULL;
     COUNTER packetnum = 0;
-    int rcode, frag_len;
+    int rcode, frag_len, i;
 
     pkthdr_ptr = &pkthdr;
+
+    if (frag == NULL)
+        frag = (char *)safe_malloc(65535); /* mtu size */
 
     /* MAIN LOOP 
@@ -279 +284 @@
                     (cache_result == TCPR_DIR_C2S && options.fragroute_dir == FRAGROUTE_DIR_C2S) ||
                     (cache_result == TCPR_DIR_S2C && options.fragroute_dir == FRAGROUTE_DIR_S2C)) {
-                fragroute_process(options.frag_ctx, *packet, pkthdr_ptr->caplen);
+                if (fragroute_process(options.frag_ctx, *packet, pkthdr_ptr->caplen) != 0) {
+                    errx(1, "Error processing packet via fragroute %s", options.frag_ctx->errbuf);
+                }
+                i = 0;
                 while ((frag_len = fragroute_getfragment(options.frag_ctx, &frag)) > 0) {
                     /* frags get the same timestamp as the original packet */
+                    notice("processing frag: %u", i++);
                     pkthdr_ptr->caplen = frag_len;
                     pkthdr_ptr->len = frag_len;

@@ -16 +16 @@
 *.tmproj
 *.exe
+*.tar.gz