Переглянути джерело

2010-04-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed segmentation fault when running unit tests on opensolaris.
	* src/SocketCore.cc
	* src/bittorrent_helper.cc
Tatsuhiro Tsujikawa 15 роки тому
батько
коміт
2141656346
3 змінених файлів з 9 додано та 3 видалено
  1. 6 0
      ChangeLog
  2. 2 2
      src/SocketCore.cc
  3. 1 1
      src/bittorrent_helper.cc

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2010-04-27  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed segmentation fault when running unit tests on opensolaris.
+	* src/SocketCore.cc
+	* src/bittorrent_helper.cc
+
 2010-04-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Updated Russian translation. Thanks to all translators.

+ 2 - 2
src/SocketCore.cc

@@ -288,7 +288,7 @@ void SocketCore::bind(uint16_t port, int flags)
       int s;
       s = getnameinfo(reinterpret_cast<const struct sockaddr*>(&(*i).first),
                       (*i).second,
-                      host, NI_MAXHOST, 0, NI_MAXSERV,
+                      host, NI_MAXHOST, 0, 0,
                       NI_NUMERICHOST);
       if(s) {
         error = gai_strerror(s);
@@ -1210,7 +1210,7 @@ void SocketCore::bindAddress(const std::string& iface)
       int s;
       s = getnameinfo(reinterpret_cast<const struct sockaddr*>(&(*i).first),
                       (*i).second,
-                      host, NI_MAXHOST, 0, NI_MAXSERV,
+                      host, NI_MAXHOST, 0, 0,
                       NI_NUMERICHOST);
       if(s == 0) {
         if(LogFactory::getInstance()->debug()) {

+ 1 - 1
src/bittorrent_helper.cc

@@ -815,7 +815,7 @@ std::pair<std::string, uint16_t> unpackcompact(const unsigned char* compact)
   char host[NI_MAXHOST];
   int s;
   s = getnameinfo(reinterpret_cast<const struct sockaddr*>(&in), sizeof(in),
-                  host, NI_MAXHOST, 0, NI_MAXSERV,
+                  host, NI_MAXHOST, 0, 0,
                   NI_NUMERICHOST);
   if(s) {
     return std::pair<std::string, uint16_t>();