dcplusplus-commit — SVN commit log

[Dcplusplus-commit] dcplusplus/yassl/src buffer.cpp,1.1,1.2 yassl_imp.cpp,1.1,1.2 handshake.cpp,1.2,1.3 ssl.cpp,1.1,1.2 socket_wrapper.cpp,1.2,1.3 cert_wrapper.cpp,1.1,1.2 crypto_wrapper.cpp,1.1,1.2 yassl_int.cpp,1.1,1.2

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/yassl/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl/src

Modified Files:
	buffer.cpp yassl_imp.cpp handshake.cpp ssl.cpp 
	socket_wrapper.cpp cert_wrapper.cpp crypto_wrapper.cpp 
	yassl_int.cpp 
Log Message:
yassl update, installer fix

Index: cert_wrapper.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/cert_wrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cert_wrapper.cpp	27 Nov 2005 19:23:07 -0000	1.1
--- cert_wrapper.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 40,44 ****
  
  
! x509::x509(uint sz) : length_(sz), buffer_(new opaque[sz]) 
  {
  }
--- 40,44 ----
  
  
! x509::x509(uint sz) : length_(sz), buffer_(NEW_YS opaque[sz]) 
  {
  }
***************
*** 52,56 ****
  
  x509::x509(const x509& that) : length_(that.length_),
!                                buffer_(new opaque[length_])
  {
      memcpy(buffer_, that.buffer_, length_);
--- 52,56 ----
  
  x509::x509(const x509& that) : length_(that.length_),
!                                buffer_(NEW_YS opaque[length_])
  {
      memcpy(buffer_, that.buffer_, length_);
***************
*** 93,97 ****
  //CertManager
  CertManager::CertManager()
!     : peerX509_(0), verifyPeer_(false), failNoCert_(false), sendVerify_(false)
  {}
  
--- 93,98 ----
  //CertManager
  CertManager::CertManager()
!     : peerX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
!       sendVerify_(false)
  {}
  
***************
*** 115,118 ****
--- 116,125 ----
  
  
+ bool CertManager::verifyNone() const
+ {
+     return verifyNone_;
+ }
+ 
+ 
  bool CertManager::failNoCert() const
  {
***************
*** 133,136 ****
--- 140,149 ----
  
  
+ void CertManager::setVerifyNone()
+ {
+     verifyNone_ = true;
+ }
+ 
+ 
  void CertManager::setFailNoCert()
  {
***************
*** 154,158 ****
  {
      if (x)
!         list_.push_back(new x509(*x));
  }
  
--- 167,171 ----
  {
      if (x)
!         list_.push_back(NEW_YS x509(*x));
  }
  
***************
*** 162,171 ****
  {
      TaoCrypt::Source source(x->get_buffer(), x->get_length());
!     TaoCrypt::CertDecoder cert(source, true, &signers_,
                                 TaoCrypt::CertDecoder::CA);
  
      if (!cert.GetError().What()) {
          const TaoCrypt::PublicKey& key = cert.GetPublicKey();
!         signers_.push_back(new TaoCrypt::Signer(key.GetKey(), key.size(),
                                          cert.GetCommonName(), cert.GetHash()));
      }
--- 175,184 ----
  {
      TaoCrypt::Source source(x->get_buffer(), x->get_length());
!     TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_,
                                 TaoCrypt::CertDecoder::CA);
  
      if (!cert.GetError().What()) {
          const TaoCrypt::PublicKey& key = cert.GetPublicKey();
!         signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(),
                                          cert.GetCommonName(), cert.GetHash()));
      }
***************
*** 230,234 ****
      while ( count > 1 ) {
          TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
!         TaoCrypt::CertDecoder cert(source, true, &signers_);
  
          if (int err = cert.GetError().What())
--- 243,247 ----
      while ( count > 1 ) {
          TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
!         TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_);
  
          if (int err = cert.GetError().What())
***************
*** 236,240 ****
  
          const TaoCrypt::PublicKey& key = cert.GetPublicKey();
!         signers_.push_back(new TaoCrypt::Signer(key.GetKey(), key.size(),
                                          cert.GetCommonName(), cert.GetHash()));
          --last;
--- 249,253 ----
  
          const TaoCrypt::PublicKey& key = cert.GetPublicKey();
!         signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(),
                                          cert.GetCommonName(), cert.GetHash()));
          --last;
***************
*** 245,249 ****
          // peer's is at the front
          TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
!         TaoCrypt::CertDecoder cert(source, true, &signers_);
  
          if (int err = cert.GetError().What())
--- 258,262 ----
          // peer's is at the front
          TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
!         TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_);
  
          if (int err = cert.GetError().What())
***************
*** 261,265 ****
          int iSz = cert.GetIssuer() ? strlen(cert.GetIssuer()) + 1 : 0;
          int sSz = cert.GetCommonName() ? strlen(cert.GetCommonName()) + 1 : 0;
!         peerX509_ = new X509(cert.GetIssuer(), iSz, cert.GetCommonName(),
                                    sSz);
      }
--- 274,278 ----
          int iSz = cert.GetIssuer() ? strlen(cert.GetIssuer()) + 1 : 0;
          int sSz = cert.GetCommonName() ? strlen(cert.GetCommonName()) + 1 : 0;
!         peerX509_ = NEW_YS X509(cert.GetIssuer(), iSz, cert.GetCommonName(),
                                    sSz);
      }

Index: ssl.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/ssl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ssl.cpp	27 Nov 2005 19:23:07 -0000	1.1
--- ssl.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 30,34 ****
  
  
- 
  /*  see man pages for function descriptions */
  
--- 30,33 ----
***************
*** 39,42 ****
--- 38,49 ----
  #include <stdio.h>
  
+ #ifdef _WIN32
+     #include <windows.h>    // FindFirstFile etc..
+ #else
+     #include <sys/types.h>  // file helper
+     #include <sys/stat.h>   // stat
+     #include <dirent.h>     // opendir
+ #endif
+ 
  
  namespace yaSSL {
***************
*** 53,57 ****
  SSL_METHOD* SSLv3_server_method()
  {
!     return new SSL_METHOD(server_end, ProtocolVersion(3,0));
  }
  
--- 60,64 ----
  SSL_METHOD* SSLv3_server_method()
  {
!     return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,0));
  }
  
***************
*** 59,63 ****
  SSL_METHOD* SSLv3_client_method()
  {
!     return new SSL_METHOD(client_end, ProtocolVersion(3,0));
  }
  
--- 66,70 ----
  SSL_METHOD* SSLv3_client_method()
  {
!     return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,0));
  }
  
***************
*** 65,69 ****
  SSL_METHOD* TLSv1_server_method()
  {
!     return new SSL_METHOD(server_end, ProtocolVersion(3,1));
  }
  
--- 72,76 ----
  SSL_METHOD* TLSv1_server_method()
  {
!     return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,1));
  }
  
***************
*** 71,75 ****
  SSL_METHOD* TLSv1_client_method()
  {
!     return new SSL_METHOD(client_end, ProtocolVersion(3,1));
  }
  
--- 78,82 ----
  SSL_METHOD* TLSv1_client_method()
  {
!     return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,1));
  }
  
***************
*** 84,88 ****
  SSL_CTX* SSL_CTX_new(SSL_METHOD* method)
  {
!     return new SSL_CTX(method);
  }
  
--- 91,95 ----
  SSL_CTX* SSL_CTX_new(SSL_METHOD* method)
  {
!     return NEW_YS SSL_CTX(method);
  }
  
***************
*** 96,100 ****
  SSL* SSL_new(SSL_CTX* ctx)
  {
!     return new SSL(ctx);
  }
  
--- 103,107 ----
  SSL* SSL_new(SSL_CTX* ctx)
  {
!     return NEW_YS SSL(ctx);
  }
  
***************
*** 459,463 ****
              long sz = ftell(input);
              rewind(input);
!             x = new x509(sz); // takes ownership
              size_t bytes = fread(x->use_buffer(), sz, 1, input);
              if (bytes != 1) {
--- 466,470 ----
              long sz = ftell(input);
              rewind(input);
!             x = NEW_YS x509(sz); // takes ownership
              size_t bytes = fread(x->use_buffer(), sz, 1, input);
              if (bytes != 1) {
***************
*** 496,499 ****
--- 503,509 ----
          ctx->setVerifyPeer();
  
+     if (mode == SSL_VERIFY_NONE)
+         ctx->setVerifyNone();
+ 
      if (mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
          ctx->setFailNoCert();
***************
*** 502,509 ****
  
  int SSL_CTX_load_verify_locations(SSL_CTX* ctx, const char* file,
!                                   const char* /*path*/)
  {
!     // just files for now
!     return read_file(ctx, file, SSL_FILETYPE_PEM, CA);
  }
  
--- 512,574 ----
  
  int SSL_CTX_load_verify_locations(SSL_CTX* ctx, const char* file,
!                                   const char* path)
  {
!     int       ret = SSL_SUCCESS;
!     const int HALF_PATH = 128;
! 
!     if (file) ret = read_file(ctx, file, SSL_FILETYPE_PEM, CA);
! 
!     if (ret == SSL_SUCCESS && path) {
!         // call read_file for each reqular file in path
! #ifdef _WIN32
! 
!         WIN32_FIND_DATA FindFileData;
!         HANDLE hFind;
! 
!         char name[MAX_PATH + 1];  // directory specification
!         strncpy(name, path, MAX_PATH - 3);
!         strncat(name, "\\*", 3);
! 
!         hFind = FindFirstFile(name, &FindFileData);
!         if (hFind == INVALID_HANDLE_VALUE) return SSL_BAD_PATH;
! 
!         do {
!             if (FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) {
!                 strncpy(name, path, MAX_PATH - 2 - HALF_PATH);
!                 strncat(name, "\\", 2);
!                 strncat(name, FindFileData.cFileName, HALF_PATH);
!                 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
!             }
!         } while (ret == SSL_SUCCESS && FindNextFile(hFind, &FindFileData));
! 
!         FindClose(hFind);
! 
! #else   // _WIN32
! 
!         const int MAX_PATH = 260;
! 
!         DIR* dir = opendir(path);
!         if (!dir) return SSL_BAD_PATH;
! 
!         struct dirent* entry;
!         struct stat    buf;
!         char           name[MAX_PATH + 1];
! 
!         while (ret == SSL_SUCCESS && (entry = readdir(dir))) {
!             strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
!             strncat(name, "/", 1);
!             strncat(name, entry->d_name, HALF_PATH);
!             if (stat(name, &buf) < 0) return SSL_BAD_STAT;
!      
!             if (S_ISREG(buf.st_mode))
!                 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
!         }
! 
!         closedir(dir);
! 
! #endif
!     }
! 
!     return ret;
  }
  
***************
*** 654,658 ****
  DH* DH_new(void)
  {
!     DH* dh = new DH;
      if (dh)
          dh->p = dh->g = 0;
--- 719,723 ----
  DH* DH_new(void)
  {
!     DH* dh = NEW_YS DH;
      if (dh)
          dh->p = dh->g = 0;
***************
*** 679,683 ****
      if (!retVal) {
          created = true;
!         bn.reset(new BIGNUM);
          retVal = bn.get();
      }
--- 744,748 ----
      if (!retVal) {
          created = true;
!         bn.reset(NEW_YS BIGNUM);
          retVal = bn.get();
      }
***************
*** 730,734 ****
  {
      // TODO: FIX add to some list for destruction
!     return new MD5;
  }
  
--- 795,799 ----
  {
      // TODO: FIX add to some list for destruction
!     return NEW_YS MD5;
  }
  
***************
*** 737,741 ****
  {
      // TODO: FIX add to some list for destruction
!     return new DES_EDE;
  }
  
--- 802,806 ----
  {
      // TODO: FIX add to some list for destruction
!     return NEW_YS DES_EDE;
  }
  

Index: buffer.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/buffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buffer.cpp	27 Nov 2005 19:23:07 -0000	1.1
--- buffer.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 65,69 ****
  
  input_buffer::input_buffer(uint s) 
!     : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s)
  {}
  
--- 65,69 ----
  
  input_buffer::input_buffer(uint s) 
!     : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s)
  {}
  
***************
*** 71,75 ****
  // with assign
  input_buffer::input_buffer(uint s, const byte* t, uint len) 
!     : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s) 
  { 
      assign(t, len); 
--- 71,75 ----
  // with assign
  input_buffer::input_buffer(uint s, const byte* t, uint len) 
!     : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) 
  { 
      assign(t, len); 
***************
*** 87,91 ****
  { 
      assert(!buffer_);       // find realloc error
!     buffer_ = new byte[s];
      end_ = buffer_ + s; 
  }
--- 87,91 ----
  { 
      assert(!buffer_);       // find realloc error
!     buffer_ = NEW_YS byte[s];
      end_ = buffer_ + s; 
  }
***************
*** 99,103 ****
  
  
! // after a raw write user can set new size
  // if you know the size before the write use assign()
  void input_buffer::add_size(uint i) 
--- 99,103 ----
  
  
! // after a raw write user can set NEW_YS size
  // if you know the size before the write use assign()
  void input_buffer::add_size(uint i) 
***************
*** 201,205 ****
  // with allocate
  output_buffer::output_buffer(uint s) 
!     : current_(0), buffer_(new byte[s]), end_(buffer_ + s) 
  {}
  
--- 201,205 ----
  // with allocate
  output_buffer::output_buffer(uint s) 
!     : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) 
  {}
  
***************
*** 207,211 ****
  // with assign
  output_buffer::output_buffer(uint s, const byte* t, uint len) 
!     : current_(0), buffer_(new byte[s]), end_(buffer_+ s) 
  { 
      write(t, len); 
--- 207,211 ----
  // with assign
  output_buffer::output_buffer(uint s, const byte* t, uint len) 
!     : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_+ s) 
  { 
      write(t, len); 
***************
*** 242,246 ****
  { 
      assert(!buffer_);   // find realloc error
!     buffer_ = new byte[s]; end_ = buffer_ + s; 
  }
  
--- 242,246 ----
  { 
      assert(!buffer_);   // find realloc error
!     buffer_ = NEW_YS byte[s]; end_ = buffer_ + s; 
  }
  

Index: yassl_int.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/yassl_int.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_int.cpp	27 Nov 2005 19:23:08 -0000	1.1
--- yassl_int.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 32,69 ****
  
  
- void* operator new(size_t sz, yaSSL::new_t)
- {
  #ifdef YASSL_PURE_C
-     void* ptr = malloc(sz ? sz : 1);
-     if (!ptr) abort();
  
!     return ptr;
! #else
!     return ::operator new(sz);
! #endif
! }
  
  
- void operator delete(void* ptr, yaSSL::new_t)
- {
- #ifdef YASSL_PURE_C
-     if (ptr) free(ptr);
- #else
-     ::operator delete(ptr);
- #endif
- }
  
  
- void* operator new[](size_t sz, yaSSL::new_t nt)
- {
-     return ::operator new(sz, nt);
- }
  
  
- void operator delete[](void* ptr, yaSSL::new_t nt)
- {
-     ::operator delete(ptr, nt);
- }
  
  
  
--- 32,70 ----
  
  
  #ifdef YASSL_PURE_C
  
!     void* operator new(size_t sz, yaSSL::new_t)
!     {
!         void* ptr = malloc(sz ? sz : 1);
!         if (!ptr) abort();
  
+         return ptr;
+     }
  
  
+     void operator delete(void* ptr, yaSSL::new_t)
+     {
+         if (ptr) free(ptr);
+     }
  
  
+     void* operator new[](size_t sz, yaSSL::new_t nt)
+     {
+         return ::operator new(sz, nt);
+     }
  
  
+     void operator delete[](void* ptr, yaSSL::new_t nt)
+     {
+         ::operator delete(ptr, nt);
+     }
+ 
+     namespace yaSSL {
+ 
+         new_t ys;   // for yaSSL library new
+ 
+     }
+ 
+ #endif // YASSL_PURE_C
  
  
***************
*** 73,77 ****
  using mySTL::min;
  
- new_t ys;   // for yaSSL library new
  
  
--- 74,77 ----
***************
*** 287,290 ****
--- 287,292 ----
      if (ctx->getMethod()->verifyPeer())
          cm.setVerifyPeer();
+     if (ctx->getMethod()->verifyNone())
+         cm.setVerifyNone();
      if (ctx->getMethod()->failNoCert())
          cm.setFailNoCert();
***************
*** 322,327 ****
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_SHA],
                  MAX_SUITE_NAME);
--- 324,329 ----
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_SHA],
                  MAX_SUITE_NAME);
***************
*** 336,341 ****
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_SHA],
                  MAX_SUITE_NAME);
--- 338,343 ----
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_SHA],
                  MAX_SUITE_NAME);
***************
*** 350,355 ****
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_3DES_EDE_CBC_SHA]
                  , MAX_SUITE_NAME);
--- 352,357 ----
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_3DES_EDE_CBC_SHA]
                  , MAX_SUITE_NAME);
***************
*** 364,369 ****
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
--- 366,371 ----
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
***************
*** 378,383 ****
          parms.iv_size_   = 0;
          parms.cipher_type_ = stream;
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new RC4);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_SHA],
                  MAX_SUITE_NAME);
--- 380,385 ----
          parms.iv_size_   = 0;
          parms.cipher_type_ = stream;
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS RC4);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_SHA],
                  MAX_SUITE_NAME);
***************
*** 392,397 ****
          parms.iv_size_   = 0;
          parms.cipher_type_ = stream;
!         crypto_.setDigest(new MD5);
!         crypto_.setCipher(new RC4);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_MD5],
                  MAX_SUITE_NAME);
--- 394,399 ----
          parms.iv_size_   = 0;
          parms.cipher_type_ = stream;
!         crypto_.setDigest(NEW_YS MD5);
!         crypto_.setCipher(NEW_YS RC4);
          strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_MD5],
                  MAX_SUITE_NAME);
***************
*** 408,413 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
--- 410,415 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
***************
*** 424,429 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_,
                cipher_names[SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
--- 426,431 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_,
                cipher_names[SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
***************
*** 440,445 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
--- 442,447 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
***************
*** 456,461 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
--- 458,463 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
***************
*** 472,477 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
--- 474,479 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES);
          strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_DES_CBC_SHA],
                  MAX_SUITE_NAME);
***************
*** 488,493 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_,
                cipher_names[SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
--- 490,495 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_,
                cipher_names[SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
***************
*** 504,509 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
--- 506,511 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
***************
*** 520,525 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new SHA);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
--- 522,527 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS SHA);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
***************
*** 534,539 ****
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_RSA_WITH_AES_256_CBC_RMD160], MAX_SUITE_NAME);
--- 536,541 ----
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_RSA_WITH_AES_256_CBC_RMD160], MAX_SUITE_NAME);
***************
*** 548,553 ****
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_RSA_WITH_AES_128_CBC_RMD160], MAX_SUITE_NAME);
--- 550,555 ----
          parms.iv_size_   = AES_BLOCK_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_RSA_WITH_AES_128_CBC_RMD160], MAX_SUITE_NAME);
***************
*** 562,567 ****
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_RSA_WITH_3DES_EDE_CBC_RMD160], MAX_SUITE_NAME);
--- 564,569 ----
          parms.iv_size_   = DES_IV_SZ;
          parms.cipher_type_ = block;
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_,
                 cipher_names[TLS_RSA_WITH_3DES_EDE_CBC_RMD160], MAX_SUITE_NAME);
***************
*** 578,583 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160],
--- 580,585 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160],
***************
*** 595,600 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_RMD160],
--- 597,602 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_RMD160],
***************
*** 612,617 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_RMD160],
--- 614,619 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_RMD160],
***************
*** 629,634 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new DES_EDE);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160],
--- 631,636 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS DES_EDE);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160],
***************
*** 646,651 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_RMD160],
--- 648,653 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_RMD160],
***************
*** 663,668 ****
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(new RMD);
!         crypto_.setCipher(new AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_RMD160],
--- 665,670 ----
          parms.cipher_type_ = block;
          secure_.use_connection().send_server_key_  = true; // eph
!         crypto_.setDigest(NEW_YS RMD);
!         crypto_.setCipher(NEW_YS AES);
          strncpy(parms.cipher_name_,
                  cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_RMD160],
***************
*** 1384,1388 ****
  {
      Lock guard(mutex_);
!     list_.push_back(new SSL_SESSION(ssl, random_));
  }
  
--- 1386,1390 ----
  {
      Lock guard(mutex_);
!     list_.push_back(NEW_YS SSL_SESSION(ssl, random_));
  }
  
***************
*** 1451,1455 ****
  
  SSL_METHOD::SSL_METHOD(ConnectionEnd ce, ProtocolVersion pv) 
!     : version_(pv), side_(ce), verifyPeer_(false), failNoCert_(false) 
  {}
  
--- 1453,1458 ----
  
  SSL_METHOD::SSL_METHOD(ConnectionEnd ce, ProtocolVersion pv) 
!     : version_(pv), side_(ce), verifyPeer_(false), verifyNone_(false),
!       failNoCert_(false) 
  {}
  
