 Chromium Code Reviews
 Chromium Code Reviews Issue 1556743002:
  Bind a socket to a network if the network handle is set.  (Closed) 
  Base URL: https://chromium.googlesource.com/external/webrtc.git@master
    
  
    Issue 1556743002:
  Bind a socket to a network if the network handle is set.  (Closed) 
  Base URL: https://chromium.googlesource.com/external/webrtc.git@master| OLD | NEW | 
|---|---|
| 1 /* | 1 /* | 
| 2 * libjingle | 2 * libjingle | 
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. | 
| 4 * | 4 * | 
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without | 
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: | 
| 7 * | 7 * | 
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, | 
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. | 
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 26 */ | 26 */ | 
| 27 | 27 | 
| 28 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 28 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 
| 29 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 29 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 
| 30 | 30 | 
| 31 #include "webrtc/base/networkmonitor.h" | 31 #include "webrtc/base/networkmonitor.h" | 
| 32 | 32 | 
| 33 #include <map> | |
| 34 | |
| 35 #include "webrtc/base/criticalsection.h" | |
| 33 #include "webrtc/base/thread_checker.h" | 36 #include "webrtc/base/thread_checker.h" | 
| 34 #include "talk/app/webrtc/java/jni/jni_helpers.h" | 37 #include "talk/app/webrtc/java/jni/jni_helpers.h" | 
| 35 | 38 | 
| 36 namespace webrtc_jni { | 39 namespace webrtc_jni { | 
| 37 | 40 | 
| 41 typedef uint32_t NetworkHandle; | |
| 42 | |
| 43 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType. | |
| 44 enum NetworkType { | |
| 45 NETWORK_UNKNOWN, | |
| 46 NETWORK_ETHERNET, | |
| 47 NETWORK_WIFI, | |
| 48 NETWORK_4G, | |
| 49 NETWORK_3G, | |
| 50 NETWORK_2G, | |
| 51 NETWORK_BLUETOOTH, | |
| 52 NETWORK_NONE | |
| 53 }; | |
| 54 | |
| 55 // The information is collected from Android OS so that the native code can get | |
| 56 // the network type and handle (Android network ID) for each interface. | |
| 
pthatcher1
2016/01/15 19:56:11
is collected => collected
from Android OS => from
 | |
| 57 struct NetworkInformation { | |
| 58 std::string interface_name; | |
| 59 NetworkHandle handle; | |
| 60 NetworkType type; | |
| 61 std::vector<rtc::IPAddress> ip_addresses; | |
| 62 | |
| 63 std::string ToString() const; | |
| 64 }; | |
| 65 | |
| 38 class AndroidNetworkMonitor : public rtc::NetworkMonitorBase { | 66 class AndroidNetworkMonitor : public rtc::NetworkMonitorBase { | 
| 39 public: | 67 public: | 
| 40 AndroidNetworkMonitor(); | 68 AndroidNetworkMonitor(); | 
| 41 | 69 | 
| 42 static void SetAndroidContext(JNIEnv* jni, jobject context); | 70 static void SetAndroidContext(JNIEnv* jni, jobject context); | 
| 43 | 71 | 
| 44 void Start() override; | 72 void Start() override; | 
| 45 void Stop() override; | 73 void Stop() override; | 
| 46 | 74 | 
| 75 int BindSocketToNetwork(int socket_fd, | |
| 76 const rtc::IPAddress& address) override; | |
| 77 void OnNetworkAvailable(const NetworkInformation& network_info); | |
| 78 | |
| 47 private: | 79 private: | 
| 48 JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); } | 80 JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); } | 
| 49 | 81 | 
| 82 void OnNetworkAvailable_w(const NetworkInformation& network_info); | |
| 83 | |
| 50 ScopedGlobalRef<jclass> j_network_monitor_class_; | 84 ScopedGlobalRef<jclass> j_network_monitor_class_; | 
| 51 ScopedGlobalRef<jobject> j_network_monitor_; | 85 ScopedGlobalRef<jobject> j_network_monitor_; | 
| 52 rtc::ThreadChecker thread_checker_; | 86 rtc::ThreadChecker thread_checker_; | 
| 53 static jobject application_context_; | 87 static jobject application_context_; | 
| 88 bool started_ = false; | |
| 89 std::map<rtc::IPAddress, NetworkInformation> network_info_by_address_; | |
| 54 }; | 90 }; | 
| 55 | 91 | 
| 56 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory { | 92 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory { | 
| 57 public: | 93 public: | 
| 58 AndroidNetworkMonitorFactory() {} | 94 AndroidNetworkMonitorFactory() {} | 
| 59 | 95 | 
| 60 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override { | 96 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override; | 
| 61 return new AndroidNetworkMonitor(); | |
| 62 } | |
| 63 }; | 97 }; | 
| 64 | 98 | 
| 65 } // namespace webrtc_jni | 99 } // namespace webrtc_jni | 
| 66 | 100 | 
| 67 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 101 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ | 
| OLD | NEW |