mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00

This reverts commit7ded733518
. Reason for revert: Found more code calling NetworkMonitorFactory::SetFactory... Original change's description: > Reland "Pass NetworkMonitorFactory through PeerConnectionFactory." > > This is a reland of003c9be817
> > Original change's description: > > Pass NetworkMonitorFactory through PeerConnectionFactory. > > > > Previously the instance was set through a static method, which was > > really only done because it was difficult to add new > > PeerConnectionFactory construction arguments at the time. > > > > Now that we have PeerConnectionFactoryDependencies it's easy to clean > > this up. > > > > I'm doing this because I plan to add a NetworkMonitor implementation > > for iOS, and don't want to inherit this ugliness. > > > > Bug: webrtc:9883 > > Change-Id: Id94dc061ab1c7186b81af8547393a6e336ff04c2 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180241 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Taylor <deadbeef@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#31815} > > TBR=hta@webrtc.org, sakal@webrtc.org > > Bug: webrtc:9883 > Change-Id: Ibf69a22e8f94226908636c7d50ff9eda65bd4129 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180720 > Reviewed-by: Taylor <deadbeef@webrtc.org> > Commit-Queue: Taylor <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31822} TBR=deadbeef@webrtc.org,sakal@webrtc.org,hta@webrtc.org Change-Id: Iae51b94072cec9abc021eed4e51d1fbeee998adc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9883 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180721 Reviewed-by: Taylor <deadbeef@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31823}
147 lines
4.9 KiB
C++
147 lines
4.9 KiB
C++
/*
|
|
* Copyright 2015 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 SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
|
|
#define SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
|
|
|
|
#include <stdint.h>
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "rtc_base/network_monitor.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
typedef int64_t NetworkHandle;
|
|
|
|
// c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
|
|
enum NetworkType {
|
|
NETWORK_UNKNOWN,
|
|
NETWORK_ETHERNET,
|
|
NETWORK_WIFI,
|
|
NETWORK_5G,
|
|
NETWORK_4G,
|
|
NETWORK_3G,
|
|
NETWORK_2G,
|
|
NETWORK_UNKNOWN_CELLULAR,
|
|
NETWORK_BLUETOOTH,
|
|
NETWORK_VPN,
|
|
NETWORK_NONE
|
|
};
|
|
|
|
// The information is collected from Android OS so that the native code can get
|
|
// the network type and handle (Android network ID) for each interface.
|
|
struct NetworkInformation {
|
|
std::string interface_name;
|
|
NetworkHandle handle;
|
|
NetworkType type;
|
|
NetworkType underlying_type_for_vpn;
|
|
std::vector<rtc::IPAddress> ip_addresses;
|
|
|
|
NetworkInformation();
|
|
NetworkInformation(const NetworkInformation&);
|
|
NetworkInformation(NetworkInformation&&);
|
|
~NetworkInformation();
|
|
NetworkInformation& operator=(const NetworkInformation&);
|
|
NetworkInformation& operator=(NetworkInformation&&);
|
|
|
|
std::string ToString() const;
|
|
};
|
|
|
|
class AndroidNetworkMonitor : public rtc::NetworkMonitorBase,
|
|
public rtc::NetworkBinderInterface {
|
|
public:
|
|
AndroidNetworkMonitor(JNIEnv* env,
|
|
const JavaRef<jobject>& j_application_context);
|
|
~AndroidNetworkMonitor() override;
|
|
|
|
// TODO(sakal): Remove once down stream dependencies have been updated.
|
|
static void SetAndroidContext(JNIEnv* jni, jobject context) {}
|
|
|
|
void Start() override;
|
|
void Stop() override;
|
|
|
|
rtc::NetworkBindingResult BindSocketToNetwork(
|
|
int socket_fd,
|
|
const rtc::IPAddress& address) override;
|
|
rtc::AdapterType GetAdapterType(const std::string& if_name) override;
|
|
rtc::AdapterType GetVpnUnderlyingAdapterType(
|
|
const std::string& if_name) override;
|
|
void OnNetworkConnected(const NetworkInformation& network_info);
|
|
void OnNetworkDisconnected(NetworkHandle network_handle);
|
|
// Always expected to be called on the network thread.
|
|
void SetNetworkInfos(const std::vector<NetworkInformation>& network_infos);
|
|
|
|
void NotifyConnectionTypeChanged(JNIEnv* env,
|
|
const JavaRef<jobject>& j_caller);
|
|
void NotifyOfNetworkConnect(JNIEnv* env,
|
|
const JavaRef<jobject>& j_caller,
|
|
const JavaRef<jobject>& j_network_info);
|
|
void NotifyOfNetworkDisconnect(JNIEnv* env,
|
|
const JavaRef<jobject>& j_caller,
|
|
jlong network_handle);
|
|
void NotifyOfActiveNetworkList(JNIEnv* env,
|
|
const JavaRef<jobject>& j_caller,
|
|
const JavaRef<jobjectArray>& j_network_infos);
|
|
|
|
// Visible for testing.
|
|
absl::optional<NetworkHandle> FindNetworkHandleFromAddress(
|
|
const rtc::IPAddress& address) const;
|
|
|
|
private:
|
|
void OnNetworkConnected_w(const NetworkInformation& network_info);
|
|
void OnNetworkDisconnected_w(NetworkHandle network_handle);
|
|
|
|
const int android_sdk_int_;
|
|
ScopedJavaGlobalRef<jobject> j_application_context_;
|
|
ScopedJavaGlobalRef<jobject> j_network_monitor_;
|
|
rtc::ThreadChecker thread_checker_;
|
|
bool started_ = false;
|
|
std::map<std::string, rtc::AdapterType> adapter_type_by_name_;
|
|
std::map<std::string, rtc::AdapterType> vpn_underlying_adapter_type_by_name_;
|
|
std::map<rtc::IPAddress, NetworkHandle> network_handle_by_address_;
|
|
std::map<NetworkHandle, NetworkInformation> network_info_by_handle_;
|
|
bool find_network_handle_without_ipv6_temporary_part_;
|
|
bool surface_cellular_types_;
|
|
};
|
|
|
|
class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
|
|
public:
|
|
// Deprecated. Pass in application context to this class.
|
|
AndroidNetworkMonitorFactory();
|
|
|
|
AndroidNetworkMonitorFactory(JNIEnv* env,
|
|
const JavaRef<jobject>& j_application_context);
|
|
|
|
~AndroidNetworkMonitorFactory() override;
|
|
|
|
rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
|
|
|
|
private:
|
|
ScopedJavaGlobalRef<jobject> j_application_context_;
|
|
};
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|
|
|
|
// TODO(magjed): Remove once external clients are updated.
|
|
namespace webrtc_jni {
|
|
|
|
using webrtc::jni::AndroidNetworkMonitor;
|
|
using webrtc::jni::AndroidNetworkMonitorFactory;
|
|
|
|
} // namespace webrtc_jni
|
|
|
|
#endif // SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
|