***************
*** 1473,1476 ****
--- 1476,1485 ----
  
  
+ void SSL_METHOD::setVerifyNone()
+ {
+     verifyNone_ = true;
+ }
+ 
+ 
  void SSL_METHOD::setFailNoCert()
  {
***************
*** 1485,1488 ****
--- 1494,1503 ----
  
  
+ bool SSL_METHOD::verifyNone() const
+ {
+     return verifyNone_;
+ }
+ 
+ 
  bool SSL_METHOD::failNoCert() const
  {
***************
*** 1561,1564 ****
--- 1576,1585 ----
  
  
+ void SSL_CTX::setVerifyNone()
+ {
+     method_->setVerifyNone();
+ }
+ 
+ 
  void SSL_CTX::setFailNoCert()
  {
***************
*** 1783,1787 ****
  {
      if (dh.set_)
!         dh_ = new DiffieHellman(dh.p_, dh.g_, random_);
  }
  
--- 1804,1808 ----
  {
      if (dh.set_)
!         dh_ = NEW_YS DiffieHellman(dh.p_, dh.g_, random_);
  }
  
***************
*** 1950,1954 ****
  {
      if (sz) {
!         name_ = new char[sz];
          memcpy(name_, n, sz);
      }
--- 1971,1975 ----
  {
      if (sz) {
!         name_ = NEW_YS char[sz];
          memcpy(name_, n, sz);
      }

Index: socket_wrapper.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/socket_wrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** socket_wrapper.cpp	3 Dec 2005 00:18:08 -0000	1.2
--- socket_wrapper.cpp	19 Feb 2006 16:51:08 -0000	1.3
***************
*** 47,53 ****
--- 47,55 ----
      const int SOCKET_EINVAL = WSAEINVAL;
      const int SOCKET_EWOULDBLOCK = WSAEWOULDBLOCK;
+     const int SOCKET_EAGAIN = WSAEWOULDBLOCK;
  #else
      const int SOCKET_EINVAL = EINVAL;
      const int SOCKET_EWOULDBLOCK = EWOULDBLOCK;
+     const int SOCKET_EAGAIN = EAGAIN;
  #endif // _WIN32
  
***************
*** 123,147 ****
      int recvd = ::recv(socket_, reinterpret_cast<char *>(buf), sz, flags);
  
! 	if (recvd == -1) {
! #ifdef _WIN32
! 		if(WSAGetLastError() == WSAEWOULDBLOCK)
! #else
! 		if(errno == EAGAIN)
! #endif
! 			return 0;
! 		else
! 			return (uint)-1;
! 	} else if(recvd == 0) {
! 		return (uint)-1;
! 	}
      return recvd;
  }
  
  
! // wait if blocking for input, or error
  bool Socket::wait() const
  {
      byte b;
!     return receive(&b, 1, MSG_PEEK) != (uint)-1;
  }
  
--- 125,146 ----
      int recvd = ::recv(socket_, reinterpret_cast<char *>(buf), sz, flags);
  
!     // idea to seperate error from would block by arn...@gm...
!     if (recvd == -1) {
!         if (get_lastError() == SOCKET_EWOULDBLOCK || 
!             get_lastError() == SOCKET_EAGAIN)
!             return 0;
!     }
!     else if (recvd == 0)
!         return static_cast<uint>(-1);
! 
      return recvd;
  }
  
  
! // wait if blocking for input, return false for error
  bool Socket::wait() const
  {
      byte b;
!     return receive(&b, 1, MSG_PEEK) != static_cast<uint>(-1);
  }
  

Index: handshake.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/handshake.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** handshake.cpp	3 Dec 2005 00:18:08 -0000	1.2
--- handshake.cpp	19 Feb 2006 16:51:08 -0000	1.3
***************
*** 25,28 ****
--- 25,30 ----
   */
  
+ 
+ 
  #include "runtime.hpp"
  #include "handshake.hpp"
***************
*** 363,369 ****
  
      if (hash == md5)
!         hmac.reset(new HMAC_MD5(secret.get_buffer(), secret.get_size()));
      else
!         hmac.reset(new HMAC_SHA(secret.get_buffer(), secret.get_size()));
                                                                     // A0 = seed
      hmac->get_digest(previous, seed.get_buffer(), seed.get_size());// A1
--- 365,371 ----
  
      if (hash == md5)
!         hmac.reset(NEW_YS HMAC_MD5(secret.get_buffer(), secret.get_size()));
      else
!         hmac.reset(NEW_YS HMAC_SHA(secret.get_buffer(), secret.get_size()));
                                                                     // A0 = seed
      hmac->get_digest(previous, seed.get_buffer(), seed.get_size());// A1
***************
*** 583,591 ****
  
      if (algo == sha)
!         hmac.reset(new HMAC_SHA(ssl.get_macSecret(verify), SHA_LEN));
      else if (algo == rmd)
!         hmac.reset(new HMAC_RMD(ssl.get_macSecret(verify), RMD_LEN));
      else
!         hmac.reset(new HMAC_MD5(ssl.get_macSecret(verify), MD5_LEN));
      
      hmac->update(seq, SEQ_SZ);                                       // seq_num
--- 585,593 ----
  
      if (algo == sha)
!         hmac.reset(NEW_YS HMAC_SHA(ssl.get_macSecret(verify), SHA_LEN));
      else if (algo == rmd)
!         hmac.reset(NEW_YS HMAC_RMD(ssl.get_macSecret(verify), RMD_LEN));
      else
!         hmac.reset(NEW_YS HMAC_MD5(ssl.get_macSecret(verify), MD5_LEN));
      
      hmac->update(seq, SEQ_SZ);                                       // seq_num
***************
*** 655,665 ****
  DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
  {
! 	// wait for input if blocking
! 	if(!ssl.getSocket().wait()) {
!         ssl.SetError(receive_error);	
! 		return buffered;
! 	}
      uint ready = ssl.getSocket().get_ready();
!     if (!ready) return buffered;
  
      // add buffered data if its there
--- 657,667 ----
  DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
  {
!     // wait for input if blocking
!     if (!ssl.getSocket().wait()) {
!         ssl.SetError(receive_error);
!         return buffered = null_buffer;
!     }
      uint ready = ssl.getSocket().get_ready();
!     if (!ready) return buffered; 
  
      // add buffered data if its there
***************
*** 671,675 ****
      }
  
!     // add new data
      uint read  = ssl.getSocket().receive(buffer.get_buffer() + buffSz, ready);
      buffer.add_size(read);
--- 673,677 ----
      }
  
!     // add NEW_YS data
      uint read  = ssl.getSocket().receive(buffer.get_buffer() + buffSz, ready);
      buffer.add_size(read);
***************
*** 692,696 ****
          if (hdr.length_ > buffer.get_remaining()) { 
              uint sz = buffer.get_remaining() + RECORD_HEADER;
!             buffered.reset(new input_buffer(sz, buffer.get_buffer() +
                             buffer.get_current() - RECORD_HEADER, sz));
              break;
--- 694,698 ----
          if (hdr.length_ > buffer.get_remaining()) { 
              uint sz = buffer.get_remaining() + RECORD_HEADER;
!             buffered.reset(NEW_YS input_buffer(sz, buffer.get_buffer() +
                             buffer.get_current() - RECORD_HEADER, sz));
              break;
***************
*** 728,731 ****
--- 730,734 ----
          else
              break;
+         if (ssl.GetError()) return;
      }
  }
***************
*** 765,769 ****
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
      buildHeaders(ssl, hsHeader, rlHeader, ck);
      buildOutput(*out.get(), rlHeader, hsHeader, ck);
--- 768,772 ----
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
      buildHeaders(ssl, hsHeader, rlHeader, ck);
      buildOutput(*out.get(), rlHeader, hsHeader, ck);
***************
*** 786,790 ****
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
      buildHeaders(ssl, hsHeader, rlHeader, sk);
      buildOutput(*out.get(), rlHeader, hsHeader, sk);
--- 789,793 ----
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
      buildHeaders(ssl, hsHeader, rlHeader, sk);
      buildOutput(*out.get(), rlHeader, hsHeader, sk);
***************
*** 811,815 ****
      RecordLayerHeader rlHeader;
      buildHeader(ssl, rlHeader, ccs);
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
      buildOutput(*out.get(), rlHeader, ccs);
     
--- 814,818 ----
      RecordLayerHeader rlHeader;
      buildHeader(ssl, rlHeader, ccs);
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
      buildOutput(*out.get(), rlHeader, ccs);
     
***************
*** 828,832 ****
      Finished fin;
      buildFinished(ssl, fin, side == client_end ? client : server);
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
      cipherFinished(ssl, fin, *out.get());                   // hashes handshake
  
--- 831,835 ----
      Finished fin;
      buildFinished(ssl, fin, side == client_end ? client : server);
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
      cipherFinished(ssl, fin, *out.get());                   // hashes handshake
  
***************
*** 912,916 ****
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
  
      buildServerHello(ssl, sh);
--- 915,919 ----
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
  
      buildServerHello(ssl, sh);
***************
*** 935,939 ****
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, shd);
--- 938,942 ----
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, shd);
***************
*** 956,960 ****
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, cert);
--- 959,963 ----
      RecordLayerHeader rlHeader;
      HandShakeHeader   hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, cert);
***************
*** 978,982 ****
      RecordLayerHeader  rlHeader;
      HandShakeHeader    hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, request);
--- 981,985 ----
      RecordLayerHeader  rlHeader;
      HandShakeHeader    hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, request);
***************
*** 1000,1004 ****
      RecordLayerHeader  rlHeader;
      HandShakeHeader    hsHeader;
!     mySTL::auto_ptr<output_buffer> out(new output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, verify);
--- 1003,1007 ----
      RecordLayerHeader  rlHeader;
      HandShakeHeader    hsHeader;
!     mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer, ysDelete);
  
      buildHeaders(ssl, hsHeader, rlHeader, verify);

Index: crypto_wrapper.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/crypto_wrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** crypto_wrapper.cpp	27 Nov 2005 19:23:08 -0000	1.1
--- crypto_wrapper.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 59,63 ****
  
  
! MD5::MD5() : pimpl_(new MD5Impl) {}
  
  
--- 59,63 ----
  
  
! MD5::MD5() : pimpl_(NEW_YS MD5Impl) {}
  
  
***************
*** 65,69 ****
  
  
! MD5::MD5(const MD5& that) : Digest(), pimpl_(new 
                                               MD5Impl(that.pimpl_->md5_)) {}
  
--- 65,69 ----
  
  
! MD5::MD5(const MD5& that) : Digest(), pimpl_(NEW_YS 
                                               MD5Impl(that.pimpl_->md5_)) {}
  
***************
*** 117,121 ****
  
  
! SHA::SHA() : pimpl_(new SHAImpl) {}
  
  
--- 117,121 ----
  
  
! SHA::SHA() : pimpl_(NEW_YS SHAImpl) {}
  
  
***************
*** 123,127 ****
  
  
! SHA::SHA(const SHA& that) : Digest(), pimpl_(new SHAImpl(that.pimpl_->sha_)) {}
  
  SHA& SHA::operator=(const SHA& that)
--- 123,127 ----
  
  
! SHA::SHA(const SHA& that) : Digest(), pimpl_(NEW_YS SHAImpl(that.pimpl_->sha_)) {}
  
  SHA& SHA::operator=(const SHA& that)
***************
*** 174,178 ****
  
  
! RMD::RMD() : pimpl_(new RMDImpl) {}
  
  
--- 174,178 ----
  
  
! RMD::RMD() : pimpl_(NEW_YS RMDImpl) {}
  
  
***************
*** 180,184 ****
  
  
! RMD::RMD(const RMD& that) : Digest(), pimpl_(new RMDImpl(that.pimpl_->rmd_)) {}
  
  RMD& RMD::operator=(const RMD& that)
--- 180,184 ----
  
  
! RMD::RMD(const RMD& that) : Digest(), pimpl_(NEW_YS RMDImpl(that.pimpl_->rmd_)) {}
  
  RMD& RMD::operator=(const RMD& that)
***************
*** 231,235 ****
  
  HMAC_MD5::HMAC_MD5(const byte* secret, unsigned int len) 
