Make GREProtocol no longer make its own sequence numbers.

[greproxy] / greprotocol.h

diff --git a/greprotocol.h b/greprotocol.h
index 6930f20b601a9c932ea9d27384a970e4ecc2435d..739b97e17177a0a3e9936804caf3d45fcadcb5e0 100644 (file)
--- a/greprotocol.h
+++ b/greprotocol.h
@@ -1,23 +1,21 @@
 #ifndef _GREPROTOCOL_H
 #define _GREPROTOCOL_H
 
-#include "protocol.h"
-
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdint.h>
 #include <string>
 
-class Reorderer;
+#include "protocol.h"
 
-class GREProtocol : public Protocol {
+class GREProtocol : public Sender, public Reader {
 public:
        GREProtocol(const in6_addr &myaddr, const in6_addr &dst);
-       virtual void send_packet(uint16_t proto, const std::string &data);
+       virtual void send_packet(uint16_t proto, const std::string &data, int incoming_seq);
        virtual int fd() const;
-       void read_packet(Reorderer* sender);
+       virtual void read_packet(Sender* sender);
 
 private:
-       int seq;
        int sock;
        sockaddr_in6 dstaddr;
 };