Allow UDP listening port selection for Android

project-chip · Jun 14, 2022 · 51241c3 · 51241c3
1 parent 9acc410
commit 51241c3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -79,6 +79,7 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
                                                         chip::Inet::EndPointManager<chip::Inet::TCPEndPoint> * tcpEndPointManager,
                                                         chip::Inet::EndPointManager<chip::Inet::UDPEndPoint> * udpEndPointManager,
                                                         AndroidOperationalCredentialsIssuerPtr opCredsIssuer,
+                                                        uint16_t listenPort,
                                                         CHIP_ERROR * errInfoOnFailure);
 
 private:

diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -160,12 +160,30 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self, jobject contr
     long result                              = 0;
 
     ChipLogProgress(Controller, "newDeviceController() called");
-    std::unique_ptr<chip::Controller::AndroidOperationalCredentialsIssuer> opCredsIssuer(
-        new chip::Controller::AndroidOperationalCredentialsIssuer());
-    wrapper = AndroidDeviceControllerWrapper::AllocateNew(sJVM, self, kLocalDeviceId, chip::kUndefinedCATs,
-                                                          &DeviceLayer::SystemLayer(), DeviceLayer::TCPEndPointManager(),
-                                                          DeviceLayer::UDPEndPointManager(), std::move(opCredsIssuer), &err);
+
+
+    // Retrieve initialization params.
+    jmethodID getUdpListenPort;
+    err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getUdpListenPort",
+                                                        "()Lchip/devicecontroller/ControllerParams;",
+                                                        &getUdpListenPort);
     SuccessOrExit(err);
+    {
+      uint16_t listenPort = env->CallIntMethod(controllerParams, getUdpListenPort);
+
+      std::unique_ptr<chip::Controller::AndroidOperationalCredentialsIssuer> opCredsIssuer(
+          new chip::Controller::AndroidOperationalCredentialsIssuer());
+      wrapper = AndroidDeviceControllerWrapper::AllocateNew(sJVM,
+                                                            self,
+                                                            kLocalDeviceId,chip::kUndefinedCATs,
+                                                            &DeviceLayer::SystemLayer(),
+                                                            DeviceLayer::TCPEndPointManager(),
+                                                            DeviceLayer::UDPEndPointManager(),
+                                                            std::move(opCredsIssuer),
+                                                            listenPort,
+                                                            &err);
+      SuccessOrExit(err);
+    }
 
     // Create and start the IO thread. Must be called after Controller()->Init
     if (sIOThread == PTHREAD_NULL)