X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=greproxy.cpp;h=127e0a6c72f51f717cc02cc3eb84a84877877f27;hb=9e8a28e92f8e092a2409ddad770b3dbe088a4fe9;hp=030ea1f335da90ea4a9b3704db8d9cd8e7e151f5;hpb=47f75fc7569e504a94a601cb3a81793400b134ac;p=greproxy diff --git a/greproxy.cpp b/greproxy.cpp index 030ea1f..127e0a6 100644 --- a/greproxy.cpp +++ b/greproxy.cpp @@ -7,6 +7,7 @@ #include "greprotocol.h" #include "reorderer.h" +#include "rsencoder.h" using namespace std; @@ -26,8 +27,10 @@ int main(int argc, char **argv) in6_addr myaddr = get_addr(argv[3]); GREProtocol gre_a(myaddr, addr_a); GREProtocol gre_b(myaddr, addr_b); - Reorderer dst_a(&gre_a); - Reorderer dst_b(&gre_b); + RSEncoder rs_a(&gre_a); + RSEncoder rs_b(&gre_b); + Reorderer reorder_a(&rs_a); + Reorderer reorder_b(&rs_b); fd_set fds; FD_ZERO(&fds); @@ -41,10 +44,10 @@ int main(int argc, char **argv) } if (FD_ISSET(gre_a.fd(), &fds)) { - gre_a.read_packet(&dst_b); + gre_a.read_packet(&reorder_b); } if (FD_ISSET(gre_b.fd(), &fds)) { - gre_b.read_packet(&dst_a); + gre_b.read_packet(&reorder_a); } } }