commit 7dd7f46b09a49b8585240796e04b594ea1f72cb9
author Mahmoud Elsherif <moelsherif@google.com> Mon Sep 26 22:22:02 2022 +0000
committer Thomas Girardier <girardier@google.com> Tue Dec 13 18:43:54 2022 +0000
tree 3018e8b6ba2d1c16a438c2357997c01aca3a8853
parent 9577176310df2a97c5b812c4012cc4d3ee6af7f0

Move the modem simulator region to 9600 zone for extra spacing.

Bug: 245578454
Ignore-AOSP-First: cherry-pick from AOSP
Test: build , launch_cvd
Change-Id: I74195c984068121f20a7729cf5c8272d4aa29373
Merged-In: I74195c984068121f20a7729cf5c8272d4aa29373

host/commands/assemble_cvd/flags.cc

diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc
index 5d01c80..a68a475 100644
--- a/host/commands/assemble_cvd/flags.cc
+++ b/host/commands/assemble_cvd/flags.cc
@@ -759,7 +759,7 @@
     const auto vsock_guest_cid = FLAGS_vsock_guest_cid + num - GetInstance();
     instance.set_vsock_guest_cid(vsock_guest_cid);
     auto calc_vsock_port = [vsock_guest_cid](const int base_port) {
-      // a base (vsock) port is like 9200 for modem_simulator, etc
+      // a base (vsock) port is like 9600 for modem_simulator, etc
       return cuttlefish::GetVsockServerPort(base_port, vsock_guest_cid);
     };
     instance.set_session_id(iface_config.mobile_tap.session_id);
@@ -882,10 +882,10 @@
     if (modem_simulator_count > 0) {
       std::stringstream modem_ports;
       for (auto index {0}; index < modem_simulator_count - 1; index++) {
-        auto port = 9200 + (modem_simulator_count * (num - 1)) + index;
+        auto port = 9600 + (modem_simulator_count * (num - 1)) + index;
         modem_ports << calc_vsock_port(port) << ",";
       }
-      auto port = 9200 + (modem_simulator_count * (num - 1)) +
+      auto port = 9600 + (modem_simulator_count * (num - 1)) +
                   modem_simulator_count - 1;
       modem_ports << calc_vsock_port(port);
       instance.set_modem_simulator_ports(modem_ports.str());