simulator: add --port flag

We might want to use different ports or run multiple simulators in
parallel for testing, in which case one must be able to specify the
port.

Author: benma

py/send_message.py

@@ -1572,7 +1572,7 @@ def run(self) -> int:
         return 0
 
 
-def connect_to_simulator_bitbox(debug: bool) -> int:
+def connect_to_simulator_bitbox(debug: bool, port: int) -> int:
     """
     Connects and runs the main menu on host computer,
     simulating a BitBox02 connected over USB.
@@ -1586,7 +1586,6 @@ class Simulator(PhysicalLayer):
 
         def __init__(self) -> None:
             self.client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            port = 15423
             self.client_socket.connect(("127.0.0.1", port))
             if debug:
                 print("Connected to the simulator")
@@ -1713,6 +1712,12 @@ def main() -> int:
         action="store_true",
         help="Connect to the BitBox02 simulator instead of a real BitBox02",
     )
+    parser.add_argument(
+        "--simulator-port",
+        default=15423,
+        type=int,
+        help="Simulator port",
+    )
     parser.add_argument(
         "--no-cache", action="store_true", help="Don't use cached or store noise keys"
     )
@@ -1734,7 +1739,7 @@ def main() -> int:
         return 1
 
     if args.simulator:
-        return connect_to_simulator_bitbox(args.debug)
+        return connect_to_simulator_bitbox(args.debug, args.simulator_port)
 
     return connect_to_usb_bitbox(args.debug, not args.no_cache)
 

test/simulator/simulator.c

@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <getopt.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -63,8 +64,25 @@ void simulate_firmware_execution(const uint8_t* input)
     usb_processing_process(usb_processing_hww());
 }
 
-int main(void)
+int main(int argc, char* argv[])
 {
+    // Default port number
+    int portno = 15423;
+
+    struct option long_options[] = {{"port", required_argument, 0, 'p'}, {0, 0, 0, 0}};
+
+    int opt;
+    while ((opt = getopt_long(argc, argv, "", long_options, NULL)) != -1) {
+        switch (opt) {
+        case 'p':
+            portno = atoi(optarg);
+            break;
+        default:
+            fprintf(stderr, "Usage: %s --port <port number>\n", argv[0]);
+            return 1;
+        }
+    }
+
     // BitBox02 simulation initialization
     usb_processing_init();
     usb_processing_set_send(usb_processing_hww(), send_usb_message_socket);
@@ -96,7 +114,6 @@ int main(void)
     idle_workflow_blocking();
 
     // Establish socket connection with client
-    int portno = 15423;
     int sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
         perror("ERROR opening socket");
@@ -115,6 +132,9 @@ int main(void)
         perror("ERROR listening on socket");
         return 1;
     }
+
+    printf("Listening on port %d\n", portno);
+
     while (1) {
         if ((commfd = accept(sockfd, (struct sockaddr*)&serv_addr, (socklen_t*)&serv_addr_len)) <
             0) {
@@ -148,4 +168,4 @@ int main(void)
         printf("Waiting for new clients, CTRL+C to shut down the simulator\n");
     }
     return 0;
-}
+}