Add --ip and --port flags for remote bridge connections

- Add --ip flag to specify remote bridge IP address
- Add --port flag to specify custom port number
- Update init_client() to use configurable IP/port with inet_pton for Windows
- Add IP address validation and conversion
- Update usage documentation for both spdm_requester_emu and spdm_device_validator_sample
- Support both MCTP and TCP transports with custom ports
- Fix Windows MSVC build by replacing deprecated inet_addr with inet_pton
- Enable spdm_device_validator_sample to connect to remote bridges

This enables spdm-emu tools to connect to bridges running on remote machines,
useful for testing SPDM implementations across different hosts while maintaining
backward compatibility with default localhost:2323 connections.

Signed-off-by: Lee Ballard <lee.ballard@dell.com>

Author: ballle98

spdm_emu/spdm_device_validator_sample/spdm_device_validator_sample.c

@@ -94,7 +94,9 @@ int main(int argc, char *argv[])
 
     process_args("spdm_device_validator_sample", argc, argv);
 
-    platform_client_routine(DEFAULT_SPDM_PLATFORM_PORT);
+    /* Use custom port if provided, otherwise default to 2323 */
+uint16_t port = (m_custom_port != 0) ? m_custom_port : DEFAULT_SPDM_PLATFORM_PORT;
+platform_client_routine(port);
     printf("Client stopped\n");
 
     close_pcap_packet_file();

spdm_emu/spdm_emu_common/spdm_emu.c

@@ -32,6 +32,9 @@ uint32_t m_exe_session =
 
 #define IP_ADDRESS "127.0.0.1"
 
+char m_ip_address_string[16] = "127.0.0.1";
+uint16_t m_custom_port = 0; /* 0 means use default */
+
 #ifdef _MSC_VER
 struct in_addr m_ip_address = { { { 127, 0, 0, 1 } } };
 #else
@@ -42,6 +45,8 @@ void print_usage(const char *name)
 {
     printf("\n%s [--trans MCTP|PCI_DOE|TCP|NONE]\n", name);
     printf("   [--tcp_sub RI|NO_RI]\n");
+    printf("   [--ip <ip_address>]\n");
+    printf("   [--port <port_number>]\n");
     printf("   [--ver 1.0|1.1|1.2|1.3|1.4]\n");
     printf("   [--sec_ver 1.0|1.1|1.2]\n");
     printf(
@@ -609,6 +614,44 @@ void process_args(char *program_name, int argc, char *argv[])
             }
         }
 
+        if (strcmp(argv[0], "--ip") == 0) {
+            if (argc >= 2) {
+                if (strlen(argv[1]) >= sizeof(m_ip_address_string)) {
+                    printf("invalid --ip %s (too long)\n", argv[1]);
+                    print_usage(program_name);
+                    exit(0);
+                }
+                strcpy(m_ip_address_string, argv[1]);
+                printf("ip - %s\n", m_ip_address_string);
+                argc -= 2;
+                argv += 2;
+                continue;
+            } else {
+                printf("invalid --ip\n");
+                print_usage(program_name);
+                exit(0);
+            }
+        }
+
+        if (strcmp(argv[0], "--port") == 0) {
+            if (argc >= 2) {
+                m_custom_port = (uint16_t)atoi(argv[1]);
+                if (m_custom_port == 0) {
+                    printf("invalid --port %s\n", argv[1]);
+                    print_usage(program_name);
+                    exit(0);
+                }
+                printf("port - %d\n", m_custom_port);
+                argc -= 2;
+                argv += 2;
+                continue;
+            } else {
+                printf("invalid --port\n");
+                print_usage(program_name);
+                exit(0);
+            }
+        }
+
         if (strcmp(argv[0], "--ver") == 0) {
             if (argc >= 2) {
                 if (!get_value_from_name(
@@ -1443,10 +1486,23 @@ void process_args(char *program_name, int argc, char *argv[])
     return;
 }
 
+bool convert_ip_to_addr(const char *ip_string, struct in_addr *addr)
+{
+#ifdef _MSC_VER
+    /* Use inet_pton for Windows MSVC compatibility */
+    return (inet_pton(AF_INET, ip_string, addr) == 1);
+#else
+    /* Fallback to inet_addr for non-Windows platforms */
+    addr->s_addr = inet_addr(ip_string);
+    return (addr->s_addr != INADDR_NONE);
+#endif
+}
+
 bool init_client(SOCKET *sock, uint16_t port)
 {
     SOCKET client_socket;
     struct sockaddr_in server_addr;
+    struct in_addr ip_addr;
     int32_t ret_val;
 
 #ifdef _MSC_VER
@@ -1470,9 +1526,28 @@ bool init_client(SOCKET *sock, uint16_t port)
     }
 
     server_addr.sin_family = AF_INET;
-    libspdm_copy_mem(&server_addr.sin_addr.s_addr, sizeof(struct in_addr), &m_ip_address,
-                     sizeof(struct in_addr));
-    server_addr.sin_port = htons(port);
+    
+    /* Use custom IP if provided, otherwise use default */
+    if (strcmp(m_ip_address_string, "127.0.0.1") != 0) {
+        if (!convert_ip_to_addr(m_ip_address_string, &ip_addr)) {
+            printf("Invalid IP address: %s\n", m_ip_address_string);
+            closesocket(client_socket);
+            return false;
+        }
+        libspdm_copy_mem(&server_addr.sin_addr.s_addr, sizeof(struct in_addr), &ip_addr,
+                         sizeof(struct in_addr));
+    } else {
+        libspdm_copy_mem(&server_addr.sin_addr.s_addr, sizeof(struct in_addr), &m_ip_address,
+                         sizeof(struct in_addr));
+    }
+    
+    /* Use custom port if provided */
+    if (m_custom_port != 0) {
+        server_addr.sin_port = htons(m_custom_port);
+    } else {
+        server_addr.sin_port = htons(port);
+    }
+    
     libspdm_zero_mem(server_addr.sin_zero, sizeof(server_addr.sin_zero));
 
     ret_val = connect(client_socket, (struct sockaddr *)&server_addr,

spdm_emu/spdm_emu_common/spdm_emu.h

@@ -23,6 +23,8 @@
 
 extern uint32_t m_use_transport_layer;
 extern uint32_t m_use_tcp_role_inquiry;
+extern char m_ip_address_string[16];
+extern uint16_t m_custom_port;
 extern uint8_t m_use_version;
 extern uint8_t m_use_secured_message_version;
 extern uint32_t m_use_requester_capability_flags;

spdm_emu/spdm_requester_emu/spdm_requester_emu.c

@@ -294,11 +294,14 @@ int main(int argc, char *argv[])
     process_args("spdm_requester_emu", argc, argv);
 
     if (m_use_transport_layer == SOCKET_TRANSPORT_TYPE_TCP) {
-        /* Port number 4194 for SPDM */
-        result = platform_client_routine(TCP_SPDM_PLATFORM_PORT);
+        /* Use custom port if specified, otherwise default to 4194 for TCP */
+        uint16_t port = (m_custom_port != 0) ? m_custom_port : TCP_SPDM_PLATFORM_PORT;
+        result = platform_client_routine(port);
     }
     else {
-        result = platform_client_routine(DEFAULT_SPDM_PLATFORM_PORT);
+        /* Use custom port if specified, otherwise default to 2323 for other transports */
+        uint16_t port = (m_custom_port != 0) ? m_custom_port : DEFAULT_SPDM_PLATFORM_PORT;
+        result = platform_client_routine(port);
     }
 
     printf("Client stopped\n");