!     : pimpl_(new HMAC_MD5Impl) 
  {
      pimpl_->mac_.SetKey(secret, len);
--- 231,235 ----
  
  HMAC_MD5::HMAC_MD5(const byte* secret, unsigned int len) 
!     : pimpl_(NEW_YS HMAC_MD5Impl) 
  {
      pimpl_->mac_.SetKey(secret, len);
***************
*** 281,285 ****
  
  HMAC_SHA::HMAC_SHA(const byte* secret, unsigned int len) 
!     : pimpl_(new HMAC_SHAImpl) 
  {
      pimpl_->mac_.SetKey(secret, len);
--- 281,285 ----
  
  HMAC_SHA::HMAC_SHA(const byte* secret, unsigned int len) 
!     : pimpl_(NEW_YS HMAC_SHAImpl) 
  {
      pimpl_->mac_.SetKey(secret, len);
***************
*** 332,336 ****
  
  HMAC_RMD::HMAC_RMD(const byte* secret, unsigned int len) 
!     : pimpl_(new HMAC_RMDImpl) 
  {
      pimpl_->mac_.SetKey(secret, len);
--- 332,336 ----
  
  HMAC_RMD::HMAC_RMD(const byte* secret, unsigned int len) 
!     : pimpl_(NEW_YS HMAC_RMDImpl) 
  {
      pimpl_->mac_.SetKey(secret, len);
***************
*** 380,384 ****
  
  
! DES::DES() : pimpl_(new DESImpl) {}
  
  DES::~DES() { ysDelete(pimpl_); }
--- 380,384 ----
  
  
! DES::DES() : pimpl_(NEW_YS DESImpl) {}
  
  DES::~DES() { ysDelete(pimpl_); }
***************
*** 416,420 ****
  
  
! DES_EDE::DES_EDE() : pimpl_(new DES_EDEImpl) {}
  
  DES_EDE::~DES_EDE() { ysDelete(pimpl_); }
--- 416,420 ----
  
  
! DES_EDE::DES_EDE() : pimpl_(NEW_YS DES_EDEImpl) {}
  
  DES_EDE::~DES_EDE() { ysDelete(pimpl_); }
***************
*** 454,458 ****
  
  
! RC4::RC4() : pimpl_(new RC4Impl) {}
  
  RC4::~RC4() { ysDelete(pimpl_); }
--- 454,458 ----
  
  
! RC4::RC4() : pimpl_(NEW_YS RC4Impl) {}
  
  RC4::~RC4() { ysDelete(pimpl_); }
***************
*** 496,500 ****
  
  
! AES::AES(unsigned int ks) : pimpl_(new AESImpl(ks)) {}
  
  AES::~AES() { ysDelete(pimpl_); }
--- 496,500 ----
  
  
! AES::AES(unsigned int ks) : pimpl_(NEW_YS AESImpl(ks)) {}
  
  AES::~AES() { ysDelete(pimpl_); }
***************
*** 537,541 ****
  };
  
! RandomPool::RandomPool() : pimpl_(new RandomImpl) {}
  
  RandomPool::~RandomPool() { ysDelete(pimpl_); }
--- 537,541 ----
  };
  
! RandomPool::RandomPool() : pimpl_(NEW_YS RandomImpl) {}
  
  RandomPool::~RandomPool() { ysDelete(pimpl_); }
***************
*** 581,585 ****
  // Set public or private key
  DSS::DSS(const byte* key, unsigned int sz, bool publicKey) 
!     : pimpl_(new DSSImpl)
  {
      if (publicKey) 
--- 581,585 ----
  // Set public or private key
  DSS::DSS(const byte* key, unsigned int sz, bool publicKey) 
!     : pimpl_(NEW_YS DSSImpl)
  {
      if (publicKey) 
***************
*** 652,656 ****
  // Set public or private key
  RSA::RSA(const byte* key, unsigned int sz, bool publicKey) 
!     : pimpl_(new RSAImpl)
  {
      if (publicKey) 
--- 652,656 ----
  // Set public or private key
  RSA::RSA(const byte* key, unsigned int sz, bool publicKey) 
!     : pimpl_(NEW_YS RSAImpl)
  {
      if (publicKey) 
***************
*** 724,728 ****
  };
  
! Integer::Integer() : pimpl_(new IntegerImpl) {}
  
  Integer::~Integer() { ysDelete(pimpl_); }
--- 724,728 ----
  };
  
! Integer::Integer() : pimpl_(NEW_YS IntegerImpl) {}
  
  Integer::~Integer() { ysDelete(pimpl_); }
***************
*** 730,734 ****
  
  
! Integer::Integer(const Integer& other) : pimpl_(new 
                                                 IntegerImpl(other.pimpl_->int_))
  {}
--- 730,734 ----
  
  
! Integer::Integer(const Integer& other) : pimpl_(NEW_YS 
                                                 IntegerImpl(other.pimpl_->int_))
  {}
***************
*** 774,780 ****
      void AllocKeys(unsigned int pubSz, unsigned int privSz, unsigned int agrSz)
      {
!         publicKey_  = new byte[pubSz];
!         privateKey_ = new byte[privSz];
!         agreedKey_  = new byte[agrSz];
      }
  };
--- 774,780 ----
      void AllocKeys(unsigned int pubSz, unsigned int privSz, unsigned int agrSz)
      {
!         publicKey_  = NEW_YS byte[pubSz];
!         privateKey_ = NEW_YS byte[privSz];
!         agreedKey_  = NEW_YS byte[agrSz];
      }
  };
***************
*** 785,789 ****
  // server Side DH, server's view
  DiffieHellman::DiffieHellman(const char* file, const RandomPool& random)
!     : pimpl_(new DHImpl(random.pimpl_->RNG_))
  {
      using namespace TaoCrypt;
--- 785,789 ----
  // server Side DH, server's view
  DiffieHellman::DiffieHellman(const char* file, const RandomPool& random)
!     : pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
  {
      using namespace TaoCrypt;
***************
*** 809,818 ****
                               unsigned int gSz, const byte* pub,
                               unsigned int pubSz, const RandomPool& random)
!     : pimpl_(new DHImpl(random.pimpl_->RNG_))
  {
      using TaoCrypt::Integer;
  
      pimpl_->dh_.Initialize(Integer(p, pSz).Ref(), Integer(g, gSz).Ref());
!     pimpl_->publicKey_ = new opaque[pubSz];
      memcpy(pimpl_->publicKey_, pub, pubSz);
  }
--- 809,818 ----
                               unsigned int gSz, const byte* pub,
                               unsigned int pubSz, const RandomPool& random)
!     : pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
  {
      using TaoCrypt::Integer;
  
      pimpl_->dh_.Initialize(Integer(p, pSz).Ref(), Integer(g, gSz).Ref());
!     pimpl_->publicKey_ = NEW_YS opaque[pubSz];
      memcpy(pimpl_->publicKey_, pub, pubSz);
  }
***************
*** 822,826 ****
  DiffieHellman::DiffieHellman(const Integer& p, const Integer& g,
                               const RandomPool& random)
! : pimpl_(new DHImpl(random.pimpl_->RNG_))
  {
      using TaoCrypt::Integer;
--- 822,826 ----
  DiffieHellman::DiffieHellman(const Integer& p, const Integer& g,
                               const RandomPool& random)
! : pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
  {
      using TaoCrypt::Integer;
***************
*** 840,844 ****
  // Client side and view, use server that for p and g
  DiffieHellman::DiffieHellman(const DiffieHellman& that) 
!     : pimpl_(new DHImpl(*that.pimpl_))
  {   
      pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
--- 840,844 ----
  // Client side and view, use server that for p and g
  DiffieHellman::DiffieHellman(const DiffieHellman& that) 
!     : pimpl_(NEW_YS DHImpl(*that.pimpl_))
  {   
      pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
***************
*** 961,965 ****
  
      uint sz = der.size();
!     mySTL::auto_ptr<x509> x(new x509(sz), ysDelete);
      memcpy(x->use_buffer(), der.get_buffer(), sz);
  
--- 961,965 ----
  
      uint sz = der.size();
!     mySTL::auto_ptr<x509> x(NEW_YS x509(sz), ysDelete);
      memcpy(x->use_buffer(), der.get_buffer(), sz);
  

Index: yassl_imp.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/yassl_imp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_imp.cpp	27 Nov 2005 19:23:07 -0000	1.1
--- yassl_imp.cpp	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 135,142 ****
      
      if (ssl.getSecurity().get_parms().sig_algo_ == rsa_sa_algo)
!         auth.reset(new RSA(cert.get_privateKey(),
                     cert.get_privateKeyLength(), false));
      else {
!         auth.reset(new DSS(cert.get_privateKey(),
                     cert.get_privateKeyLength(), false));
          sigSz += DSS_ENCODED_EXTRA;
--- 135,142 ----
      
      if (ssl.getSecurity().get_parms().sig_algo_ == rsa_sa_algo)
!         auth.reset(NEW_YS RSA(cert.get_privateKey(),
                     cert.get_privateKeyLength(), false));
      else {
!         auth.reset(NEW_YS DSS(cert.get_privateKey(),
                     cert.get_privateKeyLength(), false));
          sigSz += DSS_ENCODED_EXTRA;
***************
*** 169,173 ****
      MD5  md5;
      SHA  sha;
!     signature_ = new byte[sigSz];
  
      const Connection& conn = ssl.getSecurity().get_connection();
--- 169,173 ----
      MD5  md5;
      SHA  sha;
!     signature_ = NEW_YS byte[sigSz];
  
      const Connection& conn = ssl.getSecurity().get_connection();
***************
*** 200,204 ****
  
      // key message
!     keyMessage_ = new opaque[length_];
      memcpy(keyMessage_, tmp.get_buffer(), tmp.get_size());
  }
--- 200,204 ----
  
      // key message
!     keyMessage_ = NEW_YS opaque[length_];
      memcpy(keyMessage_, tmp.get_buffer(), tmp.get_size());
  }
***************
*** 254,258 ****
  {
      length_ = sz;
!     secret_ = new opaque[sz];
  }
  
--- 254,258 ----
  {
      length_ = sz;
!     secret_ = NEW_YS opaque[sz];
  }
  
***************
*** 304,308 ****
  {
      length_ = sz + (offset ? KEY_OFFSET : 0); 
!     Yc_ = new opaque[length_];
  }
  
--- 304,308 ----
  {
      length_ = sz + (offset ? KEY_OFFSET : 0); 
!     Yc_ = NEW_YS opaque[length_];
  }
  
***************
*** 349,353 ****
      ato16(tmp, length);
  
!     signature_ = new byte[length];
      input.read(signature_, length);
  
--- 349,353 ----
      ato16(tmp, length);
  
!     signature_ = NEW_YS byte[length];
      input.read(signature_, length);
  
***************
*** 387,391 ****
  
      // save input
!     ssl.useCrypto().SetDH(new DiffieHellman(parms_.get_p(),
                 parms_.get_pSize(), parms_.get_g(), parms_.get_gSize(),
                 parms_.get_pub(), parms_.get_pubSize(),
--- 387,391 ----
  
      // save input
!     ssl.useCrypto().SetDH(NEW_YS DiffieHellman(parms_.get_p(),
                 parms_.get_pSize(), parms_.get_g(), parms_.get_gSize(),
                 parms_.get_pub(), parms_.get_pubSize(),
***************
*** 929,933 ****
      if (dataSz) {
          input_buffer* data;
!         ssl.addData(data = new input_buffer(dataSz));
          input.read(data->get_buffer(), dataSz);
          data->add_size(dataSz);
--- 929,933 ----
      if (dataSz) {
          input_buffer* data;
!         ssl.addData(data = NEW_YS input_buffer(dataSz));
          input.read(data->get_buffer(), dataSz);
          data->add_size(dataSz);
***************
*** 1026,1030 ****
          
          x509* myCert;
!         cm.AddPeerCert(myCert = new x509(cert_sz));
          input.read(myCert->use_buffer(), myCert->get_length());
  
--- 1026,1030 ----
          
          x509* myCert;
!         cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
          input.read(myCert->use_buffer(), myCert->get_length());
  
***************
*** 1112,1116 ****
  opaque* ServerDHParams::alloc_p(int sz)
  {
!     p_ = new opaque[pSz_ = sz];
      return p_;
  }
--- 1112,1116 ----
  opaque* ServerDHParams::alloc_p(int sz)
  {
!     p_ = NEW_YS opaque[pSz_ = sz];
      return p_;
  }
***************
*** 1119,1123 ****
  opaque* ServerDHParams::alloc_g(int sz)
  {
!     g_ = new opaque[gSz_ = sz];
      return g_;
  }
--- 1119,1123 ----
  opaque* ServerDHParams::alloc_g(int sz)
  {
!     g_ = NEW_YS opaque[gSz_ = sz];
      return g_;
  }
***************
*** 1126,1130 ****
  opaque* ServerDHParams::alloc_pub(int sz)
  {
!     Ys_ = new opaque[pubSz_ = sz];
      return Ys_;
  }
--- 1126,1130 ----
  opaque* ServerDHParams::alloc_pub(int sz)
  {
!     Ys_ = NEW_YS opaque[pubSz_ = sz];
      return Ys_;
  }
***************
*** 1538,1542 ****
          int sz = REQUEST_HEADER + MIN_DIS_SIZE;
          DistinguishedName dn;
!         certificate_authorities_.push_back(dn = new byte[sz]);
  
          opaque tmp[REQUEST_HEADER];
--- 1538,1542 ----
          int sz = REQUEST_HEADER + MIN_DIS_SIZE;
          DistinguishedName dn;
!         certificate_authorities_.push_back(dn = NEW_YS byte[sz]);
  
          opaque tmp[REQUEST_HEADER];
***************
*** 1585,1589 ****
          
          DistinguishedName dn;
!         request.certificate_authorities_.push_back(dn = new 
                                                    byte[REQUEST_HEADER + dnSz]);
          memcpy(dn, tmp, REQUEST_HEADER);
--- 1585,1589 ----
          
          DistinguishedName dn;
!         request.certificate_authorities_.push_back(dn = NEW_YS 
                                                    byte[REQUEST_HEADER + dnSz]);
          memcpy(dn, tmp, REQUEST_HEADER);
***************
*** 1631,1635 ****
  void CertificateRequest::Process(input_buffer&, SSL& ssl)
  {
!     ssl.useCrypto().use_certManager().setSendVerify();
  }
  
--- 1631,1636 ----
  void CertificateRequest::Process(input_buffer&, SSL& ssl)
  {
!     if (ssl.useCrypto().use_certManager().get_cert())
!         ssl.useCrypto().use_certManager().setSendVerify();
  }
  
***************
*** 1666,1670 ****
  
          sz = rsa.get_cipherLength() + VERIFY_HEADER;
!         sig.reset(new byte[sz]);
  
          c16toa(sz - VERIFY_HEADER, len);
--- 1667,1671 ----
  
          sz = rsa.get_cipherLength() + VERIFY_HEADER;
!         sig.reset(NEW_YS byte[sz]);
  
          c16toa(sz - VERIFY_HEADER, len);
***************
*** 1677,1681 ****
  
          sz = DSS_SIG_SZ + DSS_ENCODED_EXTRA + VERIFY_HEADER;
!         sig.reset(new byte[sz]);
  
          c16toa(sz - VERIFY_HEADER, len);
--- 1678,1682 ----
  
          sz = DSS_SIG_SZ + DSS_ENCODED_EXTRA + VERIFY_HEADER;
!         sig.reset(NEW_YS byte[sz]);
  
          c16toa(sz - VERIFY_HEADER, len);
***************
*** 1715,1719 ****
      request.set_length(sz);
  
!     request.signature_ = new byte[sz];
      input.read(request.signature_, sz);
  
--- 1716,1720 ----
      request.set_length(sz);
  
!     request.signature_ = NEW_YS byte[sz];
      input.read(request.signature_, sz);
  
***************
*** 1976,1980 ****
  void Connection::AllocPreSecret(uint sz) 
  { 
!     pre_master_secret_ = new opaque[pre_secret_len_ = sz];
  }
  
--- 1977,1981 ----
  void Connection::AllocPreSecret(uint sz) 
  { 
!     pre_master_secret_ = NEW_YS opaque[pre_secret_len_ = sz];
  }
  
***************
*** 2012,2044 ****
  
  // Create functions for message factory
! Message* CreateCipherSpec() { return new ChangeCipherSpec; }
! Message* CreateAlert()      { return new Alert; }
! Message* CreateHandShake()  { return new HandShakeHeader; }
! Message* CreateData()       { return new Data; }
  
  // Create functions for handshake factory
! HandShakeBase* CreateHelloRequest()       { return new HelloRequest; }
! HandShakeBase* CreateClientHello()        { return new ClientHello; }
! HandShakeBase* CreateServerHello()        { return new ServerHello; }
! HandShakeBase* CreateCertificate()        { return new Certificate; }
! HandShakeBase* CreateServerKeyExchange()  { return new ServerKeyExchange;}
! HandShakeBase* CreateCertificateRequest() { return new 
                                                      CertificateRequest; }
! HandShakeBase* CreateServerHelloDone()    { return new ServerHelloDone; }
! HandShakeBase* CreateCertificateVerify()  { return new CertificateVerify;}
! HandShakeBase* CreateClientKeyExchange()  { return new ClientKeyExchange;}
! HandShakeBase* CreateFinished()           { return new Finished; }
  
  // Create functions for server key exchange factory
! ServerKeyBase* CreateRSAServerKEA()       { return new RSA_Server; }
! ServerKeyBase* CreateDHServerKEA()        { return new DH_Server; }
! ServerKeyBase* CreateFortezzaServerKEA()  { return new Fortezza_Server; }
  
  // Create functions for client key exchange factory
! ClientKeyBase* CreateRSAClient()      { return new 
                                                  EncryptedPreMasterSecret; }
! ClientKeyBase* CreateDHClient()       { return new 
                                                  ClientDiffieHellmanPublic; }
! ClientKeyBase* CreateFortezzaClient() { return new FortezzaKeys; }
  
  
--- 2013,2045 ----
  
  // Create functions for message factory
! Message* CreateCipherSpec() { return NEW_YS ChangeCipherSpec; }
! Message* CreateAlert()      { return NEW_YS Alert; }
! Message* CreateHandShake()  { return NEW_YS HandShakeHeader; }
! Message* CreateData()       { return NEW_YS Data; }
  
  // Create functions for handshake factory
! HandShakeBase* CreateHelloRequest()       { return NEW_YS HelloRequest; }
! HandShakeBase* CreateClientHello()        { return NEW_YS ClientHello; }
! HandShakeBase* CreateServerHello()        { return NEW_YS ServerHello; }
! HandShakeBase* CreateCertificate()        { return NEW_YS Certificate; }
! HandShakeBase* CreateServerKeyExchange()  { return NEW_YS ServerKeyExchange;}
! HandShakeBase* CreateCertificateRequest() { return NEW_YS 
                                                      CertificateRequest; }
! HandShakeBase* CreateServerHelloDone()    { return NEW_YS ServerHelloDone; }
! HandShakeBase* CreateCertificateVerify()  { return NEW_YS CertificateVerify;}
! HandShakeBase* CreateClientKeyExchange()  { return NEW_YS ClientKeyExchange;}
! HandShakeBase* CreateFinished()           { return NEW_YS Finished; }
  
  // Create functions for server ...
 
[truncated message content]

[Dcplusplus-commit] dcplusplus/yassl/include cert_wrapper.hpp,1.1,1.2 yassl_int.hpp,1.1,1.2 yassl_types.hpp,1.1,1.2

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/yassl/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl/include

Modified Files:
	cert_wrapper.hpp yassl_int.hpp yassl_types.hpp 
Log Message:
yassl update, installer fix

Index: cert_wrapper.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/cert_wrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cert_wrapper.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- cert_wrapper.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 84,87 ****
--- 84,88 ----
                                          //    plus verified chained certs
      bool verifyPeer_;
+     bool verifyNone_;                   // no error if verify fails
      bool failNoCert_;
      bool sendVerify_;
***************
*** 108,115 ****
--- 109,118 ----
  
      bool verifyPeer() const;
+     bool verifyNone() const;
      bool failNoCert() const;
      bool sendVerify() const;
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
      void setSendVerify();

Index: yassl_types.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/yassl_types.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_types.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- yassl_types.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 35,80 ****
  namespace yaSSL {
  
! // library allocation
! struct new_t {};      // yaSSL New type
! extern new_t ys;      // pass in parameter
  
! } // namespace yaSSL
  
! void* operator new  (size_t, yaSSL::new_t);
! void* operator new[](size_t, yaSSL::new_t);
  
! void operator delete  (void*, yaSSL::new_t);
! void operator delete[](void*, yaSSL::new_t);
  
  
- namespace yaSSL {
  
  
- template<typename T>
- void ysDelete(T* ptr)
- {
-     if (ptr) ptr->~T();
-     ::operator delete(ptr, yaSSL::ys);
- }
  
! template<typename T>
! void ysArrayDelete(T* ptr)
! {
!     // can't do array placement destruction since not tracking size in
!     // allocation, only allow builtins to use array placement since they
!     // don't need destructors called
!     typedef char builtin[TaoCrypt::IsFundamentalType<T>::Yes ? 1 : -1];
!     (void)sizeof(builtin);
  
!     ::operator delete[](ptr, yaSSL::ys);
! }
  
  
! // to resolve compiler generated operator delete on base classes with
! // virtual destructors (when on stack), make sure doesn't get called
! class virtual_base {
! public:
!     static void operator delete(void*) { assert(0); }
! };
  
  
--- 35,107 ----
  namespace yaSSL {
  
! #ifdef YASSL_PURE_C
  
!     // library allocation
!     struct new_t {};      // yaSSL New type
!     extern new_t ys;      // pass in parameter
  
!     } // namespace yaSSL
  
!     void* operator new  (size_t, yaSSL::new_t);
!     void* operator new[](size_t, yaSSL::new_t);
  
+     void operator delete  (void*, yaSSL::new_t);
+     void operator delete[](void*, yaSSL::new_t);
  
  
+     namespace yaSSL {
  
  
!     template<typename T>
!     void ysDelete(T* ptr)
!     {
!         if (ptr) ptr->~T();
!         ::operator delete(ptr, yaSSL::ys);
!     }
  
!     template<typename T>
!     void ysArrayDelete(T* ptr)
!     {
!         // can't do array placement destruction since not tracking size in
!         // allocation, only allow builtins to use array placement since they
!         // don't need destructors called
!         typedef char builtin[TaoCrypt::IsFundamentalType<T>::Yes ? 1 : -1];
!         (void)sizeof(builtin);
  
+         ::operator delete[](ptr, yaSSL::ys);
+     }
  
!     #define NEW_YS new (ys) 
! 
!     // to resolve compiler generated operator delete on base classes with
!     // virtual destructors (when on stack), make sure doesn't get called
!     class virtual_base {
!     public:
!         static void operator delete(void*) { assert(0); }
!     };
! 
! 
! #else   // YASSL_PURE_C
! 
! 
!     template<typename T>
!     void ysDelete(T* ptr)
!     {
!         delete ptr;
!     }
! 
!     template<typename T>
!     void ysArrayDelete(T* ptr)
!     {
!         delete[] ptr;
!     }
! 
!     #define NEW_YS new
! 
!     class virtual_base {};
! 
! 
! 
! #endif // YASSL_PURE_C
  
  

Index: yassl_int.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/yassl_int.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_int.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- yassl_int.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 230,234 ****
      ProtocolVersion version_;
      ConnectionEnd   side_;
!     bool            verifyPeer_;
      bool            failNoCert_;
  public:
--- 230,235 ----
      ProtocolVersion version_;
      ConnectionEnd   side_;
!     bool            verifyPeer_;    // request or send certificate
!     bool            verifyNone_;    // whether to verify certificate
      bool            failNoCert_;
  public:
***************
*** 239,245 ****
--- 240,248 ----
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
  
      bool verifyPeer() const;
+     bool verifyNone() const;
      bool failNoCert() const;
  private:
***************
*** 334,337 ****
--- 337,341 ----
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
      bool SetCipherList(const char*);

[Dcplusplus-commit] dcplusplus/yassl README,1.1,1.2

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/yassl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl

Modified Files:
	README 
Log Message:
yassl update, installer fix

Index: README
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	27 Nov 2005 19:19:20 -0000	1.1
--- README	19 Feb 2006 16:51:10 -0000	1.2
***************
*** 1,3 ****
! yaSSL Release notes, version 1.0.6
  
  This release of yaSSL contains minor bug fixes, portability enhancements,
--- 1,15 ----
! yaSSL Release notes, version 1.1.5
! 
!     This release of yaSSL contains minor bug fixes, portability enhancements,
!     and user requested changes including the ability to add all certificates in
!     a directory, more robust socket handling, no new overloading unless
!     requested, and an SSL_VERIFY_NONE option.
! 
! 
! See build instructions below under 1.0.6:
! 
! 
! 
! ******************yaSSL Release notes, version 1.0.6
  
  This release of yaSSL contains minor bug fixes, portability enhancements,

[Dcplusplus-commit] dcplusplus/yassl/include/openssl ssl.h,1.1,1.2

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/yassl/include/openssl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl/include/openssl

Modified Files:
	ssl.h 
Log Message:
yassl update, installer fix

Index: ssl.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/openssl/ssl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ssl.h	27 Nov 2005 19:19:20 -0000	1.1
--- ssl.h	19 Feb 2006 16:51:08 -0000	1.2
***************
*** 24,27 ****
--- 24,29 ----
   */
  
+ 
+ 
  #ifndef ysSSL_openssl_h__
  #define yaSSL_openssl_h__
***************
*** 259,262 ****
--- 261,266 ----
  
  enum { /* ssl Constants */
+     SSL_BAD_STAT        = -7,
+     SSL_BAD_PATH        = -6,
      SSL_BAD_FILETYPE    = -5,
      SSL_BAD_FILE        = -4,

[Dcplusplus-commit] dcplusplus changelog.txt,1.315,1.316 DCPlusPlus.nsi,1.18,1.19

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210

Modified Files:
	changelog.txt DCPlusPlus.nsi 
Log Message:
yassl update, installer fix

Index: changelog.txt
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/changelog.txt,v
retrieving revision 1.315
retrieving revision 1.316
diff -C2 -d -r1.315 -r1.316
*** changelog.txt	18 Feb 2006 23:32:17 -0000	1.315
--- changelog.txt	19 Feb 2006 16:51:08 -0000	1.316
***************
*** 6,9 ****
--- 6,11 ----
  * Played some more with bufferedsocket performance
  * Fixed some VS 2005 issues (thanks trem)
+ * Installer now removes old unicows library
+ * Updated to yaSSL 1.1.5
  
  

Index: DCPlusPlus.nsi
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/DCPlusPlus.nsi,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DCPlusPlus.nsi	10 Feb 2006 07:56:47 -0000	1.18
--- DCPlusPlus.nsi	19 Feb 2006 16:51:08 -0000	1.19
***************
*** 63,66 ****
--- 63,69 ----
    File "License-GeoIP.txt"
    File "Magnet.exe"
+   ; Remove unicows so that opencow will be used instead
+   Delete "$INSTDIR\unicows.dll"
+   Delete "$INSTDIR\unicows.pdb"
    
    ; Get DCPlusplus version we just installed and store in $1

[Dcplusplus-commit] dcplusplus/windows QueuePage.h,1.4,1.5 WindowsPage.h,1.6,1.7 FlatTabCtrl.h,1.40,1.41 PropPage.h,1.11,1.12 CertificatesPage.h,1.2,1.3 NotepadFrame.h,1.15,1.16 UCHandler.h,1.12,1.13 MainFrm.h,1.67,1.68 PublicHubsFrm.h,1.33,1.34 GeneralPage.h,1.15,1.16 TextFrame.h,1.6,1.7 WinUtil.h,1.53,1.54 WaitingUsersFrame.h,1.2,1.3 DownloadPage.h,1.15,1.16 PrivateFrame.cpp,1.61,1.62 SearchFrm.cpp,1.109,1.110 AppearancePage.h,1.15,1.16 StatsFrame.h,1.11,1.12 SpyFrame.cpp,1.37,1.38 SearchFrm.h,1.65,1.66 QueueFrame.h,1.56,1.57 UsersFrame.h,1.28,1.29 MagnetDlg.h,1.7,1.8 AdvancedPage.h,1.15,1.16 PublicHubsListDlg.h,1.8,1.9 TransferView.cpp,1.63,1.64 LineDlg.h,1.10,1.11 Advanced3Page.h,1.4,1.5 HubFrame.h,1.73,1.74 FinishedFrame.h,1.24,1.25 TypedListViewCtrl.h,1.18,1.19 FavoritesFrm.h,1.23,1.24 ADLSearchFrame.h,1.12,1.13 PrivateFrame.h,1.38,1.39 FavoriteDirsPage.h,1.7,1.8 CommandDlg.h,1.14,1.15 MainFrm.cpp,1.111,1.112 FinishedULFrame.h,1.21,1.22 TransferView.h,1.25,1.26 UploadPage.h,1.18,1.19 Appearance2Page.h,1.5,1.6 LogPage.h,1.5,1.6 SystemFrame.h,1.4,1.5 WaitingUsersFrame.cpp,1.8,1.9 ADLSProperties.h,1.4,1.5 DirectoryListingFrm.h,1.60,1.61 NetworkPage.h,1.6,1.7 UCPage.h,1.9,1.10 FinishedFrameBase.h,1.1,1.2 HashProgressDlg.h,1.8,1.9 HubFrame.cpp,1.129,1.130 AboutDlg.h,1.57,1.58 ExListViewCtrl.h,1.17,1.18 FavHubProperties.h,1.7,1.8 Appearance2Page.cpp,1.6,1.7

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10847/windows

Modified Files:
	QueuePage.h WindowsPage.h FlatTabCtrl.h PropPage.h 
	CertificatesPage.h NotepadFrame.h UCHandler.h MainFrm.h 
	PublicHubsFrm.h GeneralPage.h TextFrame.h WinUtil.h 
	WaitingUsersFrame.h DownloadPage.h PrivateFrame.cpp 
	SearchFrm.cpp AppearancePage.h StatsFrame.h SpyFrame.cpp 
	SearchFrm.h QueueFrame.h UsersFrame.h MagnetDlg.h 
	AdvancedPage.h PublicHubsListDlg.h TransferView.cpp LineDlg.h 
	Advanced3Page.h HubFrame.h FinishedFrame.h TypedListViewCtrl.h 
	FavoritesFrm.h ADLSearchFrame.h PrivateFrame.h 
	FavoriteDirsPage.h CommandDlg.h MainFrm.cpp FinishedULFrame.h 
	TransferView.h UploadPage.h Appearance2Page.h LogPage.h 
	SystemFrame.h WaitingUsersFrame.cpp ADLSProperties.h 
	DirectoryListingFrm.h NetworkPage.h UCPage.h 
	FinishedFrameBase.h HashProgressDlg.h HubFrame.cpp AboutDlg.h 
	ExListViewCtrl.h FavHubProperties.h Appearance2Page.cpp 
Log Message:
Pedantry

Index: CommandDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/CommandDlg.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CommandDlg.h	11 Jan 2006 21:31:01 -0000	1.14
--- CommandDlg.h	19 Feb 2006 16:19:06 -0000	1.15
***************
*** 68,72 ****
  	END_MSG_MAP()
  
! 	CommandDlg() : type(0), ctx(0) { };
  
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 68,72 ----
  	END_MSG_MAP()
  
! 	CommandDlg() : type(0), ctx(0) { }
  
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {

Index: PropPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PropPage.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PropPage.h	24 Apr 2005 08:13:03 -0000	1.11
--- PropPage.h	19 Feb 2006 16:19:06 -0000	1.12
***************
*** 32,37 ****
  {
  public:
! 	PropPage(SettingsManager *src) : settings(src) { };
! 	virtual ~PropPage() { };
  
  	virtual PROPSHEETPAGE *getPSP() = 0;
--- 32,37 ----
  {
  public:
! 	PropPage(SettingsManager *src) : settings(src) { }
! 	virtual ~PropPage() { }
  
  	virtual PROPSHEETPAGE *getPSP() = 0;

Index: QueueFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/QueueFrame.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** QueueFrame.h	1 Jan 2006 17:49:59 -0000	1.56
--- QueueFrame.h	19 Feb 2006 16:19:06 -0000	1.57
***************
*** 183,187 ****
  
  		struct SourceInfo : public Flags {
! 			explicit SourceInfo(const QueueItem::Source& s) : Flags(s), user(s.getUser()) { };
  
  			SourceInfo& operator=(const QueueItem::Source& s) {
--- 183,187 ----
  
  		struct SourceInfo : public Flags {
! 			explicit SourceInfo(const QueueItem::Source& s) : Flags(s), user(s.getUser()) { }
  
  			SourceInfo& operator=(const QueueItem::Source& s) {
***************
*** 190,194 ****
  				return *this;
  			}
! 			User::Ptr& getUser() { return user; };
  
  			User::Ptr user;
--- 190,194 ----
  				return *this;
  			}
! 			User::Ptr& getUser() { return user; }
  
  			User::Ptr user;
***************
*** 227,233 ****
  				badSources.push_back(SourceInfo(*(*i)));
  			}
! 		};
  
! 		~QueueItemInfo() { delete display; };
  
  		void update();
--- 227,233 ----
  				badSources.push_back(SourceInfo(*(*i)));
  			}
! 		}
  
! 		~QueueItemInfo() { delete display; }
  
  		void update();
***************
*** 251,256 ****
  		const tstring& getTargetFileName() { return getDisplay()->columns[COLUMN_TARGET]; }
  
! 		SourceList& getSources() { return sources; };
! 		SourceList& getBadSources() { return badSources; };
  
  		Display* getDisplay() {
--- 251,256 ----
  		const tstring& getTargetFileName() { return getDisplay()->columns[COLUMN_TARGET]; }
  
! 		SourceList& getSources() { return sources; }
! 		SourceList& getBadSources() { return badSources; }
  
  		Display* getDisplay() {
***************
*** 382,386 ****
  	}
  
! 	bool isCurDir(const tstring& aDir) const { return Util::stricmp(curDir, aDir) == 0; };
  
  	void moveSelected();	
--- 382,386 ----
  	}
  
! 	bool isCurDir(const tstring& aDir) const { return Util::stricmp(curDir, aDir) == 0; }
  
  	void moveSelected();	
***************
*** 407,418 ****
  		if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || MessageBox(CTSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES)	
  			removeDir(ctrlDirs.GetSelectedItem()); 
! 	};
  	
  	const tstring& getSelectedDir() { 
  		HTREEITEM ht = ctrlDirs.GetSelectedItem();
  		return ht == NULL ? Util::emptyStringT : getDir(ctrlDirs.GetSelectedItem());
! 	};
  	
! 	const tstring& getDir(HTREEITEM ht) { dcassert(ht != NULL); return *((tstring*)ctrlDirs.GetItemData(ht)); };
  
  	virtual void on(QueueManagerListener::Added, QueueItem* aQI) throw();
--- 407,418 ----
  		if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || MessageBox(CTSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES)	
  			removeDir(ctrlDirs.GetSelectedItem()); 
! 	}
  	
  	const tstring& getSelectedDir() { 
  		HTREEITEM ht = ctrlDirs.GetSelectedItem();
  		return ht == NULL ? Util::emptyStringT : getDir(ctrlDirs.GetSelectedItem());
! 	}
  	
! 	const tstring& getDir(HTREEITEM ht) { dcassert(ht != NULL); return *((tstring*)ctrlDirs.GetItemData(ht)); }
  
  	virtual void on(QueueManagerListener::Added, QueueItem* aQI) throw();

Index: Appearance2Page.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Appearance2Page.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Appearance2Page.h	5 Jan 2006 00:11:31 -0000	1.5
--- Appearance2Page.h	19 Feb 2006 16:19:06 -0000	1.6
***************
*** 34,38 ****
  		SetTitle(CTSTRING(SETTINGS_APPEARANCE2));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
  	virtual ~Appearance2Page();
--- 34,38 ----
  		SetTitle(CTSTRING(SETTINGS_APPEARANCE2));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
  	virtual ~Appearance2Page();

Index: SearchFrm.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SearchFrm.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** SearchFrm.cpp	9 Jan 2006 22:44:49 -0000	1.109
--- SearchFrm.cpp	19 Feb 2006 16:19:06 -0000	1.110
***************
*** 805,810 ****
  		ClientManager::getInstance()->userCommand(sr->getUser(), uc, tmp, true);
  	}
! 	return;
! };
  
  LRESULT SearchFrame::onCtlColor(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
--- 805,809 ----
  		ClientManager::getInstance()->userCommand(sr->getUser(), uc, tmp, true);
  	}
! }
  
  LRESULT SearchFrame::onCtlColor(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
***************
*** 822,826 ****
  		return (LRESULT)WinUtil::bgBrush;
  	}
! };
  
  LRESULT SearchFrame::onChar(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled) {
--- 821,825 ----
  		return (LRESULT)WinUtil::bgBrush;
  	}
! }
  
  LRESULT SearchFrame::onChar(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled) {

Index: FinishedFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedFrame.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FinishedFrame.h	12 Jan 2006 22:32:44 -0000	1.24
--- FinishedFrame.h	19 Feb 2006 16:19:06 -0000	1.25
***************
*** 34,39 ****
  		columnOrder = SettingsManager::FINISHED_ORDER;
  		columnWidth = SettingsManager::FINISHED_WIDTHS;
! 	};
! 	virtual ~FinishedFrame() { };
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FinishedFrame"), IDR_FINISHED_DL, 0, COLOR_3DFACE);
--- 34,39 ----
  		columnOrder = SettingsManager::FINISHED_ORDER;
  		columnWidth = SettingsManager::FINISHED_WIDTHS;
! 	}
! 	virtual ~FinishedFrame() { }
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FinishedFrame"), IDR_FINISHED_DL, 0, COLOR_3DFACE);

Index: SpyFrame.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SpyFrame.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** SpyFrame.cpp	24 Apr 2005 08:13:05 -0000	1.37
--- SpyFrame.cpp	19 Feb 2006 16:19:06 -0000	1.38
***************
*** 204,208 ****
  		SearchFrame::openWindow(searchString);
  	return 0;
! };
  
  void SpyFrame::on(ClientManagerListener::IncomingSearch, const string& s) throw() {
--- 204,208 ----
  		SearchFrame::openWindow(searchString);
  	return 0;
! }
  
  void SpyFrame::on(ClientManagerListener::IncomingSearch, const string& s) throw() {

Index: SearchFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SearchFrm.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** SearchFrm.h	3 Dec 2005 20:36:50 -0000	1.65
--- SearchFrm.h	19 Feb 2006 16:19:06 -0000	1.66
***************
*** 217,221 ****
  	class SearchInfo;
  public:
! 	TypedListViewCtrl<SearchInfo, IDC_RESULTS>& getUserList() { return ctrlResults; };
  
  private:
--- 217,221 ----
  	class SearchInfo;
  public:
! 	TypedListViewCtrl<SearchInfo, IDC_RESULTS>& getUserList() { return ctrlResults; }
  
  private:
***************
*** 242,249 ****
  		SearchInfo(SearchResult* aSR) : UserInfoBase(aSR->getUser()), sr(aSR) { 
  			sr->incRef(); update();
! 		};
  		~SearchInfo() { 
  			sr->decRef(); 
! 		};
  
  		void getList();
--- 242,249 ----
  		SearchInfo(SearchResult* aSR) : UserInfoBase(aSR->getUser()), sr(aSR) { 
  			sr->incRef(); update();
! 		}
  		~SearchInfo() { 
  			sr->decRef(); 
! 		}
  
  		void getList();
***************
*** 252,271 ****
  		void view();
  		struct Download {
! 			Download(const tstring& aTarget) : tgt(aTarget) { };
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct DownloadWhole {
! 			DownloadWhole(const tstring& aTarget) : tgt(aTarget) { };
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct DownloadTarget {
! 			DownloadTarget(const tstring& aTarget) : tgt(aTarget) { };
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct CheckSize {
! 			CheckSize() : size(-1), op(true), firstHubs(true), hasTTH(false), firstTTH(true) { };
  			void operator()(SearchInfo* si);
  			tstring ext;
--- 252,271 ----
  		void view();
  		struct Download {
! 			Download(const tstring& aTarget) : tgt(aTarget) { }
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct DownloadWhole {
! 			DownloadWhole(const tstring& aTarget) : tgt(aTarget) { }
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct DownloadTarget {
! 			DownloadTarget(const tstring& aTarget) : tgt(aTarget) { }
  			void operator()(SearchInfo* si);
  			const tstring& tgt;
  		};
  		struct CheckSize {
! 			CheckSize() : size(-1), op(true), firstHubs(true), hasTTH(false), firstTTH(true) { }
  			void operator()(SearchInfo* si);
  			tstring ext;
***************
*** 332,336 ****
  	struct HubInfo : public FastAlloc<HubInfo> {
  		HubInfo(const tstring& aIpPort, const tstring& aName, bool aOp) : ipPort(aIpPort),
! 			name(aName), op(aOp) { };
  
  		const tstring& getText(int col) const {
--- 332,336 ----
  	struct HubInfo : public FastAlloc<HubInfo> {
  		HubInfo(const tstring& aIpPort, const tstring& aName, bool aOp) : ipPort(aIpPort),
! 			name(aName), op(aOp) { }
  
  		const tstring& getText(int col) const {
***************
*** 439,443 ****
  		HubInfo* hubInfo = new HubInfo(Text::toT(aClient->getIpPort()), Text::toT(aClient->getHubName()), aClient->getMyIdentity().isOp());
  		PostMessage(WM_SPEAKER, WPARAM(s), LPARAM(hubInfo)); 
! 	};
  };
  
--- 439,443 ----
  		HubInfo* hubInfo = new HubInfo(Text::toT(aClient->getIpPort()), Text::toT(aClient->getHubName()), aClient->getMyIdentity().isOp());
  		PostMessage(WM_SPEAKER, WPARAM(s), LPARAM(hubInfo)); 
! 	}
  };
  

Index: FinishedFrameBase.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedFrameBase.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FinishedFrameBase.h	12 Jan 2006 22:32:44 -0000	1.1
--- FinishedFrameBase.h	19 Feb 2006 16:19:06 -0000	1.2
***************
*** 41,46 ****
  {
  public:
! 	FinishedFrameBase() : totalBytes(0), totalTime(0), closed(false) { };
! 	virtual ~FinishedFrameBase() { };
  
  	BEGIN_MSG_MAP(T)
--- 41,46 ----
  {
  public:
! 	FinishedFrameBase() : totalBytes(0), totalTime(0), closed(false) { }
! 	virtual ~FinishedFrameBase() { }
  
  	BEGIN_MSG_MAP(T)

Index: FavoritesFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavoritesFrm.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FavoritesFrm.h	12 Nov 2005 10:23:02 -0000	1.23
--- FavoritesFrm.h	19 Feb 2006 16:19:06 -0000	1.24
***************
*** 35,40 ****
  {
  public:
! 	FavoriteHubsFrame() : nosave(true) { };
! 	virtual ~FavoriteHubsFrame() { };
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FavoriteHubsFrame"), IDR_FAVORITES, 0, COLOR_3DFACE);
--- 35,40 ----
  {
  public:
! 	FavoriteHubsFrame() : nosave(true) { }
! 	virtual ~FavoriteHubsFrame() { }
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FavoriteHubsFrame"), IDR_FAVORITES, 0, COLOR_3DFACE);

Index: UCHandler.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UCHandler.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** UCHandler.h	3 Dec 2005 00:18:08 -0000	1.12
--- UCHandler.h	19 Feb 2006 16:19:06 -0000	1.13
***************
*** 30,34 ****
  class UCHandler {
  public:
! 	UCHandler() : menuPos(0) { };
  
  	typedef UCHandler<T> thisClass;
--- 30,34 ----
  class UCHandler {
  public:
! 	UCHandler() : menuPos(0) { }
  
  	typedef UCHandler<T> thisClass;

Index: NotepadFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/NotepadFrame.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NotepadFrame.h	12 Nov 2005 10:23:02 -0000	1.15
--- NotepadFrame.h	19 Feb 2006 16:19:06 -0000	1.16
***************
*** 65,69 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
  	
  	
--- 65,69 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
  	
  	

Index: PublicHubsListDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PublicHubsListDlg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PublicHubsListDlg.h	9 Jan 2006 22:44:49 -0000	1.8
--- PublicHubsListDlg.h	19 Feb 2006 16:19:06 -0000	1.9
***************
*** 34,41 ****
  	enum { IDD = IDD_HUB_LIST };
  
! 	PublicHubListDlg() { };
! 	virtual ~PublicHubListDlg() {
! 		ctrlList.Detach();
! 	};
  
  	BEGIN_MSG_MAP(PublicHubListDlg)
--- 34,39 ----
  	enum { IDD = IDD_HUB_LIST };
  
! 	PublicHubListDlg() { }
! 	virtual ~PublicHubListDlg() { ctrlList.Detach(); }
  
  	BEGIN_MSG_MAP(PublicHubListDlg)

Index: LogPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/LogPage.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogPage.h	5 Jan 2006 00:11:31 -0000	1.5
--- LogPage.h	19 Feb 2006 16:19:06 -0000	1.6
***************
*** 34,40 ****
  		SetTitle(CTSTRING(SETTINGS_LOGS));
  		 m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~LogPage() { };
  
  	BEGIN_MSG_MAP(LogPage)
--- 34,40 ----
  		SetTitle(CTSTRING(SETTINGS_LOGS));
  		 m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~LogPage() { }
  
  	BEGIN_MSG_MAP(LogPage)

Index: FavoriteDirsPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavoriteDirsPage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FavoriteDirsPage.h	5 Jan 2006 00:11:31 -0000	1.7
--- FavoriteDirsPage.h	19 Feb 2006 16:19:06 -0000	1.8
***************
*** 35,42 ****
  		SetTitle(CTSTRING(SETTINGS_FAVORITE_DIRS_PAGE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  	virtual ~FavoriteDirsPage() {
  		ctrlDirectories.Detach();
! 	};
  
  	BEGIN_MSG_MAP(FavoriteDirsPage)
--- 35,42 ----
  		SetTitle(CTSTRING(SETTINGS_FAVORITE_DIRS_PAGE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  	virtual ~FavoriteDirsPage() {
  		ctrlDirectories.Detach();
! 	}
  
  	BEGIN_MSG_MAP(FavoriteDirsPage)

Index: ExListViewCtrl.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ExListViewCtrl.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ExListViewCtrl.h	12 Jan 2006 22:32:44 -0000	1.17
--- ExListViewCtrl.h	19 Feb 2006 16:19:06 -0000	1.18
***************
*** 69,75 ****
  	}
  
! 	bool isAscending() { return ascending; };
! 	int getSortColumn() { return sortColumn; };
! 	int getSortType() { return sortType; };
  
  	int insert(int nItem, TStringList& aList, int iImage = 0, LPARAM lParam = NULL);
--- 69,75 ----
  	}
  
! 	bool isAscending() { return ascending; }
! 	int getSortColumn() { return sortColumn; }
! 	int getSortType() { return sortType; }
  
  	int insert(int nItem, TStringList& aList, int iImage = 0, LPARAM lParam = NULL);
***************
*** 112,116 ****
  	}
  	int moveItem(int oldPos, int newPos);
! 	void setSortDirection(bool aAscending) { setSort(sortColumn, sortType, aAscending, fun); };
  
  	static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) {
--- 112,116 ----
  	}
  	int moveItem(int oldPos, int newPos);
! 	void setSortDirection(bool aAscending) { setSort(sortColumn, sortType, aAscending, fun); }
  
  	static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) {
***************
*** 167,173 ****
  	}
  
! 	ExListViewCtrl() : sortType(SORT_STRING), ascending(true), sortColumn(-1) { };
  
! 	virtual ~ExListViewCtrl() { };
  };
  
--- 167,173 ----
  	}
  
! 	ExListViewCtrl() : sortType(SORT_STRING), ascending(true), sortColumn(-1) { }
  
! 	virtual ~ExListViewCtrl() { }
  };
  

Index: WaitingUsersFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WaitingUsersFrame.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WaitingUsersFrame.h	12 Nov 2005 10:23:02 -0000	1.2
--- WaitingUsersFrame.h	19 Feb 2006 16:19:06 -0000	1.3
***************
*** 95,99 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
  
  	// Update control layouts
--- 95,99 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
  
  	// Update control layouts

Index: NetworkPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/NetworkPage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NetworkPage.h	5 Jan 2006 00:11:31 -0000	1.6
--- NetworkPage.h	19 Feb 2006 16:19:06 -0000	1.7
***************
*** 33,39 ****
  		SetTitle(CTSTRING(SETTINGS_NETWORK));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
! 	virtual ~NetworkPage() { };
! 
  	BEGIN_MSG_MAP(NetworkPage)
  		MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog)
--- 33,39 ----
  		SetTitle(CTSTRING(SETTINGS_NETWORK));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
! 	virtual ~NetworkPage() { }
! 	
  	BEGIN_MSG_MAP(NetworkPage)
  		MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog)

Index: UsersFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UsersFrame.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** UsersFrame.h	12 Dec 2005 08:43:01 -0000	1.28
--- UsersFrame.h	19 Feb 2006 16:19:06 -0000	1.29
***************
*** 34,39 ****
  public:
  	
! 	UsersFrame() : closed(false), startup(true) { };
! 	virtual ~UsersFrame() { };
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("UsersFrame"), IDR_USERS, 0, COLOR_3DFACE);
--- 34,39 ----
  public:
  	
! 	UsersFrame() : closed(false), startup(true) { }
! 	virtual ~UsersFrame() { }
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("UsersFrame"), IDR_USERS, 0, COLOR_3DFACE);
***************
*** 95,99 ****
  		UserInfo(const FavoriteUser& u) : UserInfoBase(u.getUser()) { 
  			update(u);
! 		};
  
  		const tstring& getText(int col) const {
--- 95,99 ----
  		UserInfo(const FavoriteUser& u) : UserInfoBase(u.getUser()) { 
  			update(u);
! 		}
  
  		const tstring& getText(int col) const {

Index: CertificatesPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/CertificatesPage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CertificatesPage.h	5 Jan 2006 00:11:31 -0000	1.2
--- CertificatesPage.h	19 Feb 2006 16:19:06 -0000	1.3
***************
*** 34,40 ****
  		SetTitle(CTSTRING(SETTINGS_CERTIFICATES));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~CertificatesPage() { };
  
  	BEGIN_MSG_MAP(CertificatesPage)
--- 34,40 ----
  		SetTitle(CTSTRING(SETTINGS_CERTIFICATES));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~CertificatesPage() { }
  
  	BEGIN_MSG_MAP(CertificatesPage)

Index: Advanced3Page.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Advanced3Page.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Advanced3Page.h	5 Jan 2006 00:11:31 -0000	1.4
--- Advanced3Page.h	19 Feb 2006 16:19:06 -0000	1.5
***************
*** 34,41 ****
  		SetTitle(CTSTRING(SETTINGS_ADVANCED3));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~Advanced3Page() {
! 	};
  
  	BEGIN_MSG_MAP(Advanced3Page)
--- 34,40 ----
  		SetTitle(CTSTRING(SETTINGS_ADVANCED3));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~Advanced3Page() { }
  
  	BEGIN_MSG_MAP(Advanced3Page)

Index: WaitingUsersFrame.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WaitingUsersFrame.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WaitingUsersFrame.cpp	5 Feb 2006 17:02:38 -0000	1.8
--- WaitingUsersFrame.cpp	19 Feb 2006 16:19:06 -0000	1.9
***************
*** 177,181 ****
  	}
  	return 0; 
! };
  
  LRESULT WaitingUsersFrame::onAddToFavorites(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
--- 177,181 ----
  	}
  	return 0; 
! }
  
  LRESULT WaitingUsersFrame::onAddToFavorites(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
***************
*** 186,190 ****
  	}
  	return 0;
! };
  
  // Load all searches from manager
--- 186,190 ----
  	}
  	return 0;
! }
  
  // Load all searches from manager

Index: FlatTabCtrl.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FlatTabCtrl.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** FlatTabCtrl.h	28 Nov 2005 01:21:06 -0000	1.40
--- FlatTabCtrl.h	19 Feb 2006 16:19:06 -0000	1.41
***************
*** 51,55 ****
  	FlatTabCtrlImpl() : closing(NULL), rows(1), height(0), active(NULL), moving(NULL), inTab(false) { 
  		black.CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
! 	};
  	virtual ~FlatTabCtrlImpl() { }
  
--- 51,55 ----
  	FlatTabCtrlImpl() : closing(NULL), rows(1), height(0), active(NULL), moving(NULL), inTab(false) { 
  		black.CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
! 	}
  	virtual ~FlatTabCtrlImpl() { }
  
***************
*** 277,285 ****
  	}
  
! 	int getTabHeight() { return height; };
! 	int getHeight() { return (getRows() * getTabHeight())+1; };
! 	int getFill() { return (getTabHeight() + 1) / 2; };
  
! 	int getRows() { return rows; };
  
  	void calcRows(bool inval = true) {
--- 277,285 ----
  	}
  
! 	int getTabHeight() { return height; }
! 	int getHeight() { return (getRows() * getTabHeight())+1; }
! 	int getFill() { return (getTabHeight() + 1) / 2; }
  
! 	int getRows() { return rows; }
  
  	void calcRows(bool inval = true) {
***************
*** 326,330 ****
  		chevron.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
  			BS_PUSHBUTTON , 0, IDC_CHEVRON);
! 		chevron.SetWindowText(_T("»"));
  
  		mnu.CreatePopupMenu();
--- 326,330 ----
  		chevron.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
  			BS_PUSHBUTTON , 0, IDC_CHEVRON);
! 		chevron.SetWindowText(_T("�"));
  
  		mnu.CreatePopupMenu();
***************
*** 447,451 ****
  			name[0] = 0;
  			update();
! 		};
  
  		HWND hWnd;
--- 447,451 ----
  			name[0] = 0;
  			update();
! 		}
  
  		HWND hWnd;
***************
*** 484,488 ****
  			::ReleaseDC(hWnd, dc);
  			return true;
! 		};
  
  		bool updateText(LPCTSTR text) {
--- 484,488 ----
  			::ReleaseDC(hWnd, dc);
  			return true;
! 		}
  
  		bool updateText(LPCTSTR text) {
***************
*** 506,510 ****
  			::ReleaseDC(hWnd, dc);
  			return true;
! 		};
  
  		int getWidth() {
--- 506,510 ----
  			::ReleaseDC(hWnd, dc);
  			return true;
! 		}
  
  		int getWidth() {
***************
*** 624,628 ****
  			dc.TextOut(pos + getFill() / 2 + FT_EXTRA_SPACE / 2, ypos + 1, tab->name, tab->len);
  		}
! 	};
  };
  
--- 624,628 ----
  			dc.TextOut(pos + getFill() / 2 + FT_EXTRA_SPACE / 2, ypos + 1, tab->name, tab->len);
  		}
! 	}
  };
  
***************
*** 636,641 ****
  public:
  
! 	MDITabChildWindowImpl() : created(false) { };
! 	FlatTabCtrl* getTab() { return WinUtil::tabCtrl; };
  
  	virtual void OnFinalMessage(HWND /*hWnd*/) { delete this; }
--- 636,641 ----
  public:
  
! 	MDITabChildWindowImpl() : created(false) { }
! 	FlatTabCtrl* getTab() { return WinUtil::tabCtrl; }
  
  	virtual void OnFinalMessage(HWND /*hWnd*/) { delete this; }

Index: DirectoryListingFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/DirectoryListingFrm.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** DirectoryListingFrm.h	23 Jan 2006 08:00:50 -0000	1.60
--- DirectoryListingFrm.h	19 Feb 2006 16:19:06 -0000	1.61
***************
*** 254,258 ****
  			if(f->getTTH() != NULL)
  				columns[COLUMN_TTH] = Text::toT(f->getTTH()->toBase32());
! 		};
  		ItemInfo(DirectoryListing::Directory* d, bool utf8) : type(DIRECTORY), dir(d) { 
  			if(utf8) {
--- 254,258 ----
  			if(f->getTTH() != NULL)
  				columns[COLUMN_TTH] = Text::toT(f->getTTH()->toBase32());
! 		}
  		ItemInfo(DirectoryListing::Directory* d, bool utf8) : type(DIRECTORY), dir(d) { 
  			if(utf8) {
***************
*** 263,267 ****
  			columns[COLUMN_EXACTSIZE] = Text::toT(Util::formatExactSize(d->getTotalSize()));
  			columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(d->getTotalSize()));
! 		};
  
  		const tstring& getText(int col) {
--- 263,267 ----
  			columns[COLUMN_EXACTSIZE] = Text::toT(Util::formatExactSize(d->getTotalSize()));
  			columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(d->getTotalSize()));
! 		}
  
  		const tstring& getText(int col) {

Index: PrivateFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PrivateFrame.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** PrivateFrame.h	22 Dec 2005 19:47:33 -0000	1.38
--- PrivateFrame.h	19 Feb 2006 16:19:06 -0000	1.39
***************
*** 40,44 ****
  	static void gotMessage(const User::Ptr& from, const User::Ptr& to, const User::Ptr& replyTo, const tstring& aMessage);
  	static void openWindow(const User::Ptr& replyTo, const tstring& aMessage = Util::emptyStringT);
! 	static bool isOpen(const User::Ptr u) { return frames.find(u) != frames.end(); };
  
  	enum {
--- 40,44 ----
  	static void gotMessage(const User::Ptr& from, const User::Ptr& to, const User::Ptr& replyTo, const tstring& aMessage);
  	static void openWindow(const User::Ptr& replyTo, const tstring& aMessage = Util::emptyStringT);
! 	static bool isOpen(const User::Ptr u) { return frames.find(u) != frames.end(); }
  
  	enum {
***************
*** 117,121 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
  
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 117,121 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
  
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
***************
*** 136,140 ****
  	void sendMessage(const tstring& msg);
  	
! 	User::Ptr& getUser() { return replyTo; };
  private:
  	PrivateFrame(const User::Ptr& replyTo_) : replyTo(replyTo_), 
--- 136,140 ----
  	void sendMessage(const tstring& msg);
  	
! 	User::Ptr& getUser() { return replyTo; }
  private:
  	PrivateFrame(const User::Ptr& replyTo_) : replyTo(replyTo_), 

Index: QueuePage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/QueuePage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueuePage.h	5 Jan 2006 00:11:31 -0000	1.4
--- QueuePage.h	19 Feb 2006 16:19:06 -0000	1.5
***************
*** 34,41 ****
  		SetTitle(CTSTRING(SETTINGS_QUEUE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
! 
! 	virtual ~QueuePage() { 
! 	};
  
  	BEGIN_MSG_MAP(QueuePage)
--- 34,39 ----
  		SetTitle(CTSTRING(SETTINGS_QUEUE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
! 	virtual ~QueuePage() { }
  
  	BEGIN_MSG_MAP(QueuePage)

Index: Appearance2Page.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Appearance2Page.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Appearance2Page.cpp	19 Dec 2005 00:15:51 -0000	1.6
--- Appearance2Page.cpp	19 Feb 2006 16:19:06 -0000	1.7
***************
*** 164,168 ****
  		default:
  			break;
! 	};
  	return true;
  }
--- 164,168 ----
  		default:
  			break;
! 	}
  	return true;
  }

Index: UploadPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UploadPage.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** UploadPage.h	5 Jan 2006 00:11:31 -0000	1.18
--- UploadPage.h	19 Feb 2006 16:19:06 -0000	1.19
***************
*** 35,43 ****
  		SetTitle(CTSTRING(SETTINGS_UPLOADS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  	virtual ~UploadPage() {
  		ctrlDirectories.Detach();
  		ctrlTotal.Detach();
! 	};
  
  	BEGIN_MSG_MAP(UploadPage)
--- 35,43 ----
  		SetTitle(CTSTRING(SETTINGS_UPLOADS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  	virtual ~UploadPage() {
  		ctrlDirectories.Detach();
  		ctrlTotal.Detach();
! 	}
  
  	BEGIN_MSG_MAP(UploadPage)

Index: SystemFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SystemFrame.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SystemFrame.h	6 Jan 2006 14:44:32 -0000	1.4
--- SystemFrame.h	19 Feb 2006 16:19:06 -0000	1.5
***************
*** 69,75 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
! 	
! 	
  	LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
  		ctrlPad.SetFocus();
--- 69,74 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
! 		
  	LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
  		ctrlPad.SetFocus();

Index: GeneralPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/GeneralPage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GeneralPage.h	5 Jan 2006 00:11:31 -0000	1.15
--- GeneralPage.h	19 Feb 2006 16:19:06 -0000	1.16
***************
*** 33,39 ****
  		SetTitle(CTSTRING(SETTINGS_GENERAL));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
! 	virtual ~GeneralPage() { };
! 
  	BEGIN_MSG_MAP(GeneralPage)
  		MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog)
--- 33,39 ----
  		SetTitle(CTSTRING(SETTINGS_GENERAL));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
! 	virtual ~GeneralPage() { }
! 	
  	BEGIN_MSG_MAP(GeneralPage)
  		MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog)

Index: TransferView.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TransferView.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** TransferView.cpp	5 Feb 2006 17:02:38 -0000	1.63
--- TransferView.cpp	19 Feb 2006 16:19:06 -0000	1.64
***************
*** 147,152 ****
  		ClientManager::getInstance()->userCommand(itemI->user, uc, tmp, true);
  	}
! 	return;
! };
  
  
--- 147,151 ----
  		ClientManager::getInstance()->userCommand(itemI->user, uc, tmp, true);
  	}
! }
  
  
***************
*** 251,255 ****
  					::MoveToEx(cd->nmcd.hdc,rc.left+1,rc.top,(LPPOINT)NULL);
  					::LineTo(cd->nmcd.hdc,rc.right-2,rc.top);
! 				};
  				
  				// draw status text
