Changeset 1949

Timestamp:

01/14/08 10:09:06 (12 months ago)

Author:

aturner

Message:

more fragroute clean up. need to figure out how to parse fragroute rules.
refs #42

Location:

trunk/src

Files:

• fragroute/Makefile.am (modified) (1 diff)
• fragroute/fragroute.h (modified) (2 diffs)
• fragroute/mod.c (modified) (6 diffs)
• tcprewrite_opts.def (modified) (2 diffs)

trunk/src/fragroute/Makefile.am

@@ -9 +9 @@
 libfragroute_a_CFLAGS = -I.. -I../.. @LDNETINC@
 
-libfragroute_a_LIBS = @LDNETLIB@
+# libfragroute_a_LIBS = @LDNETLIB@
 
 noinst_HEADERS = bget.h mod.h pkt.h randutil.h fragroute.h argv.h \

trunk/src/fragroute/fragroute.h

@@ -4 +4 @@
 #ifndef __FRAGROUTE_H__
 #define __FRAGROUTE_H__
+
+#define FRAGROUTE_ERRBUF_LEN 1024
 
 /* Fragroute context. */
@@ -19 +21 @@
 //      route_t         *route;
 //      tun_t           *tun;
-    char        errbuf[1024];
+    char        errbuf[FRAGROUTE_ERRBUF_LEN];
         struct pktq *pktq; /* packet chain */    
 };

trunk/src/fragroute/mod.c

@@ -86 +86 @@
         TAILQ_INIT(&rules);
         
+        /* open the config/script file */
         if ((fp = fopen(script, "r")) == NULL) {
                 sprintf(errbuf, "couldn't open %s", script);
                 return (-1);
         }
+        
+        /* read the file, one line at a time... */
         for (i = 1; fgets(buf, sizeof(buf), fp) != NULL; i++) {
+            
+            /* skip comments & blank lines */
                 if (*buf == '#' || *buf == '\r' || *buf == '\n')
                         continue;
                 
+                /* parse the line into an array */
                 if ((argc = argv_create(buf, MAX_ARGS, argv)) < 1) {
                         sprintf(errbuf, "couldn't parse arguments (line %d)", i);
@@ -99 +105 @@
                         break;
                 }
+                
+                /* check first keyword against modules */
                 for (m = mods; *m != NULL; m++) {
                         if (strcasecmp((*m)->name, argv[0]) == 0)
                                 break;
                 }
+                
+                /* do we have a match? */
                 if (*m == NULL) {
                         sprintf(errbuf, "unknown directive '%s' (line %d)", argv[0], i);
@@ -108 +118 @@
                         break;
                 }
+                
+                /* allocate memory for our rule */
                 if ((rule = calloc(1, sizeof(*rule))) == NULL) {
                         sprintf(errbuf, "calloc");
@@ -115 +127 @@
                 rule->mod = *m;
 
+        /* pass the remaining args to the rule */
                 if (rule->mod->open != NULL &&
                     (rule->data = rule->mod->open(argc, argv)) == NULL) {
@@ -122 +135 @@
                         break;
                 }
+                /* append the rule to the rule list */
                 TAILQ_INSERT_TAIL(&rules, rule, next);
         }
+        
+        /* close the file */
         fclose(fp);
 
@@ -133 +149 @@
                 }
                 buf[strlen(buf) - 4] = '\0';
-                warnx("%s", buf);
+                sprintf(errbuf, "%s", buf);
+        ret = -1;
         }
         return (ret);

trunk/src/tcprewrite_opts.def

@@ -172 +172 @@
 flag = {
     ifdef       = ENABLE_FRAGROUTE;
-    name        = frag;
+    name        = fragroute;
     arg-type    = string;
     max         = 1;
@@ -180 +180 @@
 engine.  See the fragroute(8) man page for more details.  Important:
 tcprewrite does not support the delay, echo or print commands.    
+EOText;
+};
+
+
+flag = {
+    ifdef       = ENABLE_FRAGROUTE;
+    name        = fragdir;
+    arg-type    = string;
+    max         = 1;
+    descrip     = "Which flows to apply fragroute to";
+    doc         = <<- EOText
+Apply the fragroute engine to packets going c2s, s2c or both.
 EOText;
 };