Changeset 647

Show
Ignore:
Timestamp:
03/19/07 18:17:29 (17 months ago)
Author:
hyriand
Message:

Bumped NewNet revision, remove timeout from reactor when the firewall has been pierced. Also add FD_SETSIZE=1024 to win32 compiler flags.

Location:
branches/newnet/museekd
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/newnet/museekd

    • Property svn:externals

      •  

        old new  
        1 NewNet -r657 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet 
         1NewNet -r661 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet 

  • branches/newnet/museekd/SConstruct

    r643 r647  
    1010if sys.platform == 'win32': 
    1111  env.Append(LIBS = ['wsock32', 'shell32', 'ole32']) 
     12  env.Append(CPPDEFINES = ['FD_SETSIZE=1024']) 
    1213 
    1314from sconshelp import CheckLargeFileSupport 

  • branches/newnet/museekd/museekd/usersocket.cpp

    r632 r647  
    8484  NNLOG("museek.debug", "Initiating passive user connection to %s (type %s).", m_User.c_str(), m_Type.c_str()); 
    8585 
    86   m_Museekd->reactor()->addTimeout(60000, this, &UserSocket::onFirewallPierceTimedOut); 
     86  m_PassiveConnectTimeout = m_Museekd->reactor()->addTimeout(60000, this, &UserSocket::onFirewallPierceTimedOut); 
    8787  m_Museekd->peers()->firewallPiercedEvent.connect(this, &UserSocket::onFirewallPierced); 
    8888 
    … …  
    9797  { 
    9898    NNLOG("museek.debug", "%s's firewall successfully pierced.", m_User.c_str()); 
     99    if(m_PassiveConnectTimeout.isValid()) 
     100    { 
     101      m_Museekd->reactor()->removeTimeout(m_PassiveConnectTimeout); 
     102    } 
    99103    setDescriptor(socket->descriptor()); 
    100104    setSocketState(SocketConnected); 

  • branches/newnet/museekd/museekd/usersocket.h

    r632 r647  
    8181  private: 
    8282    NewNet::WeakRefPtr<Museekd> m_Museekd; 
     83    NewNet::WeakRefPtr<NewNet::Event<long>::Callback> m_PassiveConnectTimeout; 
    8384 
    8485    std::string m_Type, m_User;