--- 250,254 ----
  					::MoveToEx(cd->nmcd.hdc,rc.left+1,rc.top,(LPPOINT)NULL);
  					::LineTo(cd->nmcd.hdc,rc.right-2,rc.top);
! 				}
  				
  				// draw status text
***************
*** 346,350 ****
  	columns[COLUMN_USER] = WinUtil::getNicks(u);
  	columns[COLUMN_HUB] = WinUtil::getHubNames(u).first;
! };
  
  void TransferView::ItemInfo::update(const UpdateInfo& ui) {
--- 345,349 ----
  	columns[COLUMN_USER] = WinUtil::getNicks(u);
  	columns[COLUMN_HUB] = WinUtil::getHubNames(u).first;
! }
  
  void TransferView::ItemInfo::update(const UpdateInfo& ui) {

Index: TypedListViewCtrl.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TypedListViewCtrl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TypedListViewCtrl.h	12 Jan 2006 22:32:44 -0000	1.18
--- TypedListViewCtrl.h	19 Feb 2006 16:19:06 -0000	1.19
***************
*** 31,35 ****
  {
  public:
! 	TypedListViewCtrl() : sortColumn(-1), sortAscending(true) { };
  
  	typedef TypedListViewCtrl<T, ctrlId> thisClass;
--- 31,35 ----
  {
  public:
! 	TypedListViewCtrl() : sortColumn(-1), sortAscending(true) { }
  
  	typedef TypedListViewCtrl<T, ctrlId> thisClass;
***************
*** 56,61 ****
  		}
  
! 		iterator& operator+=(int n) { cur += n; return *this; };
! 		iterator& operator-=(int n) { return (cur += -n); };
  		
  		T& operator*() { return *typedList->getItemData(cur); }
--- 56,61 ----
  		}
  
! 		iterator& operator+=(int n) { cur += n; return *this; }
! 		iterator& operator-=(int n) { return (cur += -n); }
  		
  		T& operator*() { return *typedList->getItemData(cur); }
***************
*** 186,191 ****
  			SetItemText(i, j, LPSTR_TEXTCALLBACK);
  	}
! 	void updateItem(T* item) { int i = findItem(item); if(i != -1) updateItem(i); };
! 	void deleteItem(T* item) { int i = findItem(item); if(i != -1) DeleteItem(i); };
  
  	int getSortPos(T* a) {
--- 186,191 ----
  			SetItemText(i, j, LPSTR_TEXTCALLBACK);
  	}
! 	void updateItem(T* item) { int i = findItem(item); if(i != -1) updateItem(i); }
! 	void deleteItem(T* item) { int i = findItem(item); if(i != -1) DeleteItem(i); }
  
  	int getSortPos(T* a) {

Index: MainFrm.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** MainFrm.cpp	13 Feb 2006 21:13:28 -0000	1.111
--- MainFrm.cpp	19 Feb 2006 16:19:06 -0000	1.112
***************
*** 67,72 ****
  	links.features = links.homepage + _T("bugs/");
  	links.bugs = links.homepage + _T("bugs/");
! 
! };
  
  MainFrame::~MainFrame() {
--- 67,71 ----
  	links.features = links.homepage + _T("bugs/");
  	links.bugs = links.homepage + _T("bugs/");
! }
  
  MainFrame::~MainFrame() {

Index: MainFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** MainFrm.h	13 Feb 2006 21:13:28 -0000	1.67
--- MainFrm.h	19 Feb 2006 16:19:06 -0000	1.68
***************
*** 215,219 ****
  		updateTray(true); 
  		return 0;
! 	};
  
  	LRESULT onRowsChanged(UINT /*uMsg*/, WPARAM /* wParam */, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 215,219 ----
  		updateTray(true); 
  		return 0;
! 	}
  
  	LRESULT onRowsChanged(UINT /*uMsg*/, WPARAM /* wParam */, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
***************
*** 301,305 ****
  	class DirectoryListInfo {
  	public:
! 		DirectoryListInfo(const User::Ptr& aUser, const tstring& aFile, int64_t aSpeed) : user(aUser), file(aFile), speed(aSpeed) { };
  		User::Ptr user;
  		tstring file;
--- 301,305 ----
  	class DirectoryListInfo {
  	public:
! 		DirectoryListInfo(const User::Ptr& aUser, const tstring& aFile, int64_t aSpeed) : user(aUser), file(aFile), speed(aSpeed) { }
  		User::Ptr user;
  		tstring file;
***************
*** 308,312 ****
  	class DirectoryBrowseInfo {
  	public:
! 		DirectoryBrowseInfo(const User::Ptr& ptr, string aText) : user(ptr), text(aText) { };
  		User::Ptr user;
  		string text;
--- 308,312 ----
  	class DirectoryBrowseInfo {
  	public:
! 		DirectoryBrowseInfo(const User::Ptr& ptr, string aText) : user(ptr), text(aText) { }
  		User::Ptr user;
  		string text;
***************
*** 368,375 ****
  	void startSocket();
  
! 	MainFrame(const MainFrame&) { dcassert(0); };
  
  	// LogManagerListener
! 	virtual void on(LogManagerListener::Message, time_t t, const string& m) throw() { PostMessage(WM_SPEAKER, STATUS_MESSAGE, (LPARAM)new pair<time_t, tstring>(t, tstring(Text::toT(m)))); };
  
  	// TimerManagerListener
--- 368,375 ----
  	void startSocket();
  
! 	MainFrame(const MainFrame&) { dcassert(0); }
  
  	// LogManagerListener
! 	virtual void on(LogManagerListener::Message, time_t t, const string& m) throw() { PostMessage(WM_SPEAKER, STATUS_MESSAGE, (LPARAM)new pair<time_t, tstring>(t, tstring(Text::toT(m)))); }
  
  	// TimerManagerListener

Index: MagnetDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MagnetDlg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MagnetDlg.h	24 Apr 2005 08:13:03 -0000	1.7
--- MagnetDlg.h	19 Feb 2006 16:19:06 -0000	1.8
***************
*** 34,39 ****
  	enum { IDD = IDD_MAGNET };
  
! 	MagnetDlg(const tstring& aHash, const tstring& aFileName) : mHash(aHash), mFileName(aFileName) { };
! 	virtual ~MagnetDlg() { };
  
  	BEGIN_MSG_MAP(MagnetDlg)
--- 34,39 ----
  	enum { IDD = IDD_MAGNET };
  
! 	MagnetDlg(const tstring& aHash, const tstring& aFileName) : mHash(aHash), mFileName(aFileName) { }
! 	virtual ~MagnetDlg() { }
  
  	BEGIN_MSG_MAP(MagnetDlg)
***************
*** 110,114 ****
  				//::EnableWindow(GetDlgItem(IDC_MAGNET_REMEMBER), false);
  				break;
! 		};
  		return 0;
  	}
--- 110,114 ----
  				//::EnableWindow(GetDlgItem(IDC_MAGNET_REMEMBER), false);
  				break;
! 		}
  		return 0;
  	}

Index: HubFrame.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HubFrame.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** HubFrame.cpp	29 Jan 2006 18:48:26 -0000	1.129
--- HubFrame.cpp	19 Feb 2006 16:19:06 -0000	1.130
***************
*** 534,538 ****
  
  	return 0;
! };
  
  void HubFrame::UpdateLayout(BOOL bResizeBars /* = TRUE */) {
--- 534,538 ----
  
  	return 0;
! }
  
  void HubFrame::UpdateLayout(BOOL bResizeBars /* = TRUE */) {
***************
*** 818,823 ****
  		}
  	}
