Merge branch 'master' into pubsub_state

jpfr · Oct 3, 2023 · 8e53c85 · 8e53c85
2 parents d1f9f1e + 0a67c35
commit 8e53c85
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/examples/pubsub/pubsub_publish_encrypted.c b/examples/pubsub/pubsub_publish_encrypted.c
@@ -168,13 +168,15 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }
diff --git a/examples/pubsub/pubsub_subscribe_encrypted.c b/examples/pubsub/pubsub_subscribe_encrypted.c
@@ -345,13 +345,15 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -206,13 +206,15 @@ main(int argc, char **argv) {
                 return EXIT_FAILURE;
             }
 
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }
diff --git a/examples/pubsub/server_pubsub_publisher_iop.c b/examples/pubsub/server_pubsub_publisher_iop.c
@@ -846,14 +846,16 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         }
         else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }
diff --git a/examples/pubsub/server_pubsub_publisher_on_demand.c b/examples/pubsub/server_pubsub_publisher_on_demand.c
@@ -224,13 +224,15 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
 
     return run(&transportProfile, &networkAddressUrl);

diff --git a/examples/pubsub/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/server_pubsub_subscribe_custom_monitoring.c
@@ -505,7 +505,6 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf ("Error: unknown URI\n");
@@ -516,6 +515,9 @@ int main(int argc, char **argv) {
             useCustomMonitoring = UA_TRUE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
     return run(&transportProfile, &networkAddressUrl, &useCustomMonitoring);
 }
 
diff --git a/examples/pubsub/server_pubsub_subscriber_rt_level.c b/examples/pubsub/server_pubsub_subscriber_rt_level.c
@@ -400,13 +400,15 @@ int main(int argc, char **argv) {
                 return EXIT_FAILURE;
             }
 
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf ("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }

diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
@@ -204,13 +204,15 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }
diff --git a/examples/pubsub/tutorial_pubsub_subscribe.c b/examples/pubsub/tutorial_pubsub_subscribe.c
@@ -308,13 +308,15 @@ int main(int argc, char **argv) {
                 return EXIT_FAILURE;
             }
 
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
             printf ("Error: unknown URI\n");
             return EXIT_FAILURE;
         }
     }
+    if (argc > 2) {
+        networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+    }
 
     return run(&transportProfile, &networkAddressUrl);
 }