ServerFramework does not need to be derived from Pollable Signed off by: Ilya A. Volynets-Evenbakh Other Kismet patches: http://www.total-knowledge.com/progs/kismet Index: netframework.h =================================================================== --- netframework.h (revision 2980) +++ netframework.h (working copy) @@ -166,7 +166,7 @@ class NetworkServer : public Pollable { }; // Skeleton to a protocol interface -class ServerFramework : public Pollable { +class ServerFramework { public: ServerFramework() { globalreg = NULL; @@ -190,20 +190,6 @@ class NetworkServer : public Pollable { netserver = in_nets; } - virtual int MergeSet(int in_max_fd, fd_set *out_rset, fd_set *out_wset) { - if (netserver != NULL) - return netserver->MergeSet(in_max_fd, out_rset, out_wset); - - return 0; - } - - virtual int Poll(fd_set& in_rset, fd_set& in_wset) { - if (netserver != NULL) - return netserver->Poll(in_rset, in_wset); - - return 0; - } - // Is this setup valid? virtual int Valid() { return valid; } // Handle new connections