! 	return;
! };
  
  void HubFrame::onTab() {
--- 818,822 ----
  		}
  	}
! }
  
  void HubFrame::onTab() {
***************
*** 1126,1130 ****
  		}
  	}
! };
  
  void HubFrame::on(TimerManagerListener::Second, DWORD /*aTick*/) throw() {
--- 1125,1129 ----
  		}
  	}
! }
  
  void HubFrame::on(TimerManagerListener::Second, DWORD /*aTick*/) throw() {

Index: LineDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/LineDlg.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LineDlg.h	24 Apr 2005 08:13:04 -0000	1.10
--- LineDlg.h	19 Feb 2006 16:19:06 -0000	1.11
***************
*** 43,47 ****
  	END_MSG_MAP()
  	
! 	LineDlg() : password(false) { };
  	
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 43,47 ----
  	END_MSG_MAP()
  	
! 	LineDlg() : password(false) { }
  	
  	LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {

Index: ADLSProperties.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ADLSProperties.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ADLSProperties.h	24 Apr 2005 08:13:03 -0000	1.4
--- ADLSProperties.h	19 Feb 2006 16:19:06 -0000	1.5
***************
*** 36,41 ****
  
  	// Constructor/destructor
! 	ADLSProperties::ADLSProperties(ADLSearch *_search) : search(_search) { };
! 	virtual ~ADLSProperties() { };
  
  	// Dilaog unique id
--- 36,41 ----
  
  	// Constructor/destructor
! 	ADLSProperties::ADLSProperties(ADLSearch *_search) : search(_search) { }
! 	virtual ~ADLSProperties() { }
  
  	// Dilaog unique id

Index: TextFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TextFrame.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TextFrame.h	12 Nov 2005 10:23:02 -0000	1.6
--- TextFrame.h	19 Feb 2006 16:19:06 -0000	1.7
***************
*** 60,65 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
! 	
  	
  	LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 60,64 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}	
  	
  	LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {

Index: HashProgressDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HashProgressDlg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HashProgressDlg.h	24 Apr 2005 08:13:03 -0000	1.8
--- HashProgressDlg.h	19 Feb 2006 16:19:06 -0000	1.9
***************
*** 34,39 ****
  	HashProgressDlg(bool aAutoClose) : autoClose(aAutoClose), startTime(GET_TICK()), startBytes(0), startFiles(0) {
  
! 	};
! 	virtual ~HashProgressDlg() { };
  
  	BEGIN_MSG_MAP(HashProgressDlg)
--- 34,39 ----
  	HashProgressDlg(bool aAutoClose) : autoClose(aAutoClose), startTime(GET_TICK()), startBytes(0), startFiles(0) {
  
! 	}
! 	virtual ~HashProgressDlg() { }
  
  	BEGIN_MSG_MAP(HashProgressDlg)

Index: DownloadPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/DownloadPage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DownloadPage.h	5 Jan 2006 00:11:31 -0000	1.15
--- DownloadPage.h	19 Feb 2006 16:19:06 -0000	1.16
***************
*** 33,38 ****
  		SetTitle(CTSTRING(SETTINGS_DOWNLOADS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
! 	virtual ~DownloadPage() { };
  
  	BEGIN_MSG_MAP(DownloadPage)
--- 33,38 ----
  		SetTitle(CTSTRING(SETTINGS_DOWNLOADS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
! 	virtual ~DownloadPage() { }
  
  	BEGIN_MSG_MAP(DownloadPage)

Index: HubFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HubFrame.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** HubFrame.h	15 Jan 2006 18:40:43 -0000	1.73
--- HubFrame.h	19 Feb 2006 16:19:06 -0000	1.74
***************
*** 159,163 ****
  	class UserInfo;
  public:
! 	TypedListViewCtrl<UserInfo, IDC_USERS>& getUserList() { return ctrlUsers; };
  private:
  
--- 159,163 ----
  	class UserInfo;
  public:
! 	TypedListViewCtrl<UserInfo, IDC_USERS>& getUserList() { return ctrlUsers; }
  private:
  
***************
*** 188,192 ****
  		User::Ptr user;
  		Identity identity;
! 	};
  
  
--- 188,192 ----
  		User::Ptr user;
  		Identity identity;
! 	}
  
  
***************
*** 196,200 ****
  		UserInfo(const UpdateInfo& u) : UserInfoBase(u.user) { 
  			update(u.identity, -1); 
! 		};
  
  		const tstring& getText(int col) const {
--- 196,200 ----
  		UserInfo(const UpdateInfo& u) : UserInfoBase(u.user) { 
  			update(u.identity, -1); 
! 		}
  
  		const tstring& getText(int col) const {
***************
*** 224,228 ****
  	class PMInfo {
  	public:
! 		PMInfo(const User::Ptr& from_, const User::Ptr& to_, const User::Ptr& replyTo_, const string& m) : from(from_), to(to_), replyTo(replyTo_), msg(Text::toT(m)) { };
  		User::Ptr from;
  		User::Ptr to;
--- 224,228 ----
  	class PMInfo {
  	public:
! 		PMInfo(const User::Ptr& from_, const User::Ptr& to_, const User::Ptr& replyTo_, const string& m) : from(from_), to(to_), replyTo(replyTo_), msg(Text::toT(m)) { }
  		User::Ptr from;
  		User::Ptr to;
***************
*** 372,383 ****
  	virtual void on(SearchFlood, Client*, const string&) throw();
  
! 	void speak(Speakers s) { PostMessage(WM_SPEAKER, (WPARAM)s); };
! 	void speak(Speakers s, const string& msg) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new tstring(Text::toT(msg))); };
  	void speak(Speakers s, const OnlineUser& u) { 
  		Lock l(updateCS);
  		updateList.push_back(make_pair(UpdateInfo(u), s));
  		updateUsers = true;
! 	};
! 	void speak(Speakers s, const OnlineUser& from, const OnlineUser& to, const OnlineUser& replyTo, const string& line) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new PMInfo(from, to, replyTo, line)); };
  
  };
--- 372,383 ----
  	virtual void on(SearchFlood, Client*, const string&) throw();
  
! 	void speak(Speakers s) { PostMessage(WM_SPEAKER, (WPARAM)s); }
! 	void speak(Speakers s, const string& msg) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new tstring(Text::toT(msg))); }
  	void speak(Speakers s, const OnlineUser& u) { 
  		Lock l(updateCS);
  		updateList.push_back(make_pair(UpdateInfo(u), s));
  		updateUsers = true;
! 	}
! 	void speak(Speakers s, const OnlineUser& from, const OnlineUser& to, const OnlineUser& replyTo, const string& line) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new PMInfo(from, to, replyTo, line)); }
  
  };

Index: TransferView.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TransferView.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** TransferView.h	15 Jan 2006 18:40:43 -0000	1.25
--- TransferView.h	19 Feb 2006 16:19:06 -0000	1.26
***************
*** 113,117 ****
  	class ItemInfo;
  public:
