From b99059638a434776fd4a1d1ce68ca7309f243447 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 May 2020 17:57:40 -0400
Subject: [PATCH] Use plural soap versions

---
 scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in | 4 ++--
 scripts/zmonvif-probe.pl.in                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
index 01536bf77..d90a5fea3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
@@ -163,7 +163,7 @@ sub interpret_messages {
 # functions
 
 sub discover {
-  my ($soap_version, $net_interface) = @_;
+  my ($soap_versions, $net_interface) = @_;
   my @results;
 
 ## collect all responses
@@ -178,7 +178,7 @@ sub discover {
 
   my $uuid_gen = Data::UUID->new();
 
-  foreach my $version ( $soap_version ? ( $soap_version ) : ( '1.1', '1.2') ) {
+  foreach my $version ( $soap_versions ? ( split(',',$soap_versions) ) : ( '1.1', '1.2') ) {
 		my %services;
 
     print "Probing for SOAP $version\n" if $verbose;
diff --git a/scripts/zmonvif-probe.pl.in b/scripts/zmonvif-probe.pl.in
index 3598dfcae..b9d3cd0bf 100644
--- a/scripts/zmonvif-probe.pl.in
+++ b/scripts/zmonvif-probe.pl.in
@@ -41,7 +41,7 @@ my $OPTIONS = 'v';
 
 sub HELP_MESSAGE {
   my ($fh, $pkg, $ver, $opts) = @_;
-  print $fh "Usage: " . __FILE__ . " [-v] probe <soap version> <network interface>\n";
+  print $fh "Usage: " . __FILE__ . " [-v] probe <soap versions> <network interface>\n";
   print $fh "       " . __FILE__ . " [-v] <command> <device URI> <soap version> <user> <password>\n";
   print $fh  <<EOF
   Commands are:
@@ -53,7 +53,7 @@ sub HELP_MESSAGE {
     -v        - increase verbosity
   Device access parameters (for all commands but 'probe'):
     device URL    - the ONVIF Device service URL
-    soap version  - SOAP version (1.1 or 1.2)
+    soap versions - SOAP versions (1.1 or 1.2 or 1.1,1.2)
     user          - username of a user with access to the device
     password      - password for the user
 EOF
@@ -69,7 +69,7 @@ if ( !getopts($OPTIONS) ) {
 
 my $action = shift;
 
-if ( ! defined $action ) {
+if ( !defined $action ) {
   HELP_MESSAGE(\*STDOUT);
   exit(1);
 }