Printing out configuration at the start of the appl.

Signed-off-by: Naresh Nayak <[email protected]>
COVESA · Dec 18, 2024 · 6e7d13c · 6e7d13c
1 parent c0cf41d
commit 6e7d13c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 10 deletions.
diff --git a/examples/acf-can/README.md b/examples/acf-can/README.md
@@ -56,8 +56,7 @@ CAN bus over Ethernet using Open1722.
 _acf-can-bridge_ bridges the Ethernet domain with the CAN domain, i.e., all received IEEE 1722 ACF frames will be parsed for extracting CAN frames which will be sent out on CAN bus and all received CAN frames will be packed into IEEE 1722 ACF messages and sent out on the Ethernet interface.
 
 ```
-acf-can-bridge -- a program designed to receive CAN messages from a remote CAN
-bus over Ethernet using Open1722.
+acf-can-bridge -- a program for bridging a CAN interface with an Ethernet interface using IEEE 1722.
 
       --canif=CAN_IF         CAN interface
   -c, --count=COUNT          Set count of CAN messages per Ethernet frame

diff --git a/examples/acf-can/acf-can-bridge.c b/examples/acf-can/acf-can-bridge.c
@@ -64,18 +64,20 @@ static uint8_t ip_addr[sizeof(struct in_addr)];
 static int priority = -1;
 static uint8_t use_tscf = 0;
 static uint8_t use_udp = 0;
-static uint32_t udp_port = 17220;
+static uint32_t udp_listen_port = 17220;
+static uint32_t udp_send_port = 17220;
 static Avtp_CanVariant_t can_variant = AVTP_CAN_CLASSIC;
 static uint8_t num_acf_msgs = 1;
 static char can_ifname[IFNAMSIZ];
 static uint64_t talker_stream_id = TALKER_STREAM_ID;
 static uint64_t listener_stream_id = LISTENER_STREAM_ID;
+static char ip_addr_str[100];
 
 int eth_socket, can_socket;
 struct sockaddr* dest_addr;
 
 static char doc[] =
-        "\nacf-can-bridge -- a program designed to receive CAN messages from a remote CAN bus over Ethernet using Open1722.\
+        "\nacf-can-bridge -- a program for bridging a CAN interface with an Ethernet interface using IEEE 1722.\
         \vEXAMPLES\n\
         acf-can-bridge -i eth0 -d aa:bb:cc:dd:ee:ff --canif can1\n\
         \t(Bridge eth0 with can1 using Open1722 using Ethernet)\n\
@@ -100,14 +102,13 @@ static struct argp_option options[] = {
 static error_t parser(int key, char *arg, struct argp_state *state)
 {
     int res;
-    char ip_addr_str[100];
 
     switch (key) {
     case 't':
         use_tscf = 1;
         break;
     case 'p':
-        udp_port = atoi(arg);
+        udp_listen_port = atoi(arg);
         break;
     case 'u':
         use_udp = 1;
@@ -133,7 +134,7 @@ static error_t parser(int key, char *arg, struct argp_state *state)
         }
         break;
     case 'n':
-        res = sscanf(arg, "%[^:]:%d", ip_addr_str, &udp_port);
+        res = sscanf(arg, "%[^:]:%d", ip_addr_str, &udp_send_port);
         if (!res) {
             fprintf(stderr, "Invalid IP address or port\n");
             exit(EXIT_FAILURE);
@@ -181,15 +182,36 @@ int main(int argc, char *argv[])
 
     argp_parse(&argp, argc, argv, 0, NULL, NULL);
 
+    // Print current configuration
+    printf("acf-can-bridge configuration:\n");
+    if(use_tscf)
+        printf("\tUsing TSCF\n");
+    else
+        printf("\tUsing NTSCF\n");
+    if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Classic CAN\n");
+    else if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Ethernet\n");
+    if(use_udp) {
+        printf("\tUsing UDP\n");
+        printf("\tDestination IP: %s, Send port: %d, listening port: %d\n", ip_addr_str, udp_send_port, udp_listen_port);
+    } else {
+        printf("\tUsing Ethernet\n");
+        printf("\tNetwork Interface: %s\n", ifname);
+        printf("\tDestination MAC Address: %x:%x:%x:%x:%x:%x\n", macaddr[0], macaddr[1], macaddr[2],
+                                                        macaddr[3], macaddr[4], macaddr[5]);
+    }
+    printf("\tListener Stream ID: %lx, Talker Stream ID: %lx\n", listener_stream_id, talker_stream_id);
+
     // Create an appropriate sockets: UDP or Ethernet raw
     // Setup the socket for sending to the destination
     if (use_udp) {
-        eth_socket = create_listener_socket_udp(udp_port);
+        eth_socket = create_listener_socket_udp(udp_listen_port);
         if (eth_socket < 0) return 1;
 
         // Prepare socket for sending to the destination
         res = setup_udp_socket_address((struct in_addr*) ip_addr,
-                                       udp_port, &sk_udp_addr);
+                                       udp_send_port, &sk_udp_addr);
         dest_addr = (struct sockaddr*) &sk_udp_addr;
     } else {
         eth_socket = create_listener_socket(ifname, macaddr, ETH_P_TSN);

diff --git a/examples/acf-can/acf-can-listener.c b/examples/acf-can/acf-can-listener.c
@@ -126,6 +126,20 @@ int main(int argc, char *argv[])
     struct ifreq ifr;
 
     argp_parse(&argp, argc, argv, 0, NULL, NULL);
+    // Print current configuration
+    printf("acf-can-listener configuration:\n");
+    if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Classic CAN\n");
+    else if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Ethernet\n");
+    if(use_udp) {
+        printf("\tUsing UDP\n");
+        printf("\tListening port: %d\n", udp_port);
+    } else {
+        printf("\tUsing Ethernet\n");
+        printf("\tNetwork Interface: %s\n", ifname);
+    }
+    printf("\tListener Stream ID: %lx", listener_stream_id);
 
     // Configure an appropriate socket: UDP or Ethernet Raw
     if (use_udp) {

diff --git a/examples/acf-can/acf-can-talker.c b/examples/acf-can/acf-can-talker.c
@@ -59,6 +59,7 @@ static Avtp_CanVariant_t can_variant = AVTP_CAN_CLASSIC;
 static uint8_t num_acf_msgs = 1;
 static char can_ifname[IFNAMSIZ];
 static uint64_t talker_stream_id = STREAM_ID;
+static char ip_addr_str[100];
 
 static char doc[] =
         "\nacf-can-talker -- a program to send CAN messages to a remote CAN bus over Ethernet using Open1722.\
@@ -84,7 +85,6 @@ static struct argp_option options[] = {
 static error_t parser(int key, char *arg, struct argp_state *state)
 {
     int res;
-    char ip_addr_str[100];
 
     switch (key) {
     case 't':
@@ -144,6 +144,25 @@ int main(int argc, char *argv[])
     struct sockaddr* dest_addr;
 
     argp_parse(&argp, argc, argv, 0, NULL, NULL);
+    printf("acf-talker-configuration:\n");
+    if(use_tscf)
+        printf("\tUsing TSCF\n");
+    else
+        printf("\tUsing NTSCF\n");
+    if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Classic CAN\n");
+    else if(can_variant == AVTP_CAN_CLASSIC)
+        printf("\tUsing Ethernet\n");
+    if(use_udp) {
+        printf("\tUsing UDP\n");
+        printf("\tDestination IP: %s, Send port: %d\n", ip_addr_str, udp_port);
+    } else {
+        printf("\tUsing Ethernet\n");
+        printf("\tNetwork Interface: %s\n", ifname);
+        printf("\tDestination MAC Address: %x:%x:%x:%x:%x:%x\n", macaddr[0], macaddr[1], macaddr[2],
+                                                        macaddr[3], macaddr[4], macaddr[5]);
+    }
+    printf("\tTalker Stream ID: %lx\n", talker_stream_id);
 
     // Create an appropriate talker socket: UDP or Ethernet raw
     // Setup the socket for sending to the destination