! 	TypedListViewCtrl<ItemInfo, IDC_TRANSFERS>& getUserList() { return ctrlTransfers; };
  private:
  	enum {
--- 113,117 ----
  	class ItemInfo;
  public:
! 	TypedListViewCtrl<ItemInfo, IDC_TRANSFERS>& getUserList() { return ctrlTransfers; }
  private:
  	enum {

Index: AboutDlg.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AboutDlg.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** AboutDlg.h	11 Feb 2006 21:01:55 -0000	1.57
--- AboutDlg.h	19 Feb 2006 16:19:06 -0000	1.58
***************
*** 32,35 ****
--- 32,36 ----
  _T("(www.stlport.org), a most excellent STL package. zlib is also used in this application. ")
  _T("This product includes GeoIP data created by MaxMind, available from http://maxmind.com/. ")
+ _T("This product uses yassl from www.yassl.com, thanks to Todd Ouska and Larry Stefonic.")
  _T("The following people have contributed code to ")
  _T("DC++ (I hope I haven't missed someone, they're in roughly chronological order...=):\r\n")
***************
*** 37,41 ****
  _T("patbateman, xeroc, fusbar, vladimir marko, kenneth skovhede, ondrea, todd pederzani, who, ")
  _T("sedulus, sandos, henrik engstr?m, dwomac, robert777, saurod, atomicjo, bzbetty, orkblutt, ")
! _T("distiller, citruz, dan fulger, cologic, christer palm, twink, ilkka seppälä, johnny, ciber, ")
  _T("theparanoidone, gadget, naga, tremor, joakim tosteberg, pofis, psf8500, lauris ievins, ")
  _T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ")
--- 38,42 ----
  _T("patbateman, xeroc, fusbar, vladimir marko, kenneth skovhede, ondrea, todd pederzani, who, ")
  _T("sedulus, sandos, henrik engstr?m, dwomac, robert777, saurod, atomicjo, bzbetty, orkblutt, ")
! _T("distiller, citruz, dan fulger, cologic, christer palm, twink, ilkka sepp�l�, johnny, ciber, ")
  _T("theparanoidone, gadget, naga, tremor, joakim tosteberg, pofis, psf8500, lauris ievins, ")
  _T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ")
***************
*** 50,55 ****
  	enum { WM_VERSIONDATA = WM_APP + 53 };
  
! 	AboutDlg() { };
! 	virtual ~AboutDlg() { };
  
  	BEGIN_MSG_MAP(AboutDlg)
--- 51,56 ----
  	enum { WM_VERSIONDATA = WM_APP + 53 };
  
! 	AboutDlg() { }
! 	virtual ~AboutDlg() { }
  
  	BEGIN_MSG_MAP(AboutDlg)
***************
*** 61,65 ****
  
  	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
! 		SetDlgItemText(IDC_VERSION, _T("DC++ v") _T(VERSIONSTRING) _T("\n(c) Copyright 2001-2005 Jacek Sieka\nCodeveloper: Per Lindén\nGraphics: Martin Skogevall\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/"));
  		CEdit ctrl(GetDlgItem(IDC_THANKS));
  		ctrl.FmtLines(TRUE);
--- 62,66 ----
  
  	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
! 		SetDlgItemText(IDC_VERSION, _T("DC++ v") _T(VERSIONSTRING) _T("\n(c) Copyright 2001-2005 Jacek Sieka\nCodeveloper: Per Lind�n\nGraphics: Martin Skogevall\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/"));
  		CEdit ctrl(GetDlgItem(IDC_THANKS));
  		ctrl.FmtLines(TRUE);
***************
*** 97,101 ****
  	HttpConnection c;
  
! 	AboutDlg(const AboutDlg&) { dcassert(0); };
  	
  	virtual void on(HttpConnectionListener::Data, HttpConnection* /*conn*/, const u_int8_t* buf, size_t len) throw() {
--- 98,102 ----
  	HttpConnection c;
  
! 	AboutDlg(const AboutDlg&) { dcassert(0); }
  	
  	virtual void on(HttpConnectionListener::Data, HttpConnection* /*conn*/, const u_int8_t* buf, size_t len) throw() {

Index: UCPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UCPage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UCPage.h	5 Jan 2006 00:11:30 -0000	1.9
--- UCPage.h	19 Feb 2006 16:19:06 -0000	1.10
***************
*** 36,44 ****
  		SetTitle(CTSTRING(SETTINGS_USER_COMMANDS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~UCPage() {
! 		ctrlCommands.Detach();
! 	};
  
  	BEGIN_MSG_MAP(UCPage)
--- 36,42 ----
  		SetTitle(CTSTRING(SETTINGS_USER_COMMANDS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~UCPage() { 	ctrlCommands.Detach(); }
  
  	BEGIN_MSG_MAP(UCPage)

Index: PublicHubsFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PublicHubsFrm.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** PublicHubsFrm.h	23 Jan 2006 08:00:50 -0000	1.33
--- PublicHubsFrm.h	19 Feb 2006 16:19:06 -0000	1.34
***************
*** 39,46 ****
  	PublicHubsFrame() : users(0), hubs(0), closed(false), 
  		filterContainer(WC_EDIT, this, FILTER_MESSAGE_MAP) {
! 	};
  
! 	virtual ~PublicHubsFrame() {
! 	};
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("PublicHubsFrame"), IDR_PUBLICHUBS, 0, COLOR_3DFACE);
--- 39,45 ----
  	PublicHubsFrame() : users(0), hubs(0), closed(false), 
  		filterContainer(WC_EDIT, this, FILTER_MESSAGE_MAP) {
! 	}
  
! 	virtual ~PublicHubsFrame() { }
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("PublicHubsFrame"), IDR_PUBLICHUBS, 0, COLOR_3DFACE);
***************
*** 99,103 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
  	
  	LRESULT onSetFocus(UINT /* uMsg */, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
--- 98,102 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
  	
  	LRESULT onSetFocus(UINT /* uMsg */, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {

Index: StatsFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/StatsFrame.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StatsFrame.h	12 Nov 2005 10:23:02 -0000	1.11
--- StatsFrame.h	19 Feb 2006 16:19:06 -0000	1.12
***************
*** 85,90 ****
  
  	struct Stat {
! 		Stat() : scroll(0), speed(0) { };
! 		Stat(u_int32_t aScroll, int64_t aSpeed) : scroll(aScroll), speed(aSpeed) { };
  		u_int32_t scroll;
  		int64_t speed;
--- 85,90 ----
  
  	struct Stat {
! 		Stat() : scroll(0), speed(0) { }
! 		Stat(u_int32_t aScroll, int64_t aSpeed) : scroll(aScroll), speed(aSpeed) { }
  		u_int32_t scroll;
  		int64_t speed;

Index: WinUtil.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WinUtil.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** WinUtil.h	10 Feb 2006 07:56:47 -0000	1.53
--- WinUtil.h	19 Feb 2006 16:19:06 -0000	1.54
***************
*** 44,48 ****
  class UserInfoBase {
  public:
! 	UserInfoBase(const User::Ptr& u) : user(u) { };
  	
  	void getList();
--- 44,48 ----
  class UserInfoBase {
  public:
! 	UserInfoBase(const User::Ptr& u) : user(u) { }
  	
  	void getList();
***************
*** 135,139 ****
  class StaticFrame {
  public:
! 	virtual ~StaticFrame() { frame = NULL; };
  
  	static T* frame;
--- 135,139 ----
  class StaticFrame {
  public:
! 	virtual ~StaticFrame() { frame = NULL; }
  
  	static T* frame;

Index: FavHubProperties.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavHubProperties.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FavHubProperties.h	24 Apr 2005 08:13:05 -0000	1.7
--- FavHubProperties.h	19 Feb 2006 16:19:06 -0000	1.8
***************
*** 29,34 ****
  {
  public:
! 	FavHubProperties::FavHubProperties(FavoriteHubEntry *_entry) : entry(_entry) { };
! 	virtual ~FavHubProperties() { };
  
  	enum { IDD = IDD_FAVORITEHUB };
--- 29,34 ----
  {
  public:
! 	FavHubProperties::FavHubProperties(FavoriteHubEntry *_entry) : entry(_entry) { }
! 	virtual ~FavHubProperties() { }
  
  	enum { IDD = IDD_FAVORITEHUB };

Index: PrivateFrame.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PrivateFrame.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** PrivateFrame.cpp	5 Feb 2006 17:02:38 -0000	1.61
--- PrivateFrame.cpp	19 Feb 2006 16:19:06 -0000	1.62
***************
*** 290,294 ****
  
  	ClientManager::getInstance()->userCommand(replyTo, uc, ucParams, true);
! };
  
  LRESULT PrivateFrame::onGetList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
--- 290,294 ----
  
  	ClientManager::getInstance()->userCommand(replyTo, uc, ucParams, true);
! }
  
  LRESULT PrivateFrame::onGetList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {

Index: AdvancedPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AdvancedPage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AdvancedPage.h	5 Jan 2006 00:11:31 -0000	1.15
--- AdvancedPage.h	19 Feb 2006 16:19:06 -0000	1.16
***************
*** 33,40 ****
  		SetTitle(CTSTRING(SETTINGS_ADVANCED));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~AdvancedPage() {
! 	};
  
  	BEGIN_MSG_MAP(AdvancedPage)
--- 33,39 ----
  		SetTitle(CTSTRING(SETTINGS_ADVANCED));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~AdvancedPage() { }
  
  	BEGIN_MSG_MAP(AdvancedPage)

Index: WindowsPage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WindowsPage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WindowsPage.h	5 Jan 2006 00:11:31 -0000	1.6
--- WindowsPage.h	19 Feb 2006 16:19:06 -0000	1.7
***************
*** 33,40 ****
  		SetTitle(CTSTRING(SETTINGS_WINDOWS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
! 	virtual ~WindowsPage() { 
! 	};
  
  	BEGIN_MSG_MAP(WindowsPage)
--- 33,39 ----
  		SetTitle(CTSTRING(SETTINGS_WINDOWS));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
! 	virtual ~WindowsPage() { }
  
  	BEGIN_MSG_MAP(WindowsPage)

Index: ADLSearchFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ADLSearchFrame.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ADLSearchFrame.h	12 Nov 2005 10:23:02 -0000	1.12
--- ADLSearchFrame.h	19 Feb 2006 16:19:06 -0000	1.13
***************
*** 19,23 ****
  /*
   * Automatic Directory Listing Search
!  * Henrik Engström, henrikengstrom on home point se
   */
  
--- 19,23 ----
  /*
   * Automatic Directory Listing Search
!  * Henrik Engstr�m, henrikengstrom on home point se
   */
  
***************
*** 105,109 ****
  		bHandled = FALSE;
  		return FALSE;
! 	};
  
  	// Update control layouts
--- 105,109 ----
  		bHandled = FALSE;
  		return FALSE;
! 	}
  
  	// Update control layouts

Index: AppearancePage.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AppearancePage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AppearancePage.h	5 Jan 2006 00:11:31 -0000	1.15
--- AppearancePage.h	19 Feb 2006 16:19:06 -0000	1.16
***************
*** 34,38 ****
  		SetTitle(CTSTRING(SETTINGS_APPEARANCE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	};
  
  	virtual ~AppearancePage();
--- 34,38 ----
  		SetTitle(CTSTRING(SETTINGS_APPEARANCE));
  		m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING;
! 	}
  
  	virtual ~AppearancePage();

Index: FinishedULFrame.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedULFrame.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FinishedULFrame.h	12 Jan 2006 22:32:44 -0000	1.21
--- FinishedULFrame.h	19 Feb 2006 16:19:06 -0000	1.22
***************
*** 34,40 ****
  		columnOrder = SettingsManager::FINISHED_UL_ORDER;
  		columnWidth = SettingsManager::FINISHED_UL_WIDTHS;
! 	};
  
! 	virtual ~FinishedULFrame() { };
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FinishedULFrame"), IDR_FINISHED_UL, 0, COLOR_3DFACE);
--- 34,40 ----
  		columnOrder = SettingsManager::FINISHED_UL_ORDER;
  		columnWidth = SettingsManager::FINISHED_UL_WIDTHS;
! 	}
  
! 	virtual ~FinishedULFrame() { }
  
  	DECLARE_FRAME_WND_CLASS_EX(_T("FinishedULFrame"), IDR_FINISHED_UL, 0, COLOR_3DFACE);

[Dcplusplus-commit] dcplusplus/client DownloadManager.h,1.84,1.85 FavoriteManager.cpp,1.17,1.18 LogManager.h,1.20,1.21 ConnectionManager.h,1.76,1.77 QueueItem.h,1.24,1.25 ConnectionManager.cpp,1.118,1.119 BufferedSocket.h,1.77,1.78 NmdcHub.h,1.30,1.31 TimerManager.h,1.28,1.29 MerkleTree.h,1.26,1.27 Socket.h,1.66,1.67 ResourceManager.h,1.16,1.17 SearchManager.h,1.58,1.59 Client.h,1.108,1.109 AdcHub.h,1.40,1.41 TigerHash.h,1.8,1.9 ShareManager.h,1.86,1.87 HashManager.h,1.32,1.33 Exception.h,1.18,1.19 BitOutputStream.h,1.15,1.16 UploadManager.h,1.84,1.85 Semaphore.h,1.14,1.15 QueueManager.cpp,1.145,1.146 StringTokenizer.h,1.9,1.10 SimpleXML.h,1.45,1.46 StringSearch.h,1.9,1.10 ConnectionManagerListener.h,1.6,1.7 Client.cpp,1.92,1.93 BufferedSocket.cpp,1.101,1.102 SFVReader.h,1.6,1.7 Util.h,1.127,1.128 BloomFilter.h,1.10,1.11 CriticalSection.h,1.28,1.29 BitInputStream.h,1.17,1.18 UserConnection.h,1.105,1.106 ShareManager.cpp,1.144,1.145 File.h,1.53,1.54 Streams.h,1.6,1.7 User.h,1.70,1.71 Thread.h,1.22,1.23 SettingsManager.h,1.110,1.111 DownloadManager.cpp,1.159,1.160 QueueManager.h,1.74,1.75 FinishedManager.h,1.17,1.18 UserCommand.h,1.13,1.14 Pointer.h,1.21,1.22 Makefile.am,1.9,1.10 CryptoManager.cpp,1.55,1.56 HttpConnection.h,1.26,1.27 DirectoryListing.h,1.45,1.46 ServerSocket.h,1.27,1.28 HashManager.cpp,1.51,1.52 DirectoryListing.cpp,1.57,1.58 FavoriteManager.h,1.11,1.12 CryptoManager.h,1.43,1.44 MerkleCheckOutputStream.h,1.4,1.5 Speaker.h,1.9,1.10 HashValue.h,1.12,1.13

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10847/client

Modified Files:
	DownloadManager.h FavoriteManager.cpp LogManager.h 
	ConnectionManager.h QueueItem.h ConnectionManager.cpp 
	BufferedSocket.h NmdcHub.h TimerManager.h MerkleTree.h 
	Socket.h ResourceManager.h SearchManager.h Client.h AdcHub.h 
	TigerHash.h ShareManager.h HashManager.h Exception.h 
	BitOutputStream.h UploadManager.h Semaphore.h QueueManager.cpp 
	StringTokenizer.h SimpleXML.h StringSearch.h 
	ConnectionManagerListener.h Client.cpp BufferedSocket.cpp 
	SFVReader.h Util.h BloomFilter.h CriticalSection.h 
	BitInputStream.h UserConnection.h ShareManager.cpp File.h 
	Streams.h User.h Thread.h SettingsManager.h 
	DownloadManager.cpp QueueManager.h FinishedManager.h 
	UserCommand.h Pointer.h Makefile.am CryptoManager.cpp 
	HttpConnection.h DirectoryListing.h ServerSocket.h 
	HashManager.cpp DirectoryListing.cpp FavoriteManager.h 
	CryptoManager.h MerkleCheckOutputStream.h Speaker.h 
	HashValue.h 
Log Message:
Pedantry

Index: FinishedManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/FinishedManager.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FinishedManager.h	24 Apr 2005 08:13:11 -0000	1.17
--- FinishedManager.h	19 Feb 2006 16:19:06 -0000	1.18
***************
*** 45,49 ****
  	}
  
! 	int64_t getAvgSpeed() { return milliSeconds > 0 ? (chunkSize * ((int64_t)1000) / milliSeconds) : 0; };
  
  	GETSET(string, target, Target);
--- 45,49 ----
  	}
  
! 	int64_t getAvgSpeed() { return milliSeconds > 0 ? (chunkSize * ((int64_t)1000) / milliSeconds) : 0; }
  
  	GETSET(string, target, Target);
***************
*** 84,89 ****
  {
  public:
! 	FinishedItem::List& lockList(bool upload = false) { cs.enter(); return upload ? uploads : downloads; };
! 	void unlockList() { cs.leave(); };
  
  	void remove(FinishedItem *item, bool upload = false);
--- 84,89 ----
  {
  public:
! 	FinishedItem::List& lockList(bool upload = false) { cs.enter(); return upload ? uploads : downloads; }
! 	void unlockList() { cs.leave(); }
  
  	void remove(FinishedItem *item, bool upload = false);

Index: BloomFilter.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BloomFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BloomFilter.h	24 Apr 2005 08:13:10 -0000	1.10
--- BloomFilter.h	19 Feb 2006 16:19:06 -0000	1.11
***************
*** 35,40 ****
  class BloomFilter {
  public:
! 	BloomFilter(size_t tableSize) { table.resize(tableSize); };
! 	~BloomFilter() { };
  
  	void add(const string& s) { xadd(s, N); }
--- 35,40 ----
  class BloomFilter {
  public:
! 	BloomFilter(size_t tableSize) { table.resize(tableSize); }
! 	~BloomFilter() { }
  
  	void add(const string& s) { xadd(s, N); }

Index: BufferedSocket.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BufferedSocket.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** BufferedSocket.h	17 Feb 2006 19:23:51 -0000	1.77
--- BufferedSocket.h	19 Feb 2006 16:19:06 -0000	1.78
***************
*** 72,81 ****
  	static BufferedSocket* getSocket(char sep) throw() { 
  		return new BufferedSocket(sep); 
! 	};
  
  	static void putSocket(BufferedSocket* aSock) { 
  		aSock->removeListeners(); 
  		aSock->shutdown();
! 	};
  
  	static void waitShutdown() {
--- 72,81 ----
  	static BufferedSocket* getSocket(char sep) throw() { 
  		return new BufferedSocket(sep); 
! 	}
  
  	static void putSocket(BufferedSocket* aSock) { 
  		aSock->removeListeners(); 
  		aSock->shutdown();
! 	}
  
  	static void waitShutdown() {
***************
*** 95,99 ****
  	 */
  	void setLineMode(size_t aRollback) { mode = MODE_LINE; rollback = aRollback; }
! 	Modes getMode() const { return mode; };
  	const string& getIp() { return sock ? sock->getIp() : Util::emptyString; }
  	bool isConnected() { return sock && sock->isConnected(); }
--- 95,99 ----
  	 */
  	void setLineMode(size_t aRollback) { mode = MODE_LINE; rollback = aRollback; }
! 	Modes getMode() const { return mode; }
  	const string& getIp() { return sock ? sock->getIp() : Util::emptyString; }
  	bool isConnected() { return sock && sock->isConnected(); }
***************
*** 120,124 ****
  
  	struct TaskData { 
! 		virtual ~TaskData() { };
  	};
  	struct ConnectInfo : public TaskData {
--- 120,124 ----
  
  	struct TaskData { 
! 		virtual ~TaskData() { }
  	};
  	struct ConnectInfo : public TaskData {

Index: File.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/File.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** File.h	12 Oct 2005 14:02:53 -0000	1.53
--- File.h	19 Feb 2006 16:19:06 -0000	1.54
***************
*** 102,106 ****
  	}
  
! 	bool isOpen() { return h != INVALID_HANDLE_VALUE; };
  
  	virtual void close() throw() {
--- 102,106 ----
  	}
  
! 	bool isOpen() { return h != INVALID_HANDLE_VALUE; }
  
  	virtual void close() throw() {
***************
*** 260,264 ****
  	}
  
! 	bool isOpen() { return h != -1; };
  
  	virtual void close() throw() {
--- 260,264 ----
  	}
  
! 	bool isOpen() { return h != -1; }
  
  	virtual void close() throw() {
***************
*** 281,287 ****
  	}
  
! 	virtual void setPos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_SET); };
! 	virtual void setEndPos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_END); };
! 	virtual void movePos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_CUR); };
  
  	virtual size_t read(void* buf, size_t& len) throw(FileException) {
--- 281,287 ----
  	}
  
! 	virtual void setPos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_SET); }
! 	virtual void setEndPos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_END); }
! 	virtual void movePos(int64_t pos) throw(FileException) { lseek(h, (off_t)pos, SEEK_CUR); }
  
  	virtual size_t read(void* buf, size_t& len) throw(FileException) {
***************
*** 343,347 ****
  	}
  
! 	static void deleteFile(const string& aFileName) throw() { ::unlink(aFileName.c_str()); };
  
  	/* ::rename seems to have problems when source and target is on different partitions
--- 343,347 ----
  	}
  
! 	static void deleteFile(const string& aFileName) throw() { ::unlink(aFileName.c_str()); }
  
  	/* ::rename seems to have problems when source and target is on different partitions
***************
*** 419,423 ****
  	}
  
! 	void write(const string& aString) throw(FileException) { write((void*)aString.data(), aString.size()); };
  
  protected:
--- 419,423 ----
  	}
  
! 	void write(const string& aString) throw(FileException) { write((void*)aString.data(), aString.size()); }
  
  protected:

Index: Exception.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Exception.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Exception.h	24 Apr 2005 08:13:36 -0000	1.18
--- Exception.h	19 Feb 2006 16:19:06 -0000	1.19
***************
*** 27,34 ****
  {
  public:
! 	Exception() { };
! 	Exception(const string& aError) throw() : error(aError) { dcdrun(if(error.size()>0)) dcdebug("Thrown: %s\n", error.c_str()); };
! 	virtual ~Exception() throw() { };
! 	virtual const string& getError() const throw() { return error; };
  protected:
  	string error;
--- 27,34 ----
  {
  public:
! 	Exception() { }
! 	Exception(const string& aError) throw() : error(aError) { dcdrun(if(error.size()>0)) dcdebug("Thrown: %s\n", error.c_str()); }
! 	virtual ~Exception() throw() { }
! 	virtual const string& getError() const throw() { return error; }
  protected:
  	string error;

Index: UserCommand.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/UserCommand.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** UserCommand.h	24 Apr 2005 08:13:37 -0000	1.13
--- UserCommand.h	19 Feb 2006 16:19:06 -0000	1.14
***************
*** 50,56 ****
  	};
  
! 	UserCommand() : cid(0), type(0), ctx(0) { };
  	UserCommand(int aId, int aType, int aCtx, int aFlags, const string& aName, const string& aCommand, const string& aHub) throw() 
! 		: Flags(aFlags), cid(aId), type(aType), ctx(aCtx), name(aName), command(aCommand), hub(aHub) { };
  	
  	UserCommand(const UserCommand& rhs) : Flags(rhs), cid(rhs.cid), type(rhs.type), 
--- 50,56 ----
  	};
  
! 	UserCommand() : cid(0), type(0), ctx(0) { }
  	UserCommand(int aId, int aType, int aCtx, int aFlags, const string& aName, const string& aCommand, const string& aHub) throw() 
! 		: Flags(aFlags), cid(aId), type(aType), ctx(aCtx), name(aName), command(aCommand), hub(aHub) { }
  	
  	UserCommand(const UserCommand& rhs) : Flags(rhs), cid(rhs.cid), type(rhs.type), 

Index: ConnectionManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ConnectionManager.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** ConnectionManager.h	29 Jan 2006 18:48:25 -0000	1.76
--- ConnectionManager.h	19 Feb 2006 16:19:06 -0000	1.77
***************
*** 47,51 ****
  	};
  
! 	ConnectionQueueItem(const User::Ptr& aUser, bool aDownload) : state(WAITING), lastAttempt(0), download(aDownload), user(aUser) { };
  	
  	User::Ptr& getUser() { return user; }
--- 47,51 ----
  	};
  
! 	ConnectionQueueItem(const User::Ptr& aUser, bool aDownload) : state(WAITING), lastAttempt(0), download(aDownload), user(aUser) { }
  	
  	User::Ptr& getUser() { return user; }
***************
*** 166,170 ****
  	ConnectionManager();
  
! 	virtual ~ConnectionManager() throw() { shutdown(); };
  	
  	UserConnection* getConnection(bool aNmdc, bool secure) throw();
--- 166,170 ----
  	ConnectionManager();
  
! 	virtual ~ConnectionManager() throw() { shutdown(); }
  	
  	UserConnection* getConnection(bool aNmdc, bool secure) throw();

Index: QueueItem.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/QueueItem.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** QueueItem.h	1 Jan 2006 22:42:54 -0000	1.24
--- QueueItem.h	19 Feb 2006 16:19:06 -0000	1.25
***************
*** 107,117 ****
  		};
  
! 		Source(const User::Ptr& aUser, const string& aPath) : path(aPath), user(aUser) { };
  		Source(const Source& aSource) : Flags(aSource), path(aSource.path), user(aSource.user) { }
  
! 		User::Ptr& getUser() { return user; };
! 		const User::Ptr& getUser() const { return user; };
! 		void setUser(const User::Ptr& aUser) { user = aUser; };
! 		string getFileName() { return Util::getFileName(path); };
  
  		GETSET(string, path, Path);
--- 107,117 ----
  		};
  
! 		Source(const User::Ptr& aUser, const string& aPath) : path(aPath), user(aUser) { }
  		Source(const Source& aSource) : Flags(aSource), path(aSource.path), user(aSource.user) { }
  
! 		User::Ptr& getUser() { return user; }
! 		const User::Ptr& getUser() const { return user; }
! 		void setUser(const User::Ptr& aUser) { user = aUser; }
! 		string getFileName() { return Util::getFileName(path); }
  
  		GETSET(string, path, Path);
***************
*** 126,130 ****
  		priority(aPriority), current(NULL), currentDownload(NULL), added(aAdded),
  		tthRoot(tth == NULL ? NULL : new TTHValue(*tth))
! 	{ };
  
  	QueueItem(const QueueItem& rhs) : 
--- 126,130 ----
  		priority(aPriority), current(NULL), currentDownload(NULL), added(aAdded),
  		tthRoot(tth == NULL ? NULL : new TTHValue(*tth))
! 	{ }
  
  	QueueItem(const QueueItem& rhs) : 
***************
*** 147,151 ****
  		for_each(badSources.begin(), badSources.end(), DeleteFunction());
  		delete tthRoot;
! 	};
  
  	int countOnlineUsers() const {
--- 147,151 ----
  		for_each(badSources.begin(), badSources.end(), DeleteFunction());
  		delete tthRoot;
! 	}
  
  	int countOnlineUsers() const {
***************
*** 158,162 ****
  		return n;
  	}
! 	bool hasOnlineUsers() const { return countOnlineUsers() > 0; };
  
  	const string& getSourcePath(const User::Ptr& aUser) { 
--- 158,162 ----
  		return n;
  	}
! 	bool hasOnlineUsers() const { return countOnlineUsers() > 0; }
  
  	const string& getSourcePath(const User::Ptr& aUser) { 
***************
*** 165,170 ****
  	}
  
! 	Source::List& getSources() { return sources; };
! 	Source::List& getBadSources() { return badSources; };
  
  	void getOnlineUsers(User::List& l) const  {
--- 165,170 ----
  	}
  
! 	Source::List& getSources() { return sources; }
! 	Source::List& getBadSources() { return badSources; }
  
  	void getOnlineUsers(User::List& l) const  {
***************
*** 174,187 ****
  	}
  
! 	string getTargetFileName() const { return Util::getFileName(getTarget()); };
  
! 	Source::Iter getSource(const User::Ptr& aUser) { return getSource(aUser, sources); };
! 	Source::Iter getBadSource(const User::Ptr& aUser) { return getSource(aUser, badSources); };
  
! 	bool isSource(const User::Ptr& aUser) { return (getSource(aUser, sources) != sources.end()); };
! 	bool isBadSource(const User::Ptr& aUser) { return (getSource(aUser, badSources) != badSources.end()); };
  
! 	bool isSource(const User::Ptr& aUser) const { return isSource(aUser, sources); };
! 	bool isBadSource(const User::Ptr& aUser) const { return isSource(aUser, badSources); };
  	bool isBadSourceExcept(const User::Ptr& aUser, Flags::MaskType exceptions) const {
  		Source::ConstIter i = getSource(aUser, badSources);
--- 174,187 ----
  	}
  
! 	string getTargetFileName() const { return Util::getFileName(getTarget()); }
  
! 	Source::Iter getSource(const User::Ptr& aUser) { return getSource(aUser, sources); }
! 	Source::Iter getBadSource(const User::Ptr& aUser) { return getSource(aUser, badSources); }
  
! 	bool isSource(const User::Ptr& aUser) { return (getSource(aUser, sources) != sources.end()); }
! 	bool isBadSource(const User::Ptr& aUser) { return (getSource(aUser, badSources) != badSources.end()); }
  
! 	bool isSource(const User::Ptr& aUser) const { return isSource(aUser, sources); }
! 	bool isBadSource(const User::Ptr& aUser) const { return isSource(aUser, badSources); }
  	bool isBadSourceExcept(const User::Ptr& aUser, Flags::MaskType exceptions) const {
  		Source::ConstIter i = getSource(aUser, badSources);
***************
*** 189,193 ****
  			return (*i)->isAnySet(exceptions^Source::FLAG_MASK); 
  		return false;
! 	};
  
  	void setCurrent(const User::Ptr& aUser) {
--- 189,193 ----
  			return (*i)->isAnySet(exceptions^Source::FLAG_MASK); 
  		return false;
! 	}
  
  	void setCurrent(const User::Ptr& aUser) {

Index: NmdcHub.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/NmdcHub.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** NmdcHub.h	29 Jan 2006 18:48:25 -0000	1.30
--- NmdcHub.h	19 Feb 2006 16:19:06 -0000	1.31
***************
*** 62,66 ****
  	virtual int64_t getAvailable() const;
  
! 	virtual string escape(string const& str) const { return Util::validateMessage(str, false); };
  
  	virtual void disconnect(bool graceless) throw();
--- 62,66 ----
  	virtual int64_t getAvailable() const;
  
! 	virtual string escape(string const& str) const { return Util::validateMessage(str, false); }
  
  	virtual void disconnect(bool graceless) throw();
***************
*** 73,80 ****
  
  	void validateNick(const string& aNick) { send("$ValidateNick " + toNmdc(aNick) + "|"); }
! 	void key(const string& aKey) { send("$Key " + aKey + "|"); };	
! 	void version() { send("$Version 1,0091|"); };
! 	void getNickList() { checkstate(); send("$GetNickList|"); };
! 	void getInfo(const OnlineUser& aUser) { checkstate(); send("$GetINFO " + toNmdc(aUser.getIdentity().getNick()) + " " + toNmdc(getMyNick()) + "|"); };
  
  	void connectToMe(const OnlineUser& aUser);
--- 73,80 ----
  
  	void validateNick(const string& aNick) { send("$ValidateNick " + toNmdc(aNick) + "|"); }
! 	void key(const string& aKey) { send("$Key " + aKey + "|"); }
! 	void version() { send("$Version 1,0091|"); }
! 	void getNickList() { checkstate(); send("$GetNickList|"); }
! 	void getInfo(const OnlineUser& aUser) { checkstate(); send("$GetINFO " + toNmdc(aUser.getIdentity().getNick()) + " " + toNmdc(getMyNick()) + "|"); }
  
  	void connectToMe(const OnlineUser& aUser);

Index: DirectoryListing.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/DirectoryListing.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** DirectoryListing.h	1 Jan 2006 22:42:54 -0000	1.45
--- DirectoryListing.h	19 Feb 2006 16:19:06 -0000	1.46
***************
*** 50,58 ****
  			name(aName), size(aSize), parent(aDir), tthRoot(new TTHValue(aTTH)), adls(false)
  		{ 
! 		};
  		File(Directory* aDir, const string& aName, int64_t aSize) throw() : 
  			name(aName), size(aSize), parent(aDir), tthRoot(NULL), adls(false)
  		{ 
! 		};
  			
  		File(const File& rhs, bool _adls = false) : name(rhs.name), size(rhs.size), parent(rhs.parent), tthRoot(rhs.tthRoot == NULL ? NULL : new TTHValue(*rhs.tthRoot)), adls(_adls)
--- 50,58 ----
  			name(aName), size(aSize), parent(aDir), tthRoot(new TTHValue(aTTH)), adls(false)
  		{ 
! 		}
  		File(Directory* aDir, const string& aName, int64_t aSize) throw() : 
  			name(aName), size(aSize), parent(aDir), tthRoot(NULL), adls(false)
  		{ 
! 		}
  			
  		File(const File& rhs, bool _adls = false) : name(rhs.name), size(rhs.size), parent(rhs.parent), tthRoot(rhs.tthRoot == NULL ? NULL : new TTHValue(*rhs.tthRoot)), adls(_adls)
***************
*** 91,95 ****
  		
  		Directory(Directory* aParent, const string& aName, bool _adls, bool aComplete) 
! 			: name(aName), parent(aParent), adls(_adls), complete(aComplete) { };
  		
  		virtual ~Directory() {
--- 91,95 ----
  		
  		Directory(Directory* aParent, const string& aName, bool _adls, bool aComplete) 
! 			: name(aName), parent(aParent), adls(_adls), complete(aComplete) { }
  		
  		virtual ~Directory() {
***************
*** 104,108 ****
  		void getHashList(HASH_SET<TTHValue, TTHValue::Hash>& l);
  		
! 		size_t getFileCount() { return files.size(); };
  		
  		int64_t getSize() {
--- 104,108 ----
  		void getHashList(HASH_SET<TTHValue, TTHValue::Hash>& l);
  		
! 		size_t getFileCount() { return files.size(); }
  		
  		int64_t getSize() {

Index: HashManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/HashManager.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** HashManager.h	24 Dec 2005 23:13:25 -0000	1.32
--- HashManager.h	19 Feb 2006 16:19:06 -0000	1.33
***************
*** 197,201 ****
  		const TTHValue* getTTH(const string& aFileName);
  		bool getTree(const TTHValue& root, TigerTree& tth);
! 		bool isDirty() { return dirty; };
  	private:
  		/** Root -> tree mapping info, we assume there's only one tree for each root (a collision would mean we've broken tiger...) */
--- 197,201 ----
  		const TTHValue* getTTH(const string& aFileName);
  		bool getTree(const TTHValue& root, TigerTree& tth);
! 		bool isDirty() { return dirty; }
  	private:
  		/** Root -> tree mapping info, we assume there's only one tree for each root (a collision would mean we've broken tiger...) */

Index: User.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/User.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** User.h	17 Feb 2006 19:23:51 -0000	1.70
--- User.h	19 Feb 2006 16:19:06 -0000	1.71
***************
*** 72,76 ****
  	User(const CID& aCID) : cid(aCID) { }
  
! 	virtual ~User() throw() { };
  
  	operator CID() { return cid; }
--- 72,76 ----
  	User(const CID& aCID) : cid(aCID) { }
  
! 	virtual ~User() throw() { }
  
  	operator CID() { return cid; }

Index: MerkleTree.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/MerkleTree.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MerkleTree.h	24 Apr 2005 09:45:39 -0000	1.26
--- MerkleTree.h	19 Feb 2006 16:19:06 -0000	1.27
***************
*** 220,224 ****
  template<int64_t aBlockSize>
  struct TTFilter {
! 	TTFilter() : tt(aBlockSize) { };
  	void operator()(const void* data, size_t len) { tt.update(data, len); }
  	TigerTree& getTree() { return tt; }
--- 220,224 ----
  template<int64_t aBlockSize>
  struct TTFilter {
! 	TTFilter() : tt(aBlockSize) { }
  	void operator()(const void* data, size_t len) { tt.update(data, len); }
  	TigerTree& getTree() { return tt; }

Index: DirectoryListing.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/DirectoryListing.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** DirectoryListing.cpp	5 Feb 2006 17:02:38 -0000	1.57
--- DirectoryListing.cpp	19 Feb 2006 16:19:06 -0000	1.58
***************
*** 177,181 ****
  public:
  	ListLoader(DirectoryListing::Directory* root, bool aUpdating) : cur(root), base("/"), inListing(false), updating(aUpdating) { 
! 	};
  
  	virtual ~ListLoader() { }
--- 177,181 ----
  public:
  	ListLoader(DirectoryListing::Directory* root, bool aUpdating) : cur(root), base("/"), inListing(false), updating(aUpdating) { 
! 	}
  
  	virtual ~ListLoader() { }

Index: Speaker.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Speaker.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Speaker.h	24 Apr 2005 08:13:36 -0000	1.9
--- Speaker.h	19 Feb 2006 16:19:06 -0000	1.10
***************
*** 32,37 ****
  
  public:
! 	Speaker() throw() { };
! 	virtual ~Speaker() throw() { };
  
  	template<typename T0>
--- 32,37 ----
  
  public:
! 	Speaker() throw() { }
! 	virtual ~Speaker() throw() { }
  
  	template<typename T0>

Index: Thread.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Thread.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Thread.h	24 Apr 2005 08:13:37 -0000	1.22
--- Thread.h	19 Feb 2006 16:19:06 -0000	1.23
***************
*** 48,56 ****
  	};
  
! 	Thread() throw() : threadHandle(NULL), threadId(0){ };
  	virtual ~Thread() { 
  		if(threadHandle)
  			CloseHandle(threadHandle);
! 	};
  	
  	void start() throw(ThreadException);
--- 48,56 ----
  	};
  
! 	Thread() throw() : threadHandle(NULL), threadId(0){ }
  	virtual ~Thread() { 
  		if(threadHandle)
  			CloseHandle(threadHandle);
! 	}
  	
  	void start() throw(ThreadException);
***************
*** 65,75 ****
  	}
  
! 	void setThreadPriority(Priority p) throw() { ::SetThreadPriority(threadHandle, p); };
  	
! 	static void sleep(u_int32_t millis) { ::Sleep(millis); };
! 	static void yield() { ::Sleep(0); };
! 	static long safeInc(volatile long& v) { return InterlockedIncrement(&v); };
! 	static long safeDec(volatile long& v) { return InterlockedDecrement(&v); };
! 	static long safeExchange(volatile long& target, long value) { return InterlockedExchange(&target, value); };
  
  #else
--- 65,75 ----
  	}
  
! 	void setThreadPriority(Priority p) throw() { ::SetThreadPriority(threadHandle, p); }
  	
! 	static void sleep(u_int32_t millis) { ::Sleep(millis); }
! 	static void yield() { ::Sleep(0); }
! 	static long safeInc(volatile long& v) { return InterlockedIncrement(&v); }
! 	static long safeDec(volatile long& v) { return InterlockedDecrement(&v); }
! 	static long safeExchange(volatile long& target, long value) { return InterlockedExchange(&target, value); }
  
  #else
***************
*** 81,90 ****
  		HIGH = -1
  	};
! 	Thread() throw() : threadHandle(0) { };
  	virtual ~Thread() { 
  		if(threadHandle != 0) {
  			pthread_detach(threadHandle);
  		}
! 	};
  	void start() throw(ThreadException);
  	void join() throw() { 
--- 81,90 ----
  		HIGH = -1
  	};
! 	Thread() throw() : threadHandle(0) { }
  	virtual ~Thread() { 
  		if(threadHandle != 0) {
  			pthread_detach(threadHandle);
  		}
! 	}
  	void start() throw(ThreadException);
  	void join() throw() { 
***************
*** 93,101 ****
  			threadHandle = 0;
  		}
! 	};
  
! 	void setThreadPriority(Priority p) { setpriority(PRIO_PROCESS, 0, p); };
! 	static void sleep(u_int32_t millis) { ::usleep(millis*1000); };
! 	static void yield() { ::sched_yield(); };
  	static long safeInc(volatile long& v) { 
  #ifdef HAVE_ASM_ATOMIC_H
--- 93,101 ----
  			threadHandle = 0;
  		}
! 	}
  
! 	void setThreadPriority(Priority p) { setpriority(PRIO_PROCESS, 0, p); }
! 	static void sleep(u_int32_t millis) { ::usleep(millis*1000); }
! 	static void yield() { ::sched_yield(); }
  	static long safeInc(volatile long& v) { 
  #ifdef HAVE_ASM_ATOMIC_H
***************
*** 107,111 ****
  		return ++v;
  #endif
! 	};
  	static long safeDec(volatile long& v) { 
  #ifdef HAVE_ASM_ATOMIC_H
--- 107,111 ----
  		return ++v;
  #endif
! 	}
  	static long safeDec(volatile long& v) { 
  #ifdef HAVE_ASM_ATOMIC_H
***************
*** 117,121 ****
  		return --v;
  #endif
! 	};
  #endif
  
--- 117,121 ----
  		return --v;
  #endif
! 	}
  #endif
  

Index: FavoriteManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/FavoriteManager.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FavoriteManager.cpp	5 Feb 2006 13:38:44 -0000	1.17
--- FavoriteManager.cpp	19 Feb 2006 16:19:05 -0000	1.18
***************
*** 279,283 ****
  class XmlListLoader : public SimpleXMLReader::CallBack {
  public:
! 	XmlListLoader(HubEntry::List& lst) : publicHubs(lst) { };
  	virtual ~XmlListLoader() { }
  	virtual void startTag(const string& name, StringPairList& attribs, bool) {
--- 279,283 ----
  class XmlListLoader : public SimpleXMLReader::CallBack {
  public:
! 	XmlListLoader(HubEntry::List& lst) : publicHubs(lst) { }
  	virtual ~XmlListLoader() { }
  	virtual void startTag(const string& name, StringPairList& attribs, bool) {

Index: TimerManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/TimerManager.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** TimerManager.h	12 Feb 2006 18:16:12 -0000	1.28
--- TimerManager.h	19 Feb 2006 16:19:06 -0000	1.29
***************
*** 64,68 ****
  		return (u_int32_t)((tv2.tv_sec - tv.tv_sec) * 1000 ) + ( (tv2.tv_usec - tv.tv_usec) / 1000);
  #endif
! 	};
  private:
  
--- 64,68 ----
  		return (u_int32_t)((tv2.tv_sec - tv.tv_sec) * 1000 ) + ( (tv2.tv_usec - tv.tv_usec) / 1000);
  #endif
! 	}
  private:
  
***************
*** 74,83 ****
  		gettimeofday(&tv, NULL);
  #endif
! 	};
  
  	virtual ~TimerManager() throw() {
  		dcassert(listeners.empty());
  		shutdown();
! 	};
  
  	virtual int run();
--- 74,83 ----
  		gettimeofday(&tv, NULL);
  #endif
! 	}
  
  	virtual ~TimerManager() throw() {
  		dcassert(listeners.empty());
  		shutdown();
! 	}
  
  	virtual int run();

Index: UploadManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/UploadManager.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** UploadManager.h	29 Jan 2006 18:48:25 -0000	1.84
--- UploadManager.h	19 Feb 2006 16:19:06 -0000	1.85
***************
*** 45,55 ****
  	typedef List::iterator Iter;
  	
! 	Upload() : tth(NULL), file(NULL) { };
  	virtual ~Upload() { 
  		delete file;
  		delete tth;
! 	};
  	
! 	User::Ptr& getUser() { dcassert(getUserConnection() != NULL); return getUserConnection()->getUser(); };
  	
  	GETSET(string, fileName, FileName);
--- 45,55 ----
  	typedef List::iterator Iter;
  	
! 	Upload() : tth(NULL), file(NULL) { }
  	virtual ~Upload() { 
  		delete file;
  		delete tth;
! 	}
  	
! 	User::Ptr& getUser() { dcassert(getUserConnection() != NULL); return getUserConnection()->getUser(); }
  	
  	GETSET(string, fileName, FileName);
***************
*** 70,79 ****
  	typedef X<5> WaitingRemoveUser;
  
! 	virtual void on(Starting, Upload*) throw() { };
! 	virtual void on(Tick, const Upload::List&) throw() { };
! 	virtual void on(Complete, Upload*) throw() { };
! 	virtual void on(Failed, Upload*, const string&) throw() { };
! 	virtual void on(WaitingAddFile, const User::Ptr, const string&) throw() { };
! 	virtual void on(WaitingRemoveUser, const User::Ptr) throw() { };
  
  };
--- 70,79 ----
  	typedef X<5> WaitingRemoveUser;
  
! 	virtual void on(Starting, Upload*) throw() { }
! 	virtual void on(Tick, const Upload::List&) throw() { }
! 	virtual void on(Complete, Upload*) throw() { }
! 	virtual void on(Failed, Upload*, const string&) throw() { }
! 	virtual void on(WaitingAddFile, const User::Ptr, const string&) throw() { }
! 	virtual void on(WaitingRemoveUser, const User::Ptr) throw() { }
  
  };
***************
*** 84,88 ****
  	
  	/** @return Number of uploads. */ 
! 	size_t getUploadCount() { Lock l(cs); return uploads.size(); };
  
  	/**
--- 84,88 ----
  	
  	/** @return Number of uploads. */ 
! 	size_t getUploadCount() { Lock l(cs); return uploads.size(); }
  
  	/**
***************
*** 118,122 ****
  
  	/** @internal */
! 	int getFreeExtraSlots() { return max(3 - getExtra(), 0); };
  	
  	/** @param aUser Reserve an upload slot for this user and connect. */
--- 118,122 ----
  
  	/** @internal */
! 	int getFreeExtraSlots() { return max(3 - getExtra(), 0); }
  	
  	/** @param aUser Reserve an upload slot for this user and connect. */

Index: UserConnection.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/UserConnection.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** UserConnection.h	12 Feb 2006 18:16:12 -0000	1.105
--- UserConnection.h	19 Feb 2006 16:19:06 -0000	1.106
***************
*** 97,121 ****
  public:
  	Transfer() : userConnection(NULL), start(0), lastTick(GET_TICK()), runningAverage(0), 
! 		last(0), actual(0), pos(0), startPos(0), size(-1) { };
! 	virtual ~Transfer() { };
  	
! 	int64_t getPos() const { return pos; };
! 	void setPos(int64_t aPos) { pos = aPos; };
  
! 	void resetPos() { pos = getStartPos(); };
! 	void setStartPos(int64_t aPos) { startPos = aPos; pos = aPos; };
  	int64_t getStartPos() const { return startPos; }
  
! 	void addPos(int64_t aBytes, int64_t aActual) { pos += aBytes; actual+= aActual; };
  
  	enum { AVG_PERIOD = 30000 };
  	void updateRunningAverage();
  
! 	int64_t getTotal() const { return getPos() - getStartPos(); };
! 	int64_t getActual() const { return actual; };
  	
! 	int64_t getSize() const { return size; };
! 	void setSize(int64_t aSize) { size = aSize; };
! 	void setSize(const string& aSize) { setSize(Util::toInt64(aSize)); };
  
  	int64_t getAverageSpeed() const {
--- 97,121 ----
  public:
  	Transfer() : userConnection(NULL), start(0), lastTick(GET_TICK()), runningAverage(0), 
! 		last(0), actual(0), pos(0), startPos(0), size(-1) { }
! 	virtual ~Transfer() { }
  	
! 	int64_t getPos() const { return pos; }
! 	void setPos(int64_t aPos) { pos = aPos; }
  
! 	void resetPos() { pos = getStartPos(); }
! 	void setStartPos(int64_t aPos) { startPos = aPos; pos = aPos; }
  	int64_t getStartPos() const { return startPos; }
  
! 	void addPos(int64_t aBytes, int64_t aActual) { pos += aBytes; actual+= aActual; }
  
  	enum { AVG_PERIOD = 30000 };
  	void updateRunningAverage();
  
! 	int64_t getTotal() const { return getPos() - getStartPos(); }
! 	int64_t getActual() const { return actual; }
  	
! 	int64_t getSize() const { return size; }
! 	void setSize(int64_t aSize) { size = aSize; }
! 	void setSize(const string& aSize) { setSize(Util::toInt64(aSize)); }
  
  	int64_t getAverageSpeed() const {
***************
*** 226,230 ****
  	};
  
! 	short getNumber() { return (short)((((size_t)this)>>2) & 0x7fff); };
  
  	// NMDC stuff
--- 226,230 ----
  	};
  
! 	short getNumber() { return (short)((((size_t)this)>>2) & 0x7fff); }
  
  	// NMDC stuff
***************
*** 233,245 ****
  	void key(const string& aKey) { send("$Key " + aKey + '|'); }
  	void direction(const string& aDirection, int aNumber) { send("$Direction " + aDirection + " " + Util::toString(aNumber) + '|'); }
! 	void get(const string& aFile, int64_t aResume) { send("$Get " + aFile + "$" + Util::toString(aResume + 1) + '|'); }; 	// No acp - utf conversion here...
! 	void getZBlock(const string& aFile, int64_t aResume, int64_t aBytes, bool utf8) { send((utf8 ? "$UGetZBlock " : "$GetZBlock ") + Util::toString(aResume) + ' ' + Util::toString(aBytes) + ' ' + aFile + '|'); };
  	void uGetBlock(const string& aFile, int64_t aResume, int64_t aBytes) { send("$UGetBlock " + Util::toString(aResume) + ' ' + Util::toString(aBytes) + ' ' + aFile + '|'); }
  	void fileLength(const string& aLength) { send("$FileLength " + aLength + '|'); }
  	void startSend() { send("$Send|"); }
! 	void sending(int64_t bytes) { send(bytes == -1 ? string("$Sending|") : "$Sending " + Util::toString(bytes) + "|"); };
! 	void error(const string& aError) { send("$Error " + aError + '|'); };
! 	void listLen(const string& aLength) { send("$ListLen " + aLength + '|'); };
! 	void maxedOut() { isSet(FLAG_NMDC) ? send("$MaxedOut|") : send(AdcCommand(AdcCommand::SEV_RECOVERABLE, AdcCommand::ERROR_SLOTS_FULL, "Slots full")); };
  	void fileNotAvail() { isSet(FLAG_NMDC) ? send("$Error " + FILE_NOT_AVAILABLE + "|") : send(AdcCommand(AdcCommand::SEV_RECOVERABLE, AdcCommand::ERROR_FILE_NOT_AVAILABLE, FILE_NOT_AVAILABLE)); }
  
--- 233,245 ----
  	void key(const string& aKey) { send("$Key " + aKey + '|'); }
  	void direction(const string& aDirection, int aNumber) { send("$Direction " + aDirection + " " + Util::toString(aNumber) + '|'); }
! 	void get(const string& aFile, int64_t aResume) { send("$Get " + aFile + "$" + Util::toString(aResume + 1) + '|'); } 	// No acp - utf conversion here...
! 	void getZBlock(const string& aFile, int64_t aResume, int64_t aBytes, bool utf8) { send((utf8 ? "$UGetZBlock " : "$GetZBlock ") + Util::toString(aResume) + ' ' + Util::toString(aBytes) + ' ' + aFile + '|'); }
  	void uGetBlock(const string& aFile, int64_t aResume, int64_t aBytes) { send("$UGetBlock " + Util::toString(aResume) + ' ' + Util::toString(aBytes) + ' ' + aFile + '|'); }
  	void fileLength(const string& aLength) { send("$FileLength " + aLength + '|'); }
  	void startSend() { send("$Send|"); }
! 	void sending(int64_t bytes) { send(bytes == -1 ? string("$Sending|") : "$Sending " + Util::toString(bytes) + "|"); }
! 	void error(const string& aError) { send("$Error " + aError + '|'); }
! 	void listLen(const string& aLength) { send("$ListLen " + aLength + '|'); }
! 	void maxedOut() { isSet(FLAG_NMDC) ? send("$MaxedOut|") : send(AdcCommand(AdcCommand::SEV_RECOVERABLE, AdcCommand::ERROR_SLOTS_FULL, "Slots full")); }
  	void fileNotAvail() { isSet(FLAG_NMDC) ? send("$Error " + FILE_NOT_AVAILABLE + "|") : send(AdcCommand(AdcCommand::SEV_RECOVERABLE, AdcCommand::ERROR_FILE_NOT_AVAILABLE, FILE_NOT_AVAILABLE)); }
  
***************
*** 318,326 ****
  	UserConnection(bool secure_) throw() : /*cqi(NULL),*/ state(STATE_UNCONNECTED), lastActivity(0),
  		socket(0), secure(secure_), download(NULL) { 
! 	};
  
  	virtual ~UserConnection() throw() {
  		BufferedSocket::putSocket(socket);
! 	};
  	friend struct DeleteFunction;
  
--- 318,326 ----
  	UserConnection(bool secure_) throw() : /*cqi(NULL),*/ state(STATE_UNCONNECTED), lastActivity(0),
  		socket(0), secure(secure_), download(NULL) { 
! 	}
  
  	virtual ~UserConnection() throw() {
  		BufferedSocket::putSocket(socket);
! 	}
  	friend struct DeleteFunction;
  
***************
*** 330,334 ****
  	void setUser(const User::Ptr& aUser) {
  		user = aUser;
! 	};
  
  	void onLine(const string& aLine) throw();
--- 330,334 ----
  	void setUser(const User::Ptr& aUser) {
  		user = aUser;
! 	}
  
  	void onLine(const string& aLine) throw();

Index: LogManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/LogManager.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** LogManager.h	26 Dec 2005 17:16:03 -0000	1.20
--- LogManager.h	19 Feb 2006 16:19:05 -0000	1.21
***************
*** 34,38 ****
  
  	typedef X<0> Message;
! 	virtual void on(Message, time_t, const string&) throw() { };
  };
  
