Attachment #1032 for bug #1097

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1097
Collapse All | Expand All

Lines 40-46 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h (-2 / +2 lines)
40	#define CS_TRACK_OWNER 1	40	#define CS_TRACK_OWNER 1
41	#endif // _DEBUG	41	#endif // _DEBUG
42		42
43	#if CS_TRACK_OWNER	43	#ifdef CS_TRACK_OWNER
44	#define TRACK_OWNER(x) x	44	#define TRACK_OWNER(x) x
45	#else // !CS_TRACK_OWNER	45	#else // !CS_TRACK_OWNER
46	#define TRACK_OWNER(x)	46	#define TRACK_OWNER(x)
Lines 68-74 Link Here
68	LeaveCriticalSection(&crit_);	68	LeaveCriticalSection(&crit_);
69	}	69	}
70		70
71	#if CS_TRACK_OWNER	71	#ifdef CS_TRACK_OWNER
72	bool CurrentThreadIsOwner() const { return thread_ == GetCurrentThreadId(); }	72	bool CurrentThreadIsOwner() const { return thread_ == GetCurrentThreadId(); }
73	#endif // CS_TRACK_OWNER	73	#endif // CS_TRACK_OWNER
74		74




    LOG(INFO) << "=== DNS RESOLUTION (" << hostname << ") ===";
#if DISABLE_DNS
    LOG(WARNING) << "*** DNS DISABLED ***";
#ifdef WIN32
    WSASetLastError(WSAHOST_NOT_FOUND);
#endif // WIN32
#endif // DISABLE_DNS
    if (hostent * pHost = gethostbyname(hostname.c_str())) {
      ip = NetworkToHost32(*reinterpret_cast<uint32 *>(pHost->h_addr_list[0]));
    } else {
#ifdef WIN32
      LOG(LS_ERROR) << "gethostbyname error: " << WSAGetLastError();
#else
      LOG(LS_ERROR) << "gethostbyname error: " << strerror(h_errno);

Lines 30-36 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h (-1 / +1 lines)
30		30
31	#ifdef WIN32	31	#ifdef WIN32
32		32
33	#if _MSC_VER > 1000	33	#if defined(_MSC_VER) && _MSC_VER > 1000
34	#pragma once	34	#pragma once
35	#endif // _MSC_VER > 1000	35	#endif // _MSC_VER > 1000
36		36




public:
  StunAddressAttribute(uint16 type);

#if defined(_MSC_VER) && _MSC_VER < 1300
  enum { SIZE = 8 };
#else
  static const uint16 SIZE = 8;

public:
  StunUInt32Attribute(uint16 type);

#if defined(_MSC_VER) && _MSC_VER < 1300
  enum { SIZE = 4 };
#else
  static const uint16 SIZE = 4;

  StunErrorCodeAttribute(uint16 type, uint16 length);
  ~StunErrorCodeAttribute();

#if defined(_MSC_VER) && _MSC_VER < 1300
  enum { MIN_SIZE = 4 };
#else
  static const uint16 MIN_SIZE = 4;

  StunTransportPrefsAttribute(uint16 type, uint16 length);
  ~StunTransportPrefsAttribute();

#if defined(_MSC_VER) && _MSC_VER < 1300
  enum { SIZE1 = 4, SIZE2 = 12 };
#else
  static const uint16 SIZE1 = 4;

Return to bug 1097

Lines 246-259 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc (-2 / +2 lines)
246	LOG(INFO) << "=== DNS RESOLUTION (" << hostname << ") ===";	246	LOG(INFO) << "=== DNS RESOLUTION (" << hostname << ") ===";
247	#if DISABLE_DNS	247	#if DISABLE_DNS
248	LOG(WARNING) << "* DNS DISABLED *";	248	LOG(WARNING) << "* DNS DISABLED *";
249	#if WIN32	249	#ifdef WIN32
250	WSASetLastError(WSAHOST_NOT_FOUND);	250	WSASetLastError(WSAHOST_NOT_FOUND);
251	#endif // WIN32	251	#endif // WIN32
252	#endif // DISABLE_DNS	252	#endif // DISABLE_DNS
253	if (hostent * pHost = gethostbyname(hostname.c_str())) {	253	if (hostent * pHost = gethostbyname(hostname.c_str())) {
254	ip = NetworkToHost32(reinterpret_cast<uint32 >(pHost->h_addr_list[0]));	254	ip = NetworkToHost32(reinterpret_cast<uint32 >(pHost->h_addr_list[0]));
255	} else {	255	} else {
256	#if WIN32	256	#ifdef WIN32
257	LOG(LS_ERROR) << "gethostbyname error: " << WSAGetLastError();	257	LOG(LS_ERROR) << "gethostbyname error: " << WSAGetLastError();
258	#else	258	#else
259	LOG(LS_ERROR) << "gethostbyname error: " << strerror(h_errno);	259	LOG(LS_ERROR) << "gethostbyname error: " << strerror(h_errno);

Lines 196-202 Link Here

(-)tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h (-4 / +4 lines)
196	public:	196	public:
197	StunAddressAttribute(uint16 type);	197	StunAddressAttribute(uint16 type);
198		198
199	#if (_MSC_VER < 1300)	199	#if defined(_MSC_VER) && _MSC_VER < 1300
200	enum { SIZE = 8 };	200	enum { SIZE = 8 };
201	#else	201	#else
202	static const uint16 SIZE = 8;	202	static const uint16 SIZE = 8;
Lines 224-230 Link Here
224	public:	224	public:
225	StunUInt32Attribute(uint16 type);	225	StunUInt32Attribute(uint16 type);
226		226
227	#if (_MSC_VER < 1300)	227	#if defined(_MSC_VER) && _MSC_VER < 1300
228	enum { SIZE = 4 };	228	enum { SIZE = 4 };
229	#else	229	#else
230	static const uint16 SIZE = 4;	230	static const uint16 SIZE = 4;
Lines 273-279 Link Here
273	StunErrorCodeAttribute(uint16 type, uint16 length);	273	StunErrorCodeAttribute(uint16 type, uint16 length);
274	~StunErrorCodeAttribute();	274	~StunErrorCodeAttribute();
275		275
276	#if (_MSC_VER < 1300)	276	#if defined(_MSC_VER) && _MSC_VER < 1300
277	enum { MIN_SIZE = 4 };	277	enum { MIN_SIZE = 4 };
278	#else	278	#else
279	static const uint16 MIN_SIZE = 4;	279	static const uint16 MIN_SIZE = 4;
Lines 323-329 Link Here
323	StunTransportPrefsAttribute(uint16 type, uint16 length);	323	StunTransportPrefsAttribute(uint16 type, uint16 length);
324	~StunTransportPrefsAttribute();	324	~StunTransportPrefsAttribute();
325		325
326	#if (_MSC_VER < 1300)	326	#if defined(_MSC_VER) && _MSC_VER < 1300
327	enum { SIZE1 = 4, SIZE2 = 12 };	327	enum { SIZE1 = 4, SIZE2 = 12 };
328	#else	328	#else
329	static const uint16 SIZE1 = 4;	329	static const uint16 SIZE1 = 4;