X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/53a941d3f97a50964587c6e9533b1e43e74a57a8..c9cb7c0c2f698be97ddafd7575a3859aed9cb518:/proxy/tripe-mitm.c
diff --git a/proxy/tripe-mitm.c b/proxy/tripe-mitm.c
index 7394aaaa..74739539 100644
--- a/proxy/tripe-mitm.c
+++ b/proxy/tripe-mitm.c
@@ -9,19 +9,18 @@
*
* This file is part of Trivial IP Encryption (TrIPE).
*
- * TrIPE 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.
+ * TrIPE 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 3 of the License, or (at your
+ * option) any later version.
*
- * TrIPE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * TrIPE is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
*
* You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE. If not, see .
*/
/*----- Header files ------------------------------------------------------*/
@@ -67,6 +66,8 @@
#include
#include
+#include "util.h"
+
/*----- Data structures ---------------------------------------------------*/
typedef struct peer {
@@ -255,7 +256,7 @@ static void addcorrupt(filter *f, unsigned ac, char **av)
{
corrupt *c;
if (ac > 1)
- die(1, "syntax: filt:corrupt[:PCORRUPT]");
+ die(1, "syntax: filt:corrupt[:P-CORRUPT]");
c = CREATE(corrupt);
if (ac > 0)
c->p_corrupt = atoi(av[0]);
@@ -265,6 +266,36 @@ static void addcorrupt(filter *f, unsigned ac, char **av)
f->func = docorrupt;
}
+/*----- Drop filter -------------------------------------------------------*/
+
+typedef struct drop {
+ unsigned p_drop;
+} drop;
+
+static void dodrop(filter *f, const octet *buf, size_t sz)
+{
+ drop *d = f->state;
+
+ if (!RND(d->p_drop))
+ puts("drop packet");
+ else
+ PASS(f->next, buf, sz);
+}
+
+static void adddrop(filter *f, unsigned ac, char **av)
+{
+ drop *d;
+ if (ac > 1)
+ die(1, "syntax: filt:drop[:P-DROP]");
+ d = CREATE(drop);
+ if (ac > 0)
+ d->p_drop = atoi(av[0]);
+ else
+ d->p_drop = 5;
+ f->state = d;
+ f->func = dodrop;
+}
+
/*----- Delay filter ------------------------------------------------------*/
typedef struct delaynode {
@@ -377,7 +408,7 @@ static void adddelay(filter *f, unsigned ac, char **av)
unsigned i;
if (ac < 1 || ac > 3)
- die(1, "syntax: filt:delay:QLEN[:MILLIS:PREPLAY]");
+ die(1, "syntax: filt:delay:QLEN[:MILLIS:P-REPLAY]");
d = CREATE(delay);
d->max = atoi(av[0]);
if (ac > 1)
@@ -407,7 +438,7 @@ static void adddelay(filter *f, unsigned ac, char **av)
static void dosend(filter *f, const octet *buf, size_t sz)
{
printf("send to `%s'\n", f->p_to->name);
- write(f->p_to->sf.fd, buf, sz);
+ DISCARD(write(f->p_to->sf.fd, buf, sz));
}
static void addsend(filter *f, unsigned ac, char **av)
@@ -424,6 +455,7 @@ const struct filtab {
{ "send", addsend },
{ "fork", addfork },
{ "delay", adddelay },
+ { "drop", adddrop },
{ "corrupt", addcorrupt },
{ 0, 0 }
};
@@ -631,6 +663,7 @@ Filters:\n\
send\n\
fork:TAG\n\
delay:QLEN[:MILLIS:P-REPLAY]\n\
+ drop[:P-DROP]\n\
corrupt[:P-CORRUPT]\n",
fp);
}
@@ -688,8 +721,10 @@ int main(int argc, char *argv[])
parse(argv[i]);
if (npeer != 2)
die(1, "need two peers");
- for (;;)
- sel_select(&sel);
+ for (;;) {
+ if (sel_select(&sel) && errno != EINTR)
+ die(1, "select failed: %s", strerror(errno));
+ }
#undef f_bogus
}