--- 34,38 ----
  
  	typedef X<0> Message;
! 	virtual void on(Message, time_t, const string&) throw() { }
  };
  
***************
*** 113,118 ****
  		logOptions[STATUS][FILE]		= SettingsManager::LOG_FILE_STATUS;
  		logOptions[STATUS][FORMAT]		= SettingsManager::LOG_FORMAT_STATUS;
! 	};
! 	virtual ~LogManager() throw() { };
  
  };
--- 113,118 ----
  		logOptions[STATUS][FILE]		= SettingsManager::LOG_FILE_STATUS;
  		logOptions[STATUS][FORMAT]		= SettingsManager::LOG_FORMAT_STATUS;
! 	}
! 	virtual ~LogManager() throw() { }
  
  };

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	17 Feb 2006 19:23:51 -0000	1.9
--- Makefile.am	19 Feb 2006 16:19:06 -0000	1.10
***************
*** 5,11 ****
  LIBDCPP_AGE=0
  
! libdcppclient_la_LDFLAGS = -export-dynamic -version-info $(LIBDCPP_CURRENT):$(LIBDCPP_REVISION):$(LIBDCPP_AGE)
  
! libdcppclient_la_CXXFLAGS = -Wall -pedantic -ansi -Wno-long-long -I$(top_srcdir)/yassl/include
  
  libdcppclient_la_SOURCES= \
--- 5,11 ----
  LIBDCPP_AGE=0
  
! libdcppclient_la_LDFLAGS = -no-undefined -export-dynamic -version-info $(LIBDCPP_CURRENT):$(LIBDCPP_REVISION):$(LIBDCPP_AGE)
  
! libdcppclient_la_CXXFLAGS = -Wall -Winvalid-pch -pedantic -ansi -Wno-long-long -I$(top_srcdir)/yassl/include
  
  libdcppclient_la_SOURCES= \
***************
*** 126,129 ****
  
  stdinc.h.gch: stdinc.h
! 	$(CXX) $(libdcppclient_la_CXXFLAGS) $(CXXFLAGS) $?
  
--- 126,129 ----
  
  stdinc.h.gch: stdinc.h
! 	$(CXXCOMPILE) $?
  

