This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
67 lines
1.9 KiB
C++
67 lines
1.9 KiB
C++
/*
|
|
* Copyright 2008 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_RTC_BASE_NETHELPERS_H_
|
|
#define WEBRTC_RTC_BASE_NETHELPERS_H_
|
|
|
|
#if defined(WEBRTC_POSIX)
|
|
#include <netdb.h>
|
|
#include <stddef.h>
|
|
#elif WEBRTC_WIN
|
|
#include <winsock2.h> // NOLINT
|
|
#endif
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/base/asyncresolverinterface.h"
|
|
#include "webrtc/base/signalthread.h"
|
|
#include "webrtc/base/sigslot.h"
|
|
#include "webrtc/base/socketaddress.h"
|
|
|
|
namespace rtc {
|
|
|
|
class AsyncResolverTest;
|
|
|
|
// AsyncResolver will perform async DNS resolution, signaling the result on
|
|
// the SignalDone from AsyncResolverInterface when the operation completes.
|
|
class AsyncResolver : public SignalThread, public AsyncResolverInterface {
|
|
public:
|
|
AsyncResolver();
|
|
~AsyncResolver() override;
|
|
|
|
void Start(const SocketAddress& addr) override;
|
|
bool GetResolvedAddress(int family, SocketAddress* addr) const override;
|
|
int GetError() const override;
|
|
void Destroy(bool wait) override;
|
|
|
|
const std::vector<IPAddress>& addresses() const { return addresses_; }
|
|
void set_error(int error) { error_ = error; }
|
|
|
|
protected:
|
|
void DoWork() override;
|
|
void OnWorkDone() override;
|
|
|
|
private:
|
|
SocketAddress addr_;
|
|
std::vector<IPAddress> addresses_;
|
|
int error_;
|
|
};
|
|
|
|
// rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid
|
|
// the windows-native versions of these.
|
|
const char* inet_ntop(int af, const void *src, char* dst, socklen_t size);
|
|
int inet_pton(int af, const char* src, void *dst);
|
|
|
|
bool HasIPv4Enabled();
|
|
bool HasIPv6Enabled();
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_RTC_BASE_NETHELPERS_H_
|