diff -r a3685be3f14a -r 60c9ef5a7bd3 src/base/inet.hh --- a/src/base/inet.hh Wed Aug 29 19:55:15 2012 +0100 +++ b/src/base/inet.hh Wed Aug 29 19:55:38 2012 +0100 @@ -380,8 +380,6 @@ uint16_t cksum(const TcpPtr &ptr); -typedef Range SackRange; - struct TcpOpt : public tcp_opt { uint8_t type() const { return opt_type; } @@ -393,7 +391,6 @@ uint16_t mss() const { return ntohs(opt_data.mss); } uint8_t wscale() const { return opt_data.wscale; } - bool sack(std::vector &vec) const; uint32_t echo() const { return ntohl(opt_data.echo); } uint32_t tsval() const { return ntohl(opt_data.timestamp[0]); } uint32_t tsecr() const { return ntohl(opt_data.timestamp[1]); } diff -r a3685be3f14a -r 60c9ef5a7bd3 src/base/inet.cc --- a/src/base/inet.cc Wed Aug 29 19:55:15 2012 +0100 +++ b/src/base/inet.cc Wed Aug 29 19:55:38 2012 +0100 @@ -254,29 +254,6 @@ return true; } -bool -TcpOpt::sack(vector &vec) const -{ - vec.clear(); - - const uint8_t *data = bytes() + sizeof(struct tcp_hdr); - int all = len() - offsetof(tcp_opt, opt_data.sack); - while (all > 0) { - const uint16_t *sack = (const uint16_t *)data; - int len = sizeof(uint16_t) * 2; - if (all < len) { - vec.clear(); - return false; - } - - vec.push_back(RangeIn(ntohs(sack[0]), ntohs(sack[1]))); - all -= len; - data += len; - } - - return false; -} - int hsplit(const EthPacketPtr &ptr) {