Index: BitInputStream.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BitInputStream.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BitInputStream.h	24 Apr 2005 08:13:11 -0000	1.17
--- BitInputStream.h	19 Feb 2006 16:19:06 -0000	1.18
***************
*** 36,41 ****
  {
  public:
! 	BitInputStream(const u_int8_t* aStream, size_t aStart, size_t aEnd) : bitPos(aStart*8), endPos(aEnd*8), is(aStream) { };
! 	~BitInputStream() { };
  	
  	bool get() throw(BitStreamException) {
--- 36,41 ----
  {
  public:
! 	BitInputStream(const u_int8_t* aStream, size_t aStart, size_t aEnd) : bitPos(aStart*8), endPos(aEnd*8), is(aStream) { }
! 	~BitInputStream() { }
  	
  	bool get() throw(BitStreamException) {

Index: ShareManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ShareManager.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** ShareManager.cpp	13 Feb 2006 21:13:27 -0000	1.144
--- ShareManager.cpp	19 Feb 2006 16:19:06 -0000	1.145
***************
*** 45,50 ****
  
  ShareManager::ShareManager() : hits(0), listLen(0), bzXmlListLen(0),
! 	xmlDirty(true), nmdcDirty(false), refreshDirs(false), update(false), initial(true), listN(0), lFile(NULL), 
! 	xFile(NULL), lastXmlUpdate(0), lastNmdcUpdate(0), lastFullUpdate(GET_TICK()), bloom(1<<20), refreshing(0)
  { 
  	SettingsManager::getInstance()->addListener(this);
--- 45,50 ----
  
  ShareManager::ShareManager() : hits(0), listLen(0), bzXmlListLen(0),
! 	xmlDirty(true), nmdcDirty(false), refreshDirs(false), update(false), initial(true), listN(0), refreshing(0), lFile(NULL), 
! 	xFile(NULL), lastXmlUpdate(0), lastNmdcUpdate(0), lastFullUpdate(GET_TICK()), bloom(1<<20)
  { 
  	SettingsManager::getInstance()->addListener(this);

Index: ServerSocket.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ServerSocket.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ServerSocket.h	16 Dec 2005 01:00:46 -0000	1.27
--- ServerSocket.h	19 Feb 2006 16:19:06 -0000	1.28
***************
*** 37,41 ****
  class ServerSocket : public Speaker<ServerSocketListener> {
  public:
! 	ServerSocket() throw() { };
  
  	void listen(short port) throw(SocketException);
--- 37,41 ----
  class ServerSocket : public Speaker<ServerSocketListener> {
  public:
! 	ServerSocket() throw() { }
  
  	void listen(short port) throw(SocketException);

Index: Semaphore.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Semaphore.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Semaphore.h	24 Apr 2005 08:13:11 -0000	1.14
--- Semaphore.h	19 Feb 2006 16:19:06 -0000	1.15
***************
*** 35,39 ****
  	Semaphore() throw() {
  		h = CreateSemaphore(NULL, 0, MAXLONG, NULL);
! 	};
  
  	void signal() throw() {
--- 35,39 ----
  	Semaphore() throw() {
  		h = CreateSemaphore(NULL, 0, MAXLONG, NULL);
! 	}
  
  	void signal() throw() {
***************
*** 41,50 ****
  	}
  
! 	bool wait() throw() { return WaitForSingleObject(h, INFINITE) == WAIT_OBJECT_0; };
! 	bool wait(u_int32_t millis) throw() { return WaitForSingleObject(h, millis) == WAIT_OBJECT_0; };
  
  	~Semaphore() throw() {
  		CloseHandle(h);
! 	};
  
  private:
--- 41,50 ----
  	}
  
! 	bool wait() throw() { return WaitForSingleObject(h, INFINITE) == WAIT_OBJECT_0; }
! 	bool wait(u_int32_t millis) throw() { return WaitForSingleObject(h, millis) == WAIT_OBJECT_0; }
  
  	~Semaphore() throw() {
  		CloseHandle(h);
! 	}
  
  private:
***************
*** 52,62 ****
  #else
  public:
! 	Semaphore() throw() : count(0) { pthread_cond_init(&cond, NULL); };
! 	~Semaphore() throw() { pthread_cond_destroy(&cond); };
  	void signal() throw() { 
  		Lock l(cs);
  		count++;
  		pthread_cond_signal(&cond);
! 	};
  
  	bool wait() throw() { 
--- 52,62 ----
  #else
  public:
! 	Semaphore() throw() : count(0) { pthread_cond_init(&cond, NULL); }
! 	~Semaphore() throw() { pthread_cond_destroy(&cond); }
  	void signal() throw() { 
  		Lock l(cs);
  		count++;
  		pthread_cond_signal(&cond);
! 	}
  
  	bool wait() throw() { 
***************
*** 67,71 ****
  		count--;
  		return true;
! 	};
  	bool wait(u_int32_t millis) throw() { 
  		Lock l(cs);
--- 67,71 ----
  		count--;
  		return true;
! 	}
  	bool wait(u_int32_t millis) throw() { 
  		Lock l(cs);
***************
*** 84,88 ****
  		count--;
  		return true;
! 	};
  
  private:
--- 84,88 ----
  		count--;
  		return true;
! 	}
  
  private:

Index: CryptoManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/CryptoManager.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** CryptoManager.cpp	24 Apr 2005 09:45:39 -0000	1.55
--- CryptoManager.cpp	19 Feb 2006 16:19:06 -0000	1.56
***************
*** 306,310 ****
  	bool operator() (const Node* a, const Node* b) const { 
  		return *a < *b; 
! 	}; 
  };
  
--- 306,310 ----
  	bool operator() (const Node* a, const Node* b) const { 
  		return *a < *b; 
! 	}
  };
  

Index: QueueManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/QueueManager.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** QueueManager.cpp	10 Feb 2006 07:56:46 -0000	1.145
--- QueueManager.cpp	19 Feb 2006 16:19:06 -0000	1.146
***************
*** 1182,1186 ****
  class QueueLoader : public SimpleXMLReader::CallBack {
  public:
! 	QueueLoader() : cur(NULL), inDownloads(false) { };
  	virtual ~QueueLoader() { }
  	virtual void startTag(const string& name, StringPairList& attribs, bool simple);
--- 1182,1186 ----
  class QueueLoader : public SimpleXMLReader::CallBack {
  public:
! 	QueueLoader() : cur(NULL), inDownloads(false) { }
  	virtual ~QueueLoader() { }
  	virtual void startTag(const string& name, StringPairList& attribs, bool simple);

Index: ResourceManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ResourceManager.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ResourceManager.h	5 Jan 2006 00:11:31 -0000	1.16
--- ResourceManager.h	19 Feb 2006 16:19:06 -0000	1.17
***************
*** 32,37 ****
  
  	void loadLanguage(const string& aFile);
! 	const string& getString(Strings x) const { dcassert(x >= 0 && x < LAST); return strings[x]; };
! 	const wstring& getStringW(Strings x) const { dcassert(x >= 0 && x < LAST); return wstrings[x]; };
  	bool isRTL() { return rtl; }
  private:
--- 32,37 ----
  
  	void loadLanguage(const string& aFile);
! 	const string& getString(Strings x) const { dcassert(x >= 0 && x < LAST); return strings[x]; }
! 	const wstring& getStringW(Strings x) const { dcassert(x >= 0 && x < LAST); return wstrings[x]; }
  	bool isRTL() { return rtl; }
  private:
***************
*** 43,49 ****
  	ResourceManager() : rtl(false) {
  		createWide();
! 	};
  
! 	virtual ~ResourceManager() { };
  
  	static string strings[LAST];
--- 43,49 ----
  	ResourceManager() : rtl(false) {
  		createWide();
! 	}
  
! 	virtual ~ResourceManager() { }
  
  	static string strings[LAST];

Index: StringSearch.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/StringSearch.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StringSearch.h	24 Apr 2005 08:13:11 -0000	1.9
--- StringSearch.h	19 Feb 2006 16:19:06 -0000	1.10
***************
*** 40,47 ****
  	explicit StringSearch(const string& aPattern) throw() : pattern(Text::toLower(aPattern)) { 
  		initDelta1();
! 	};
  	StringSearch(const StringSearch& rhs) throw() : pattern(rhs.pattern) { 
  		memcpy(delta1, rhs.delta1, sizeof(delta1));
! 	};
  	const StringSearch& operator=(const StringSearch& rhs) {
  		memcpy(delta1, rhs.delta1, sizeof(delta1));
--- 40,47 ----
  	explicit StringSearch(const string& aPattern) throw() : pattern(Text::toLower(aPattern)) { 
  		initDelta1();
! 	}
  	StringSearch(const StringSearch& rhs) throw() : pattern(rhs.pattern) { 
  		memcpy(delta1, rhs.delta1, sizeof(delta1));
! 	}
  	const StringSearch& operator=(const StringSearch& rhs) {
  		memcpy(delta1, rhs.delta1, sizeof(delta1));
***************
*** 55,61 ****
  	}
  
! 	bool operator==(const StringSearch& rhs) { return pattern == rhs.pattern; };
  
! 	const string& getPattern() const { return pattern; };
  
  	/** Match a text against the pattern */
--- 55,61 ----
  	}
  
! 	bool operator==(const StringSearch& rhs) { return pattern == rhs.pattern; }
  
! 	const string& getPattern() const { return pattern; }
  
  	/** Match a text against the pattern */

Index: ConnectionManagerListener.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ConnectionManagerListener.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConnectionManagerListener.h	24 Apr 2005 08:13:11 -0000	1.6
--- ConnectionManagerListener.h	19 Feb 2006 16:19:06 -0000	1.7
***************
*** 36,44 ****
  	typedef X<4> StatusChanged;
  
! 	virtual void on(Added, ConnectionQueueItem*) throw() { };
! 	virtual void on(Connected, ConnectionQueueItem*) throw() { };
! 	virtual void on(Removed, ConnectionQueueItem*) throw() { };
! 	virtual void on(Failed, ConnectionQueueItem*, const string&) throw() { };
! 	virtual void on(StatusChanged, ConnectionQueueItem*) throw() { };
  };
  
--- 36,44 ----
  	typedef X<4> StatusChanged;
  
! 	virtual void on(Added, ConnectionQueueItem*) throw() { }
! 	virtual void on(Connected, ConnectionQueueItem*) throw() { }
! 	virtual void on(Removed, ConnectionQueueItem*) throw() { }
! 	virtual void on(Failed, ConnectionQueueItem*, const string&) throw() { }
! 	virtual void on(StatusChanged, ConnectionQueueItem*) throw() { }
  };
  

Index: ShareManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ShareManager.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** ShareManager.h	10 Feb 2006 07:56:46 -0000	1.86
--- ShareManager.h	19 Feb 2006 16:19:06 -0000	1.87
***************
*** 62,66 ****
  	bool getTTH(const string& aFile, TTHValue& tth) throw();
  	void refresh(bool dirs = false, bool aUpdate = true, bool block = false) throw(ThreadException, ShareException);
! 	void setDirty() { xmlDirty = nmdcDirty = true; };
  
  	void search(SearchResult::List& l, const string& aString, int aSearchType, int64_t aSize, int aFileType, Client* aClient, StringList::size_type maxResults);
--- 62,66 ----
  	bool getTTH(const string& aFile, TTHValue& tth) throw();
  	void refresh(bool dirs = false, bool aUpdate = true, bool block = false) throw(ThreadException, ShareException);
! 	void setDirty() { xmlDirty = nmdcDirty = true; }
  
  	void search(SearchResult::List& l, const string& aString, int aSearchType, int64_t aSize, int aFileType, Client* aClient, StringList::size_type maxResults);
***************
*** 79,87 ****
  	size_t getSharedFiles() throw();
  
! 	string getShareSizeString() { return Util::toString(getShareSize()); };
! 	string getShareSizeString(const string& aDir) { return Util::toString(getShareSize(aDir)); };
  	
! 	int64_t getListLen() { return generateNmdcList(), listLen; };
! 	string getListLenString() { return Util::toString(getListLen()); };
  	
  	SearchManager::TypeModes getType(const string& fileName);
--- 79,87 ----
  	size_t getSharedFiles() throw();
  
! 	string getShareSizeString() { return Util::toString(getShareSize()); }
! 	string getShareSizeString(const string& aDir) { return Util::toString(getShareSize(aDir)); }
  	
! 	int64_t getListLen() { return generateNmdcList(), listLen; }
! 	string getListLenString() { return Util::toString(getListLen()); }
  	
  	SearchManager::TypeModes getType(const string& fileName);
***************
*** 125,133 ****
  			typedef Set::iterator Iter;
  
! 			File() : size(0), parent(NULL) { };
  			File(const string& aName, int64_t aSize, Directory* aParent, const TTHValue& aRoot) : 
! 			name(aName), tth(aRoot), size(aSize), parent(aParent) { };
  			File(const File& rhs) : 
! 			name(rhs.getName()), tth(rhs.getTTH()), size(rhs.getSize()), parent(rhs.getParent()) { };
  
  			~File() { }
--- 125,133 ----
  			typedef Set::iterator Iter;
  
! 			File() : size(0), parent(NULL) { }
  			File(const string& aName, int64_t aSize, Directory* aParent, const TTHValue& aRoot) : 
! 			name(aName), tth(aRoot), size(aSize), parent(aParent) { }
  			File(const File& rhs) : 
! 			name(rhs.getName()), tth(rhs.getTTH()), size(rhs.getSize()), parent(rhs.getParent()) { }
  
  			~File() { }
***************
*** 161,165 ****
  		Directory(const string& aName = Util::emptyString, Directory* aParent = NULL) : 
  		size(0), name(aName), parent(aParent), fileTypes(0) { 
! 		};
  
  		~Directory();
--- 161,165 ----
  		Directory(const string& aName = Util::emptyString, Directory* aParent = NULL) : 
  		size(0), name(aName), parent(aParent), fileTypes(0) { 
! 		}
  
  		~Directory();

Index: FavoriteManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/FavoriteManager.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FavoriteManager.h	1 Jan 2006 22:42:54 -0000	1.11
--- FavoriteManager.h	19 Feb 2006 16:19:06 -0000	1.12
***************
*** 42,46 ****
  	HubEntry(const string& aName, const string& aServer, const string& aDescription, const string& aUsers) throw() : 
  	name(aName), server(aServer), description(aDescription), country(Util::emptyString), 
! 	rating(Util::emptyString), reliability(0.0), shared(0), minShare(0), users(Util::toInt(aUsers)), minSlots(0), maxHubs(0), maxUsers(0) { };
  
  	HubEntry(const string& aName, const string& aServer, const string& aDescription, const string& aUsers, const string& aCountry,
--- 42,46 ----
  	HubEntry(const string& aName, const string& aServer, const string& aDescription, const string& aUsers) throw() : 
  	name(aName), server(aServer), description(aDescription), country(Util::emptyString), 
! 	rating(Util::emptyString), reliability(0.0), shared(0), minShare(0), users(Util::toInt(aUsers)), minSlots(0), maxHubs(0), maxUsers(0) { }
  
  	HubEntry(const string& aName, const string& aServer, const string& aDescription, const string& aUsers, const string& aCountry,
***************
*** 53,62 ****
  	}
  
! 	HubEntry() throw() { };
  	HubEntry(const HubEntry& rhs) throw() : name(rhs.name), server(rhs.server), description(rhs.description), country(rhs.country), 
  		rating(rhs.rating), reliability(rhs.reliability), shared(rhs.shared), minShare(rhs.minShare), users(rhs.users), minSlots(rhs.minSlots),
  		maxHubs(rhs.maxHubs), maxUsers(rhs.maxUsers) { }
  
! 	~HubEntry() throw() { };
  
  	GETSET(string, name, Name);
--- 53,62 ----
  	}
  
! 	HubEntry() throw() { }
  	HubEntry(const HubEntry& rhs) throw() : name(rhs.name), server(rhs.server), description(rhs.description), country(rhs.country), 
  		rating(rhs.rating), reliability(rhs.reliability), shared(rhs.shared), minShare(rhs.minShare), users(rhs.users), minSlots(rhs.minSlots),
  		maxHubs(rhs.maxHubs), maxUsers(rhs.maxUsers) { }
  
! 	~HubEntry() throw() { }
  
  	GETSET(string, name, Name);
***************
*** 80,87 ****
  	typedef List::iterator Iter;
  
! 	FavoriteHubEntry() throw() : connect(false), bottom(0), top(0), left(0), right(0){ };
! 	FavoriteHubEntry(const HubEntry& rhs) throw() : name(rhs.getName()), server(rhs.getServer()), description(rhs.getDescription()), connect(false), bottom(0), top(0), left(0), right(0){ };
  	FavoriteHubEntry(const FavoriteHubEntry& rhs) throw() : userdescription(rhs.userdescription), name(rhs.getName()), server(rhs.getServer()), description(rhs.getDescription()), 
! 		password(rhs.getPassword()), connect(rhs.getConnect()), bottom(rhs.getBottom()), top(rhs.getTop()), left(rhs.getLeft()), right(rhs.getRight()), nick(rhs.nick){ };
  	~FavoriteHubEntry() throw() { }	
  	
--- 80,87 ----
  	typedef List::iterator Iter;
  
! 	FavoriteHubEntry() throw() : connect(false), bottom(0), top(0), left(0), right(0){ }
! 	FavoriteHubEntry(const HubEntry& rhs) throw() : name(rhs.getName()), server(rhs.getServer()), description(rhs.getDescription()), connect(false), bottom(0), top(0), left(0), right(0){ }
  	FavoriteHubEntry(const FavoriteHubEntry& rhs) throw() : userdescription(rhs.userdescription), name(rhs.getName()), server(rhs.getServer()), description(rhs.getDescription()), 
! 		password(rhs.getPassword()), connect(rhs.getConnect()), bottom(rhs.getBottom()), top(rhs.getTop()), left(rhs.getLeft()), right(rhs.getRight()), nick(rhs.nick){ }
  	~FavoriteHubEntry() throw() { }	
  	
***************
*** 90,94 ****
  	}
  
! 	void setNick(const string& aNick) { nick = aNick; };
  
  	GETSET(string, userdescription, UserDescription);
--- 90,94 ----
  	}
  
! 	void setNick(const string& aNick) { nick = aNick; }
  
  	GETSET(string, userdescription, UserDescription);
***************
*** 148,163 ****
  	StringList getHubLists();
  	bool setHubList(int /*aHubList*/);
! 	int getSelectedHubList() { return lastServer; };
  	void refresh();
! 	HubTypes getHubListType() { return listType; };
  	HubEntry::List getPublicHubs() {
  		Lock l(cs);
  		return publicListMatrix[publicListServer];
  	}
! 	bool isDownloading() { return running; };
  
  // Favorite Users
  	typedef HASH_MAP_X(CID, FavoriteUser, CID::Hash, equal_to<CID>, less<CID>) FavoriteMap;
! 	FavoriteMap getFavoriteUsers() { Lock l(cs); return users; };
  	
  	void addFavoriteUser(User::Ptr& aUser);
--- 148,163 ----
  	StringList getHubLists();
  	bool setHubList(int /*aHubList*/);
! 	int getSelectedHubList() { return lastServer; }
  	void refresh();
! 	HubTypes getHubListType() { return listType; }
  	HubEntry::List getPublicHubs() {
  		Lock l(cs);
  		return publicListMatrix[publicListServer];
  	}
! 	bool isDownloading() { return running; }
  
  // Favorite Users
  	typedef HASH_MAP_X(CID, FavoriteUser, CID::Hash, equal_to<CID>, less<CID>) FavoriteMap;
! 	FavoriteMap getFavoriteUsers() { Lock l(cs); return users; }
  	
  	void addFavoriteUser(User::Ptr& aUser);
***************
*** 171,175 ****
  	time_t getLastSeen(const User::Ptr& aUser) const;
  // Favorite Hubs
! 	FavoriteHubEntry::List& getFavoriteHubs() { return favoriteHubs; };
  
  	void addFavorite(const FavoriteHubEntry& aEntry);
--- 171,175 ----
  	time_t getLastSeen(const User::Ptr& aUser) const;
  // Favorite Hubs
! 	FavoriteHubEntry::List& getFavoriteHubs() { return favoriteHubs; }
  
  	void addFavorite(const FavoriteHubEntry& aEntry);
***************
*** 194,198 ****
  	void removeHubUserCommands(int ctx, const string& hub);
  
! 	UserCommand::List getUserCommands() { Lock l(cs); return userCommands; };
  	UserCommand::List getUserCommands(int ctx, const StringList& hub);
  
--- 194,198 ----
  	void removeHubUserCommands(int ctx, const string& hub);
  
! 	UserCommand::List getUserCommands() { Lock l(cs); return userCommands; }
  	UserCommand::List getUserCommands(int ctx, const StringList& hub);
  

Index: SearchManager.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/SearchManager.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** SearchManager.h	29 Jan 2006 18:48:25 -0000	1.58
--- SearchManager.h	19 Feb 2006 16:19:06 -0000	1.59
***************
*** 83,87 ****
  		if(Thread::safeDec(ref) == 0) 
  			delete this; 
! 	};
  
  private:
--- 83,87 ----
  		if(Thread::safeDec(ref) == 0) 
  			delete this; 
! 	}
  
  private:
***************
*** 89,93 ****
  
  	SearchResult();
! 	~SearchResult() { delete tth; };
  
  	SearchResult(const SearchResult& rhs);
--- 89,93 ----
  
  	SearchResult();
! 	~SearchResult() { delete tth; }
  
  	SearchResult(const SearchResult& rhs);
***************
*** 169,173 ****
  	friend class Singleton<SearchManager>;
  
! 	SearchManager() : socket(NULL), port(0), stop(false), lastSearch(0) {  };
  
  	virtual int run();
--- 169,173 ----
  	friend class Singleton<SearchManager>;
  
! 	SearchManager() : socket(NULL), port(0), stop(false), lastSearch(0) {  }
  
  	virtual int run();
***************
*** 182,186 ****
  			delete socket;
  		}
! 	};
  
  	void onData(const u_int8_t* buf, size_t aLen, const string& address);
--- 182,186 ----
  			delete socket;
  		}
! 	}
  
  	void onData(const u_int8_t* buf, size_t aLen, const string& address);

Index: DownloadManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/DownloadManager.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** DownloadManager.cpp	21 Jan 2006 09:23:55 -0000	1.159
--- DownloadManager.cpp	19 Feb 2006 16:19:06 -0000	1.160
***************
*** 409,413 ****
  class RollbackException : public FileException {
  public:
! 	RollbackException (const string& aError) : FileException(aError) { };
  };
  
--- 409,413 ----
  class RollbackException : public FileException {
  public:
! 	RollbackException (const string& aError) : FileException(aError) { }
  };
  
***************
*** 420,424 ****
  		f->movePos(-((int64_t)bytes));
  	}
! 	virtual ~RollbackOutputStream() throw() { delete[] buf; if(managed) delete s; };
  
  	virtual size_t flush() throw(FileException) {
--- 420,424 ----
  		f->movePos(-((int64_t)bytes));
  	}
! 	virtual ~RollbackOutputStream() throw() { delete[] buf; if(managed) delete s; }
  
  	virtual size_t flush() throw(FileException) {

Index: Socket.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Socket.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Socket.h	24 Dec 2005 23:13:25 -0000	1.66
--- Socket.h	19 Feb 2006 16:19:06 -0000	1.67...
 
[truncated message content]

[Dcplusplus-commit] dcplusplus/windows main.cpp,1.41,1.42 ExtendedTrace.cpp,1.13,1.14

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15474/windows

Modified Files:
	main.cpp ExtendedTrace.cpp 
Log Message:
vs2k fix, bufferedsocket fix

Index: main.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/main.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** main.cpp	13 Feb 2006 21:13:28 -0000	1.41
--- main.cpp	18 Feb 2006 23:32:17 -0000	1.42
***************
*** 61,65 ****
  #if _MSC_VER == 1200
  	__pfnDliFailureHook = FailHook;
! #elif _MSC_VER == 1300 || _MSC_VER == 1310
  	__pfnDliFailureHook2 = FailHook;
  #else
--- 61,65 ----
  #if _MSC_VER == 1200
  	__pfnDliFailureHook = FailHook;
! #elif _MSC_VER == 1300 || _MSC_VER == 1310 || _MSC_VER == 1400
  	__pfnDliFailureHook2 = FailHook;
  #else

Index: ExtendedTrace.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ExtendedTrace.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ExtendedTrace.cpp	24 Apr 2005 08:13:05 -0000	1.13
--- ExtendedTrace.cpp	18 Feb 2006 23:32:17 -0000	1.14
***************
*** 191,195 ****
  			for( ; ; index++ )
  			{
! 				lpszParamSep = _tcschr( lpszParsed, _T(',') );
  				if ( lpszParamSep == NULL )
  					break;
--- 191,195 ----
  			for( ; ; index++ )
  			{
! 				lpszParamSep = _tcschr( const_cast<wchar_t*>(lpszParsed), _T(',') );
  				if ( lpszParamSep == NULL )
  					break;
***************
*** 203,207 ****
  			}
  
! 			lpszParamSep = _tcschr( lpszParsed, _T(')') );
  			if ( lpszParamSep != NULL )
  			{
--- 203,207 ----
  			}
  
! 			lpszParamSep = _tcschr( const_cast<wchar_t*>(lpszParsed), _T(')') );
  			if ( lpszParamSep != NULL )
  			{

[Dcplusplus-commit] dcplusplus changelog.txt,1.314,1.315

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15474

Modified Files:
	changelog.txt 
Log Message:
vs2k fix, bufferedsocket fix

Index: changelog.txt
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/changelog.txt,v
retrieving revision 1.314
retrieving revision 1.315
diff -C2 -d -r1.314 -r1.315
*** changelog.txt	13 Feb 2006 21:13:27 -0000	1.314
--- changelog.txt	18 Feb 2006 23:32:17 -0000	1.315
***************
*** 2,5 ****
--- 2,9 ----
  * Fixed XML file list generation for invalid filenames from other os's
  * Fixed a rare refresh crash
+ * CID is now shown if no nick name is currently available for a user
+ * Fixed another crash when loading file lists
+ * Played some more with bufferedsocket performance
+ * Fixed some VS 2005 issues (thanks trem)
  
  

[Dcplusplus-commit] dcplusplus/client stdinc.h,1.21,1.22 Util.cpp,1.94,1.95 BufferedSocket.cpp,1.100,1.101 ClientManager.cpp,1.95,1.96

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15474/client

Modified Files:
	stdinc.h Util.cpp BufferedSocket.cpp ClientManager.cpp 
Log Message:
vs2k fix, bufferedsocket fix

Index: ClientManager.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/ClientManager.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** ClientManager.cpp	13 Feb 2006 21:13:27 -0000	1.95
--- ClientManager.cpp	18 Feb 2006 23:32:17 -0000	1.96
***************
*** 114,117 ****
--- 114,119 ----
  		if(i != users.end())
  			lst.push_back(i->second->getFirstNick());
+ 		else
+ 			lst.push_back('{' + cid.toBase32() + '}');
  	}
  	return lst;

Index: Util.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Util.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** Util.cpp	5 Feb 2006 13:38:44 -0000	1.94
--- Util.cpp	18 Feb 2006 23:32:17 -0000	1.95
***************
*** 65,68 ****
--- 65,74 ----
  }
  
+ #if defined(_WIN32) && _MSC_VER == 1400
+ void WINAPI invalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t) {
+ 	//do nothing, this exist because vs2k5 crt needs it not to crash on errors.
+ }
+ #endif
+ 
  void Util::initialize() {
  	setlocale(LC_ALL, "");
***************
*** 77,80 ****
--- 83,91 ----
  	appPath = Text::fromT(buf);
  	appPath.erase(appPath.rfind('\\') + 1);
+ 
+ #if _MSC_VER == 1400
+ 	_set_invalid_parameter_handler(reinterpret_cast<_invalid_parameter_handler>(invalidParameterHandler));
+ #endif
+ 
  #else // _WIN32
  	char* home = getenv("HOME");

Index: BufferedSocket.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BufferedSocket.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** BufferedSocket.cpp	12 Feb 2006 18:16:12 -0000	1.100
--- BufferedSocket.cpp	18 Feb 2006 23:32:17 -0000	1.101
***************
*** 198,202 ****
  	dcassert(file != NULL);
  	size_t sockSize = (size_t)sock->getSocketOptInt(SO_SNDBUF);
! 	size_t bufSize =  sockSize * 16;		// Perhaps make this a setting?
  	dcdebug("threadSendFile buffer size: %lu\n", bufSize);
  	AutoArray<u_int8_t> buf(bufSize);
--- 198,202 ----
  	dcassert(file != NULL);
  	size_t sockSize = (size_t)sock->getSocketOptInt(SO_SNDBUF);
! 	size_t bufSize = max(sockSize, (size_t)64*1024);
  	dcdebug("threadSendFile buffer size: %lu\n", bufSize);
  	AutoArray<u_int8_t> buf(bufSize);
***************
*** 216,232 ****
  				return;
  
! 			int w = sock->wait(POLL_TIMEOUT, Socket::WAIT_WRITE | Socket::WAIT_READ);
! 			if(w & Socket::WAIT_READ) {
! 				threadRead();
! 			}
! 			if(w & Socket::WAIT_WRITE) {
! 				int written = sock->write(buf + done, min(sockSize, actual - done));
! 				if(written > 0) {
! 					done += written;
  
! 					size_t doneReadNow = static_cast<size_t>((static_cast<double>(done)/actual) * bytesRead);
  
! 					fire(BufferedSocketListener::BytesSent(), doneReadNow - doneRead, written);
! 					doneRead = doneReadNow;
  				}
  			}
--- 216,231 ----
  				return;
  
! 			int written = sock->write(buf + done, min(sockSize, actual - done));
! 			if(written > 0) {
! 				done += written;
  
! 				size_t doneReadNow = static_cast<size_t>((static_cast<double>(done)/actual) * bytesRead);
  
! 				fire(BufferedSocketListener::BytesSent(), doneReadNow - doneRead, written);
! 				doneRead = doneReadNow;
! 			} else if(written == -1) {
! 				int w = sock->wait(POLL_TIMEOUT, Socket::WAIT_WRITE | Socket::WAIT_READ);
! 				if(w & Socket::WAIT_READ) {
! 					threadRead();
  				}
  			}

Index: stdinc.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/stdinc.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** stdinc.h	15 Jan 2006 18:40:37 -0000	1.21
--- stdinc.h	18 Feb 2006 23:32:17 -0000	1.22
***************
*** 33,36 ****
--- 33,43 ----
  #define _ATL_NO_OLD_NAMES
  
+ #if _MSC_VER == 1400
+ //disable the deperecated warnings for the crt functions.
+ #define _CRT_SECURE_NO_DEPRECATE 1
+ #define _ATL_SECURE_NO_DEPRECATE 1
+ #define _CRT_NON_CONFORMING_SWPRINTFS 1
+ #endif
+ 
  #include <Winsock2.h>
  

[Dcplusplus-commit] dcplusplus/client AdcCommand.h,1.27,1.28 BufferedSocket.h,1.76,1.77 Makefile.am,1.8,1.9 Pointer.h,1.20,1.21 User.cpp,1.52,1.53 User.h,1.69,1.70

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479/client

Modified Files:
	AdcCommand.h BufferedSocket.h Makefile.am Pointer.h User.cpp 
	User.h 
Log Message:
A few pedantry fixes

Index: BufferedSocket.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/BufferedSocket.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** BufferedSocket.h	12 Feb 2006 18:16:12 -0000	1.76
--- BufferedSocket.h	17 Feb 2006 19:23:51 -0000	1.77
***************
*** 133,137 ****
  	};
  
! 	BufferedSocket(char aSeparator) throw(ThreadException);
  
  	// Dummy...
--- 133,137 ----
  	};
  
! 	BufferedSocket(char aSeparator) throw();
  
  	// Dummy...

Index: User.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/User.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** User.cpp	29 Jan 2006 18:48:25 -0000	1.52
--- User.cpp	17 Feb 2006 19:23:51 -0000	1.53
***************
*** 24,28 ****
  #include "StringTokenizer.h"
  
! OnlineUser::OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_) : user(ptr), identity(ptr, client_.getHubUrl()), client(&client_), sid(sid_) { 
  
  }
--- 24,28 ----
  #include "StringTokenizer.h"
  
! OnlineUser::OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_) : user(ptr), identity(ptr, client_.getHubUrl()), sid(sid_), client(&client_) { 
  
  }

Index: AdcCommand.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/AdcCommand.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AdcCommand.h	12 Feb 2006 18:16:12 -0000	1.27
--- AdcCommand.h	17 Feb 2006 19:23:51 -0000	1.28
***************
*** 99,103 ****
  #undef C
  
! 	static const HUB_SID = 0x41414141;		// AAAA in base32
  
  	explicit AdcCommand(u_int32_t aCmd, char aType = TYPE_CLIENT);
--- 99,103 ----
  #undef C
  
! 	static const u_int32_t HUB_SID = 0x41414141;		// AAAA in base32
  
  	explicit AdcCommand(u_int32_t aCmd, char aType = TYPE_CLIENT);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	16 Dec 2005 01:00:46 -0000	1.8
--- Makefile.am	17 Feb 2006 19:23:51 -0000	1.9
***************
*** 123,129 ****
  pch: stdinc.h.gch
  
  stdinc.h.gch: stdinc.h
!     $(CXX) $(venus_CXXFLAGS) $(CXXFLAGS) $?
  
- .PHONY: pch
- 	
--- 123,129 ----
  pch: stdinc.h.gch
  
+ BUILT_SOURCES = stdinc.h.gch
+ 
  stdinc.h.gch: stdinc.h
! 	$(CXX) $(libdcppclient_la_CXXFLAGS) $(CXXFLAGS) $?
  

Index: User.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/User.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** User.h	29 Jan 2006 18:48:25 -0000	1.69
--- User.h	17 Feb 2006 19:23:51 -0000	1.70
***************
*** 100,104 ****
  	Identity() { }
  	Identity(const User::Ptr& ptr, const string& aHubUrl) : user(ptr), hubUrl(aHubUrl) { }
! 	Identity(const Identity& rhs) : user(rhs.user), hubUrl(rhs.hubUrl), info(rhs.info) { }
  	Identity& operator=(const Identity& rhs) { user = rhs.user; hubUrl = rhs.hubUrl; info = rhs.info; return *this; }
  
--- 100,104 ----
  	Identity() { }
  	Identity(const User::Ptr& ptr, const string& aHubUrl) : user(ptr), hubUrl(aHubUrl) { }
! 	Identity(const Identity& rhs) : ::Flags(rhs), user(rhs.user), hubUrl(rhs.hubUrl), info(rhs.info) { }
  	Identity& operator=(const Identity& rhs) { user = rhs.user; hubUrl = rhs.hubUrl; info = rhs.info; return *this; }
  
***************
*** 163,167 ****
  	typedef List::iterator Iter;
  
! 	OnlineUser() : client(NULL), sid(0) { }
  	OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_);
  
--- 163,167 ----
  	typedef List::iterator Iter;
  
! 	OnlineUser() : sid(0), client(NULL) { }
  	OnlineUser(const User::Ptr& ptr, Client& client_, u_int32_t sid_);
  

Index: Pointer.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/Pointer.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Pointer.h	1 Jan 2006 22:42:54 -0000	1.20
--- Pointer.h	17 Feb 2006 19:23:51 -0000	1.21
***************
*** 160,164 ****
  struct DeleteFunction {
  	template<typename T>
! 	void operator()(const T& p) const { delete p; };
  };
  
--- 160,164 ----
  struct DeleteFunction {
  	template<typename T>
! 	void operator()(const T& p) const { delete p; }
  };